From f2361fed2261720a9337f32d6ef21fd8cdcae9bb Mon Sep 17 00:00:00 2001
From: Tobias Speicher <rootcommander@gmail.com>
Date: Thu, 29 Jan 2026 11:41:57 +0100
Subject: [PATCH] Use preferred tile.openstreetmap.org URL

See https://github.com/openstreetmap/operations/issues/737
---
 service/src/migrations/005-create-osm-layer.js                | 2 +-
 .../imagery-layer-settings.component.html                     | 4 ++--
 .../imagery-layer-settings.component.ts                       | 2 +-
 .../admin-layers/layer-preview/layer-preview.component.ts     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/service/src/migrations/005-create-osm-layer.js b/service/src/migrations/005-create-osm-layer.js
index 90292c3e4..21aeb7ca6 100644
--- a/service/src/migrations/005-create-osm-layer.js
+++ b/service/src/migrations/005-create-osm-layer.js
@@ -23,7 +23,7 @@ async function createOSMLayer(db) {
     type: "Imagery",
     format: "XYZ",
     base: true,
-    url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+    url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
   };
 
   const collection = db.collection('layers');
diff --git a/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.html b/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.html
index e5ddbc47e..ebea6a4e3 100644
--- a/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.html
+++ b/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.html
@@ -2,7 +2,7 @@
     <div class="form-field">
         <label class="field-label">Layer URL</label>
         <input type="text" class="form-input" [(ngModel)]="config.url" (ngModelChange)="onConfigChange()"
-            placeholder="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" />
+            placeholder="http://tile.openstreetmap.org/{z}/{x}/{y}.png" />
     </div>
 
     <div class="form-field">
@@ -172,4 +172,4 @@ <h3>Layer Preview</h3>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.ts b/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.ts
index ba885579d..c559a5d14 100644
--- a/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.ts
+++ b/web-app/admin/src/app/admin/admin-layers/imagery-layer-settings/imagery-layer-settings.component.ts
@@ -232,7 +232,7 @@ export class ImageryLayerSettingsComponent implements OnChanges {
             worldCopyJump: true
         });
 
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
             maxZoom: 18
         }).addTo(this.previewMap);
diff --git a/web-app/admin/src/app/admin/admin-layers/layer-preview/layer-preview.component.ts b/web-app/admin/src/app/admin/admin-layers/layer-preview/layer-preview.component.ts
index e2b16e116..f73e7de44 100644
--- a/web-app/admin/src/app/admin/admin-layers/layer-preview/layer-preview.component.ts
+++ b/web-app/admin/src/app/admin/admin-layers/layer-preview/layer-preview.component.ts
@@ -51,7 +51,7 @@ export class LayerPreviewComponent implements AfterViewInit, OnChanges {
             worldCopyJump: true
         });
 
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
             maxZoom: 18
         }).addTo(this.map);