diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-20 21:13:45 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-20 21:13:45 +0100 |
| commit | c34d05a6f04dbddc92df8d90d1447233a2fed3a0 (patch) | |
| tree | cb7b89e69b8a869e0fb4909d7a87a8c2380572b9 /chimere/static | |
| parent | 57bbba43a75a72eeacd44f1ce5fcd6f203dc321c (diff) | |
| parent | a47acfb77d874e62e2d699ae792fbb77c5f8f61a (diff) | |
| download | Chimère-c34d05a6f04dbddc92df8d90d1447233a2fed3a0.tar.bz2 Chimère-c34d05a6f04dbddc92df8d90d1447233a2fed3a0.zip | |
Merge branch 'v2.1' into v2.2
Diffstat (limited to 'chimere/static')
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 23165fa..3dbc80c 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -73,6 +73,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { routing_end_lat: null, routing_end_lon: null, routing_steps_lonlat: null, + routing_transport: null, + routing_speed: null, // Provide this function to make a custom click event on the marker on_marker_click: null, // Provide this function to override the feature detail display @@ -211,8 +213,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { // Make specific params params.checked_categories = settings.checked_categories; params.display_submited = settings.display_submited; - if(settings.current_feature) + if (settings.current_feature) params.current_feature = settings.current_feature.pk; + if (settings.routing_speed) + params.routing_speed = settings.routing_speed; + if (settings.routing_transport) + params.routing_transport = settings.routing_transport; if (settings.routing_start){ lonlat = settings.routing_start.lonlat.clone().transform( EPSG_PROJECTION, EPSG_DISPLAY_PROJECTION); @@ -1110,7 +1116,14 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { } if (settings.routing_end && settings.routing_start) methods.route(); }, - + // change routing speed + routingChangeSpeed: function(speed){ + settings.routing_speed = speed; + }, + // change routing transport + routingChangeTransport: function(transport){ + settings.routing_transport = transport; + }, // add a step on the interface add_step_fx: function (){ settings.itinerary_step_number += 1; @@ -1200,16 +1213,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { steps.push(settings.routing_end.lonlat.clone()); // create the appropriate URL var uri = extra_url + "route/" - var transport = $('input[name=transport]:checked').val(); - if(transport){ - uri += transport + "/" - } - var speed = $('#id_speed option:selected').val(); - if(!speed){ - var speed = $('input[name=speed]:checked').val(); + if(settings.routing_transport){ + uri += settings.routing_transport + "/" } - if(speed){ - uri += speed.split('_')[1] + "/" + if(settings.routing_speed){ + //uri += speed.split('_')[1] + "/" + uri += routing_settings.speed + "/" } for (var i = 0; i < steps.length; i++) { var step = steps[i].transform( |