From 77bdb8667453b80ff2e3929f0c2cf55228c7aa4c Mon Sep 17 00:00:00 2001
From: Simon Hohl <simon.hohl@dainst.de>
Date: Fri, 27 Sep 2024 13:27:54 +0200
Subject: [PATCH 1/3] Fix local typo by using upstream change

---
 docker-compose.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 761c59b04..e902eb271 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
     volumes:
       - ${ARCHAEOCLOUD_PATH}:/media/archaeocloud
     hostname: "${HOST_NAME}"
+    user: "${UID}:${GID}"
     labels:
       - traefik.enable=true
       - traefik.http.routers.backend.rule=Host(`${SERVER_ADDRESS}`) && PathPrefix(`/data`)
@@ -111,6 +112,25 @@ services:
     user: "${UID}:${GID}"
     restart: always
 
+  hac_via:
+    image: ghcr.io/dainst/hac_via:latest
+    volumes:
+     - ${HAC_VIA_ARCHIVE_DIR}:/archive
+     - ${HAC_VIA_PREVIEW_DIR}:/previews
+    environment:
+     - PHX_HOST=images.${SERVER_ADDRESS}
+     - DATABASE_URL=ecto://arachne:${DB_PASSWORD}@arachne4_db/arachne
+     - SECRET_KEY_BASE=${HAC_VIA_KEY_BASE}
+    labels:
+     - traefik.enable=true
+     - traefik.http.routers.hac_via.rule=Host(`images.${SERVER_ADDRESS}`)
+     - traefik.http.routers.hac_via.entrypoints=websecure
+     - traefik.http.routers.hac_via.tls.certresolver=myresolver
+     - traefik.http.services.hac_via.loadbalancer.server.port=4000
+     - com.centurylinklabs.watchtower.enable=true
+    restart: always
+
+
   traefik:
     image: traefik:v2.5
     restart: always

From 3cf769a3e65ec66f22f5e5469e241e4d42aaebdb Mon Sep 17 00:00:00 2001
From: Simon Hohl <simon.hohl@dainst.de>
Date: Fri, 27 Sep 2024 13:39:36 +0200
Subject: [PATCH 2/3] Remove hac via service definition for now

---
 docker-compose.yml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e902eb271..cce9866c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -112,25 +112,6 @@ services:
     user: "${UID}:${GID}"
     restart: always
 
-  hac_via:
-    image: ghcr.io/dainst/hac_via:latest
-    volumes:
-     - ${HAC_VIA_ARCHIVE_DIR}:/archive
-     - ${HAC_VIA_PREVIEW_DIR}:/previews
-    environment:
-     - PHX_HOST=images.${SERVER_ADDRESS}
-     - DATABASE_URL=ecto://arachne:${DB_PASSWORD}@arachne4_db/arachne
-     - SECRET_KEY_BASE=${HAC_VIA_KEY_BASE}
-    labels:
-     - traefik.enable=true
-     - traefik.http.routers.hac_via.rule=Host(`images.${SERVER_ADDRESS}`)
-     - traefik.http.routers.hac_via.entrypoints=websecure
-     - traefik.http.routers.hac_via.tls.certresolver=myresolver
-     - traefik.http.services.hac_via.loadbalancer.server.port=4000
-     - com.centurylinklabs.watchtower.enable=true
-    restart: always
-
-
   traefik:
     image: traefik:v2.5
     restart: always

From 00c1cae83a78293fb4d218bc04e85527baac6d1a Mon Sep 17 00:00:00 2001
From: Simon Hohl <simon.hohl@dainst.de>
Date: Mon, 14 Oct 2024 11:32:51 +0200
Subject: [PATCH 3/3] Switch to default OSS layers

---
 .../con10t-widgets/network/con10t-network-map.directive.js    | 4 ++--
 frontend/app/map/ar-entity-map.directive.js                   | 4 +++-
 frontend/app/map/map.service.js                               | 4 ++--
 frontend/con10t/ar/hinkel_map.html                            | 4 ++--
 frontend/con10t/de/ceramegypt.html                            | 2 +-
 frontend/con10t/de/hinkel_map.html                            | 4 ++--
 frontend/con10t/en/ceramegypt.html                            | 2 +-
 frontend/con10t/en/hinkel_map.html                            | 4 ++--
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/app/con10t-widgets/network/con10t-network-map.directive.js b/frontend/app/con10t-widgets/network/con10t-network-map.directive.js
index 2a0c8e573..8776e83a2 100644
--- a/frontend/app/con10t-widgets/network/con10t-network-map.directive.js
+++ b/frontend/app/con10t-widgets/network/con10t-network-map.directive.js
@@ -20,8 +20,8 @@ export default function($compile, transl8) {
                 zoomAnimation: false});
 
             L.tileLayer(
-                'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
-                { attribution: 'Maps &copy; Thunderforest, Data &copy; OpenStreetMap contributors' })
+                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                { attribution: 'Maps and Data &copy; <a href="https://osmfoundation.org/wiki/Licence">OpenStreetMap</a>.' })
                 .addTo(scope.map);
 
             scope.placeLayer = new L.LayerGroup().addTo(scope.map);
diff --git a/frontend/app/map/ar-entity-map.directive.js b/frontend/app/map/ar-entity-map.directive.js
index fbb3535c7..57b2708af 100644
--- a/frontend/app/map/ar-entity-map.directive.js
+++ b/frontend/app/map/ar-entity-map.directive.js
@@ -38,7 +38,9 @@ export default function($compile, Query, placesPainter) {
             });
             // / Disable dragging functionality if outside of container bounds
 
-            var layer = L.tileLayer('http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87', {
+            var layer = L.tileLayer(
+                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                { attribution: 'Maps and Data &copy; <a href="https://osmfoundation.org/wiki/Licence">OpenStreetMap</a>.' }, {
                 maxZoom: 18,
                 minZoom: 2
             });
diff --git a/frontend/app/map/map.service.js b/frontend/app/map/map.service.js
index 8fb721a7a..d4544b899 100644
--- a/frontend/app/map/map.service.js
+++ b/frontend/app/map/map.service.js
@@ -20,10 +20,10 @@ export default function(searchService) {
         'osm': {
             'name': 'OpenStreetMap',
             'type': 'xyz',
-            'url': 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+            'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
             'layerOptions': {
                 'subdomains': ['a', 'b', 'c'],
-                'attribution': '&copy; <a href=\'https://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'https://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+                'attribution': 'Maps and Data &copy; <a href="https://osmfoundation.org/wiki/Licence">OpenStreetMap</a>.',
                 'continuousWorld': false,
                 'maxZoom': 18
             }
diff --git a/frontend/con10t/ar/hinkel_map.html b/frontend/con10t/ar/hinkel_map.html
index a96e87bab..d4fd2de90 100644
--- a/frontend/con10t/ar/hinkel_map.html
+++ b/frontend/con10t/ar/hinkel_map.html
@@ -64,10 +64,10 @@
     osm: {
         'name': 'OpenStreetMap',
         'type': 'xyz',
-        'url': 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png/{z}/{x}/{y}.png',
         'yayerOptions': {
             'subdomains': ['a', 'b', 'c'],
-            'attribution': '&copy; <a href=\'http://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+            'attribution': 'Maps and Data &copy; <a href=\'https://osmfoundation.org/wiki/Licence\'>OpenStreetMap</a>.'',
             'continuousWorld': false,
             'maxZoom': 18
         }
diff --git a/frontend/con10t/de/ceramegypt.html b/frontend/con10t/de/ceramegypt.html
index 714a69303..1649a1a64 100644
--- a/frontend/con10t/de/ceramegypt.html
+++ b/frontend/con10t/de/ceramegypt.html
@@ -43,7 +43,7 @@ <h3>Map view</h3>
 						osm: {
 							name: 'OpenStreetMap',
 							type: 'xyz',
-							url: 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png',
+							url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png/{z}/{x}/{y}.png',
 							layerOptions: {
 								subdomains: ['a', 'b', 'c'],
 								attribution: '<a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
diff --git a/frontend/con10t/de/hinkel_map.html b/frontend/con10t/de/hinkel_map.html
index 0dfe0e7b0..1438524b3 100644
--- a/frontend/con10t/de/hinkel_map.html
+++ b/frontend/con10t/de/hinkel_map.html
@@ -64,10 +64,10 @@
     osm: {
         'name': 'OpenStreetMap',
         'type': 'xyz',
-        'url': 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
         'layerOptions': {
             'subdomains': ['a', 'b', 'c'],
-            'attribution': '&copy; <a href=\'http://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+            'attribution': ''Maps and Data &copy; <a href=\'https://osmfoundation.org/wiki/Licence\'>OpenStreetMap</a>.'',
             'continuousWorld': false,
             'maxZoom': 18
         }
diff --git a/frontend/con10t/en/ceramegypt.html b/frontend/con10t/en/ceramegypt.html
index 65c58c59b..e5efcdacb 100644
--- a/frontend/con10t/en/ceramegypt.html
+++ b/frontend/con10t/en/ceramegypt.html
@@ -43,7 +43,7 @@ <h3>Map view</h3>
 						osm: {
 							name: 'OpenStreetMap',
 							type: 'xyz',
-							url: 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png',
+							url: 'http://{s}.https://tile.openstreetmap.org/{z}/{x}/{y}.png/{z}/{x}/{y}.png',
 							layerOptions: {
 								subdomains: ['a', 'b', 'c'],
 								attribution: '<a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
diff --git a/frontend/con10t/en/hinkel_map.html b/frontend/con10t/en/hinkel_map.html
index 5ee1602ee..cefdf5f31 100644
--- a/frontend/con10t/en/hinkel_map.html
+++ b/frontend/con10t/en/hinkel_map.html
@@ -64,10 +64,10 @@
     osm: {
         'name': 'OpenStreetMap',
         'type': 'xyz',
-        'url': 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
         'yayerOptions': {
             'subdomains': ['a', 'b', 'c'],
-            'attribution': '&copy; <a href=\'http://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+            'attribution': 'Maps and Data &copy; <a href=\'https://osmfoundation.org/wiki/Licence\'>OpenStreetMap</a>.',
             'continuousWorld': false,
             'maxZoom': 18
         }