X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/628eea2b97d6a0185a17673c48eeb3e35c333493..2b252e8337109de714bb8aa38ccf6d46e7686e42:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index fc8e8ff46..3d063189f 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -13,9 +13,8 @@ //= require index/history //= require index/note //= require index/new_note +//= require index/directions //= require router -//= require routing -//= require_tree ./routing_engines (function() { var loaderTimeout; @@ -154,7 +153,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') { @@ -282,6 +281,7 @@ $(document).ready(function () { return page; }; + var directions = OSM.Directions(map); var history = OSM.History(map); OSM.router = OSM.Router(map, { @@ -326,8 +326,8 @@ $(document).ready(function () { $(".search_form").on("submit", function(e) { e.preventDefault(); if ($(".query_wrapper.routing").is(":visible")) { - // Routing - OSM.routing.requestRoute(true, false); + // Directions + directions.requestRoute(true, true); } else { // Search $("header").addClass("closed"); @@ -342,36 +342,9 @@ $(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))); }); - - OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing')); - 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(); - $("#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(); - $("#map").off('dragend drop dragover'); - $(".routing_marker").off('dragstart'); - $(".query_wrapper.search [name=query]").focus(); - }); - });