Refer to the id for the distance/time summary

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index fc772a1a8692cb93fbed2ce45cd988e98d45db09..e5f6fe47811a4f275f4814a0a7267dc5cee9b3f6 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -154,7 +154,7 @@ $(document).ready(function () {
       map._object);
 
     $.removeCookie("_osm_location");
       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') {
   });
 
   if ($.cookie('_osm_welcome') == 'hide') {


@@ -327,7 +327,7 @@ $(document).ready(function () {
     e.preventDefault();
     if ($(".query_wrapper.routing").is(":visible")) {
       // Routing
     e.preventDefault();
     if ($(".query_wrapper.routing").is(":visible")) {
       // Routing

-      OSM.routing.requestRoute();
+      OSM.routing.requestRoute(true, true);

     } else {
       // Search
       $("header").addClass("closed");
     } else {
       // Search
       $("header").addClass("closed");


@@ -342,14 +342,14 @@ $(document).ready(function () {
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
 
   $(".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.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('Car (OSRM)');
+  OSM.routing.chooseEngine('javascripts.directions.engines.osrm_car');

 
   $(".get_directions").on("click",function(e) {
     e.preventDefault();
 
   $(".get_directions").on("click",function(e) {
     e.preventDefault();


@@ -357,10 +357,12 @@ $(document).ready(function () {
     $(".routing").show();
     $(".query_wrapper.routing [name=route_from]").focus();
     $("#map").on('dragend dragover',function(e) { e.preventDefault(); });
     $(".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) {
     $(".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('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));

     });
   });
 
     });
   });