update pbf

Either move to o5m for subways or remove from here

Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>

.forgejo/workflows/process_subways.yml

@@ -35,6 +35,47 @@ jobs:
           cd ~
           git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
 
+  update-planet-pbf:
+    name: Update PBF Planet
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal/:/mnt/4tbexternal/
+        - /mnt/4tbexternal/osm-planet:/home/planet
+    concurrency:
+      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Download Planet File if Absent
+        shell: bash
+        # TODO: replace wget2 with curl -Z
+        run: |
+          if [ ! -d /home/planet/planet/ ]; then
+          mkdir -p /home/planet/planet/
+          fi
+          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
+          cd /home/planet/planet/
+          wget2 --verbose --progress=bar --continue https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
+          else
+          echo "planet-latest.osm.pbf was found, raw download not required."
+          fi
+      - name: Update PBF Planet
+        shell: bash
+        run: |
+          cd /home/planet/planet/
+          rm -f planet-latest-new.osm.pbf
+          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
+          mv planet-latest-new.osm.pbf planet-latest.osm.pbf
+      - name: Notify Zulip
+        run: |
+          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
+            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
+            --data-urlencode type=stream \
+            --data-urlencode 'to="DevOps"' \
+            --data-urlencode topic=codeberg-bot \
+            --data-urlencode 'content=PBF planet update is done!'
+
   update-planet-o5m:
     name: Update O5M Planet
     runs-on: mapfilemaker
@@ -83,7 +124,6 @@ jobs:
             --data-urlencode 'content=O5M planet update is done!'
 
   update-subways:
-    if: inputs.run-subways
     name: Update Subways
     runs-on: mapfilemaker
     needs:
@@ -94,7 +134,7 @@ jobs:
         - /mnt/4tbexternal/:/mnt/4tbexternal/
         - /mnt/4tbexternal/osm-planet:/home/planet
     concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-processs-subways-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
       - uses: actions/cache@v4

data/categories-strings/de.json/localize.json

@@ -77,9 +77,6 @@
 "amenity-townhall": "3Rathaus|4Gemeindeamt",
 "tourism-attraction|@category_tourism": "3Attraktion|3Sehenswürdigkeit",
 "tourism-artwork": "3Kunstwerk|4Skulptur|4Gemälde|Statue",
-"tourism-artwork-sculpture": "Skulptur|Kunstwerk",
-"tourism-artwork-statue": "Statue|Kunstwerk",
-"tourism-artwork-painting": "Gemälde|Kunstwerk",
 "tourism-viewpoint|@category_tourism": "3Panorama|Ausblick|4Aussichtspunkt",
 "tourism-information": "4Tourist-Information|Information|7Touristeninformation",
 "tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picknickplatz|5Grillplatz|3Picknicktisch|3BBQ",
@@ -348,7 +345,6 @@
 "amenity-community_centre": "5Gemeinschaftszentrum|Bürgerhaus",
 "amenity-compressed_air": "Druckluft|Pressluft",
 "amenity-courthouse": "Justizgebäude|Gerichtsgebäude",
-"amenity-vending_machine": "Verkaufsautomat|Automat",
 "amenity-vending_machine-cigarettes": "5Zigarettenautomat",
 "amenity-vending_machine-coffee": "6Kaffeeautomat",
 "amenity-vending_machine-condoms": "6Kondomautomat",
@@ -375,7 +371,6 @@
 "tourism-chalet|@category_hotel": "Ferienhäuschen|Ferienhaus",
 "tourism-information-board": "Informationstafel",
 "tourism-information-map": "Touristenkarte",
-"tourism-information-guidepost": "Wegweiser",
 "aerialway-station": "Seilbahn|Liftstation",
 "aeroway-helipad": "Hubschrauberlandeplatz",
 "barrier-border_control": "Grenzkontrolle",
@@ -466,7 +461,6 @@
 "leisure-track": "Laufbahn",
 "leisure-bandstand": "6Musikpavillon|8Konzertpavillon|Konzertmuschel|Musikmuschel|Kurpavillon|Kurmuschel",
 "power-plant": "Kraftwerk",
-"power-generator-wind": "Windgenerator|Windrad|Windkraftanlage",
 "shop-auction|@category_secondhand": "Auktion",
 "shop-collector|@category_shopping|@category_secondhand": "Sammlerartikel|Sammlerstücke",
 "man_made-cairn": "Steinmännchen",

data/categories-strings/en.json/localize.json

@@ -242,7 +242,7 @@
 "leisure-stadium": "4Stadium|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|olympic stadium|sports stadium|sports complex|arena|sports arena",
 "leisure-playground|@category_children": "4Playground",
 "leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sports Center|sport|sports|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum",
-"leisure-sports_centre-sport-swimming": "4Swimming Centre",
+"leisure-sports_centre-sport-swimming": "4Swimmming Centre",
 "leisure-golf_course": "4Golf Course|golf|U+26F3",
 "leisure-miniature_golf": "4Minigolf|Miniature Golf|Putt Putt|mini golf|mini-golf",
 "leisure-escape_game": "4Escape Room|Escape Game|quest",

tools/unix/maps/upload_to_cdn.sh

@@ -48,7 +48,7 @@ OLD_VERSIONS_RU1=$(rclone lsd ru1:comaps-maps/maps --max-depth 1 | awk '{print $
 for version in $OLD_VERSIONS_RU1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting ru1:comaps-maps/maps/$version/"
-    rclone purge ru1:comaps-maps/maps/$version/
+    rclone purge -v ru1:comaps-maps/maps/$version/
   fi
 done
 
@@ -58,7 +58,7 @@ OLD_VERSIONS_FI1=$(rclone lsd fi1:/var/www/html/maps --max-depth 1 | awk '{print
 for version in $OLD_VERSIONS_FI1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting fi1:/var/www/html/maps/$version/"
-    rclone purge fi1:/var/www/html/maps/$version/
+    rclone purge -v fi1:/var/www/html/maps/$version/
   fi
 done
 
@@ -68,7 +68,7 @@ OLD_VERSIONS_DE1=$(rclone lsd de1:/var/www/html/comaps-cdn/maps --max-depth 1 |
 for version in $OLD_VERSIONS_DE1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting de1:/var/www/html/comaps-cdn/maps/$version/"
-    rclone purge de1:/var/www/html/comaps-cdn/maps/$version/
+    rclone purge -v de1:/var/www/html/comaps-cdn/maps/$version/
   fi
 done
 
@@ -78,7 +78,7 @@ OLD_VERSIONS_FR1=$(rclone lsd fr1:/data/maps --max-depth 1 | awk '{print $5}' |
 for version in $OLD_VERSIONS_FR1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting fr1:/data/maps/$version/"
-    rclone purge fr1:/data/maps/$version/
+    rclone purge -v fr1:/data/maps/$version/
   fi
 done
 
@@ -89,19 +89,19 @@ echo "Old version cleanup complete"
 
 echo "Uploading to us2"
 # An explicit mwm/txt filter is used to skip temp files when run for an unfinished generation
-rclone copy --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS &
+rclone copy -v --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS &
 
 echo "Uploading to ru1"
-rclone copy --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS &
+rclone copy -v --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS &
 
 echo "Uploading to fi1"
-rclone copy --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS &
+rclone copy -v --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS &
 
 echo "Uploading to de1"
-rclone copy --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS &
+rclone copy -v --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS &
 
 echo "Uploading to fr1"
-rclone copy --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS &
+rclone copy -v --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS &
 
 # us1 is not used for maps atm
 # rclone lsd us1:/home/dh_zzxxrk/cdn-us-1.comaps.app/maps