Themes(guideposts): update guidepost-type questions, make sure they are shown in cyclenodes.json and walkingnodes.json (if relevant), show high-zoom layer to avoid duplicates, see #2385

.forgejo/workflows/on_release.yml

@@ -0,0 +1,58 @@
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build_android:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: https://source.mapcomplete.org/actions/checkout@v4
+      - uses: https://source.mapcomplete.org/actions/setup-android@v3.2.2
+
+      - name: Set up Node.js
+        uses: https://source.mapcomplete.org/actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+
+      - name: install deps
+        run: npm ci
+        shell: bash
+
+      - run: mkdir -p ./assets/generated && npm run init
+
+      - name: clone submodule
+        shell: bash
+        run: |
+          echo -e "[submodule \"android\"]\n\tpath = android\n\turl = https://source.mapcomplete.org/MapComplete/android-wrapper.git" > .gitmodules
+          cat .gitmodules
+          git submodule init  
+          git submodule update
+
+      - name: Decode keystore
+        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > ~/.gradle/release-key.jks
+
+      - name: Grant execute permission to gradlew
+        run: cd android && chmod +x ./gradlew
+
+      - name: Build signed APK
+        run: |
+          cd android
+          export ANDROID_SDK_HOME=/home/runner/.android/sdk/
+          export PATH=$ANDROID_SDK_HOME/tools:$ANDROID_SDK_HOME/platform-tools:$ANDROID_SDK_HOME/:$ANDROID_SDK_HOME/cmdline-tools/latest/tools/bin:$PATH
+          export storeFile=my-release-key.jks
+          export storePassword=${{ secrets.KEYSTORE_PASSWORD }}
+          export keyAlias=${{ secrets.KEY_ALIAS }}
+          export keyPassword=${{ secrets.KEY_PASSWORD }}
+          ./gradlew assembleRelease
+
+      - name: Upload APK to hetzner
+        shell: bash
+        run: |
+          TAG=$( echo ${{ env.GITHUB_REF_NAME }} )
+          scp android/app/build/outputs/apk/release/app-release.apk hetzner:~/apk/mapcomplete-$TAG.apk
+          ssh hetzner 'cp "apk/$(ls -v apk/ | tail -n 1)" app/mapcomplete-latest.apk'
+

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "android"]
 	path = android
-	url = git@github.com:MapComplete/android.git
+	url = forgejo@source.mapcomplete.org:MapComplete/android-wrapper.git

CHANGELOG.md

@@ -2,6 +2,46 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.51.2](https://source.mapcomplete.org/MapComplete/MapComplete/compare/v0.51.1...v0.51.2) (2025-04-29)
+
+
+### Features
+
+* add link to the original provider, see [#2387](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2387) ([3e5b144](https://source.mapcomplete.org/MapComplete/MapComplete/commits/3e5b1444cca871fcb8f9c785e8473cb000703927))
+* layer validation system now builds a dependency graph and only updates what is needed, makes "refresh:layeroverview" redundant ([fda0bc6](https://source.mapcomplete.org/MapComplete/MapComplete/commits/fda0bc6b2edeb01280cbc559420dfe8687b5be02))
+* moving a point due to relocatoin now shows a searchbar (again) ([15cbadc](https://source.mapcomplete.org/MapComplete/MapComplete/commits/15cbadc4e01f9594fcdff64636ddcc270ce535da))
+
+
+### Bug Fixes
+
+* allow inline images in index.html ([0441772](https://source.mapcomplete.org/MapComplete/MapComplete/commits/0441772d3e4a61ea5ef2a0e52a13806920e6a140))
+* attempt to fix layers which don't hide ([01034b1](https://source.mapcomplete.org/MapComplete/MapComplete/commits/01034b186e22ade4ed4eb9d2a8656c18c8e2f2d5))
+* canonicalize wikimedia links, see [#2367](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2367), fix attribution ([518a426](https://source.mapcomplete.org/MapComplete/MapComplete/commits/518a426805363eef0cb2e25fc3965cfb2936ed8e))
+* don't crash if an unselected element is selected (by not selecting it) ([981b412](https://source.mapcomplete.org/MapComplete/MapComplete/commits/981b412180bd89cdafe4064f366ffb48cb5e74ef))
+* don't crash if no home location is set and the hotkey is triggered ([991925b](https://source.mapcomplete.org/MapComplete/MapComplete/commits/991925ba35af6cdcdb7055ddd261cb12d58123bd))
+* don't hint on images if they are blacklisted ([4f419b9](https://source.mapcomplete.org/MapComplete/MapComplete/commits/4f419b9321ca91b0876adedf274ae2bec218060c))
+* fix build ([1a22e12](https://source.mapcomplete.org/MapComplete/MapComplete/commits/1a22e12fa33c168e7a53fd4e05a1381b0391d8e9))
+* opening hours now correctly shows "closes at <point far in the future>" ([d5b0976](https://source.mapcomplete.org/MapComplete/MapComplete/commits/d5b0976fb0b1df68772146d3e972bd245672951a))
+* tests ([55c8ec9](https://source.mapcomplete.org/MapComplete/MapComplete/commits/55c8ec95f36834049a349e7aa2d5e35179c37e9a))
+
+
+### Theme improvements
+
+* add toilet information in food and shops ([3bc8eae](https://source.mapcomplete.org/MapComplete/MapComplete/commits/3bc8eae6b121e40941fd462c8fb3552f477bdec9))
+* add toilet layers automatically if toilet information is included ([af2636b](https://source.mapcomplete.org/MapComplete/MapComplete/commits/af2636bfaa6f58cc6d82f46b8cc9025e861023ee))
+* allow to easily import tagrenderings and add a prefix key to all tags ([01680f2](https://source.mapcomplete.org/MapComplete/MapComplete/commits/01680f236caf1a9b1bd6b0d4c802ad4a07aa6ef8))
+* **artwork:** add poem as artwork type, fix [#2392](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2392) ([cbf398e](https://source.mapcomplete.org/MapComplete/MapComplete/commits/cbf398ef6dea47a4e9ab5c8bab8c22627a3717c3))
+* **bike_cleaning:** add payment options, opening hours ([8584a4b](https://source.mapcomplete.org/MapComplete/MapComplete/commits/8584a4ba68fc2e0e0b35e9c752a833e208200ecb))
+* **bike_parking:** add 'anchor' as bicycle_parking-type, fix [#2381](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2381) ([4bd61c3](https://source.mapcomplete.org/MapComplete/MapComplete/commits/4bd61c30a3f4cbf63d28a79497cb1e1c580ee694))
+* **cafe_pub, toilets:** add toilet information to pubs; forward wheelchair accessibility information to 'toilet_at_amenity' ([455b2c6](https://source.mapcomplete.org/MapComplete/MapComplete/commits/455b2c641c41634784c57d53ee657246b6b3af4d))
+* **maxspeed:** support forward/backward, fix [#1127](https://source.mapcomplete.org/MapComplete/MapComplete/issues/1127) ([5515114](https://source.mapcomplete.org/MapComplete/MapComplete/commits/5515114be95bd442d682c01818e0fcd48507c455))
+* **mobility_hub:** Add condition to marker question ([369c2e6](https://source.mapcomplete.org/MapComplete/MapComplete/commits/369c2e6ee882476003807f9bef97f0b413ce0656))
+* **mobility_hub:** noname and network options ([f072b82](https://source.mapcomplete.org/MapComplete/MapComplete/commits/f072b82fc3937fac6ec90b3a69f0f551b4ef6313))
+* **nature:** add viewpoint and observation tower, fix [#2397](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2397), fix [#2400](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2400) ([4899065](https://source.mapcomplete.org/MapComplete/MapComplete/commits/4899065fc42060a51e366a195169c40c9117c02b))
+* reintroduce check for defaultBackgroundID: make sure it _does_ exist as global layer ([6a1c5fe](https://source.mapcomplete.org/MapComplete/MapComplete/commits/6a1c5fec976562e624822fa720aa3e8ea5e1708e))
+* simplify toilets theme by using the new prefix functionality ([92eca24](https://source.mapcomplete.org/MapComplete/MapComplete/commits/92eca242eca556e39c114f772b21c31e740739fa))
+* **waste:** Include excrement bag dispensers ([#2020](https://source.mapcomplete.org/MapComplete/MapComplete/issues/2020)) ([45e20da](https://source.mapcomplete.org/MapComplete/MapComplete/commits/45e20dadee71e5c23a1bfadfd8f69f986c84e898))
+
 ### [0.51.1](https://source.mapcomplete.org/MapComplete/MapComplete/compare/v0.51.0...v0.51.1) (2025-04-23)
 
 

Docs/ServerConfig/hetzner/Caddyfile

@@ -49,7 +49,10 @@ single.mapcomplete.org {
 		Report-To "{\"group\":\"csp-endpoint\", \"max_age\":86400, \"endpoints\":[{\"url\":\"https://report.mapcomplete.org/csp\"}], \"include_subdomains\":true}"
 	}
 }
-
+app.mapcomplete.org/builds {
+	file_server browse
+	root * apk/
+}
 app.mapcomplete.org {
 	root * app/
 	file_server

android

@@ -1 +1 @@
-Subproject commit 2b8090a9009ab19af4f9913ae3ed9cafd29364db
+Subproject commit 921863589c14e1a3002a6be491337de6fe8778dd

assets/layers/guidepost/guidepost.json

@@ -80,6 +80,10 @@
         {
           "if": "bicycle=yes",
           "ifnot": "bicycle=",
+          "alsoShowIf": "guidepost~.*bicycle.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
           "then": {
             "en": "This guidepost shows bicycle routes",
             "de": "Dieser Wegweiser zeigt Fahrradwege",
@@ -91,6 +95,10 @@
         {
           "if": "hiking=yes",
           "ifnot": "hiking=",
+          "alsoShowIf": "guidepost~.*hiking.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
           "then": {
             "en": "This guidepost shows hiking routes",
             "de": "Dieser Wegweiser zeigt Wanderwege",
@@ -102,6 +110,10 @@
         {
           "if": "mtb=yes",
           "ifnot": "mtb=",
+          "alsoShowIf": "guidepost~.*mtb.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
           "then": {
             "en": "This guidepost shows mountain bike routes",
             "de": "Dieser Wegweiser zeigt Mountainbike-Routen",
@@ -113,6 +125,10 @@
         {
           "if": "horse=yes",
           "ifnot": "horse=",
+          "alsoShowIf": "guidepost~.*horse.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
           "then": {
             "en": "This guidepost shows horse riding routes",
             "de": "Dieser Wegweiser zeigt Reitwege",
@@ -124,6 +140,10 @@
         {
           "if": "ski=yes",
           "ifnot": "ski=",
+          "alsoShowIf": "guidepost~.*ski.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
           "then": {
             "en": "This guidepost shows ski routes",
             "de": "Dieser Wegweiser zeigt Skirouten",
@@ -131,6 +151,28 @@
             "es": "Este poste indicador muestra rutas de esquí",
             "ca": "Aquest document guia mostra les rutes d'esquí"
           }
+        },
+        {
+          "if": "running=yes",
+          "ifnot": "running=",
+          "alsoShowIf": "guidepost~.*running.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
+          "then": {
+            "en": "This guidepost shows running routes"
+          }
+        },
+        {
+          "if": "winter_hiking=yes",
+          "ifnot": "winter_hiking=",
+          "alsoShowIf": "guidepost~.*winter_hiking.*",
+          "addExtraTags": [
+            "guidepost="
+          ],
+          "then": {
+            "en": "This guidepost shows winter hiking routes"
+          }
         }
       ]
     },

assets/themes/cyclenodes/cyclenodes.json

@@ -417,7 +417,13 @@
             "tags": [
               "tourism=information",
               "information=guidepost",
-              "bicycle=yes"
+              {
+                "or": [
+                  "bicycle=yes",
+                  "guidepost~.*bicycle",
+                  "guidepost~.*mtb.*"
+                ]
+              }
             ]
           }
         ],
@@ -448,6 +454,17 @@
         "type"
       ]
     },
+    {
+      "builtin": "guidepost",
+      "override": {
+        "minzoom": 18,
+        "=presets": [],
+        "name": null,
+        "filter": {
+          "sameAs": "bicycle_guidepost"
+        }
+      }
+    },
     {
       "builtin": "route_marker",
       "override": {

assets/themes/walkingnodes/walkingnodes.json

@@ -324,13 +324,18 @@
         "guidepost"
       ],
       "override": {
-        "minzoom": 16,
+        "minzoom": 15,
         "id": "guidepost_hiking",
         "source": {
           "osmTags": {
             "and": [
               "information=guidepost",
-              "hiking=yes"
+              {
+                "or": [
+                  "hiking=yes",
+                  "guidepost~.*hiking.*"
+                ]
+              }
             ]
           }
         },
@@ -366,6 +371,17 @@
         "type"
       ]
     },
+    {
+      "builtin": "guidepost",
+      "override": {
+        "minzoom": 18,
+        "=presets": [],
+        "name": null,
+        "filter": {
+          "sameAs": "guidepost_hiking"
+        }
+      }
+    },
     {
       "builtin": "route_marker",
       "override": {

index.html

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta content="width=device-width, initial-scale=1.0" name="viewport">
   <meta http-equiv="Content-Security-Policy"
-        content="default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' https://gc.zgo.at/; img-src *; connect-src 'self' https://www.openstreetmap.org/ https://api.openstreetmap.org/ https://pietervdvn.goatcounter.com/;">
+        content="default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' https://gc.zgo.at/; img-src * data: ; connect-src 'self' https://www.openstreetmap.org/ https://api.openstreetmap.org/ https://pietervdvn.goatcounter.com/;">
   <link href="./css/mobile.css" rel="stylesheet" />
   <link href="./css/openinghourstable.css" rel="stylesheet" />
   <link href="./css/tagrendering.css" rel="stylesheet" />

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mapcomplete",
-  "version": "0.51.1",
+  "version": "0.51.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mapcomplete",
-      "version": "0.51.1",
+      "version": "0.51.2",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapcomplete",
-  "version": "0.51.1",
+  "version": "0.51.2",
   "repository": "https://source.mapcomplete.org/MapComplete/MapComplete",
   "description": "A small website to edit OSM easily",
   "bugs": "hhttps://source.mapcomplete.org/MapComplete/MapComplete/issues",