X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3eaf58c151ca9c790dcf6d0937dc186c5c790422..608ec07b1f356ac8f9e857d1a31b9eb94a2c79ab:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 8f989deaf..e5f6fe478 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -154,7 +154,7 @@ $(document).ready(function () { map._object); $.removeCookie("_osm_location"); - $.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" }); + $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); if ($.cookie('_osm_welcome') == 'hide') { @@ -327,7 +327,7 @@ $(document).ready(function () { e.preventDefault(); if ($(".query_wrapper.routing").is(":visible")) { // Routing - OSM.routing.requestRoute(true); + OSM.routing.requestRoute(true, true); } else { // Search $("header").addClass("closed"); @@ -342,7 +342,7 @@ $(document).ready(function () { $(".describe_location").on("click", function(e) { e.preventDefault(); - var precision = zoomPrecision(map.getZoom()); + var precision = OSM.zoomPrecision(map.getZoom()); OSM.router.route("/search?query=" + encodeURIComponent( map.getCenter().lat.toFixed(precision) + "," + map.getCenter().lng.toFixed(precision))); @@ -357,10 +357,12 @@ $(document).ready(function () { $(".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); }); + $("#map").on('drop',function(e) { OSM.routing.handleDrop(e); e.preventDefault(); }); $(".routing_marker").on('dragstart',function(e) { - e.originalEvent.dataTransfer.effectAllowed = 'move'; + e.originalEvent.dataTransfer.effectAllowed = 'move'; e.originalEvent.dataTransfer.setData('id', this.id); + e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width/2 - (e.originalEvent.x-e.target.x)); + e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - (e.originalEvent.y-e.target.y)); }); });