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

Merge remote-tracking branch 'upstream/pull/1707'

Browse source
This commit is contained in:
Tom Hughes 2018-01-13 10:35:42 +00:00
commit 9cf698322c
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,9 +241,7 @@ $(document).ready(function () {
function remoteEditHandler(bbox, object) {
var loaded = false,
url = document.location.protocol === "https:" ?
"https://127.0.0.1:8112/load_and_zoom?" :
"http://127.0.0.1:8111/load_and_zoom?",
url = "http://127.0.0.1:8111/load_and_zoom?",
query = {
left: bbox.getWest() - 0.0001,
top: bbox.getNorth() + 0.0001,

2
app/controllers/application_controller.rb
View file

@ -413,7 +413,7 @@ class ApplicationController < ActionController::Base
def map_layout
append_content_security_policy_directives(
:child_src => %w[127.0.0.1:8111 127.0.0.1:8112],
:child_src => %w[127.0.0.1:8111],
:connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org],
:form_action => %w[render.openstreetmap.org],
:script_src => %w[graphhopper.com open.mapquestapi.com],