OSM.Routing -> OSM.Directions

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 52b8b4c2300c1386a93b518976ddbee10b8920a0..66e0e064237ff4d00c5a45b92a4552612646ee8a 100644 (file)
--- 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;
@@ -326,8 +325,8 @@ $(document).ready(function () {
   $(".search_form").on("submit", function(e) {
     e.preventDefault();
     if ($(".query_wrapper.routing").is(":visible")) {
-      // Routing
-      OSM.routing.requestRoute(true, true);
+      // Directions
+      OSM.directions.requestRoute(true, true);
     } else {
       // Search
       $("header").addClass("closed");
@@ -348,8 +347,8 @@ $(document).ready(function () {
       map.getCenter().lng.toFixed(precision)));
   });
 
-  OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing'));
-  OSM.routing.chooseEngine('javascripts.directions.engines.osrm_car');
+  OSM.directions = OSM.Directions(map, 'OSM.directions', $('.query_wrapper.routing'));
+  OSM.directions.chooseEngine('javascripts.directions.engines.osrm_car');
 
   $(".get_directions").on("click",function(e) {
     e.preventDefault();
@@ -358,7 +357,7 @@ $(document).ready(function () {
     $(".search_form input[type='submit']").addClass("routing_submit");
     $(".query_wrapper.routing [name=route_from]").focus();
     $("#map").on('dragend dragover',function(e) { e.preventDefault(); });
-    $("#map").on('drop',function(e) { OSM.routing.handleDrop(e); e.preventDefault(); });
+    $("#map").on('drop',function(e) { OSM.directions.handleDrop(e); e.preventDefault(); });
     $(".routing_marker").on('dragstart',function(e) {
       e.originalEvent.dataTransfer.effectAllowed = 'move';
       e.originalEvent.dataTransfer.setData('id', this.id);
@@ -374,7 +373,7 @@ $(document).ready(function () {
     $(".search").show();
     $(".routing").hide();
     $(".search_form input[type='submit']").removeClass("routing_submit");
-    OSM.routing.close();
+    OSM.directions.close();
     $("#map").off('dragend drop dragover');
     $(".routing_marker").off('dragstart');
     $(".query_wrapper.search [name=query]").focus();