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

Always use http to talk to josm

Browse source 
See discussion in #2445 and resulting conclusion that JOSM no
longer even listens on the https port.

Closes #2446
This commit is contained in:
Guillaume Rischard 2019-11-26 18:53:54 +00:00 • committed by Tom Hughes
parent cd0254d148
commit 7e390ec89b
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,7 @@
//= require querystring //= require querystring
$(document).ready(function () { $(document).ready(function () {
var querystring = require("querystring-component"), var querystring = require("querystring-component");
browser = bowser.getParser(window.navigator.userAgent);
var loaderTimeout; var loaderTimeout;
@ -256,12 +255,7 @@ $(document).ready(function () {
bottom: bbox.getSouth() - 0.0001 bottom: bbox.getSouth() - 0.0001
}; };
if (location.protocol === "http" || url = "http://127.0.0.1:8111/load_and_zoom?";
browser.satisfies({ chrome: ">=53", firefox: ">=55" })) {
url = "http://127.0.0.1:8111/load_and_zoom?";
} else {
url = "https://127.0.0.1:8112/load_and_zoom?";
}
if (object) query.select = object.type + object.id; if (object) query.select = object.type + object.id;