X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bd5ae239950a842e565ba747466da903e605bda..902f1b088743b1983ef5bbb2ac7a3c8f2fadbdf1:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 9ddac98a3..fc8e8ff46 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -327,7 +327,7 @@ $(document).ready(function () { e.preventDefault(); if ($(".query_wrapper.routing").is(":visible")) { // Routing - OSM.routing.requestRoute(); + OSM.routing.requestRoute(true, false); } else { // Search $("header").addClass("closed"); @@ -349,22 +349,29 @@ $(document).ready(function () { }); OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing')); - OSM.routing.addEngines(OSM.RoutingEngines.list); - OSM.routing.chooseEngine('Car (OSRM)'); + OSM.routing.chooseEngine('javascripts.directions.engines.osrm_car'); $(".get_directions").on("click",function(e) { - e.preventDefault(); - $(".search").hide(); - $(".routing").show(); - $(".query_wrapper.routing [name=route_from]").focus(); + e.preventDefault(); + $(".search").hide(); + $(".routing").show(); + $(".query_wrapper.routing [name=route_from]").focus(); + $("#map").on('dragend dragover',function(e) { e.preventDefault(); }); + $("#map").on('drop',function(e) { OSM.routing.handleDrop(e); }); + $(".routing_marker").on('dragstart',function(e) { + e.originalEvent.dataTransfer.effectAllowed = 'move'; + e.originalEvent.dataTransfer.setData('id', this.id); + }); }); $(".close_directions").on("click",function(e) { - e.preventDefault(); - $(".search").show(); - $(".routing").hide(); - OSM.routing.close(); - $(".query_wrapper.search [name=query]").focus(); + e.preventDefault(); + $(".search").show(); + $(".routing").hide(); + OSM.routing.close(); + $("#map").off('dragend drop dragover'); + $(".routing_marker").off('dragstart'); + $(".query_wrapper.search [name=query]").focus(); }); });