diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-20 21:07:26 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-20 21:07:26 +0100 |
commit | 8319c848841b8744ed0c72ca34e97f081256abc4 (patch) | |
tree | 01fd9326dde8ee9ba502e0744e3c760c40faf223 | |
parent | 521933c89abf21998541f98cc1a7e207f9fee547 (diff) | |
download | Chimère - projet Saclay-8319c848841b8744ed0c72ca34e97f081256abc4.tar.bz2 Chimère - projet Saclay-8319c848841b8744ed0c72ca34e97f081256abc4.zip |
Change JS transport and route management to be available on startup
-rw-r--r-- | static/saclay/js/interface.js | 19 | ||||
-rw-r--r-- | templates/chimere/blocks/map.html | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js index 76a63da..3f23a72 100644 --- a/static/saclay/js/interface.js +++ b/static/saclay/js/interface.js @@ -156,9 +156,26 @@ $(function(){ par.removeClass('opened'); } }); - + $('input[name="transport"]').change(change_routing_transport); + $('input[name="speed"]').change(change_routing_speed); + $('#id_speed').change(change_routing_speed); }); +function change_routing_speed(){ + var speed = $('#id_speed option:selected').val(); + if(!speed){ + speed = $('input[name=speed]:checked').val(); + } + if (!speed) return; + speed = speed.split('_')[1] + $('#main-map').chimere('routingChangeSpeed', speed); +} + +function change_routing_transport(){ + $('#main-map').chimere('routingChangeTransport', + $('input[name="transport"]:checked').val()); +} + function display_feature_detail(data, settings){ settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>"); $('.detail_zoomin').bind("click", function(event){ diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html index 958954e..d8711ad 100644 --- a/templates/chimere/blocks/map.html +++ b/templates/chimere/blocks/map.html @@ -112,6 +112,8 @@ $(function(){ {% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %} {% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %} {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %} + {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %} + {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %} chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}}, {{icon_offset_y}}); chimere_init_options['marker_hover_offset'] = new OpenLayers.Pixel(7, 20); |