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

Move routing API endpoint addresses to config file

Browse source
This commit is contained in:
Tom Hughes 2016-01-11 19:03:47 +00:00
parent 409e99c6fc
commit e128e78408
5 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ function GraphHopperEngine(id, vehicleType) {
// GraphHopper Directions API documentation
// https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
return $.ajax({
url: document.location.protocol + "//graphhopper.com/api/1/route",
url: document.location.protocol + OSM.GRAPHHOPPER_URL,
data: {
vehicle: vehicleType,
locale: I18n.currentLocale(),

2
app/assets/javascripts/index/directions/mapquest.js
View file

@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) {
var to = points[points.length - 1];
return $.ajax({
url: document.location.protocol + "//open.mapquestapi.com/directions/v2/route",
url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL,
data: {
key: OSM.MAPQUEST_KEY,
from: from.lat + "," + from.lng,

2
app/assets/javascripts/index/directions/mapzen.js
View file

@ -39,7 +39,7 @@ function MapzenEngine(id, costing) {
getRoute: function (points, callback) {
return $.ajax({
url: document.location.protocol + "//valhalla.mapzen.com/route",
url: document.location.protocol + OSM.MAPZEN_VALHALLA_URL,
data: {
api_key: OSM.MAPZEN_VALHALLA_KEY,
json: JSON.stringify({

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

@ -51,7 +51,7 @@ function OSRMEngine() {
}
return $.ajax({
url: document.location.protocol + "//router.project-osrm.org/viaroute",
url: document.location.protocol + OSM.OSRM_URL,
data: params,
dataType: "json",
success: function (data) {

40
app/assets/javascripts/osm.js.erb
View file

@ -2,34 +2,38 @@
OSM = {
<% if defined?(PIWIK) %>
PIWIK: <%= PIWIK.to_json %>,
PIWIK: <%= PIWIK.to_json %>,
<% end %>
MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
SERVER_URL: <%= SERVER_URL.to_json %>,
API_VERSION: <%= API_VERSION.to_json %>,
STATUS: <%= STATUS.to_json %>,
MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
OVERPASS_URL: <%= OVERPASS_URL.to_json %>,
NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>,
MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
SERVER_URL: <%= SERVER_URL.to_json %>,
API_VERSION: <%= API_VERSION.to_json %>,
STATUS: <%= STATUS.to_json %>,
MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
OVERPASS_URL: <%= OVERPASS_URL.to_json %>,
NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>,
GRAPHHOPPER_URL: <%= GRAPHHOPPER_URL.to_json %>,
MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>,
MAPZEN_VALHALLA_URL: <%= MAPZEN_VALHALLA_URL.to_json %>,
OSRM_URL: <%= OSRM_URL.to_json %>,
<% if defined?(MAPQUEST_KEY) %>
MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>,
MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>,
<% end %>
<% if defined?(MAPZEN_VALHALLA_KEY) %>
MAPZEN_VALHALLA_KEY: <%= MAPZEN_VALHALLA_KEY.to_json %>,
MAPZEN_VALHALLA_KEY: <%= MAPZEN_VALHALLA_KEY.to_json %>,
<% end %>
MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
MARKER_RED: <%= image_path("marker-red.png").to_json %>,
MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
MARKER_RED: <%= image_path("marker-red.png").to_json %>,
MARKER_ICON: <%= image_path("images/marker-icon.png").to_json %>,
MARKER_ICON_2X: <%= image_path("images/marker-icon-2x.png").to_json %>,
MARKER_SHADOW: <%= image_path("images/marker-shadow.png").to_json %>,
MARKER_ICON: <%= image_path("images/marker-icon.png").to_json %>,
MARKER_ICON_2X: <%= image_path("images/marker-icon-2x.png").to_json %>,
MARKER_SHADOW: <%= image_path("images/marker-shadow.png").to_json %>,
NEW_NOTE_MARKER: <%= image_path("new_note_marker.png").to_json %>,
OPEN_NOTE_MARKER: <%= image_path("open_note_marker.png").to_json %>,
CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.png").to_json %>,
NEW_NOTE_MARKER: <%= image_path("new_note_marker.png").to_json %>,
OPEN_NOTE_MARKER: <%= image_path("open_note_marker.png").to_json %>,
CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.png").to_json %>,
apiUrl: function (object) {
var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;