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

tomhughes · Nov 8, 2023 · f5c5aac · f5c5aac
2 parents 675b89d + b834bd7
commit f5c5aac
Show file tree

Hide file tree

Showing 56 changed files with 746 additions and 669 deletions.
diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
@@ -13,8 +13,10 @@ document.addEventListener("DOMContentLoaded", function () {
   } else {
     var idContext = iD.coreContext();
     idContext.connection().apiConnections([]);
+    var url = location.protocol + "//" + location.host;
     idContext.preauth({
-      url: location.protocol + "//" + location.host,
+      url: url,
+      apiUrl: url === "https://www.openstreetmap.org" ? "https://api.openstreetmap.org" : url,
       access_token: container.dataset.token
     });
 

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
@@ -2711,6 +2711,7 @@
     stroke: #20c4ff;
 }
 
+
 /* Mapilio Image Layer */
 .ideditor .layer-mapilio {
     pointer-events: none;
@@ -2736,39 +2737,35 @@
             justify-content: center;
     gap: 4px;
 }
-
 .ideditor .photo-controls-mapilio button {
     padding:0 6px;
     pointer-events: initial;
 }
-
 .ideditor .mapilio-wrapper {
     position: relative;
     background-color: #000;
     background-image: url(<%= asset_path("iD/img/loader-black.gif") %>);
     background-position: center;
     background-repeat: no-repeat;
 }
-
 .ideditor #ideditor-viewer-mapilio-simple-wrap {
     height: 100%;
 }
-
 .ideditor #ideditor-viewer-mapilio-simple {
     width: 100%;
     height: 100%;
     -webkit-transform-origin: 0 0;
         -ms-transform-origin: 0 0;
             transform-origin: 0 0;
 }
-
 .ideditor #ideditor-viewer-mapilio-simple img {
     width: 100%;
     height: 100%;
     -o-object-fit: cover;
        object-fit: cover;
     overflow: hidden
-} 
+}
+
 
 /* Streetside Viewer (pannellum) */
 .ideditor .ms-wrapper .photo-attribution .image-link {