Merge remote-tracking branch 'origin/heal' into heal

# Conflicts: # .github/workflows/heal.yml
GIScience · Jul 18, 2024 · 6b68664 · 6b68664
2 parents cbf91b9 + 39523fc
commit 6b68664
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/heal.yml b/.github/workflows/heal.yml
@@ -24,6 +24,12 @@ jobs:
       - name: copy example configs to config folder
         working-directory: ${{ secrets.work_dir }}
         run: cd src && cp config-examples/* config && for i in config/*-example.js; do mv -- "$i" "${i%-example.js}.js"; done
+      - name: Replace ORS API Key in app-config.js
+        working-directory: ${{ secrets.work_dir }}
+        run: |
+          cd src/config
+          secret_value="${{ secrets.ORS_API_KEY }}"
+          sed -i "s/'put-here-an-ors-api-key'/'$secret_value'/g" app-config.js
       - name: build docker rebuild and restart
         working-directory: ${{ secrets.work_dir }}
         run: docker compose up --build --force-recreate -d
diff --git a/src/app.js b/src/app.js
@@ -35,6 +35,8 @@ export default {
     })
     const favIcon = document.getElementById('favIcon')
     favIcon.href = utils.getImgSrc('favIcon')
+    // show heatstress level on the route by default.
+    this.$store.commit('extraHighlight', {key: 'csv', value: 'all', index: 0})
   },
   mounted() {
     EventBus.$on('appLoaded', () => {

diff --git a/src/config-examples/app-config-example.js b/src/config-examples/app-config-example.js
@@ -75,36 +75,28 @@ const appConfig = {
       maxZoom: 19
     },
     {
-      name: 'Topography',
-      id: 'topography',
+      name: 'Lite contrast',
+      id: 'stamen-toner-lite',
       visible: false,
-      url: 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
-      attribution: 'Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href=https:///viewfinderpanoramas.org">SRTM</a> | Map style: &copy; <a href="https://opentopomap.org">OpenTopoMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)',
-      maxZoom: 18
-    },
-    {
-      name: 'Transport Dark',
-      id: 'transport-dark',
-      visible: false,
-      url: 'https://{s}.tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png?apikey=13efc496ac0b486ea05691c820824f5f',
-      attribution: 'Maps &copy; <a href="https://thunderforest.com/">Thunderforest</a>, Data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-      maxZoom: 18
+      url: 'https://tiles.stadiamaps.com/tiles/stamen_toner_lite/{z}/{x}/{y}{r}.png',
+      attribution: '&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a> <a href="https://stamen.com/" target="_blank">&copy; Stamen Design</a> &copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> &copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> contributors',
+      maxZoom: 19
     },
     {
-      name: 'Outdoors',
-      id: 'outdoors',
+      name: 'High contrast',
+      id: 'stamen-toner',
       visible: false,
-      url: 'https://{s}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=13efc496ac0b486ea05691c820824f5f',
-      attribution: 'Maps &copy; <a href="https://thunderforest.com/">Thunderforest</a>, Data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-      maxZoom: 18
+      url: 'https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}{r}.png',
+      attribution: '&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a> <a href="https://stamen.com/" target="_blank">&copy; Stamen Design</a> &copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> &copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> contributors',
+      maxZoom: 19
     },
     {
-      name: 'Cyclosm',
-      id: 'cyclosm',
+      name: 'Light color',
+      id: 'cartodb-positron',
       visible: false,
-      url: 'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
-      attribution: '<a href="https://github.com/cyclosm/cyclosm-cartocss-style/releases" title="CyclOSM - Open Bicycle render">CyclOSM</a> | Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-      maxZoom: 20
+      url: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png',
+      attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+      maxZoom: 19
     }
   ],
   wpsOverlayerTileProviders: []

diff --git a/...omponents/place-and-directions/components/route-details/components/extras/route-extras.js b/...omponents/place-and-directions/components/route-details/components/extras/route-extras.js
@@ -150,7 +150,7 @@ export default {
      */
     showAllSections (extraKey) {
       this.$store.commit('extraHighlight', {key: extraKey, value: 'all', index: 0})
-      const sectionTitle = this.$t('global.' + extraKey).toLowerCase()
+      const sectionTitle = this.$t('global.' + extraKey)
       const highlightData = { extraKey: extraKey, sectionTitle, sections: [] }
 
       let index = 0