Merge pull request #3 from opengisch/upgrade-to-qwc2-lts2024

Upgrade to qwc2 lts2024
opengisch · Dec 19, 2024 · 8ca127b · 8ca127b
2 parents ceba11d + 4f47a1c
commit 8ca127b
Show file tree

Hide file tree

Showing 24 changed files with 11,445 additions and 330 deletions.
diff --git a/.github/workflows/docker-image-nightly.yml b/.github/workflows/docker-image-nightly.yml
@@ -24,6 +24,6 @@ jobs:
         with:
           context: ./
           # do not push for the moment, to avoid load
-          # push: true
+          push: true
           tags: ghcr.io/${{ github.repository }}:${{ github.head_ref }}-${{ github.sha }}
           target: prod
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,21 @@
-FROM ghcr.io/opengisch/qwc2_minimal-qwc2-minimal-builder:v1.0.1 as builder
+FROM ghcr.io/opengisch/qwc2_minimal-qwc2-minimal-builder:2024-lts.0 as builder
 
 COPY ./app/js/Help.jsx /app/js/Help.jsx
 COPY ./app/js/SearchProviders.js /app/js/SearchProviders.js
 COPY ./app/index.html /app/index.html
+COPY ./app/static/translations/cs-CZ_overrides.json /app/static/translations/cs-CZ_overrides.json
+COPY ./app/static/translations/de-CH_overrides.json /app/static/translations/de-CH_overrides.json
+COPY ./app/static/translations/de-DE_overrides.json /app/static/translations/de-DE_overrides.json
+COPY ./app/static/translations/en-US_overrides.json /app/static/translations/en-US_overrides.json
+COPY ./app/static/translations/es-ES_overrides.json /app/static/translations/es-ES_overrides.json
+COPY ./app/static/translations/fr-FR_overrides.json /app/static/translations/fr-FR_overrides.json
+COPY ./app/static/translations/it-IT_overrides.json /app/static/translations/it-IT_overrides.json
+COPY ./app/static/translations/pl-PL_overrides.json /app/static/translations/pl-PL_overrides.json
+COPY ./app/static/translations/pt-BR_overrides.json /app/static/translations/pt-BR_overrides.json
+COPY ./app/static/translations/ro-RO_overrides.json /app/static/translations/ro-RO_overrides.json
+COPY ./app/static/translations/ru-RU_overrides.json /app/static/translations/ru-RU_overrides.json
+COPY ./app/static/translations/sv-SE_overrides.json /app/static/translations/sv-SE_overrides.json
+COPY ./app/static/translations/tr-TR_overrides.json /app/static/translations/tr-TR_overrides.json
 
 WORKDIR /app
 

diff --git a/README.md b/README.md
@@ -0,0 +1,13 @@
+# WebGIS Thalwil
+
+## Local DEV setup
+Run the docker compose file to fire up a local instance of the webGIS. It mounts the contents of
+the app folder and also the configuration files copied from Thalwil TEST env (themes.json, config.json). 
+
+
+### Prevent CORS issues
+To prevent CORS issues, the following automatic and manual steps are taken.
+
+- Search: A proxy service in the docker compose redirects search requests from localhost:8888 to the TEST env
+- Map click / feature info: In themes.json, replace `"featureInfoUrl": "https://maps-test.thalwil.ch` with `"featureInfoUrl": "http://localhost:8888` to point at the proxy
+- Theme and basemap thumbnails: These still suffer from CORS blocks, no solution yet
diff --git a/app/index.html b/app/index.html
@@ -8,6 +8,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <title>Thalwil webGIS</title>
     <link rel="stylesheet" type="text/css" href="assets/css/qwc2.css" />
+    <link rel="stylesheet" type="text/css" href="assets/css/colorschemes.css" />
     <link rel="apple-touch-icon" href="assets/img/app_icon.png"/>
     <link rel="apple-touch-icon" sizes="72x72" href="assets/img/app_icon_72.png"/>
     <link rel="apple-touch-icon" sizes="114x114" href="assets/img/app_icon_114.png"/>
@@ -49,12 +50,13 @@
             }
         }
     </style>
+<!--    <script type="text/javascript" src="assets/searchProviders.js" ></script>-->
     <script type="text/javascript">
         window.addEventListener("load", function(ev) {
             document.getElementById('splash').style.display = 'none';
         }, false);
     </script>
-    <!--<script type="text/javascript" src="api_examples.js"></script>-->
+<!--    <script type="text/javascript" src="api_examples.js"></script>-->
 </head>
 <body>
 <div id="splash"><div class="lds-dual-ring"></div></div>

diff --git a/app/js/Help.jsx b/app/js/Help.jsx
@@ -16,8 +16,11 @@ export function renderHelp() {
             </div>
             <div>QWC2 build {process.env.BuildDate}</div>
             <div>
-                <a href={process.env.QWC2RepoSource}>Verwendete QWC2 Version</a>
+                <a href={process.env.QWC2RepoSource} target="_blank">Verwendete QWC2 Version</a>
+            </div>
+            <div>
+                <a href="https://qwc-services.github.io/master/release_notes/ChangeLog/" target="_blank">Changelog</a>
             </div>
         </div>
     );
-}
+}