Extend https support to all three routing engines

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 8d01bcd169dd06c691faf849f9d3e2ab1aab260a..356de34778a588ce44ba786fa533ccfc55d08fa7 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -19,7 +19,7 @@ function GraphHopperEngine(id, vehicleParam) {
     getRoute: function (points, callback) {
       // documentation
       // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
     getRoute: function (points, callback) {
       // documentation
       // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md

-      var url = "https://graphhopper.com/api/1/route?"
+      var url = document.location.protocol + "//graphhopper.com/api/1/route?"

         + vehicleParam
         + "&locale=" + I18n.currentLocale()
         + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"
         + vehicleParam
         + "&locale=" + I18n.currentLocale()
         + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"


@@ -70,5 +70,5 @@ function GraphHopperEngine(id, vehicleParam) {
   };
 }
 
   };
 }
 

-OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), false);
-OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), false);
+OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), true);
+OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), true);

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index 00ef24d6fb3f8d8ea6c2b5db6e73529e79a7efdf..05cb32f2093647f2c37acc73b95c0b34f349fa9e 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -31,7 +31,7 @@ function OSRMEngine() {
         I18n.t('javascripts.directions.instructions.end_oneway')        // 17
       ];
 
         I18n.t('javascripts.directions.instructions.end_oneway')        // 17
       ];
 

-      var url = "http://router.project-osrm.org/viaroute?z=14&output=json&instructions=true";
+      var url = document.location.protocol + "//router.project-osrm.org/viaroute?z=14&output=json&instructions=true";

 
       for (var i = 0; i < points.length; i++) {
         url += "&loc=" + points[i].lat + ',' + points[i].lng;
 
       for (var i = 0; i < points.length; i++) {
         url += "&loc=" + points[i].lat + ',' + points[i].lng;


@@ -91,4 +91,4 @@ function OSRMEngine() {
   };
 }
 
   };
 }
 

-OSM.Directions.addEngine(OSRMEngine(), false);
+OSM.Directions.addEngine(OSRMEngine(), true);