cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extend https support to all three routing engines

Browse source
This commit is contained in:
Tom Hughes 2015-02-01 21:41:06 +00:00
parent 4be0e9bd10
commit 7d32e50e0a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/index/directions/graphhopper.js
View file

@ -19,7 +19,7 @@ function GraphHopperEngine(id, vehicleParam) {
getRoute: function (points, callback) { getRoute: function (points, callback) {
// documentation // documentation
// https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md // 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 + vehicleParam
+ "&locale=" + I18n.currentLocale() + "&locale=" + I18n.currentLocale()
+ "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn" + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"
@ -70,5 +70,5 @@ function GraphHopperEngine(id, vehicleParam) {
}; };
} }
OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), false); OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), true);
OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), false); OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), true);

4
app/assets/javascripts/index/directions/osrm.js
View file

@ -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++) { for (var i = 0; i < points.length; i++) {
url += "&loc=" + points[i].lat + ',' + points[i].lng; url += "&loc=" + points[i].lat + ',' + points[i].lng;
@ -91,4 +91,4 @@ function OSRMEngine() {
}; };
} }
OSM.Directions.addEngine(OSRMEngine(), false); OSM.Directions.addEngine(OSRMEngine(), true);