From 3c2c24a839eb4cc3eecac4807d585fac97059a2a Mon Sep 17 00:00:00 2001
From: Guillaume Rischard <github@stereo.lu>
Date: Sat, 28 Sep 2019 01:54:12 +0200
Subject: [PATCH] Always call JOSM over http

Https in JOSM is unreliable and will be dropped soon. See https://josm.openstreetmap.de/ticket/10033

All modern browsers support calling 127.0.0.1 over http even from https pages, per spec:

w3c/webappsec-mixed-content@349501c
https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy

JOSM's default behaviour is to run without https.

Openstreetmap.org itself also always calls JOSM over http.
---
 app/helpers/application_helper.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 33086a2f..bf3c5828 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -36,20 +36,18 @@ def potlatch_link(zoom, lon, lat, slug = nil)
   # derives URLs for HTTP GET requests needed for JOSM to load data and tiles.
   # Actual XHRs exist in <script> in show.html.erb.
   def josm_link(zoom, lon, lat, north, south, east, west, provider, slug = nil)
-    protocol = URI.parse(request.original_url).scheme
-    port = protocol == "https" ? "8112" : "8111"
-    domain = "127.0.0.1"
+    josmremote = "http://127.0.0.1:8111"
 
     provider = provider.gsub("{S}", "{switch:a,b,c}").gsub("{Z}", "{zoom}").gsub("{Y}", "{y}").gsub("{X}", "{x}");
 
     # load data and zoom to extents
-    dataRequest = "#{protocol}://#{domain}:#{port}/load_and_zoom?left=#{west}&right=#{east}&top=#{north}5&bottom=#{south}"
+    dataRequest = "#{josmremote}/load_and_zoom?left=#{west}&right=#{east}&top=#{north}5&bottom=#{south}"
 
     # load tiles
     if slug
-      tileRequest = "#{protocol}://#{domain}:#{port}/imagery?title=osm&type=tms&url=#{FieldPapers::TILE_BASE_URL}/snapshots/#{slug}/{zoom}/{x}/{y}.png"
+      tileRequest = "#{josmremote}/imagery?title=osm&type=tms&url=#{FieldPapers::TILE_BASE_URL}/snapshots/#{slug}/{zoom}/{x}/{y}.png"
     else
-      tileRequest = "#{protocol}://#{domain}:#{port}/imagery?title=osm&type=tms&url=#{provider}"
+      tileRequest = "#{josmremote}/imagery?title=osm&type=tms&url=#{provider}"
     end
 
     return "data-data-request=#{dataRequest} data-tile-request=#{tileRequest}"