X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6d9d688080ebcf166addb868b8fceeee55c3e700..7dd23a4b5637cce3723abc242ea961841d835305:/app/assets/javascripts/index/directions.js?ds=sidebyside diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 03f8cb225..a5f3b0080 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -303,7 +303,7 @@ OSM.Directions = function (map) { $(".routing_marker").on('dragstart', function (e) { e.originalEvent.dataTransfer.effectAllowed = 'move'; - e.originalEvent.dataTransfer.setData('id', this.id); + e.originalEvent.dataTransfer.setData('type', $(this).data('type')); var img = $("").attr("src", $(e.originalEvent.target).attr("src")); e.originalEvent.dataTransfer.setDragImage(img.get(0), 12, 21); }); @@ -321,11 +321,11 @@ OSM.Directions = function (map) { $("#map").on('drop', function (e) { e.preventDefault(); var oe = e.originalEvent; - var id = oe.dataTransfer.getData('id'); + var type = oe.dataTransfer.getData('type'); var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present pt.y += 20; var ll = map.containerPointToLatLng(pt); - endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll); + endpoints[type === 'from' ? 0 : 1].setLatLng(ll); getRoute(); }); @@ -336,13 +336,8 @@ OSM.Directions = function (map) { setEngine(params.engine); } - if (params.from) { - endpoints[0].setValue(params.from); - endpoints[1].setValue(""); - } else { - endpoints[0].setValue(""); - endpoints[1].setValue(""); - } + endpoints[0].setValue(params.from || ""); + endpoints[1].setValue(params.to || ""); var o = route[0] && L.latLng(route[0].split(',')), d = route[1] && L.latLng(route[1].split(','));