Merge remote-tracking branch 'openstreetmap/pull/903'

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

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index c4ba58b1a318e50ccb482f4b179d6daeee73c64a..95cb29ab813c0ac61eb265281caf4a49c777b65b 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -8,7 +8,8 @@ function GraphHopperEngine(id, vehicleParam) {
     2: 2, // right
     3: 3, // sharp right
     4: -1, // finish reached
-    5: -1 // via reached
+    5: -1, // via reached
+    6: 11 // roundabout
   };
 
   return {
@@ -17,20 +18,21 @@ function GraphHopperEngine(id, vehicleParam) {
     draggable: false,
 
     getRoute: function (points, callback) {
-      // documentation
-      // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
+      // GraphHopper Directions API documentation
+      // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
       var url = document.location.protocol + "//graphhopper.com/api/1/route?" +
           vehicleParam +
           "&locale=" + I18n.currentLocale() +
           "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn" +
           "&type=jsonp" +
+          "&elevation=false" +
           "&instructions=true";
 
       for (var i = 0; i < points.length; i++) {
         url += "&point=" + points[i].lat + ',' + points[i].lng;
       }
 
-      $.ajax({
+      return $.ajax({
         url: url,
         dataType: 'jsonp',
         success: function (data) {