From be07dcccdf735fe91b2cc59425028a7bac1fbb71 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 2 Mar 2017 00:54:24 -0500
Subject: [PATCH] Always access OSM over https now

If you were logged in before, you might need to logout with
`id.connection().logout()` or delete the OAuth data from localStorage
---
 index.html              | 4 ++--
 modules/services/osm.js | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 0892708df..2d611ccfb 100644
--- a/index.html
+++ b/index.html
@@ -23,12 +23,12 @@
                 .call(iD.uiSourceSwitch(id)
                     .keys([
                         {
-                            'urlroot': 'http://www.openstreetmap.org',
+                            'urlroot': 'https://www.openstreetmap.org',
                             'oauth_consumer_key': '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
                             'oauth_secret': 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL'
                         },
                         {
-                            'urlroot': 'http://api06.dev.openstreetmap.org',
+                            'urlroot': 'https://api06.dev.openstreetmap.org',
                             'oauth_consumer_key': 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
                             'oauth_secret': 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p'
                         }
diff --git a/modules/services/osm.js b/modules/services/osm.js
index 1aab53baa..b3080409f 100644
--- a/modules/services/osm.js
+++ b/modules/services/osm.js
@@ -9,9 +9,7 @@ import { utilDetect } from '../util/detect';
 import { utilRebind } from '../util/rebind';
 
 var dispatch = d3.dispatch('authLoading', 'authDone', 'change', 'loading', 'loaded'),
-    useHttps = window.location.protocol === 'https:',
-    protocol = useHttps ? 'https:' : 'http:',
-    urlroot = protocol + '//www.openstreetmap.org',
+    urlroot = 'https://www.openstreetmap.org',
     blacklists = ['.*\.google(apis)?\..*/(vt|kh)[\?/].*([xyz]=.*){3}.*'],
     inflight = {},
     loadedTiles = {},