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

Use XHR instead of jsonp for GraphHopper

Browse source 
Closes #1872
This commit is contained in:
Peter Karich 2018-05-17 20:47:58 +01:00 • committed by Tom Hughes
parent cb3c4ec09b
commit 1cea6b363a
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,13 +27,12 @@ function GraphHopperEngine(id, vehicleType) {
locale: I18n.currentLocale(), locale: I18n.currentLocale(),
key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn", key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
"ch.disable": vehicleType === "car", "ch.disable": vehicleType === "car",
type: "jsonp",
elevation: false, elevation: false,
instructions: true, instructions: true,
point: points.map(function (p) { return p.lat + "," + p.lng; }) point: points.map(function (p) { return p.lat + "," + p.lng; })
}, },
traditional: true, traditional: true,
dataType: "jsonp", dataType: "json",
success: function (data) { success: function (data) {
if (!data.paths || data.paths.length === 0) if (!data.paths || data.paths.length === 0)
return callback(true); return callback(true);

4
app/controllers/application_controller.rb
View file

@ -411,9 +411,9 @@ class ApplicationController < ActionController::Base
append_content_security_policy_directives( append_content_security_policy_directives(
:child_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112], :child_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112],
:frame_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112], :frame_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112],
:connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org], :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org graphhopper.com],
:form_action => %w[render.openstreetmap.org], :form_action => %w[render.openstreetmap.org],
:script_src => %w[graphhopper.com open.mapquestapi.com], :script_src => %w[open.mapquestapi.com],
:img_src => %w[developer.mapquest.com] :img_src => %w[developer.mapquest.com]
) )