lower thread count for less OOM

Signed-off-by: zyphlar <zyphlar@gmail.com>

.forgejo/workflows/map-generator.yml

@@ -9,6 +9,7 @@ on:
         type: choice
         options:
           - all
+          - clone-repos
           - copy-coasts
           - planet
           - wiki
@@ -16,30 +17,95 @@ on:
           - subways
           - tiger
           - maps
+          - upload
+      reclone:
+        description: 'Force a re-clone of all git repos?'
+        required: false
+        default: 'no'
+        type: choice
+        options:
+          - 'no'
+          - force
+
+## RCLONE_CONF is multi-line text containing keys and credentials for us2,ru1,fi1,de1 servers
 
 env:
+  RCLONE_CONF: ${{ secrets.RCLONE_CONF }}
   WIKIMEDIA_USERNAME: ${{ secrets.WIKIMEDIA_USERNAME }}
   WIKIMEDIA_PASSWORD: ${{ secrets.WIKIMEDIA_PASSWORD }}
-  S3_KEY_ID: ${{ secrets.S3_KEY_ID }}
-  S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
-  S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
-  S3_BUCKET: ${{ secrets.S3_BUCKET }}
-  SFTP_USER: ${{ secrets.SFTP_USER }}
-  SFTP_PASSWORD: ${{ secrets.SFTP_PASSWORD }}
-  SFTP_HOST: ${{ secrets.SFTP_HOST }}
-  SFTP_PATH: ${{ secrets.SFTP_PATH }}
+  ZULIP_BOT_EMAIL: ${{ secrets.ZULIP_BOT_EMAIL }}
+  ZULIP_API_KEY: ${{ secrets.ZULIP_API_KEY }}
   DEBIAN_FRONTEND: noninteractive
   TZ: Etc/UTC 
 
 jobs:
+  clone-repos:
+    if: inputs.jobs == 'clone-repos' || inputs.jobs == 'all'
+    name: Clone Git Repos
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
+      volumes:
+        - /mnt/4tbexternal:/mnt/4tbexternal
+    concurrency:
+      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Clone or update main repo if necessary
+        shell: bash
+        run: |
+          ls -al /mnt
+          ls -al /mnt/4tbexternal
+          if [[ '${{ inputs.reclone }}' == 'force' ]]; then
+          rm -rf /mnt/4tbexternal/comaps-init
+          fi
+
+          if [ ! -d /mnt/4tbexternal/comaps-init ]; then
+          cd /mnt/4tbexternal
+          git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251027 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
+          else
+          cd /mnt/4tbexternal/comaps-init && git pull origin rebase-generator-pastk-wb251027
+          fi
+      - name: Clone or update wikiparser repo if necessary
+        shell: bash
+        run: |
+          if [[ '${{ inputs.reclone }}' == 'force' ]]; then
+          rm -rf /mnt/4tbexternal/wikiparser
+          fi
+
+          if [ ! -d /mnt/4tbexternal/wikiparser ]; then
+          cd /mnt/4tbexternal
+          git clone https://codeberg.org/comaps/wikiparser.git
+          else
+          cd /mnt/4tbexternal/wikiparser && git pull origin main
+          fi
+      - name: Clone or update subways repo if necessary
+        shell: bash
+        run: |
+          if [[ '${{ inputs.reclone }}' == 'force' ]]; then
+          rm -rf /mnt/4tbexternal/subways
+          fi
+
+          if [ ! -d /mnt/4tbexternal/subways ]; then
+          cd /mnt/4tbexternal
+          git clone https://codeberg.org/comaps/subways.git
+          else
+          cd /mnt/4tbexternal/subways && git pull origin master
+          fi
+
   copy-coasts:
     if: inputs.jobs == 'copy-coasts' || inputs.jobs == 'all'
     name: Copy Previously Generated Coasts
     runs-on: mapfilemaker
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
@@ -47,9 +113,9 @@ jobs:
       - name: Copy Coasts
         shell: bash
         run: |
-          if [ -f /media/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom ]; then
-          cp /media/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom /media/4tbexternal/osm-planet/latest_coasts.geom
-          cp /media/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.rawgeom /media/4tbexternal/osm-planet/latest_coasts.rawgeom
+          if [ -f /root/OM/osm-maps/*/intermediate_data/WorldCoasts.geom ]; then
+          cp /root/OM/osm-maps/*/intermediate_data/WorldCoasts.geom /home/planet/latest_coasts.geom
+          cp /root/OM/osm-maps/*/intermediate_data/WorldCoasts.rawgeom /home/planet/latest_coasts.rawgeom
           fi
 
   update-planet:
@@ -57,86 +123,93 @@ jobs:
     name: Update Planet
     runs-on: mapfilemaker
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Install dependencies
-        shell: bash
-        run: |
-          apt-get update -y
-          apt-get install -y pyosmium osmium-tool python3-venv python3-pip wget2
-          rm -f /usr/lib/python*/EXTERNALLY-MANAGED
-          pip3 install "protobuf<4"
       - name: Download Planet File if Absent
         shell: bash
         run: |
-          if [ ! -d /media/4tbexternal/osm-planet/planet/ ]; then
-          mkdir -p /media/4tbexternal/osm-planet/planet/
+          if [ ! -d /home/planet/planet/ ]; then
+          mkdir -p /home/planet/planet/
           fi
-          if [ ! -f /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf ]; then
-          cd /media/4tbexternal/osm-planet/planet/
-          wget2 --verbose --progress=bar --continue --debug https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
+          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
           fi
       - name: Update Planet
         shell: bash
         run: |
-          cd /media/4tbexternal/osm-planet/planet/
+          cd /home/planet/planet/
           pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -vv --size 16384
           mv planet-latest-new.osm.pbf planet-latest.osm.pbf
       - name: Converting planet-latest.osm.pbf to planet.o5m
-        run: /root/OM/osmctools/osmconvert planet-latest.osm.pbf -o=planet.o5m
+        run: |
+          echo "Starting..."
+          cd /home/planet/planet/
+          osmconvert planet-latest.osm.pbf -o=planet.o5m
+          echo "Done."
+      - 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=Planet update is done!'
 
   wiki-update:
     if: inputs.jobs == 'wiki' || inputs.jobs == 'all'
     name: Update Wikipedia
     runs-on: mapfilemaker
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Install dependencies
-        shell: bash
-        run: |
-          apt-get update -y
-          apt-get install -y jq curl wget2 rustc cargo git ca-certificates
-      - name: Clone wikiparser if necessary
-        shell: bash
-        run: |
-          if [ ! -d /media/4tbexternal/wikiparser ]; then
-          cd /media/4tbexternal
-          git clone https://codeberg.org/comaps/wikiparser.git
-          fi
       - name: Check for planet file
         shell: bash
         run: |
-          if [ ! -f /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf ]; then
-          echo "ERROR: No file at /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf"
-          ls -al /media/4tbexternal/
-          ls -al /media/4tbexternal/osm-planet/
-          ls -al /media/4tbexternal/osm-planet/planet/
+          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
+          echo "ERROR: No file at /home/planet/planet/planet-latest.osm.pbf"
+          ls -al /home/planet/
+          ls -al /home/planet/planet/
           exit 1
           fi
       - name: Update Wikipedia from Enterprise API
         shell: bash
         run: |
-          mkdir -p /media/4tbexternal/osm-planet/wikipedia/dumps
-          mkdir -p /media/4tbexternal/osm-planet/wikipedia/build
-          cd /media/4tbexternal/wikiparser
+          #todo: curl in download.sh can fail when rate limited and even save error messages to the output. need to validate.
+          #downloading all languages can also trigger rate limits or fail as well. needs work.
+          #also: a failure to download means a failure to build, and could result in no wiki descriptions etc.
+          #also-also: do we want to remove old wiki data in planet between builds?
+          mkdir -p /home/planet/wikipedia/dumps
+          mkdir -p /home/planet/wikipedia/build
+          cd /root/OM/wikiparser
           ls -al
           echo "Downloading ..."
-          ./download.sh /media/4tbexternal/osm-planet/wikipedia/dumps
+          ./download.sh /home/planet/wikipedia/dumps
+          ls -al /home/planet/wikipedia/dumps/*
           echo "Running ..."
-          ./run.sh /media/4tbexternal/osm-planet/wikipedia/build \
-          /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf \
-          /media/4tbexternal/osm-planet/wikipedia/dumps/latest/*.tar.gz
+          ./run.sh /home/planet/wikipedia/build \
+          /home/planet/planet/planet-latest.osm.pbf \
+          /home/planet/wikipedia/dumps/latest/*.tar.gz
           echo "DONE"
 
   update-isolines:
@@ -144,74 +217,34 @@ jobs:
     name: Update Isolines
     runs-on: mapfilemaker
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Install dependencies
-        shell: bash
-        run: |
-          apt-get update -qq \
-          && apt-get install -y --no-install-recommends \
-          curl \
-          osmctools \
-          rclone \
-          git \
-          ca-certificates \
-          openssh-client \
-          sshpass \
-          vim \
-          wget \
-          build-essential \
-          clang \
-          cmake \
-          python3 \
-          python3-pip \
-          python3.12-venv \
-          qt6-base-dev \
-          qt6-positioning-dev \
-          libc++-dev \
-          libfreetype-dev \
-          libglvnd-dev \
-          libgl1-mesa-dev \
-          libharfbuzz-dev \
-          libicu-dev \
-          libqt6svg6-dev \
-          libqt6positioning6-plugins \
-          libqt6positioning6 \
-          libsqlite3-dev \
-          libxrandr-dev \
-          libxinerama-dev \
-          libxcursor-dev \
-          libxi-dev \
-          zlib1g-dev
-          rm -f /usr/lib/python*/EXTERNALLY-MANAGED
-          pip3 install "protobuf<4"
-      - name: Clone main repo if necessary
-        shell: bash
-        run: |
-          if [ ! -d /media/4tbexternal/comaps-init ]; then
-          apt-get update -qq && apt-get install -y --no-install-recommends git
-          cd /media/4tbexternal
-          git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
-          fi
+      # TODO: we only need to update these if our SRTM or countries change
+      # TODO: after update, verify that sizable files exist: /home/planet/isolines/*.isolines
       - name: Update Isolines
         shell: bash
         run: |
-          cd /media/4tbexternal/comaps-init/
+          cd /root/OM/comaps-init/
           ./tools/unix/build_omim.sh -R topography_generator_tool
-          rm -rf ../osm-planet/isolines/
-          mkdir ../osm-planet/isolines/
+          rm -rf /home/planet/isolines/
+          mkdir /home/planet/isolines/
           ../omim-build-relwithdebinfo/topography_generator_tool \
           --profiles_path=./data/conf/isolines/isolines-profiles.json \
           --countries_to_generate_path=./data/conf/isolines/countries-to-generate.json \
-          --tiles_isolines_out_dir=../osm-planet/isolines/tmp-tiles/ \
-          --countries_isolines_out_dir=../osm-planet/isolines/ \
+          --tiles_isolines_out_dir=/home/planet/isolines/tmp-tiles/ \
+          --countries_isolines_out_dir=/home/planet/isolines/ \
           --data_dir=./data/ \
-          --srtm_path=../osm-planet/SRTM-patched-europe/ \
+          --srtm_path=/home/planet/SRTM-patched-europe/ \
           --threads=22
 
   update-subways:
@@ -219,37 +252,22 @@ jobs:
     name: Update Subways
     runs-on: mapfilemaker
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Install dependencies
-        shell: bash
-        run: |
-          apt-get update -qq && apt-get install -y --no-install-recommends curl osmctools osmium-tool python3-venv ca-certificates git python3-pip
-          rm -f /usr/lib/python*/EXTERNALLY-MANAGED
-          pip3 install "protobuf<4"
-      - name: Clone subways if necessary
-        shell: bash
-        run: |
-          if [ ! -d /media/4tbexternal/subways ]; then
-          cd /media/4tbexternal
-          git clone https://codeberg.org/comaps/subways.git
-          fi
-      - name: Clone main repo if necessary
-        shell: bash
-        run: |
-          if [ ! -d /media/4tbexternal/comaps-init ]; then
-          cd /media/4tbexternal
-          git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
-          fi
       - name: Update Subways
         shell: bash
         run: |
-          cd /media/4tbexternal/comaps-init/
+          cd /root/OM/comaps-init/
           cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
           ./tools/unix/maps/generate_subways.sh
 
@@ -258,125 +276,127 @@ jobs:
     name: Update TIGER
     runs-on: mapfilemaker
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Install dependencies
-        shell: bash
-        run: |
-          apt-get update -qq && apt-get install -y --no-install-recommends \
-          build-essential \
-          clang \
-          cmake \
-          ninja-build \
-          ca-certificates \
-          git \
-          wget2
-      - name: Clone main repo if necessary
-        shell: bash
-        run: |
-          if [ ! -d /media/4tbexternal/comaps-init ]; then
-          cd /media/4tbexternal
-          git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
-          fi
       - name: Build address_parser
         shell: bash
         run: |
-          cd /media/4tbexternal/comaps-init
+          cd /root/OM/comaps-init
           rm -rf ../omim-build-relwithdebinfo/CMakeCache.txt
           rm -rf ../omim-build-relwithdebinfo/CMakeFiles
           ./tools/unix/build_omim.sh -R address_parser_tool
       - name: Update TIGER from Nominatim
         shell: bash
         run: |
-          cd /media/4tbexternal/osm-planet/
+          # TODO: maybe remove old osm-planet/tiger first?
+          cd /home/planet/
+          mkdir -p tiger
           wget2 https://nominatim.org/data/tiger-nominatim-preprocessed-latest.csv.tar.gz
-          tar -xOzf tiger-nominatim-preprocessed-latest.csv.tar.gz | /media/4tbexternal/omim-build-relwithdebinfo/address_parser_tool --output_path=./tiger
+          cd /root/OM/comaps-init
+          tar -xOzf /home/planet/tiger-nominatim-preprocessed-latest.csv.tar.gz | /root/OM/omim-build-relwithdebinfo/address_parser_tool --output_path=/home/planet/tiger
 
   generate-maps:
     if: inputs.jobs == 'maps' || inputs.jobs == 'all'
     name: Generate Maps
     runs-on: mapfilemaker
+    timeout-minutes: 40320
     container:
-      image: ubuntu:latest
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
       volumes:
-        - /media/4tbexternal:/media/4tbexternal
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
       options: --ulimit nofile=262144:262144
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Install dependencies
-        shell: bash
-        run: |
-          apt-get update -qq \
-          && apt-get install -y --no-install-recommends \
-          curl \
-          osmctools \
-          rclone \
-          git \
-          ca-certificates \
-          openssh-client \
-          sshpass \
-          vim \
-          wget \
-          build-essential \
-          clang \
-          cmake \
-          ninja-build \
-          python3 \
-          python3-pip \
-          python3.12-venv \
-          qt6-base-dev \
-          qt6-positioning-dev \
-          libc++-dev \
-          libfreetype-dev \
-          libglvnd-dev \
-          libgl1-mesa-dev \
-          libharfbuzz-dev \
-          libicu-dev \
-          libqt6svg6-dev \
-          libqt6positioning6-plugins \
-          libqt6positioning6 \
-          libsqlite3-dev \
-          libxrandr-dev \
-          libxinerama-dev \
-          libxcursor-dev \
-          libxi-dev \
-          zlib1g-dev
-      - name: Clone repo if necessary
-        shell: bash
-        run: |
-          if [ ! -d /media/4tbexternal/comaps-init ]; then
-          cd /media/4tbexternal
-          git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
-          fi
       - name: Make output folders if necessary
         shell: bash
         run: |
-          if [ ! -d /media/4tbexternal/osm-maps ]; then
-          mkdir -p /media/4tbexternal/osm-maps
+          if [ ! -d /root/OM/osm-maps ]; then
+          mkdir -p /root/OM/osm-maps
           fi
       - name: Get SRTM if necessary
         shell: bash
         run: |
-          if [ ! -d /media/4tbexternal/osm-planet/SRTM-patched-europe/ ]; then
+          if [ ! -d /home/planet/SRTM-patched-europe/ ]; then
           echo "ERROR: NO SRTM"
           exit 1
           fi
-      - name: Symlink paths for repo scripts
-        shell: bash
-        run: |
-          mkdir -p /root/OM
-          ln -s /media/4tbexternal/comaps-init /root/OM/organicmaps
-          ln -s /media/4tbexternal/osm-planet /home/planet
-          ln -s /media/4tbexternal/osm-maps /root/OM/maps_build
       - name: Run docker_maps_generator.sh
         shell: bash
         run: |
-          cd /root/OM/organicmaps
-          ./tools/unix/docker_maps_generator.sh
+          cd /root/OM/comaps-init
+          ./tools/unix/docker_maps_generator.sh
+      - 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=Generator is done!'
+
+  upload-maps:
+    if: inputs.jobs == 'upload' || inputs.jobs == 'all'
+    name: Upload Maps
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:96d2a38aa23d
+      volumes:
+        - /mnt/4tbexternal/comaps-init:/root/OM/comaps-init
+        - /mnt/4tbexternal/wikiparser:/root/OM/wikiparser
+        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /mnt/4tbexternal/osm-maps:/root/OM/osm-maps
+        - /mnt/4tbexternal/subways:/root/OM/subways
+        - /mnt/4tbexternal/omim-build-relwithdebinfo:/root/OM/omim-build-relwithdebinfo
+    concurrency:
+      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Write config file
+        run: |
+          mkdir -p ~/.config/rclone/
+          echo "${{ secrets.RCLONE_CONF }}" > ~/.config/rclone/rclone.conf
+          head -n3 ~/.config/rclone/rclone.conf
+      - name: Upload map files to CDNs
+        shell: bash
+        run: |
+          shopt -s nullglob
+          buildfolder=$(find /root/OM/osm-maps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f5)
+          builddate=$(find /root/OM/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6)
+          mwmfiles=( /root/OM/osm-maps/$buildfolder/$builddate/*.mwm )
+
+          if (( ${#mwmfiles[@]} )); then
+            echo "<$(date +%T)> Uploading maps from $buildfolder/$builddate..."
+            cd /root/OM/comaps-init/tools/unix/maps
+            ./upload_to_cdn.sh /root/OM/osm-maps/$buildfolder/$builddate
+          else
+            echo "<$(date +%T)> No MWM files in /root/OM/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps."
+            echo "<$(date +%T)> Found top level: $(ls -alt /root/OM/osm-maps/*)"
+            echo "<$(date +%T)> Found second level: $(ls -alt /root/OM/osm-maps/$buildfolder/*)"
+          fi
+      - 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=Upload is done!'
+
+          

.gitignore

@@ -9,6 +9,7 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
+*.local.*
 
 stxxl.errlog
 stxxl.log

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,8 +1,8 @@
-• OpenStreetMap-Daten vom 4. November
+• OpenStreetMap-Daten vom 28. Oktober
 • Aktualisierte Karten-Icons, inkl. Farben für Unterhaltungs-, Sport- & andere Unternehmen
 • Informationen zu Steckdosen an EV-Ladestationen
 • Symbole für Sportzentren, Veranstaltungsorte, Massagesalons, Gästehäuser und einige stillgelegte Unternehmen
 • Verbesserungen bei der Suche
 • Behebung eines Absturzes bei der Suche
-• Verbesserte Sprachführung während der Navigation
+• Verbesserte Sprachführung während der Navigation (via OM)
 Weitere Änderungen finden in unseren Codeberg-Versionshinweisen!

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,8 +1,7 @@
-• OpenStreetMap data as of November 4
 • Recategorized map icons including some new colors for entertainment, sports and other businesses
 • Display info about available sockets on charging stations
-• Added bandstands, backless benches and loungers
-• New icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
-• Multiple search improvements and crash fix
-• Improved voice guidance during navigation
+• Added icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
+• Multiple search improvements
+• Fixed crash in search
+• Improved voice guidance during navigation (via OM project)
 Check our Codeberg release notes for more changes!

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,7 +1,7 @@
-• Datos OSM del 04/11
+• Datos OSM del 28/10
 • Iconos del mapa recategorizados, incluyendo nuevos colores
 • Visualización de información sobre enchufes disponibles en estaciones de recarga
 • Adición de iconos para diferentes centros deportivos, lugares de eventos, salones de masajes, posadas y algunos establecimientos comerciales desactivados
 • Varias mejoras y correcciones de errores en la búsqueda
-• Mejora en la orientación por voz durante la navegación
+• Mejora en la orientación por voz durante la navegación (via OM)
 Más detalles en Codeberg

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,8 +1,8 @@
-• Données OpenStreetMap au 4 novembre
+• Données OpenStreetMap du 28 octobre
 • Recatégorisation des icônes sur la carte avec ajout de nouvelles couleurs pour certains types de lieux
 • Affichage des prises sur les bornes électriques
 • Ajout d'icônes pour les centres sportifs, salles d'événements, salon de massage et autres lieux
 • Multiple améliorations dans la recherche
 • Correction d'un plantage dans la recherche
-• Amélioration de la synthèse vocale durant la navigation
+• Amélioration de la synthèse vocale durant la navigation (via le projet OM)
 Plus d'informations sur notre Codeberg

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,7 +1,7 @@
-• Dados OSM de 04/11
+• Dados OSM de 28/10
 • Ícones do mapa recategorizados, incluindo novas cores
 • Exibição de informações sobre tomadas disponíveis em eletropostos
 • Adição de ícones para diferentes centros esportivos, locais de eventos, salões de massagem, pousadas e alguns estabelecimentos comerciais desativados
 • Diversas melhorias e correção de erro na busca
-• Melhoria na orientação por voz durante a navegação
+• Melhoria na orientação por voz durante a navegação (via projeto OM)
 Confira nossas notas de lançamento no Codeberg para mais detalhes!

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,8 +0,0 @@
-• Карты OpenStreetMap от 4 ноября
-• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов
-• На зарядных станциях показываются имеющиеся типы разъёмов
-• Добавлены эстрады, скамейки без спинок и лежаки
-• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов
-• Несколько улучшений и исправлений в поиске
-• Улучшены голосовые подсказки при навигации
-Подробнее смотрите на codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/sl/full-description.txt

@@ -1,31 +0,0 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
-
-Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
-Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
-• Uporabljajte orodje in širite glas o njem
-• Dajajte povratne informacije in poročajte o napakah
-• Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap
-
-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
-‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
-‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
-‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
-‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
-
-<b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
-• Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
-• Pešpoti in kolesarke poti
-• Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
-• Iščite po imenu, hišnemu naslovu ali po vrsti
-• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
-• Zaznamujte svoje najljubše kraje s preprostim dotikom
-• Wikipedijini članki brez povezave
-• Prometna plast podzemne železnice z usmerjanjem
-• Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
-• Temni prikaz za uporabo ponoči
-• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika
-
-<b>Svoboda je tu</b>
-Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!

android/app/src/fdroid/play/listings/sv-SE/title.txt

@@ -1 +0,0 @@
-Comaps- Vandra, Cykla, Kör Offline, Privat

android/app/src/google/play/listings/sv-SE/title.txt

@@ -1 +0,0 @@
-Comaps- Navigera Privat

android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java

@@ -1,13 +1,11 @@
 package app.organicmaps.background;
 
 import android.content.Context;
-import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.work.Constraints;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
-import androidx.work.OutOfQuotaPolicy;
 import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
@@ -37,11 +35,7 @@ public class OsmUploadWork extends Worker
     if (Editor.nativeHasSomethingToUpload() && OsmOAuth.isAuthorized())
     {
       final Constraints c = new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build();
-      OneTimeWorkRequest.Builder builder = new OneTimeWorkRequest.Builder(OsmUploadWork.class).setConstraints(c);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-          builder.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST);
-      }
-      final OneTimeWorkRequest wr = builder.build();
+      final OneTimeWorkRequest wr = new OneTimeWorkRequest.Builder(OsmUploadWork.class).setConstraints(c).build();
       WorkManager.getInstance(context).beginUniqueWork("UploadOsmChanges", ExistingWorkPolicy.KEEP, wr).enqueue();
     }
   }

android/app/src/main/res/values-gl/strings.xml

@@ -623,8 +623,7 @@
     <string name="charge_socket_unknown_other">Outro ou descoñecido</string>
     <string name="unknow_socket_type">engache descoñecido</string>
     <string name="editor_place_doesnt_exist_description">Describe a aparencia do lugar para enviar unha nota co erro á comunidade OpenStreetMap</string>
-    <string name="avoid_steps">Evitar escaleiras</string>
+    <string name="avoid_steps">Evitar pasos</string>
     <string name="offline_explanation_title">Mapas sen conexión</string>
     <string name="offline_explanation_text">Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar.</string>
-    <string name="list_description_empty">Editar a lista para engadir unha descrición</string>
 </resources>

android/app/src/main/res/values-ta/strings.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

android/app/src/main/res/values-zh/strings.xml

@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">精度有限</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">为确保导航准确，请在设置中启用 \"精确定位\"</string>
+    <string name="precise_location_is_disabled_long_text">为确保准确导航，请在设置中启用确切位置</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">在地图上显示</string>
     <!-- Message to display at the center of the screen when the country download has failed -->

android/sdk/src/main/res/values-de/types_strings.xml

@@ -27,7 +27,6 @@
     <string name="type.amenity.bench">Sitzbank</string>
     <string name="type.amenity.bench.backless">Sitzbank ohne Rückenlehne</string>
     <string name="type.amenity.bicycle_parking">Fahrradständer</string>
-    <string name="type.amenity.boat_rental">Bootsverleih</string>
     <string name="type.amenity.bicycle_rental">Fahrradverleih</string>
     <string name="type.amenity.bicycle_repair_station">Fahrrad-Reparaturstation</string>
     <string name="type.amenity.brothel">Bordell</string>

android/sdk/src/main/res/values-nb/types_strings.xml

@@ -975,7 +975,7 @@
     <string name="type.shop.books">Bokhandel</string>
     <string name="type.shop.butcher">Slakter</string>
     <string name="type.shop.cannabis">Cannabisbutikk</string>
-    <string name="type.shop.car">Bilforhandler</string>
+    <string name="type.shop.car">Bil butikk</string>
     <string name="type.shop.car_parts">Bildeler</string>
     <string name="type.shop.car_repair">Bilverksted</string>
     <string name="type.shop.car_repair.tyres">Dekkreparasjon</string>
@@ -1353,14 +1353,4 @@
     <string name="type.railway.narrow_gauge.bridge">Smalsporet jernbanebru</string>
     <string name="type.railway.narrow_gauge.tunnel">Smalsporet jernbanetunnel</string>
     <string name="type.leisure.slipway">Slipp</string>
-    <string name="type.post_office.post_partner">Post i butikk</string>
-    <string name="type.amenity.pub">Pub</string>
-    <string name="type.historic.monument">Monument</string>
-    <string name="type.man_made.crane">Kran</string>
-    <string name="type.military.bunker">Bunker</string>
-    <string name="type.railway.construction">Jernbanebygging</string>
-    <string name="type.railway.funicular.bridge">Kabelbanebru</string>
-    <string name="type.railway.funicular.tunnel">Kabelbanetunnel</string>
-    <string name="type.military">Militært</string>
-    <string name="type.landuse.education">Utdanningsinstitusjon</string>
 </resources>

android/sdk/src/main/res/values-ro/types_strings.xml

@@ -1180,7 +1180,7 @@
     <string name="type.amenity.bar">Bar</string>
     <string name="type.amenity.bicycle_parking.covered">Parcare acoperită pentru biciclete</string>
     <string name="type.amenity.love_hotel">Hotel cu ora</string>
-    <string name="type.amenity.studio">Studio Media</string>
+    <string name="type.amenity.studio">Garsonieră</string>
     <string name="type.amenity.bicycle_repair_station">Stație Reparații Biciclete</string>
     <string name="type.amenity.car_sharing">Utilizare comună a mașinii</string>
     <string name="type.amenity.dentist">Dentist</string>

android/sdk/src/main/res/values-sl/types_strings.xml

@@ -153,5 +153,4 @@
     <string name="type.leisure.amusement_arcade">Arkadne igre</string>
     <string name="type.amenity.charging_station.motorcar.small">Polnilno mesto za avtomobile</string>
     <string name="type.amenity.childcare">Vrtec</string>
-    <string name="type.amenity.cinema">Kino</string>
 </resources>

android/sdk/src/main/res/values-ta/strings.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

android/sdk/src/main/res/values/types_strings.xml

@@ -30,7 +30,6 @@
     <string name="type.amenity.bench.backless">Backless Bench</string>
     <string name="type.amenity.bicycle_parking">Bicycle Parking</string>
     <string name="type.amenity.bicycle_parking.covered">Covered Bicycle Parking</string>
-    <string name="type.amenity.boat_rental">Boat Rental</string>
     <string name="type.amenity.bicycle_rental">Bicycle Rental</string>
     <string name="type.amenity.bicycle_repair_station">Bicycle Repair Station</string>
     <string name="type.amenity.biergarten">Biergarten</string>
@@ -93,7 +92,6 @@
     <string name="type.amenity.loading_dock">Loading Dock</string>
     <string name="type.amenity.lounger">Lounger</string>
     <string name="type.amenity.luggage_locker">Luggage Locker</string>
-    <string name="type.amenity.mobile_money_agent">Mobile Money Agent</string>
     <string name="type.amenity.marketplace">Marketplace</string>
     <string name="type.amenity.motorcycle_parking">Motorcycle Parking</string>
     <string name="type.amenity.nightclub">Nightclub</string>
@@ -123,7 +121,6 @@
     <string name="type.amenity.parking_space.private">Parking Space</string>
     <string name="type.amenity.parking_space.underground">Parking Space</string>
     <string name="type.amenity.parking_space.disabled">Disabled Parking Space</string>
-    <string name="type.amenity.payment_centre">Payment Centre</string>
     <string name="type.amenity.payment_terminal">Payment Terminal</string>
     <string name="type.amenity.pharmacy">Pharmacy</string>
     <string name="type.amenity.place_of_worship">Place of Worship</string>
@@ -660,7 +657,6 @@
     <string name="type.leisure.miniature_golf">Minigolf</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.leisure.ice_rink">Ice Rink</string>
-    <string name="type.leisure.indoor_play">Indoor Play Centre</string>
     <string name="type.leisure.marina">Marina</string>
     <string name="type.leisure.nature_reserve">Nature Reserve</string>
     <string name="type.leisure.outdoor_seating">Outdoor Seating</string>
@@ -1255,7 +1251,6 @@
     <string name="type.shop.supermarket">Supermarket</string>
     <string name="type.shop.tattoo">Tattoo Parlour</string>
     <string name="type.shop.tea">Tea Shop</string>
-    <string name="type.shop.telecommunication">Telecommunication Shop</string>
     <string name="type.shop.ticket">Ticket Shop</string>
     <string name="type.shop.toys">Toy Store</string>
     <string name="type.shop.travel_agency">Travel Agency</string>

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

@@ -19,13 +19,13 @@
 "@category_recycling": "Recycling|Abfallverwertung|Recyclebares Material|Getrennte Müllsammlung|Müllsortierung|Wiederverwendung",
 "amenity-bureau_de_change": "3Geldwechselstelle|Wechselstube|Geld|Geldumtausch",
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2Pub|4Kneipe|Bier|Trinken|4Gaststätte|4Bars und Kneipen|Brauhaus|Cocktail-Lounge",
-"amenity-cafe|@category_eat": "3Café|6Kaffeehaus|Kaffeebar|Cafeteria",
-"amenity-fast_food|@category_eat": "4Fast Food|Mitnahme|3Imbiss|Essen zum Mitnehmen|Junkfood|7Schnellimbiss",
-"amenity-restaurant|@category_eat": "3Restaurant|4Gasthaus|Gaststube|6Speiselokal|Gastwirtschaft",
+"amenity-cafe|@category_eat": "3Café|3Restaurant|4Kaffee|6Kaffeehaus|Kaffeebar|Cafeteria",
+"amenity-fast_food|@category_eat": "4Fast-Food|Takeaway|Restaurant|Café|Pizzeria|3Imbiss|5Essen zum Mitnehmen|Junkfood|7Schnellimbiss",
+"amenity-restaurant|@category_eat": "3Restaurant|3Café|4Gasthaus|Gaststube|6Speiselokal|Gastwirtschaft",
 "amenity-fuel|@category_fuel": "Tankstation|3Tankstelle",
 "@shop": "3Verbrauchermarkt|5Geschäft|5Laden",
-"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|Bäckerladen|Bäcker|4Konditorei|Konditor",
-"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|Kosmetik|Schönheitspflege|Make Up|Make-Up|Makeup",
+"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|Bäckerladen|Bäcker|4Konditorei",
+"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|Kosmetik|Schönheitspflege",
 "shop-convenience|@category_food|@shop": "5Gemischtwarenladen|Lebensmittelhändler|Lebensmittelhandlung|Lebensmittelgeschäft|4Greißler|4Tante-Emma-Laden",
 "shop-deli|@category_food|@shop": "4Feinkostladen|Feinkostgeschäft",
 "shop-farm|@category_food|@shop": "4Hofladen|4Bauernhofladen",
@@ -484,7 +484,7 @@
 "shop-craft|@shop": "Künstlerbedarf",
 "shop-pasta|@shop": "Nudelgeschäft",
 "amenity-luggage_locker": "Gepäckschließfach",
-"amenity-studio": "Medienstudio|Studio",
+"amenity-studio": "Studio",
 "shop-cannabis|@shop": "Cannabis",
 "man_made-cross": "Kreuz",
 "leisure-dance|@category_entertainment": "4Tanz|Tanzschule",

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

@@ -62,7 +62,6 @@
 "shop-laundry": "4Laundry|Laundrette|laundromat",
 "shop-toys|@category_children|@shop": "Toy|toyshop|kids|toys|kids toys",
 "amenity-marketplace|@category_food": "3Marketplace|market",
-"amenity-mobile_money_agent": "Mobile Money Agent|mobile money",
 "amenity-money_transfer": "Money Transfer",
 "shop-clothes|@category_shopping|@shop": "3Clothes|U+1F45A|U+1F457|U+1F456|U+1F455|clothing|wear",
 "shop-caravan|@category_rv|@shop": "2RV dealership|4Caravan dealership|Motorhome dealership",
@@ -129,7 +128,6 @@
 "leisure-garden": "3Garden",
 "leisure-firepit": "5Firepit",
 "amenity-bench|amenity-bench-backless": "Bench",
-"amenity-boat_rental": "4Boat Rental|boat|3rental",
 "amenity-bicycle_rental": "4Bicycle Rental|cycle|bike|3rental|U+1F6B2|U+1F6B4|U+1F6B5|bicycle hire|bike rental",
 "amenity-bicycle_repair_station": "4Bicycle Repair Station|cycle|bike|4repair of bicycles",
 "amenity-car_sharing": "Car Share|3carsharing|car|sharing|U+1F697|U+1F698|U+1F699|carpool|carsharing services|car sharing|4rideshare",
@@ -421,7 +419,6 @@
 "amenity-parking_space-disabled|@category_parking": "Disabled Parking Space",
 "amenity-nursing_home": "4Nursing Home",
 "amenity-payment_terminal": "Payment Terminal",
-"amenity-payment_centre": "Payment Centre",
 "amenity-public_bath": "Public Bath",
 "amenity-shower": "Shower",
 "emergency-assembly_point": "Emergency Assembly Point",
@@ -453,7 +450,6 @@
 "natural-glacier|@category_tourism": "Glacier",
 "highway-ford": "Ford",
 "leisure-marina": "3Marina",
-"leisure-indoor_play": "3Indoor Play Centre|indoor play|indoor playground",
 "piste:type-downhill|piste:type-nordic": "Skiing|3Ski run|4Piste",
 "amenity-events_venue": "Events Venue",
 "shop-chocolate|@category_food|@shop": "Chocolate",
@@ -463,7 +459,6 @@
 "shop-music|@shop": "Record|vinyl|Music",
 "shop-musical_instrument|@shop": "Musical instruments",
 "shop-tea|@shop": "Tea",
-"shop-telecommunication|@shop": "Telecommunication",
 "shop-antiques|@category_shopping|@shop|@category_secondhand": "Antiques",
 "shop-art|@category_shopping|@shop": "3Artwork|Arts",
 "shop-baby_goods|@category_children|@shop": "Baby Goods",

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

@@ -225,11 +225,11 @@
 "tourism-alpine_hut|@category_hotel": "4Cabaña|cabaña alpina|hotel de montaña",
 "shop-hairdresser": "4Peluquería",
 "aeroway-aerodrome": "3Aeropuerto|3avión|aeródromo",
-"leisure-stadium": "5Estadio",
-"leisure-playground|@category_children": "Patio de recreo|4Parque infantil|Corral|Corralito",
-"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": "Polideportivo|Centro deportivo|deporte",
-"leisure-golf_course": "Campo de golf|Golf",
-"leisure-miniature_golf": "5Minigolf|Mini golf",
+"leisure-stadium": "5Estadio|4deporte",
+"leisure-playground|@category_children": "Patio de recreo|Parque infantil",
+"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": "Polideportivo|deporte",
+"leisure-golf_course": "Campo de golf",
+"leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escape room|Sala de escape|Cuarto de escape",
 "leisure-hackerspace": "Espacio hacker|Espacio para hackers|Hacklab|Hackerspace",
 "leisure-pitch": "pista|deporte|cancha|campo",

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

@@ -224,7 +224,7 @@
 "leisure-stadium": "4Stade|4sport",
 "leisure-playground|@category_children": "Terrain de jeu|aire de jeu",
 "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": "Centre sportif|sport",
-"leisure-golf_course": "Terrain de golf|Parcours de golf",
+"leisure-golf_course": "Terrain de golf",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Salle d'évasion",
 "leisure-pitch": "Terrain de sport|sport",

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

@@ -210,7 +210,7 @@
 "leisure-stadium": "4Stadion|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|aréna|olimpiai stadion",
 "leisure-playground|@category_children": "Játszótér",
 "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": "4Sportközpont|sport",
-"leisure-golf_course": "Golfpálya|U+26F3",
+"leisure-golf_course": "Golfpálya",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Szabadulószoba",
 "leisure-pitch": "4Sportpálya|sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F3C9|U+1F3C3",

data/countries-strings/ro.json/localize.json

@@ -34,7 +34,7 @@
 "Austria_Burgenland":"Burgenland",
 "Austria_Carinthia":"Carintia",
 "Austria_Lower Austria_West":"Austria Inferioară — Vest",
-"Austria_Lower Austria_Wien":"Viena și Austria de Jos",
+"Austria_Lower Austria_Wien":"Viena",
 "Austria_Salzburg":"Salzburg",
 "Austria_Styria":"Stiria",
 "Austria_Tyrol":"Tirol",

data/editor.config

@@ -258,10 +258,6 @@
         <include field="outdoor_seating" />
         <include field="website_menu" />
       </type>
-      <type id="amenity-boat_rental">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
       <type id="amenity-bicycle_rental">
         <include field="website" />
         <include field="opening_hours" />
@@ -389,34 +385,6 @@
       <type id="amenity-pharmacy" group="shop">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-buddhist" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-christian" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-hindu" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-jewish" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-muslim" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-shinto" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-taoist" can_add="no">
-        <include group="poi_internet" />
-      </type>
       <type id="amenity-place_of_worship">
         <include group="poi_internet" />
       </type>
@@ -1090,9 +1058,6 @@
       <type id="shop-tea" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-telecommunication" group="shop">
-        <include group="poi_internet" />
-      </type>
       <type id="shop-trade" group="shop">
         <include group="poi_internet" />
       </type>
@@ -1140,25 +1105,6 @@
         <include group="poi_internet" />
         <include field="self_service" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-office" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-visitor_centre" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-board" can_add="no">
-        <include field="name" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-map" can_add="no">
-        <include field="name" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-guidepost" can_add="no">
-      </type>
       <type id="tourism-information">
         <include group="poi" />
       </type>
@@ -1180,7 +1126,6 @@
       <type id="amenity-bench" />
       <type id="amenity-compressed_air" />
       <type id="amenity-bbq" />
-      <type id="leisure-slipway" />
       <type id="amenity-shelter">
         <include field="name" />
       </type>
@@ -1252,9 +1197,6 @@
       <type id="amenity-social_facility">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-payment_centre">
-        <include group="poi_internet" />
-      </type>
       <type id="amenity-payment_terminal">
         <include field="operator" />
         <include field="level" />
@@ -1284,9 +1226,6 @@
       <type id="amenity-money_transfer">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-mobile_money_agent">
-        <include group="poi_internet" />
-      </type>
       <type id="amenity-vehicle_inspection">
         <include group="poi_internet" />
       </type>
@@ -1349,9 +1288,6 @@
         <include group="poi" />
         <include field="operator" />
       </type>
-      <type id="leisure-indoor_play">
-        <include group="poi_internet" />
-      </type>
       <type id="leisure-fitness_centre">
         <include group="poi_internet" />
       </type>
@@ -1520,6 +1456,19 @@
         <tag k="service" v="tyres" />
         <include group="poi_internet" />
       </type>
+      <type id="tourism-information-office">
+        <tag k="tourism" v="information" />
+        <tag k="information" v="board" />
+        <include group="poi_internet" />
+      </type>
+      <type id="tourism-information-board">
+        <tag k="tourism" v="information" />
+        <tag k="information" v="board" />
+      </type>
+      <type id="tourism-information-map">
+        <tag k="tourism" v="information" />
+        <tag k="information" v="board" />
+      </type>
       <type id="leisure-sports_centre-climbing">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="climbing" />

data/mapcss-mapping.csv

@@ -642,7 +642,7 @@ deprecated|deprecated;519;x
 sport|diving;520;
 #~270k uses.
 man_made|utility_pole;521;
-amenity|payment_centre;522;
+deprecated:boundary|administrative|suburb:04.2024;[boundary=administrative][border_type=suburb];x;name;int_name;522;
 # Generic unspecified barrier, could be node (50k) or way (100k)
 barrier|yes;523;
 railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524;
@@ -663,7 +663,7 @@ deprecated|deprecated;538;x
 railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;
 barrier|cycle_barrier;540;
 addr:interpolation;[addr:interpolation];;addr:housenumber;name;541;
-leisure|indoor_play;542;
+deprecated:amenity|speed_trap:10.2021;542;highway|speed_camera
 area:highway|track;543;
 area:highway|primary;544;
 deprecated|deprecated;545;x
@@ -857,7 +857,7 @@ sport|skiing;732;
 tourism|museum;733;
 tourism|guest_house;734;
 tourism|motel;735;
-shop|telecommunication;736;
+deprecated:boundary|administrative|4|state:01.2022;[boundary=administrative][admin_level=4][border_type=state];x;name;int_name;736;boundary|administrative|4
 place|state|USA;[place=state][addr:country=US],[place=state][is_in=USA],[place=state][is_in:country=USA],[place=state][is_in:country_code=us];;name;int_name;737;
 building|address;[addr:housenumber][addr:street];;addr:housenumber;name;738;
 amenity|parking|no-access;[amenity=parking][access=not],[amenity=parking][access=no];;name;int_name;739;
@@ -980,7 +980,8 @@ railway|rail|tourism|bridge;[railway=rail][usage=tourism][!service][bridge?];;na
 railway|rail|highspeed|tunnel;[railway=rail][highspeed?][!service][tunnel?];;name;int_name;854;
 railway|rail|tourism|tunnel;[railway=rail][usage=tourism][!service][tunnel?];;name;int_name;855;
 mapswithme|grid;856;
-amenity|mobile_money_agent;857;
+# service=bus/busway is deprecated in OSM
+deprecated:highway|service|busway:10.2023;[highway=service][service=busway];x;name;int_name;857;highway|busway
 highway|busway;[highway=busway],[highway=service][service=busway],[highway=service][service=bus];;name;int_name;858;
 highway|busway|bridge;[highway=busway][bridge?];;name;int_name;859;
 highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860;
@@ -988,7 +989,7 @@ natural|salt_pond;861;landuse|salt_pond
 amenity|conference_centre;862;
 amenity|exhibition_centre;863;
 deprecated:railway|siding|tunnel:06.2023;864;x
-amenity|boat_rental;865;
+deprecated:railway|yard|tunnel:06.2023;865;x
 area:highway|footway;866;
 junction|circular;867;
 area:highway|residential;868;

data/styles/default/dark/colors.mapcss

@@ -231,14 +231,14 @@
 @subway_label: #9E9E9E;
 @indigenous_label: #6A512F;
 @shop_label: #6B425C;
-@industry_label: #574469;
+@industry_label: #000000;
 @food_label: #8C491C;
-@entertainment_label: #8C311B;
+@entertainment_label: #000000;
 @culture_label: #6E4426;
 @hotel_label: #614A43;
-@sport_label: #2B5C4B;
-@nature_label: #3C612E;
-@water_label: #0A6074;
+@sport_label: #000000;
+@nature_label: #000000;
+@water_label: #000000;
 @neutral_label: #51585E;
 @healthcare_label: #983E44;
 @public_transport_label: #2F6499;

data/styles/default/dark/symbols/boat_rental-m.svg

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 19 19" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.3312 .9588)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6B425C" r="8.25"/><path d="m7.44735 6.64155c.6266775 0 1.16175-.4049325 1.36425-.964125h2.49225v.4820625c0 .2651325.21693.4820625.4820625.4820625s.4820625-.21693.4820625-.4820625v-.4820625c.2651325 0 .4820625-.21693.4820625-.4820625s-.21693-.4820625-.4820625-.4820625h-3.456375c-.23139-.6507825-.9063-1.07985-1.65345-.935175-.5640075.1108725-1.02195.5736525-1.132875 1.137675-.16872.9159.530265 1.72575 1.422075 1.72575zm0-1.92825c.2651325 0 .4820625.21693.4820625.4820625s-.21693.4820625-.4820625.4820625-.4820625-.21693-.4820625-.4820625.21693-.4820625.4820625-.4820625zm-1.71484793 7.891702h7.01753543c-.3091683 1-.9781318 1.5-2.0068907 1.5h-3.48081229c-.71478849 0-1.3302781-.5043681-1.47074931-1.2052179zm3.18749793-4.99999999c.89379424.94861026 1.4893498 1.67776089 1.7866668 2.18745192.297317.50969107.6428103 1.28054037 1.03648 2.31254807h-2.62497531c.12331455-.8424798.18497182-1.538368.18497182-2.0876646 0-.54929651-.12771443-1.35340832-.38314331-2.41233539zm-.17685315 1.00499799-2.12 3.495002h2.12z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/indoor_play-m.svg

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#802D19" r="8.25"/><path d="m4.33219182 13.4602521c-.56625353-.145147-1.05995548-.6661354-1.19210692-1.258018-.08901014-.3987537-.02672993-.8612893.16530454-1.2277241.12702014-.2423618.39770557-.5208347.63150605-.6497263.3295444-.1816314.40961456-.1970143 1.12899472-.2169742.63145117-.0175177.6551594-.0202617.79691486-.0920999.08035554-.04072105.70197217-.49045301 1.3813886-.99942263.67941643-.50894766 1.24429795-.91666337 1.25538374-.90596174.01106385.01065224.01704578.81354355.01328649 1.78426388l-.00683807 1.76489119-1.06258973.792744c-.58441886.4360174-1.1343181.827044-1.22196172.8689725-.32774983.1566993-.47121206.1788709-1.14046468.1762641-.38992905-.0015367-.66223894-.0150646-.74883983-.0372582zm4.82934464-.0252997-.05776137-.0649397v-8.76545977l2.19822491-1.10462793 2.198225 1.11900654v8.77369176l-.0627116.0536399c-.0527947.0451499-.1065663.0536618-.3399057.0536618-.2588862 0-.2815024-.004577-.3423974-.0688966l-.0652031-.0688746v-1.9666855h-2.78928433v1.9824361l-.06148224.0610103c-.05507774.0546497-.09057971.0610103-.34071252.0610103-.25752517 0-.28371947-.005049-.33698616-.0649452zm3.52846524-6.90776623v-1.05221738h-2.78928432v2.10443476h2.78928432z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/marina-m.svg

@@ -1 +1 @@
-<svg height="19" viewBox="0 0 18 19" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(0 .9588)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#0a6074" r="8.25"/><path d="m14.3284836 9.91216592c-.3125594 1.01096838-.8687086 1.68342498-1.6684475 2.01736998-.1656091-.072627-.3256156-.1651861-.4807525-.2805759-.950475.675-2.27887502.675-3.23467502 0-.950475.675-2.284275.675-3.223875 0-.27744671.2030098-.56714237.3353526-.8659383.4186755-.45689288-.1859843-.80641259-.5898173-.90791437-1.0962377l-.21230169-1.05923188zm-5.78195173-7.54816592.48488347.52149022.44267432.49043051c.84313944.94980132 1.43302404 1.71324441 1.76965374 2.29032927.4488396.76944648.9704078 1.93314626 1.5647046 3.49109933h-3.96274987c.18615974-1.27183553.27923961-2.32237144.27923961-3.15160773s-.19280196-2.04315016-.57840587-3.6417416zm-.26698338 1.51717831v5.27617102h-3.20042235zm5.55269401 9.95882169c-.5724075 0-1.1124-.13-1.62-.4-.9936.54-2.241.54-3.234675 0-.9936.54-2.241.54-3.223875 0-.6642075.3726-1.4256.427-2.16.4v-.88c.7614.027 1.4958-.054 2.16-.54.9396.675 2.2734.675 3.223875 0 .9558.675 2.2842.675 3.234675 0 .6534075.486 1.3932.567 2.1492.54v.88z" fill="#000" fill-rule="evenodd"/></g></svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#000" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0a6074" r="11"/><path d="m5.5116 12.152 5.7601-8.2584v8.2584zm6.8401 0c.97201-2.7.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9zm6.1921 2.5776c-.2952.4608-.64081.8568-1.044 1.1952-.46801-.2088-.88561-.5328-1.2168-.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-.36.36-.75601.684-1.224.8928-.82081-.6768-1.44-1.6416-1.656-2.6928h14.357c-.1152.54-.3168 1.0368-.60481 1.4976m-.1008 4.2624c-.76321 0-1.4832-.18-2.16-.54-1.3248.72-2.988.72-4.3129 0-1.3248.72-2.988.72-4.2985 0-.88561.4968-1.9008.576-2.88.54v-1.44c1.0152.036 1.9944-.072 2.88-.72 1.2528.9 3.0312.9 4.2985 0 1.2744.9 3.0456.9 4.3129 0 .87121.648 1.8576.756 2.8656.72v1.44z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/shield-highway_hexagon_blue-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-   height="25"
-   viewBox="0 0 40 25"
-   width="40"
-   xmlns="http://www.w3.org/2000/svg">
-   <path
-      d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-      fill="#999999"
-      style="stroke-width:0.594311" />
-   <path
-      d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-      fill="#294c88"
-      style="stroke-width:0.519333" />
-   </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_blue.svg

@@ -1,14 +0,0 @@
-<svg
-   height="18"
-   viewBox="0 0 29 18"
-   width="29"
-   xmlns="http://www.w3.org/2000/svg">
-   <path
-      d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-      fill="#999999"
-      style="stroke-width:0.427404" />
-   <path
-      d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-      fill="#294c88"
-      style="stroke-width:0.373483" />
-   </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_green-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-    height="25"
-    viewBox="0 0 40 25"
-    width="40"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-        fill="#999999"
-        style="stroke-width:0.594311" />
-    <path
-        d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-        fill="#136c30"
-        style="stroke-width:0.519333" />
-    </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_green.svg

@@ -1,14 +0,0 @@
-<svg
-    height="18"
-    viewBox="0 0 29 18"
-    width="29"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-        fill="#999999"
-        style="stroke-width:0.427404" />
-    <path
-        d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-        fill="#136c30"
-        style="stroke-width:0.373483" />
-    </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_red-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-    height="25"
-    viewBox="0 0 40 25"
-    width="40"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-        fill="#999999"
-        style="stroke-width:0.594311" />
-    <path
-        d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-        fill="#9f1a17"
-        style="stroke-width:0.519333" />
-    </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_red.svg

@@ -1,14 +0,0 @@
-<svg
-    height="18"
-    viewBox="0 0 29 18"
-    width="29"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-        fill="#999999"
-        style="stroke-width:0.427404" />
-    <path
-        d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-        fill="#9f1a17"
-        style="stroke-width:0.373483" />
-    </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_turkey-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-    height="25"
-    viewBox="0 0 40 25"
-    width="40"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-        fill="#212121"
-        style="stroke-width:0.594311" />
-    <path
-        d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-        fill="#9f5a17"
-        style="stroke-width:0.519333" />
-    </svg>

data/styles/default/dark/symbols/shield-highway_hexagon_turkey.svg

@@ -1,14 +0,0 @@
-<svg
-    height="18"
-    viewBox="0 0 29 18"
-    width="29"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-        fill="#212121"
-        style="stroke-width:0.427404" />
-    <path
-        d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-        fill="#9f5a17"
-        style="stroke-width:0.373483" />
-    </svg>

data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-  height="21"
-  viewBox="0 0 37 21"
-  width="37"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#294c88;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/dark/symbols/shield-hungary-blue.svg

@@ -1,14 +0,0 @@
-<svg
-  height="15"
-  viewBox="0 0 26 15"
-  width="26"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#294c88;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/dark/symbols/shield-hungary-green-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-  height="21"
-  viewBox="0 0 37 21"
-  width="37"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#136c30;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/dark/symbols/shield-hungary-green.svg

@@ -1,14 +0,0 @@
-<svg
-  height="15"
-  viewBox="0 0 26 15"
-  width="26"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#136c30;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/dark/symbols/slipway-m.svg

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 19 19" width="19" xmlns="http://www.w3.org/2000/svg"><path d="m2.885 12.0615528 12.23 3.2475375h-12.23zm1.11669573-3.0534098 10.69279887 2.8651268c-.8793687 1.3974981-2.1028262 1.8862358-3.6703724 1.4662131l-5.30380311-1.4211498c-1.08914156-.2918346-1.82105491-1.311646-1.74895082-2.43690057zm6.89827777-6.31723332.3483726.65749533c.7729657 1.48426312 1.2666065 2.61927763 1.4809223 3.40504355.2449323.89801819.4566462 2.21363954.6351416 3.94686404l-3.99974232-1.07172772c.53186611-1.23336117.90993282-2.26853038 1.13420022-3.10550762.2242674-.83697725.3579692-2.11436644.4011056-3.83216758zm-.6797974 1.45913545-1.4269431 5.32542429-3.23029843-.86555585z" fill="#777" transform="translate(.6688 .9588)"/></svg>

data/styles/default/dark/symbols/toll_booth-m.svg

@@ -1 +1,7 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.64671389 3.10072399 4.64689821 2.90418648-1.74258684.00012489v3.50840813l1.16109904-.73671178v1.92381589l-1.16109904.768305v3.8301576h-5.80862274v-9.29397484l-1.74258682-.00012489zm6.09842831 4.3876552v1.86805307l-1.1617245.76789994v-1.89941965zm-4.93670376-.90257077h-2.3234491v3.48526288h2.3234491zm6.36104506.00008921.8303322 1.28040112-1.3833801.91391814v-1.84365686z" fill="#777"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-m</title>
+    <g id="toll_booth-m" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M6.60018429,3 L3.60018429,4.8 L3.60018429,13.8 L3.00018429,13.8 L3.00018429,15 L10.2001843,15 L10.2001843,13.8 L9.60018429,13.8 L9.60018429,11.0437714 L10.4439386,10.5000171 L10.3126929,9.18756 L9.60019286,9.61880571 L9.60019286,4.80003429 L6.60019286,3 L6.60018429,3 Z M4.80018429,6 L8.40018429,6 L8.40018429,10.2 L4.80018429,10.2 L4.80018429,6 L4.80018429,6 Z M14.3436129,6.6 L13.8561129,6.9 L13.9873586,8.21245714 L14.9998157,7.61245714 L14.34357,6.6 L14.3436129,6.6 Z M13.3123843,7.2 L12.2999271,7.85624571 L12.4124271,9.18747429 L13.4436557,8.51247429 L13.31241,7.2 L13.3123843,7.2 Z M11.8123843,8.15622857 L10.7999271,8.81247429 L10.9124271,10.1437029 L11.9436557,9.48745714 L11.81241,8.15622857 L11.8123843,8.15622857 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>

data/styles/default/dark/symbols/toll_booth-s.svg

@@ -1 +1,7 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m4.49576922.7499232 4 2.4998925-1.5.0001075v3.02l.99946155-.63415358v1.656l-.99946155.66134875v3.29695843h-5v-8.0001536l-1.49999999-.0001075zm5.24946155 3.77684642v1.608l-1 .661v-1.635zm-4.24946155-.77692321h-2v3.00007679h2zm5.47551918.00007679.7147411 1.10215552-1.1907987.7866909v-1.587z" fill="#777"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-s</title>
+    <g id="toll_booth-s" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M4.50856084,0.999846424 L7.00863763,2.49992107 L7.00863763,6.51568727 L10.9615733,3.99993857 L11.5084615,4.84367877 L7.00863048,7.70319517 L7.00863048,10.0001229 L7.50864584,10.0001229 L7.50864584,11.0001536 L1.50846155,11.0001536 L1.50846155,10.0001229 L2.00847691,10.0001229 L2.00847691,2.4998925 L4.50856084,0.999846424 Z M6.00859977,3.49992321 L3.00850762,3.49992321 L3.00850762,7.00003072 L6.00859977,7.00003072 L6.00859977,3.49992321 Z" id="Shape" fill="#51585E"></path>
+    </g>
+</svg>

data/styles/default/dark/symbols/train_building-m.svg

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><path d="m7.33124024 14.0849349.37500187-.5625h-.95625l-1.125 1.6875h.35416688c.37614937 0 .727425-.1879875.93605625-.5009625l.04102537-.0615375h4.08751879l.0410253.0615375c.2086482.312975.5599069.5009625.9360563.5009625h.3541669l-1.125-1.6875h-.95625l.3750018.5625zm.19884375-7.87500002h2.93979371c.90675 0 1.6513875.71656875 1.6862625 1.62264375l.1739082 4.52159997c.0222862.5794951-.3977995 1.073387-.9587146 1.1561005l-.1438562.0119417-4.43342261.0002141c-.579915 0-1.057322-.4387607-1.11839886-1.0024188l-.00576993-.1658206.17390813-4.52160017c.03291306-.8557375.69896291-1.542455 1.53673222-1.61611578zm-.2607975 1.40623031c-.293265 0-.5373225.22532907-.56071125.51766032l-.13678875 1.73235656c0 .31065753.2518425.56250003.5625.56250003l3.75384621-.0004472.0224103-.0013416c.3096732-.0247736.5406244-.2958919.5158519-.60558748l-.135-1.6875c-.0233887-.29233125-.2674406-.51764063-.5607112-.51764063zm.04320281 4.78126971c.3106575 0 .5625-.2518425.5625-.5625s-.2518425-.5625-.5625-.5625-.5625.2518425-.5625.5625.2518425.5625.5625.5625zm3.375 0c.3106575 0 .5625-.2518425.5625-.5625s-.2518425-.5625-.5625-.5625-.5625.2518425-.5625.5625.2518425.5625.5625.5625zm-2.671875-5.62500002c-.07766437 0-.140625.06296062-.140625.140625s.06296063.140625.140625.140625h1.96875003c.07766437 0 .14062497-.06296062.14062497-.140625s-.0629606-.140625-.14062497-.140625zm-4.2392211-1.60024446 5.2236068-2.6118034 5.2236068 2.6118034c.2469892.12349462.3471014.42383114.2236068.67082039s-.4238311.34710142-.6708204.2236068l-4.7763932-2.3882136-4.7763932 2.3882136c-.219546.109773-.48124293.04286902-.62342158-.1468222l-.04739882-.0767846c-.12349462-.24698925-.02338245-.54732577.2236068-.67082039z" fill="#777" transform="translate(.6869)"/></svg>

data/styles/default/include/Basemap.mapcss

@@ -224,13 +224,13 @@ area|z10-17[boundary=protected_area][protect_class=1],
 
 line|z10-[boundary=national_park],
 line|z10-[boundary=protected_area][protect_class=1],
-{width: 0.5; opacity: 0.3; color: @protected_nature;}
+{width: 2; color: @protected_nature;}
 
 area|z10-16[boundary=aboriginal_lands],
 {fill-opacity: 0.07; fill-color: @indigenous_lands;}
 
 line|z10-[boundary=aboriginal_lands],
-{width: 0.5; opacity: 0.3; color: @indigenous_lands;}
+{width: 2; color: @indigenous_lands;}
 
 /* ToDo: Assume that military areas already have fences? */
 

data/styles/default/include/Icons.mapcss

@@ -44,7 +44,7 @@ node|z18-[office],
 {icon-image: office-m.svg;}
 
 node|z18-[craft],
-{icon-image: craft-m.svg;}
+{text-color: @industry_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;icon-image: craft-m.svg;}
 
 node|z16-[shop],
 {icon-min-distance: 10;}
@@ -441,15 +441,17 @@ node|z18-[historic=stone],
 
 node|z12-14[historic=fort],
 node|z12-14[historic=castle],
-{icon-image: remains-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: castle-s.svg;text-offset: 1;icon-min-distance: 12;}
 node|z15[historic=fort],
 node|z15[historic=castle],
-{icon-image: remains-m.svg;icon-min-distance: 5;}
+{icon-image: castle-m.svg;icon-min-distance: 5;}
 node|z16[historic=fort],
 node|z16[historic=castle],
-{icon-image: remains-m.svg;text-offset: 1;}
+{icon-image: castle-m.svg;text-offset: 1;}
 node|z17-[historic=fort],
 node|z17-[historic=castle],
+{icon-image: castle-m.svg;}
+node|z17-[historic=ruins][name],
 {icon-image: remains-m.svg;}
 
 node|z12-14[historic=castle][castle_type=castrum],
@@ -844,7 +846,6 @@ node|z17-[amenity=casino],
 node|z17-[amenity=gambling],
 node|z17-[leisure=adult_gaming_centre],
 node|z17-[leisure=amusement_arcade],
-node|z17-[leisure=indoor_play],
 node|z17-[amenity=courthouse],
 node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
@@ -866,11 +867,9 @@ node|z17-[amenity=vending_machine][vending=parking_tickets],
 node|z17-[amenity=vending_machine][vending=public_transport_tickets],
 node|z17-[amenity=payment_terminal],
 node|z17-[amenity=shower],
-node|z17-[amenity=slipway],
 node|z17-[amenity=motorcycle_rental],
 node|z17-[amenity=bicycle_rental],
 node|z17-[amenity=bicycle_repair_station],
-node|z17-[amenity=boat_rental],
 node|z17-[amenity=post_office],
 node|z17-[amenity=library],
 node|z18-[post_office=post_partner],
@@ -924,8 +923,6 @@ node|z18-[amenity=toilets],
 node|z18-[amenity=atm],
 node|z18-[amenity=bureau_de_change],
 node|z18-[amenity=money_transfer],
-node|z18-[amenity=mobile_money_agent],
-node|z18-[amenity=payment_centre],
 node|z18-[amenity=waste_disposal],
 node|z18-[amenity=recycling],
 node|z16-[amenity=recycling][recycling_type=centre],
@@ -1424,9 +1421,6 @@ node|z17-[leisure=amusement_arcade],
 node|z18-[shop=lottery],
 {icon-image: lottery-m.svg;}
 
-node|z17-[leisure=indoor_play],
-{icon-image: indoor_play-m.svg;icon-min-distance: 20;}
-
 node|z17-[amenity=courthouse],
 {icon-image: public-building-m.svg;}
 
@@ -1460,9 +1454,6 @@ node|z16-17[building=guardhouse],
 node|z16-[building=guardhouse]::int_name,
 {text: none;}
 
-node|z17-[building=train_station],
-{icon-image: train_building-m.svg; font-size: 11; text-offset: 1;}
-
 node|z17-[amenity=prison],
 {icon-image: prison-m.svg;}
 node|z18-[amenity=prison],
@@ -1481,11 +1472,6 @@ node|z17-[amenity=motorcycle_rental],
 node|z18-[amenity=motorcycle_rental],
 {font-size: 11;}
 
-node|z17-[amenity=boat_rental],
-{icon-image: boat-rental.svg;}
-node|z18-[amenity=boat_rental],
-{font-size: 11;}
-
 node|z17-[amenity=bicycle_rental],
 {icon-image: bicycle-rental.svg;}
 node|z18-[amenity=bicycle_rental],
@@ -1554,9 +1540,6 @@ node|z15-[power=plant][plant:source=wind],
 node|z16-[power=plant][plant:source=wind],
 {text: name;text-color: @neutral_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
 
-node|z17-[leisure=slipway],
-{icon-image: slipway-m.svg;}
-
 node|z17-[amenity=shower],
 {icon-image: shower-m.svg;}
 
@@ -1581,8 +1564,6 @@ node|z17-[aeroway=gate],
 
 node|z17-[amenity=bureau_de_change],
 node|z17-[amenity=money_transfer],
-node|z17-[amenity=mobile_money_agent],
-node|z17-[amenity=payment_centre],
 {icon-image: banknote-m.svg;font-size: 11;}
 
 node|z16-[amenity=fire_station],
@@ -1729,7 +1710,6 @@ node|z16-[shop=laundry],
 node|z16-[shop=lighting],
 node|z16-[shop=dry_cleaning],
 node|z16-[shop=mobile_phone],
-node|z16-[shop=telecommunication],
 node|z16-[shop=optician],
 node|z16-[shop=outdoor],
 node|z16-[shop=rental],
@@ -1896,7 +1876,6 @@ node|z16[shop=laundry],
 node|z16[shop=dry_cleaning],
 {icon-image:dry_cleaning-m.svg;}
 node|z16[shop=mobile_phone],
-node|z16[shop=telecommunication],
 {icon-image: mobile_phone-m.svg;}
 node|z16[shop=optician],
 {icon-image: optician-m.svg;}
@@ -2043,7 +2022,6 @@ node|z17-[shop=laundry],
 node|z17-[shop=dry_cleaning],
 {icon-image:dry_cleaning-m.svg;icon-min-distance: 24;}
 node|z17-[shop=mobile_phone],
-node|z17-[shop=telecommunication],
 {icon-image: mobile_phone-m.svg;icon-min-distance: 24;}
 node|z17-[shop=optician],
 {icon-image: optician-m.svg;icon-min-distance: 24;}
@@ -2293,4 +2271,239 @@ node|z18-[amenity=parking_space][parking_space=disabled],
 
 /* 8. Colored Labels */
 
-@import("../../default/include/Icons_Label_Colors.mapcss");
+node[amenity=car_rental],
+node[amenity=car_sharing],
+node[amenity=internet_cafe],
+node[amenity=marketplace],
+node[amenity=motorcycle_rental],
+node[shop=alcohol],
+node[shop=antiques],
+node[shop=art],
+node[shop=auction],
+node[shop=bakery],
+node[shop=beauty],
+node[shop=beverages],
+node[shop=bicycle],
+node[shop=books],
+node[shop=butcher],
+node[shop=camera],
+node[shop=car],
+node[shop=caravan],
+node[shop=charity],
+node[shop=cheese],
+node[shop=chemist],
+node[shop=chocolate],
+node[shop=clothes],
+node[shop=collector],
+node[shop=computer],
+node[shop=confectionery],
+node[shop=convenience],
+node[shop=copyshop],
+node[shop=cosmetics],
+node[shop=deli],
+node[shop=department_store],
+node[shop=doityourself],
+node[shop=dry_cleaning],
+node[shop=dry_cleaning],
+node[shop=electronics],
+node[shop=erotic],
+node[shop=fabric],
+node[shop=farm],
+node[shop=florist],
+node[shop=furniture],
+node[shop=garden_centre],
+node[shop=gift],
+node[shop=greengrocer],
+node[shop=grocery],
+node[shop=hairdresser],
+node[shop=hardware],
+node[shop=health_food],
+node[shop=hearing_aids],
+node[shop=houseware],
+node[shop=interior_decoration],
+node[shop=jewelry],
+node[shop=kiosk],
+node[shop=kitchen],
+node[shop=laundry],
+node[shop=laundry],
+node[shop=lighting],
+node[shop=mall],
+node[shop=mobile_phone],
+node[shop=motorcycle],
+node[shop=music],
+node[shop=musical_instrument],
+node[shop=optician],
+node[shop=outdoor],
+node[shop=pasta],
+node[shop=pastry],
+node[shop=pawnbroker],
+node[shop=pet],
+node[shop=photo],
+node[shop=rental],
+node[shop=rental][rental=bike],
+node[shop=seafood],
+node[shop=second_hand],
+node[shop=sewing],
+node[shop=shoes],
+node[shop=sports],
+node[shop=stationery],
+node[shop=supermarket],
+node[shop=ticket],
+node[shop=tobacco],
+node[shop=toys],
+node[shop=variety_store],
+node[shop=video],
+node[shop=video_games],
+node[shop=wine],
+node[shop],
+{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=car_wash],
+node[amenity=fuel],
+node[amenity=studio],
+node[amenity=vehicle_inspection],
+node[craft=beekeeper],
+node[craft=blacksmith],
+node[craft=carpenter],
+node[craft=caterer],
+node[craft=electrician],
+node[craft=electronics_repair],
+node[craft=grinding_mill],
+node[craft=handicraft],
+node[craft=hvac],
+node[craft=key_cutter],
+node[craft=locksmith],
+node[craft=metal_construction],
+node[craft=painter],
+node[craft=plumber],
+node[craft=sawmill],
+node[craft],
+node[landuse=industrial][industrial=mine],
+node[landuse=quarry],
+node[man_made=works],
+node[office],
+node[shop=agrarian],
+node[shop=car_parts],
+node[shop=car_repair],
+node[shop=car_repair][service=tyres],
+node[shop=funeral_directors],
+node[shop=gas],
+node[shop=motorcycle_repair],
+node[shop=tattoo],
+node[shop=trade],
+node[shop=tyres],
+node[shop=wholesale],
+{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bar],
+node[amenity=biergarten],
+node[amenity=cafe],
+node[amenity=fast_food],
+node[amenity=food_court],
+node[amenity=ice_cream],
+node[amenity=nightclub],
+node[amenity=pub],
+node[amenity=restaurant],
+{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=casino],
+node[amenity=cinema],
+node[amenity=gambling],
+node[amenity=stripclub],
+node[amenity=theatre],
+node[leisure=adult_gaming_centre],
+node[leisure=amusement_arcade],
+node[leisure=bowling_alley],
+node[leisure=escape_game],
+node[shop=bookmaker],
+node[shop=lottery],
+node[tourism=aquarium],
+node[tourism=theme_park],
+node[tourism=zoo],
+{text-color: @entertainment_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=arts_centre],
+node[amenity=community_centre],
+node[amenity=conference_centre],
+node[amenity=events_venue],
+node[amenity=exhibition_centre],
+node[amenity=place_of_worship]
+node[amenity=social_facility],
+node[historic=ship],
+node[leisure=hackerspace],
+node[tourism=attraction],
+node[tourism=gallery],
+node[tourism=museum],
+{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[leisure=resort],
+node[tourism=alpine_hut],
+node[tourism=apartment],
+node[tourism=chalet],
+node[tourism=guest_house],
+node[tourism=hostel],
+node[tourism=hotel],
+node[tourism=motel],
+node[tourism=wilderness_hut],
+{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[leisure=dance],
+node[leisure=fitness_centre],
+node[leisure=sports_centre],
+node[leisure=stadium],
+{text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[landuse=plant_nursery],
+{text-color: @nature_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=public_bath],
+node[leisure=beach_resort],
+node[leisure=marina],
+node[leisure=sports_centre][sport=scuba_diving],
+node[leisure=sports_centre][sport=swimming],
+node[shop=massage],
+{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=university][name]
+node[aeroway=gate],
+node[amenity=atm],
+node[amenity=bank],
+node[amenity=bureau_de_change],
+node[amenity=charging_station][motorcar?],
+node[amenity=childcare],
+node[amenity=college],
+node[amenity=courthouse],
+node[amenity=driving_school],
+node[amenity=fire_station],
+node[amenity=kindergarten],
+node[amenity=language_school],
+node[amenity=library],
+node[amenity=money_transfer],
+node[amenity=music_school],
+node[amenity=nursing_home],
+node[amenity=police],
+node[amenity=post_office],
+node[amenity=prison],
+node[amenity=school],
+node[amenity=townhall],
+node[amenity=university][name],
+node[barrier=border_control],
+node[building=guardhouse],
+node[office=security],
+node[shop=money_lender],
+node[tourism=information][information=office],
+{text-color: @neutral_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=hospital],
+node[amenity=clinic],
+node[amenity=dentist],
+node[amenity=doctors],
+node[amenity=hospital],
+node[amenity=pharmacy],
+node[amenity=veterinary],
+node[healthcare],
+{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bicycle_rental],
+node[amenity=taxi],
+{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -1,7 +1,5 @@
 /* Setting the colors for all POI icons */
-/* Please add new items so that they fit in the existing alphabetical order */
 
-node[amenity=boat_rental],
 node[amenity=car_rental],
 node[amenity=car_sharing],
 node[amenity=internet_cafe],
@@ -32,8 +30,8 @@ node[shop=tyres],
 node[shop=wholesale],
 {text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-node[craft=photographer],
 node[craft=tailor],
+node[craft=photographer],
 {text-color: @shop_label}
 
 node[amenity=bar],
@@ -57,7 +55,6 @@ node[leisure=adult_gaming_centre],
 node[leisure=amusement_arcade],
 node[leisure=bowling_alley],
 node[leisure=escape_game],
-node[leisure=indoor_play],
 node[shop=bookmaker],
 node[shop=lottery],
 node[tourism=aquarium],
@@ -89,7 +86,6 @@ node[tourism=motel],
 node[tourism=wilderness_hut],
 {text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-node[amenity=dojo],
 node[leisure=dance],
 node[leisure=fitness_centre],
 node[leisure=sports_centre],
@@ -104,7 +100,6 @@ node[leisure=beach_resort],
 node[leisure=marina],
 node[leisure=sports_centre][sport=scuba_diving],
 node[leisure=sports_centre][sport=swimming],
-node[leisure=water_park],
 {text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
 area[amenity=university][name]
@@ -121,11 +116,9 @@ node[amenity=fire_station],
 node[amenity=kindergarten],
 node[amenity=language_school],
 node[amenity=library],
-node[amenity=mobile_money_agent],
 node[amenity=money_transfer],
 node[amenity=music_school],
 node[amenity=nursing_home],
-node[amenity=payment_centre],
 node[amenity=police],
 node[amenity=post_office],
 node[amenity=prison],

data/styles/default/include/priorities_3_FG.prio.txt

@@ -400,7 +400,7 @@ building                                            # area z14- (also has captio
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
-building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
+building-train_station                              # area z14- (also has caption z17-)
 === 130
 
 piste:type-connection                               # line z15-

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -773,7 +773,6 @@ shop-health_food                                    # icon z16- (also has captio
 === 2700
 
 amenity-bicycle_rental                              # icon z17- (also has caption(optional) z17-)
-amenity-boat_rental                                 # icon z17- (also has caption(optional) z17-)
 amenity-car_sharing                                 # icon z18- (also has caption(optional) z18-)
 amenity-taxi                                        # icon z16- (also has caption(optional) z16-)
 === 2600
@@ -867,7 +866,6 @@ shop-shoes                                          # icon z16- (also has captio
 shop-sports                                         # icon z16- (also has caption(optional) z16-)
 shop-stationery                                     # icon z16- (also has caption(optional) z16-)
 shop-tea                                            # icon z18- (also has caption(optional) z18-)
-shop-telecommunication                              # icon z16- (also has caption(optional) z16-)
 shop-toys                                           # icon z16- (also has caption(optional) z16-)
 shop-travel_agency                                  # icon z18- (also has caption(optional) z18-)
 shop-wine                                           # icon z16- (also has caption(optional) z16-)
@@ -918,7 +916,7 @@ natural-wetland-tidalflat                           # caption z16- (also has are
 tourism-picnic_site                                 # icon z16- (also has caption(optional) z16-)
 === 1800
 
-building-train_station                              # icon z17- (also has caption(optional) z17-, area z14-)
+building-train_station                              # caption z17- (also has area z14-)
 railway-level_crossing                              # icon z17-
 === 1700
 
@@ -968,10 +966,8 @@ amenity-childcare                                   # icon z17- (also has captio
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z17-)
 amenity-language_school                             # icon z17- (also has caption(optional) z17-)
-amenity-mobile_money_agent                          # icon z17- (also has caption(optional) z18-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z17-)
-amenity-payment_centre                              # icon z17- (also has caption(optional) z18-)
 amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
@@ -1204,7 +1200,6 @@ healthcare-psychotherapist                          # icon z17- (also has captio
 healthcare-speech_therapist                         # icon z17- (also has caption(optional) z17-)
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
-leisure-indoor_play                                 # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
@@ -1321,7 +1316,7 @@ landuse-railway                                     # caption z15- (also has are
 landuse-residential                                 # caption z17-
 landuse-retail                                      # caption z16- (also has area z13-)
 leisure-common                                      # caption z17-
-leisure-slipway                                     # icon z17- (also has caption(optional) z17-)
+leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
@@ -1815,7 +1810,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7300
 
 # amenity-bicycle_rental                            # caption(optional) z17- (also has icon z17-)
-# amenity-boat_rental                               # caption(optional) z17- (also has icon z17-)
 # amenity-car_sharing                               # caption(optional) z18- (also has icon z18-)
 # amenity-taxi                                      # caption(optional) z16- (also has icon z16-)
 # === -7400
@@ -1905,7 +1899,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-sports                                       # caption(optional) z16- (also has icon z16-)
 # shop-stationery                                   # caption(optional) z16- (also has icon z16-)
 # shop-tea                                          # caption(optional) z18- (also has icon z18-)
-# shop-telecommunication                            # caption(optional) z16- (also has icon z16-)
 # shop-toys                                         # caption(optional) z16- (also has icon z16-)
 # shop-travel_agency                                # caption(optional) z18- (also has icon z18-)
 # shop-wine                                         # caption(optional) z16- (also has icon z16-)
@@ -1941,9 +1934,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
-# building-train_station                            # caption(optional) z17- (also has icon z17-, area z14-)
-# === -8300
-
 # leisure-sports_centre-sport-swimming              # caption(optional) z15- (also has icon z15-, area z13-)
 # === -8380
 
@@ -1987,10 +1977,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z17- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z17- (also has icon z17-)
-# amenity-mobile_money_agent                        # caption(optional) z18- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z17- (also has icon z17-)
-# amenity-payment_centre                            # caption(optional) z18- (also has icon z17-)
 # amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
@@ -2200,7 +2188,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-speech_therapist                       # caption(optional) z17- (also has icon z17-)
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
-# leisure-indoor_play                               # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
@@ -2291,7 +2278,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
 # landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
 # landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
-# leisure-slipway                                   # caption(optional) z17- (also has icon z17-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z17-)
 # power-generator-wind                              # caption(optional) z18- (also has icon z15-, area z13-)
 # === -9880

data/styles/default/light/colors.mapcss

@@ -229,7 +229,7 @@
 @subway_label: #333333;
 @indigenous_label: #6A512F;
 @shop_label: #8C5678;
-@industry_label: #907E9E;
+@industry_label: #9482A3;
 @food_label: #BA7141;
 @entertainment_label: #D16B53;
 @culture_label: #82512D;

data/styles/default/light/symbols/boat_rental-m.svg

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 19 19" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.3312 .9588)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#be75a3" r="8.25"/><path d="m7.44735 6.64155c.6266775 0 1.16175-.4049325 1.36425-.964125h2.49225v.4820625c0 .2651325.21693.4820625.4820625.4820625s.4820625-.21693.4820625-.4820625v-.4820625c.2651325 0 .4820625-.21693.4820625-.4820625s-.21693-.4820625-.4820625-.4820625h-3.456375c-.23139-.6507825-.9063-1.07985-1.65345-.935175-.5640075.1108725-1.02195.5736525-1.132875 1.137675-.16872.9159.530265 1.72575 1.422075 1.72575zm0-1.92825c.2651325 0 .4820625.21693.4820625.4820625s-.21693.4820625-.4820625.4820625-.4820625-.21693-.4820625-.4820625.21693-.4820625.4820625-.4820625zm-1.71484793 7.891702h7.01753543c-.3091683 1-.9781318 1.5-2.0068907 1.5h-3.48081229c-.71478849 0-1.3302781-.5043681-1.47074931-1.2052179zm3.18749793-4.99999999c.89379424.94861026 1.4893498 1.67776089 1.7866668 2.18745192.297317.50969107.6428103 1.28054037 1.03648 2.31254807h-2.62497531c.12331455-.8424798.18497182-1.538368.18497182-2.0876646 0-.54929651-.12771443-1.35340832-.38314331-2.41233539zm-.17685315 1.00499799-2.12 3.495002h2.12z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/escape_game.svg

@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>escape_game</title>
-    <g id="escape_game" stroke="none" fill="none">
-        <circle id="Oval" fill="#FFFFFF" fill-rule="nonzero" opacity="0.6" cx="9" cy="9" r="9"></circle>
-        <circle id="Oval" fill="#EB785D" fill-rule="nonzero" cx="9" cy="9" r="8.25"></circle>
-        <path d="M6.544,4.525 L6.543,5.199 L7.894,5.2 L7.894,6.55 L6.543,6.55 L6.54384181,9.2696041 C7.56205461,9.56229277 8.307,10.5006507 8.307,11.613 C8.307,12.9594702 7.21547022,14.051 5.869,14.051 C4.52252978,14.051 3.431,12.9594702 3.431,11.613 C3.431,10.5010171 4.17545473,9.56291094 5.19315214,9.26989353 L5.194,4.525 L6.544,4.525 Z M5.869,10.675 C5.3509569,10.675 4.931,11.0949569 4.931,11.613 C4.931,12.1310431 5.3509569,12.551 5.869,12.551 C6.3870431,12.551 6.807,12.1310431 6.807,11.613 C6.807,11.0949569 6.3870431,10.675 5.869,10.675 Z M12.506,11.275 L10.931,11.275 L10.925,10.868 C10.925,10.3653333 11.0083333,9.952 11.175,9.628 C11.341,9.304 11.633,8.893 12.132,8.487 L12.5637778,8.12833333 C12.807037,7.92033333 12.9611111,7.77455556 13.026,7.691 C13.176,7.493 13.251,7.274 13.251,7.034 C13.251,6.70266667 13.117,6.41933333 12.849,6.184 C12.585,5.94466667 12.2283333,5.825 11.779,5.825 C11.3456667,5.825 10.9833333,5.94866667 10.692,6.196 C10.4,6.443 10.246,6.82 10.137,7.326 L8.569,7.132 C8.61366667,6.40666667 8.92133333,5.791 9.492,5.285 C10.068,4.778 10.775,4.525 11.706,4.525 C12.687,4.525 13.421,4.782 13.999,5.297 C14.579,5.807 14.869,6.40266667 14.869,7.084 C14.869,7.46 14.7616667,7.81633333 14.547,8.153 C14.2678649,8.60277864 13.927713,9.01103812 13.5366594,9.36629677 L13.296,9.573 C12.936,9.873 12.711,10.1143333 12.621,10.297 C12.537,10.4783333 12.4986667,10.8043333 12.506,11.275 Z M10.819,13.525 L10.819,11.725 L12.619,11.725 L12.619,13.525 L10.819,13.525 Z" id="Shape" fill="#FFFFFF" fill-rule="evenodd"></path>
-    </g>
-</svg>
+<svg height="18" width="18" xmlns="http://www.w3.org/2000/svg"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#EB785D" r="8.25"/><path d="m5.194 4.525h1.35v5.4h-1.35z" fill="#fff" fill-rule="evenodd" stroke-width=".9"/><path d="m5.194 5.2h2.7v1.35h-2.7z" fill="#fff" fill-rule="evenodd" stroke-width=".9"/><circle cx="5.869" cy="11.613" fill="none" r="1.688" stroke="#fff" stroke-width="1.5"/><path d="m12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1 -1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" fill="#fff" fill-rule="evenodd" stroke-width=".9"/></svg>

data/styles/default/light/symbols/indoor_play-m.svg

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#eb785d" r="8.25"/><path d="m4.33219182 13.4602521c-.56625353-.145147-1.05995548-.6661354-1.19210692-1.258018-.08901014-.3987537-.02672993-.8612893.16530454-1.2277241.12702014-.2423618.39770557-.5208347.63150605-.6497263.3295444-.1816314.40961456-.1970143 1.12899472-.2169742.63145117-.0175177.6551594-.0202617.79691486-.0920999.08035554-.04072105.70197217-.49045301 1.3813886-.99942263.67941643-.50894766 1.24429795-.91666337 1.25538374-.90596174.01106385.01065224.01704578.81354355.01328649 1.78426388l-.00683807 1.76489119-1.06258973.792744c-.58441886.4360174-1.1343181.827044-1.22196172.8689725-.32774983.1566993-.47121206.1788709-1.14046468.1762641-.38992905-.0015367-.66223894-.0150646-.74883983-.0372582zm4.82934464-.0252997-.05776137-.0649397v-8.76545977l2.19822491-1.10462793 2.198225 1.11900654v8.77369176l-.0627116.0536399c-.0527947.0451499-.1065663.0536618-.3399057.0536618-.2588862 0-.2815024-.004577-.3423974-.0688966l-.0652031-.0688746v-1.9666855h-2.78928433v1.9824361l-.06148224.0610103c-.05507774.0546497-.09057971.0610103-.34071252.0610103-.25752517 0-.28371947-.005049-.33698616-.0649452zm3.52846524-6.90776623v-1.05221738h-2.78928432v2.10443476h2.78928432z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/marina-m.svg

@@ -1 +1 @@
-<svg height="19" viewBox="0 0 18 19" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(0 .9588)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#0797b8" r="8.25"/><path d="m14.3284836 9.91216592c-.3125594 1.01096838-.8687086 1.68342498-1.6684475 2.01736998-.1656091-.072627-.3256156-.1651861-.4807525-.2805759-.950475.675-2.27887502.675-3.23467502 0-.950475.675-2.284275.675-3.223875 0-.27744671.2030098-.56714237.3353526-.8659383.4186755-.45689288-.1859843-.80641259-.5898173-.90791437-1.0962377l-.21230169-1.05923188zm-5.78195173-7.54816592.48488347.52149022.44267432.49043051c.84313944.94980132 1.43302404 1.71324441 1.76965374 2.29032927.4488396.76944648.9704078 1.93314626 1.5647046 3.49109933h-3.96274987c.18615974-1.27183553.27923961-2.32237144.27923961-3.15160773s-.19280196-2.04315016-.57840587-3.6417416zm-.26698338 1.51717831v5.27617102h-3.20042235zm5.55269401 9.95882169c-.5724075 0-1.1124-.13-1.62-.4-.9936.54-2.241.54-3.234675 0-.9936.54-2.241.54-3.223875 0-.6642075.3726-1.4256.427-2.16.4v-.88c.7614.027 1.4958-.054 2.16-.54.9396.675 2.2734.675 3.223875 0 .9558.675 2.2842.675 3.234675 0 .6534075.486 1.3932.567 2.1492.54v.88z" fill="#fff" fill-rule="evenodd"/></g></svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="12" cy="12" fill="#fff" opacity=".6" r="12"/><circle cx="12" cy="12" fill="#0797b8" r="11"/><path d="m5.5116 12.152 5.7601-8.2584v8.2584zm6.8401 0c.97201-2.7.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9zm6.1921 2.5776c-.2952.4608-.64081.8568-1.044 1.1952-.46801-.2088-.88561-.5328-1.2168-.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-.36.36-.75601.684-1.224.8928-.82081-.6768-1.44-1.6416-1.656-2.6928h14.357c-.1152.54-.3168 1.0368-.60481 1.4976m-.1008 4.2624c-.76321 0-1.4832-.18-2.16-.54-1.3248.72-2.988.72-4.3129 0-1.3248.72-2.988.72-4.2985 0-.88561.4968-1.9008.576-2.88.54v-1.44c1.0152.036 1.9944-.072 2.88-.72 1.2528.9 3.0312.9 4.2985 0 1.2744.9 3.0456.9 4.3129 0 .87121.648 1.8576.756 2.8656.72v1.44z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/shield-highway_hexagon_blue-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-   height="25"
-   viewBox="0 0 40 25"
-   width="40"
-   xmlns="http://www.w3.org/2000/svg">
-   <path
-      d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-      fill="#ffffff"
-      style="stroke-width:0.594311" />
-   <path
-      d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-      fill="#1a5ec1"
-      style="stroke-width:0.519333" />
-   </svg>

data/styles/default/light/symbols/shield-highway_hexagon_blue.svg

@@ -1,14 +0,0 @@
-<svg
-   height="18"
-   viewBox="0 0 29 18"
-   width="29"
-   xmlns="http://www.w3.org/2000/svg">
-   <path
-      d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-      fill="#ffffff"
-      style="stroke-width:0.427404" />
-   <path
-      d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-      fill="#1a5ec1"
-      style="stroke-width:0.373483" />
-   </svg>

data/styles/default/light/symbols/shield-highway_hexagon_green-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-    height="25"
-    viewBox="0 0 40 25"
-    width="40"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-        fill="#ffffff"
-        style="stroke-width:0.594311" />
-    <path
-        d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-        fill="#309302"
-        style="stroke-width:0.519333" />
-    </svg>

data/styles/default/light/symbols/shield-highway_hexagon_green.svg

@@ -1,14 +0,0 @@
-<svg
-    height="18"
-    viewBox="0 0 29 18"
-    width="29"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-        fill="#fff"
-        style="stroke-width:0.427404" />
-    <path
-        d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-        fill="#309302"
-        style="stroke-width:0.373483" />
-    </svg>

data/styles/default/light/symbols/shield-highway_hexagon_red-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-    height="25"
-    viewBox="0 0 40 25"
-    width="40"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-        fill="#ffffff"
-        style="stroke-width:0.594311" />
-    <path
-        d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-        fill="#e63534"
-        style="stroke-width:0.519333" />
-    </svg>

data/styles/default/light/symbols/shield-highway_hexagon_red.svg

@@ -1,14 +0,0 @@
-<svg
-    height="18"
-    viewBox="0 0 29 18"
-    width="29"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-        fill="#fff"
-        style="stroke-width:0.427404" />
-    <path
-        d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-        fill="#e63534"
-        style="stroke-width:0.373483" />
-    </svg>

data/styles/default/light/symbols/shield-highway_hexagon_turkey-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-    height="25"
-    viewBox="0 0 40 25"
-    width="40"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
-        fill=""
-        style="stroke-width:0.594311" />
-    <path
-        d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
-        fill="#c97600"
-        style="stroke-width:0.519333" />
-    </svg>

data/styles/default/light/symbols/shield-highway_hexagon_turkey.svg

@@ -1,14 +0,0 @@
-<svg
-    height="18"
-    viewBox="0 0 29 18"
-    width="29"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
-        fill=""
-        style="stroke-width:0.427404" />
-    <path
-        d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
-        fill="#c97600"
-        style="stroke-width:0.373483" />
-    </svg>

data/styles/default/light/symbols/shield-hungary-blue-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-  height="21"
-  viewBox="0 0 37 21"
-  width="37"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#1a5ec1;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/light/symbols/shield-hungary-blue.svg

@@ -1,14 +0,0 @@
-<svg
-  height="15"
-  viewBox="0 0 26 15"
-  width="26"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#1a5ec1;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/light/symbols/shield-hungary-green-scaled.svg

@@ -1,14 +0,0 @@
-<svg
-  height="21"
-  viewBox="0 0 37 21"
-  width="37"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#309302;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/light/symbols/shield-hungary-green.svg

@@ -1,14 +0,0 @@
-<svg
-  height="15"
-  viewBox="0 0 26 15"
-  width="26"
-  xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
-    <path
-      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
-      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
-    <path
-      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
-      style="fill:#309302;fill-opacity:1;stroke:#00008b;stroke-width:0" />
-    </g>
-  </svg>

data/styles/default/light/symbols/slipway-m.svg

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 19 19" width="19" xmlns="http://www.w3.org/2000/svg"><path d="m2.885 12.0615528 12.23 3.2475375h-12.23zm1.11669573-3.0534098 10.69279887 2.8651268c-.8793687 1.3974981-2.1028262 1.8862358-3.6703724 1.4662131l-5.30380311-1.4211498c-1.08914156-.2918346-1.82105491-1.311646-1.74895082-2.43690057zm6.89827777-6.31723332.3483726.65749533c.7729657 1.48426312 1.2666065 2.61927763 1.4809223 3.40504355.2449323.89801819.4566462 2.21363954.6351416 3.94686404l-3.99974232-1.07172772c.53186611-1.23336117.90993282-2.26853038 1.13420022-3.10550762.2242674-.83697725.3579692-2.11436644.4011056-3.83216758zm-.6797974 1.45913545-1.4269431 5.32542429-3.23029843-.86555585z" fill="#747e86" transform="translate(.6688 .9588)"/></svg>

data/styles/default/light/symbols/toll_booth-m.svg

@@ -1 +1,7 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.64671389 3.10072399 4.64689821 2.90418648-1.74258684.00012489v3.50840813l1.16109904-.73671178v1.92381589l-1.16109904.768305v3.8301576h-5.80862274v-9.29397484l-1.74258682-.00012489zm6.09842831 4.3876552v1.86805307l-1.1617245.76789994v-1.89941965zm-4.93670376-.90257077h-2.3234491v3.48526288h2.3234491zm6.36104506.00008921.8303322 1.28040112-1.3833801.91391814v-1.84365686z" fill="#747e86"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-m</title>
+    <g id="toll_booth-m" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M6.60018429,3 L3.60018429,4.8 L3.60018429,13.8 L3.00018429,13.8 L3.00018429,15 L10.2001843,15 L10.2001843,13.8 L9.60018429,13.8 L9.60018429,11.0437714 L10.4439386,10.5000171 L10.3126929,9.18756 L9.60019286,9.61880571 L9.60019286,4.80003429 L6.60019286,3 L6.60018429,3 Z M4.80018429,6 L8.40018429,6 L8.40018429,10.2 L4.80018429,10.2 L4.80018429,6 L4.80018429,6 Z M14.3436129,6.6 L13.8561129,6.9 L13.9873586,8.21245714 L14.9998157,7.61245714 L14.34357,6.6 L14.3436129,6.6 Z M13.3123843,7.2 L12.2999271,7.85624571 L12.4124271,9.18747429 L13.4436557,8.51247429 L13.31241,7.2 L13.3123843,7.2 Z M11.8123843,8.15622857 L10.7999271,8.81247429 L10.9124271,10.1437029 L11.9436557,9.48745714 L11.81241,8.15622857 L11.8123843,8.15622857 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>

data/styles/default/light/symbols/toll_booth-s.svg

@@ -1 +1,7 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m4.49576922.7499232 4 2.4998925-1.5.0001075v3.02l.99946155-.63415358v1.656l-.99946155.66134875v3.29695843h-5v-8.0001536l-1.49999999-.0001075zm5.24946155 3.77684642v1.608l-1 .661v-1.635zm-4.24946155-.77692321h-2v3.00007679h2zm5.47551918.00007679.7147411 1.10215552-1.1907987.7866909v-1.587z" fill="#747e86"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>toll_booth-s</title>
+    <g id="toll_booth-s" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M4.50856084,0.999846424 L7.00863763,2.49992107 L7.00863763,6.51568727 L10.9615733,3.99993857 L11.5084615,4.84367877 L7.00863048,7.70319517 L7.00863048,10.0001229 L7.50864584,10.0001229 L7.50864584,11.0001536 L1.50846155,11.0001536 L1.50846155,10.0001229 L2.00847691,10.0001229 L2.00847691,2.4998925 L4.50856084,0.999846424 Z M6.00859977,3.49992321 L3.00850762,3.49992321 L3.00850762,7.00003072 L6.00859977,7.00003072 L6.00859977,3.49992321 Z" id="Shape" fill="#747E86"></path>
+    </g>
+</svg>

data/styles/default/light/symbols/train_building-m.svg

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><path d="m7.33124024 14.0849349.37500187-.5625h-.95625l-1.125 1.6875h.35416688c.37614937 0 .727425-.1879875.93605625-.5009625l.04102537-.0615375h4.08751879l.0410253.0615375c.2086482.312975.5599069.5009625.9360563.5009625h.3541669l-1.125-1.6875h-.95625l.3750018.5625zm.19884375-7.87500002h2.93979371c.90675 0 1.6513875.71656875 1.6862625 1.62264375l.1739082 4.52159997c.0222862.5794951-.3977995 1.073387-.9587146 1.1561005l-.1438562.0119417-4.43342261.0002141c-.579915 0-1.057322-.4387607-1.11839886-1.0024188l-.00576993-.1658206.17390813-4.52160017c.03291306-.8557375.69896291-1.542455 1.53673222-1.61611578zm-.2607975 1.40623031c-.293265 0-.5373225.22532907-.56071125.51766032l-.13678875 1.73235656c0 .31065753.2518425.56250003.5625.56250003l3.75384621-.0004472.0224103-.0013416c.3096732-.0247736.5406244-.2958919.5158519-.60558748l-.135-1.6875c-.0233887-.29233125-.2674406-.51764063-.5607112-.51764063zm.04320281 4.78126971c.3106575 0 .5625-.2518425.5625-.5625s-.2518425-.5625-.5625-.5625-.5625.2518425-.5625.5625.2518425.5625.5625.5625zm3.375 0c.3106575 0 .5625-.2518425.5625-.5625s-.2518425-.5625-.5625-.5625-.5625.2518425-.5625.5625.2518425.5625.5625.5625zm-2.671875-5.62500002c-.07766437 0-.140625.06296062-.140625.140625s.06296063.140625.140625.140625h1.96875003c.07766437 0 .14062497-.06296062.14062497-.140625s-.0629606-.140625-.14062497-.140625zm-4.2392211-1.60024446 5.2236068-2.6118034 5.2236068 2.6118034c.2469892.12349462.3471014.42383114.2236068.67082039s-.4238311.34710142-.6708204.2236068l-4.7763932-2.3882136-4.7763932 2.3882136c-.219546.109773-.48124293.04286902-.62342158-.1468222l-.04739882-.0767846c-.12349462-.24698925-.02338245-.54732577.2236068-.67082039z" fill="#747e86" transform="translate(.6869)"/></svg>

data/styles/outdoors/include/priorities_3_FG.prio.txt

@@ -402,7 +402,7 @@ building                                            # area z14- (also has captio
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z16-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
-building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
+building-train_station                              # area z14- (also has caption z17-)
 === 130
 
 piste:type-connection                               # line z15-

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -773,7 +773,6 @@ shop-health_food                                    # icon z16- (also has captio
 === 2700
 
 amenity-bicycle_rental                              # icon z17- (also has caption(optional) z17-)
-amenity-boat_rental                                 # icon z17- (also has caption(optional) z17-)
 amenity-car_sharing                                 # icon z18- (also has caption(optional) z18-)
 amenity-taxi                                        # icon z16- (also has caption(optional) z16-)
 === 2600
@@ -867,7 +866,6 @@ shop-shoes                                          # icon z16- (also has captio
 shop-sports                                         # icon z16- (also has caption(optional) z16-)
 shop-stationery                                     # icon z16- (also has caption(optional) z16-)
 shop-tea                                            # icon z18- (also has caption(optional) z18-)
-shop-telecommunication                              # icon z16- (also has caption(optional) z16-)
 shop-toys                                           # icon z16- (also has caption(optional) z16-)
 shop-travel_agency                                  # icon z18- (also has caption(optional) z18-)
 shop-wine                                           # icon z16- (also has caption(optional) z16-)
@@ -918,7 +916,7 @@ natural-wetland-tidalflat                           # caption z16- (also has are
 tourism-picnic_site                                 # icon z14- (also has caption(optional) z14-)
 === 1800
 
-building-train_station                              # icon z17- (also has caption(optional) z17-, area z14-)
+building-train_station                              # caption z17- (also has area z14-)
 railway-level_crossing                              # icon z17-
 === 1700
 
@@ -968,10 +966,8 @@ amenity-childcare                                   # icon z17- (also has captio
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z17-)
 amenity-language_school                             # icon z17- (also has caption(optional) z17-)
-amenity-mobile_money_agent                          # icon z17- (also has caption(optional) z18-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z17-)
-amenity-payment_centre                              # icon z17- (also has caption(optional) z18-)
 amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
@@ -1205,7 +1201,6 @@ healthcare-psychotherapist                          # icon z17- (also has captio
 healthcare-speech_therapist                         # icon z17- (also has caption(optional) z17-)
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
-leisure-indoor_play                                 # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
@@ -1324,7 +1319,7 @@ landuse-railway                                     # caption z15- (also has are
 landuse-residential                                 # caption z17-
 landuse-retail                                      # caption z16- (also has area z13-)
 leisure-common                                      # caption z17-
-leisure-slipway                                     # icon z17- (also has caption(optional) z17-)
+leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z14- (also has caption(optional) z18-)
@@ -1818,7 +1813,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7300
 
 # amenity-bicycle_rental                            # caption(optional) z17- (also has icon z17-)
-# amenity-boat_rental                               # caption(optional) z17- (also has icon z17-)
 # amenity-car_sharing                               # caption(optional) z18- (also has icon z18-)
 # amenity-taxi                                      # caption(optional) z16- (also has icon z16-)
 # === -7400
@@ -1908,7 +1902,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-sports                                       # caption(optional) z16- (also has icon z16-)
 # shop-stationery                                   # caption(optional) z16- (also has icon z16-)
 # shop-tea                                          # caption(optional) z18- (also has icon z18-)
-# shop-telecommunication                            # caption(optional) z16- (also has icon z16-)
 # shop-toys                                         # caption(optional) z16- (also has icon z16-)
 # shop-travel_agency                                # caption(optional) z18- (also has icon z18-)
 # shop-wine                                         # caption(optional) z16- (also has icon z16-)
@@ -1944,9 +1937,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200
 
-# building-train_station                            # caption(optional) z17- (also has icon z17-, area z14-)
-# === -8300
-
 # leisure-sports_centre-sport-swimming              # caption(optional) z15- (also has icon z15-, area z13-)
 # === -8380
 
@@ -1990,10 +1980,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z17- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z17- (also has icon z17-)
-# amenity-mobile_money_agent                        # caption(optional) z18- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z17- (also has icon z17-)
-# amenity-payment_centre                            # caption(optional) z18- (also has icon z17-)
 # amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
@@ -2205,7 +2193,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-speech_therapist                       # caption(optional) z17- (also has icon z17-)
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
-# leisure-indoor_play                               # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
@@ -2297,7 +2284,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
 # landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
 # landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
-# leisure-slipway                                   # caption(optional) z17- (also has icon z17-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z14-)
 # power-generator-wind                              # caption(optional) z16- (also has icon z13-, area z13-)
 # === -9880

iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings

@@ -26,7 +26,6 @@
 "type.amenity.bench" = "Sitzbank";
 "type.amenity.bench.backless" = "Sitzbank ohne Rückenlehne";
 "type.amenity.bicycle_parking" = "Fahrradständer";
-"type.amenity.boat_rental" = "Bootsverleih";
 "type.amenity.bicycle_rental" = "Fahrradverleih";
 "type.amenity.bicycle_repair_station" = "Fahrrad-Reparaturstation";
 "type.amenity.biergarten" = "Biergarten";
@@ -723,7 +722,7 @@
 "type.leisure.sports_centre.sport.multi" = "Sportzentrum";
 "type.leisure.sports_centre.sport.american_football" = "Sportzentrum";
 "type.leisure.sports_centre.sport.archery" = "Sportzentrum";
-"type.leisure.sports_centre.sport.athletics" = "Sportzentrum";
+"type.leisure.sports_centre.sport.athletics" = "Sportzentrume";
 "type.leisure.sports_centre.sport.australian_football" = "Sportzentrum";
 "type.leisure.sports_centre.sport.badminton" = "Sportzentrum";
 "type.leisure.sports_centre.sport.baseball" = "Sportzentrum";
@@ -1504,7 +1503,7 @@
 "type.highway.ladder" = "Leiter";
 "type.landuse.plant_nursery" = "Gärtnerei";
 "type.leisure.firepit" = "Feuerstelle";
-"type.amenity.studio" = "Medienstudio";
+"type.amenity.studio" = "Studio";
 "type.man_made.crane" = "Kran";
 "type.railway.station.subway.qingdao" = "U-Bahn-Station";
 "type.natural.wetland.saltmarsh" = "Salzmarsch";

iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings

@@ -26,7 +26,6 @@
 "type.amenity.bench" = "Bench";
 "type.amenity.bench.backless" = "Backless Bench";
 "type.amenity.bicycle_parking" = "Bicycle Parking";
-"type.amenity.boat_rental" = "Boat Rental";
 "type.amenity.bicycle_rental" = "Bicycle Rental";
 "type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
 "type.amenity.biergarten" = "Biergarten";
@@ -85,7 +84,6 @@
 "type.amenity.library" = "Library";
 "type.amenity.loading_dock" = "Loading Bay";
 "type.amenity.lounger" = "Lounger";
-"type.amenity.mobile_money_agent" = "Mobile Money Agent";
 "type.amenity.marketplace" = "Marketplace";
 "type.amenity.motorcycle_parking" = "Motorcycle Parking";
 "type.amenity.nightclub" = "Nightclub";
@@ -115,7 +113,6 @@
 "type.amenity.parking_space.private" = "Parking Space";
 "type.amenity.parking_space.underground" = "Parking Space";
 "type.amenity.parking_space.disabled" = "Disabled Parking Space";
-"type.amenity.payment_centre" = "Payment Centre";
 "type.amenity.payment_terminal" = "Payment Terminal";
 "type.amenity.pharmacy" = "Pharmacy";
 "type.amenity.place_of_worship" = "Place of Worship";
@@ -709,7 +706,6 @@
 "type.leisure.miniature_golf" = "Minigolf";
 "type.leisure.hackerspace" = "Hackerspace";
 "type.leisure.ice_rink" = "Ice Rink";
-"type.leisure.indoor_play" = "Indoor Play Centre";
 "type.leisure.marina" = "Marina";
 "type.leisure.nature_reserve" = "Nature Reserve";
 "type.leisure.outdoor_seating" = "Outdoor Seating";
@@ -1310,7 +1306,6 @@
 "type.shop.supermarket" = "Supermarket";
 "type.shop.tattoo" = "Tattoo Parlour";
 "type.shop.tea" = "Tea Shop";
-"type.shop.telecommunication" = "Telecommunication Shop";
 "type.shop.ticket" = "Ticket Shop";
 "type.shop.toys" = "Toy Shop";
 "type.shop.travel_agency" = "Travel Agency";

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -31,7 +31,6 @@
 "type.amenity.bench.backless" = "Backless Bench";
 "type.amenity.bicycle_parking" = "Bicycle Parking";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
-"type.amenity.boat_rental" = "Boat Rental";
 "type.amenity.bicycle_rental" = "Bicycle Rental";
 "type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
 "type.amenity.biergarten" = "Biergarten";
@@ -97,7 +96,6 @@
 "type.amenity.lounger" = "Lounger";
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.marketplace" = "Marketplace";
-"type.amenity.mobile_money_agent" = "Mobile Money Agent";
 "type.amenity.motorcycle_parking" = "Motorcycle Parking";
 "type.amenity.nightclub" = "Nightclub";
 "type.amenity.nursing_home" = "Nursing Home";
@@ -127,7 +125,6 @@
 "type.amenity.parking_space.underground" = "Parking Space";
 "type.amenity.parking_space.disabled" = "Disabled Parking Space";
 "type.amenity.payment_terminal" = "Payment Terminal";
-"type.amenity.payment_centre" = "Payment Centre";
 "type.amenity.pharmacy" = "Pharmacy";
 "type.amenity.place_of_worship" = "Place of Worship";
 "type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
@@ -739,7 +736,6 @@
 "type.leisure.miniature_golf" = "Minigolf";
 "type.leisure.hackerspace" = "Hackerspace";
 "type.leisure.ice_rink" = "Ice Rink";
-"type.leisure.indoor_play" = "Indoor Play Centre";
 "type.leisure.marina" = "Marina";
 "type.leisure.nature_reserve" = "Nature Reserve";
 "type.leisure.outdoor_seating" = "Outdoor Seating";
@@ -1350,7 +1346,6 @@
 "type.shop.supermarket" = "Supermarket";
 "type.shop.tattoo" = "Tattoo Parlour";
 "type.shop.tea" = "Tea Shop";
-"type.shop.telecommunication" = "Telecommunication Shop";
 "type.shop.ticket" = "Ticket Shop";
 "type.shop.toys" = "Toy Store";
 "type.shop.travel_agency" = "Travel Agency";

iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings

@@ -591,5 +591,5 @@
 "existence_confirmed_time_ago" = "Existence confirmed %@";
 "offline_explanation_text" = "Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar.";
 "offline_explanation_title" = "Mapas sen conexión";
-"avoid_steps" = "Evitar escaleiras";
+"avoid_steps" = "Evitar pasos";
 "editor_place_doesnt_exist_description" = "Describe a aparencia do lugar para enviar unha nota co erro á comunidade OpenStreetMap";

iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings

@@ -662,7 +662,7 @@
 "type.landuse.religious" = "Religiøst område";
 "type.landuse.commercial" = "Næringsområde";
 "type.landuse.construction" = "Byggeplass";
-"type.landuse.education" = "Utdanningsinstitusjon";
+"type.landuse.education" = "Educational Facility";
 "type.landuse.farmland" = "Jordbruksområde";
 "type.landuse.farmyard" = "Bondegård";
 "type.landuse.field" = "Field";
@@ -760,7 +760,7 @@
 "type.man_made.water_well.drinking_water_no" = "Brønn";
 "type.man_made.windmill" = "Vindmølle";
 "type.man_made.works" = "Industrial Works";
-"type.military" = "Militært";
+"type.military" = "Military";
 "type.military.bunker" = "Bunker";
 "type.mountain_pass" = "Fjellpass";
 "type.natural" = "Natur";
@@ -892,12 +892,12 @@
 "type.railway.abandoned" = "Nedlagt jernbane";
 "type.railway.abandoned.bridge" = "Nedlagt jernbanebru";
 "type.railway.abandoned.tunnel" = "Nedlagt jernbanetunnel";
-"type.railway.construction" = "Jernbanebygging";
+"type.railway.construction" = "Railway Construction";
 "type.railway.crossing" = "Jernbaneovergang";
 "type.railway.disused" = "Ubenyttet jernbane";
 "type.railway.funicular" = "Kabelbane";
-"type.railway.funicular.bridge" = "Kabelbanebru";
-"type.railway.funicular.tunnel" = "Kabelbanetunnel";
+"type.railway.funicular.bridge" = "Funicular Bridge";
+"type.railway.funicular.tunnel" = "Funicular Tunnel";
 "type.railway.halt" = "Togstasjon";
 "type.railway.level_crossing" = "Planovergang";
 "type.railway.light_rail" = "Light Rail";
@@ -1198,7 +1198,7 @@
 "type.shop.books" = "Bokhandel";
 "type.shop.butcher" = "Slakter";
 "type.shop.cannabis" = "Cannabisbutikk";
-"type.shop.car" = "Bilforhandler";
+"type.shop.car" = "Bil butikk";
 "type.shop.car_parts" = "Bildeler";
 "type.shop.car_repair" = "Bilverksted";
 "type.shop.car_repair.tyres" = "Dekkreparasjon";
@@ -1467,7 +1467,7 @@
 "type.sport.diving" = "High Diving";
 "type.highway.ladder" = "Stige";
 "type.natural.wetland.swamp" = "Sumpskog";
-"type.man_made.crane" = "Kran";
+"type.man_made.crane" = "Crane";
 "type.natural.wetland.saltmarsh" = "Salt Marsh";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.barrier.guard_rail" = "Autovern";
@@ -1482,7 +1482,7 @@
 "type.amenity.luggage_locker" = "Bagasjeoppbevaring";
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Overbygd sykkelparkering";
-"type.post_office.post_partner" = "Post i butikk";
+"type.post_office.post_partner" = "Post Partner";
 "type.barrier.wicket_gate" = "Wicket gate";
 "type.amenity.animal_shelter" = "Dyrehjem";
 "type.office.security" = "Security Guards Office";

iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings

@@ -319,10 +319,10 @@
 "report_incorrect_map_bug" = "Raportați sau remediați datele incorecte de pe hartă";
 
 /* Button in the About screen */
-"volunteer" = "Fii voluntar și îmbunătațește CoMaps";
+"volunteer" = "Pentru a fi voluntar";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Conectează-te cu noi";
+"follow_us" = "Urmăriți-ne și contactați-ne";
 
 /* Alert text */
 "email_error_body" = "Clientul de e-mail nu a fost configurat. Te rugăm să-l configurezi sau să ne contactezi la %@";
@@ -1090,6 +1090,6 @@
 "pref_mapappearance_title" = "Map Appearance";
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Limbă Locală";
+"pref_maplanguage_local" = "Local Language";
 "hours_confirmed_time_ago" = "Confirmed %@";
 "existence_confirmed_time_ago" = "Existence confirmed %@";

iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings

@@ -1471,7 +1471,7 @@
 "type.natural.wetland.saltmarsh" = "Mlaștină sărată";
 "type.natural.wetland.mangrove" = "Pădure de mangrove";
 "type.barrier.guard_rail" = "Barieră de protecție";
-"type.amenity.studio" = "Studio Media";
+"type.amenity.studio" = "Garsonieră";
 "type.natural.wetland.fen" = "Pajiște mlăștinoasă";
 "type.natural.wetland.saltmarsh.tidal" = "Mlaștină sărată de maree";
 "type.natural.wetland.reedbed" = "Stufăriș";

iphone/Maps/LocalizedStrings/sl.lproj/Localizable.strings

@@ -377,4 +377,3 @@
 "placepage_call_button" = "Klic";
 "today" = "Danes";
 "bookmark_sets" = "Seznami zaznamkov";
-"about_proposition_3" = "Transparentno in nedobičkonosno";

iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings

@@ -152,4 +152,3 @@
 "type.aeroway" = "Infrastruktura zračnega prostora";
 "type.amenity.love_hotel" = "Hotel za zaljubljence";
 "type.amenity.charging_station.motorcar.small" = "Polnilno mesto za avtomobile";
-"type.amenity.cinema" = "Kino";

iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict

@@ -12,8 +12,6 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Noll bokmärken</string>
 			<key>one</key>
 			<string>%d bokmärke</string>
 			<key>other</key>

iphone/metadata/sv/subtitle.txt

@@ -1 +0,0 @@
-Navigera Privat

libs/drape_frontend/apply_feature_functors.cpp

@@ -196,31 +196,19 @@ m2::PointF GetOffset(int offsetX, int offsetY)
 
 bool IsSymbolRoadShield(ftypes::RoadShield const & shield)
 {
-  return shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Green || shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Blue || shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Red ||  shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Turkey || shield.m_type == ftypes::RoadShieldType::US_Interstate || shield.m_type == ftypes::RoadShieldType::US_Highway || shield.m_type == ftypes::RoadShieldType::Italy_Autostrada || shield.m_type == ftypes::RoadShieldType::Hungary_Green || shield.m_type == ftypes::RoadShieldType::Hungary_Blue;
+  return shield.m_type == ftypes::RoadShieldType::US_Interstate || shield.m_type == ftypes::RoadShieldType::US_Highway || shield.m_type == ftypes::RoadShieldType::Italy_Autostrada;
 }
 
 std::string GetRoadShieldSymbolName(ftypes::RoadShield const & shield, double fontScale)
 {
   ASSERT(IsSymbolRoadShield(shield), ());
   std::string result = "";
-  if (shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Green)
-    result = "shield-highway_hexagon_green";
-  else if (shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Blue)
-    result = "shield-highway_hexagon_blue";
-  else if (shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Red)
-    result = "shield-highway_hexagon_red";
-  else if (shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Turkey)
-    result = "shield-highway_hexagon_turkey";
-  else if (shield.m_type == ftypes::RoadShieldType::US_Interstate)
+  if (shield.m_type == ftypes::RoadShieldType::US_Interstate)
     result = shield.m_name.size() <= 2 ? "shield-us-i-thin" : "shield-us-i-wide";
   else if (shield.m_type == ftypes::RoadShieldType::US_Highway)
     result = shield.m_name.size() <= 2 ? "shield-us-hw-thin" : "shield-us-hw-wide";
   else if (shield.m_type == ftypes::RoadShieldType::Italy_Autostrada)
     result = "shield-it-a";
-  else if (shield.m_type == ftypes::RoadShieldType::Hungary_Green)
-    result = "shield-hungary-green";
-  else if (shield.m_type == ftypes::RoadShieldType::Hungary_Blue)
-    result = "shield-hungary-blue";
   else
     ASSERT(false, ("This shield type doesn't support symbols:", shield.m_type));
 
@@ -318,16 +306,10 @@ dp::Color GetRoadShieldTextColor(dp::Color const & baseColor, ftypes::RoadShield
       {RoadShieldType::Generic_Pill_Blue_Bordered, kRoadShieldWhiteTextColor},
       {RoadShieldType::Generic_Pill_Red_Bordered, kRoadShieldWhiteTextColor},
       {RoadShieldType::Generic_Pill_Orange_Bordered, kRoadShieldBlackTextColor},
-      {RoadShieldType::Highway_Hexagon_Green, kRoadShieldWhiteTextColor},
-      {RoadShieldType::Highway_Hexagon_Blue, kRoadShieldWhiteTextColor},
-      {RoadShieldType::Highway_Hexagon_Red, kRoadShieldWhiteTextColor},
-      {RoadShieldType::Highway_Hexagon_Turkey, kRoadShieldBlackTextColor},
       {RoadShieldType::US_Interstate, kRoadShieldWhiteTextColor},
       {RoadShieldType::US_Highway, kRoadShieldBlackTextColor},
       {RoadShieldType::UK_Highway, kRoadShieldUKYellowTextColor},
-      {RoadShieldType::Italy_Autostrada, kRoadShieldWhiteTextColor},
-      {RoadShieldType::Hungary_Green, kRoadShieldWhiteTextColor},
-      {RoadShieldType::Hungary_Blue, kRoadShieldWhiteTextColor}};
+      {RoadShieldType::Italy_Autostrada, kRoadShieldWhiteTextColor}};
 
   if (auto const * cl = kColors.Find(shield.m_type); cl)
     return df::GetColorConstant(*cl);

libs/drape_frontend/rule_drawer.cpp

@@ -353,7 +353,7 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s, TInsertSha
       df::RoadClass m_roadClass;
     };
     static Checker const checkers[] = {
-        {{HighwayClass::Motorway, HighwayClass::Trunk, HighwayClass::Primary}, kRoadClass0ZoomLevel, df::RoadClass::Class0},
+        {{HighwayClass::Trunk, HighwayClass::Primary}, kRoadClass0ZoomLevel, df::RoadClass::Class0},
         {{HighwayClass::Secondary, HighwayClass::Tertiary}, kRoadClass1ZoomLevel, df::RoadClass::Class1},
         {{HighwayClass::LivingStreet, HighwayClass::Service, HighwayClass::ServiceMinor},
          kRoadClass2ZoomLevel,

libs/editor/editor_notes.cpp

@@ -142,7 +142,7 @@ void Notes::CreateNote(ms::LatLon const & latLon, std::string const & text)
     return;
   }
 
-  std::lock_guard<std::mutex> g(m_dataAccessMutex);
+  std::lock_guard<std::mutex> g(m_mu);
   auto const it = std::find_if(m_notes.begin(), m_notes.end(), [&latLon, &text](Note const & note)
   { return latLon.EqualDxDy(note.m_point, kTolerance) && text == note.m_note; });
   // No need to add the same note. It works in case when saved note are not uploaded yet.
@@ -155,56 +155,61 @@ void Notes::CreateNote(ms::LatLon const & latLon, std::string const & text)
 
 void Notes::Upload(osm::OsmOAuth const & auth)
 {
-  std::unique_lock<std::mutex> uploadingNotesLock(m_uploadingNotesMutex, std::defer_lock);
-  if (!uploadingNotesLock.try_lock()) {
-    // Do not run more than one uploading task at a time.
-    LOG(LDEBUG, ("OSM notes upload is already running"));
-    return;
-  }
-  std::unique_lock<std::mutex> dataAccessLock(m_dataAccessMutex);
+  // Capture self to keep it from destruction until this thread is done.
+  auto const self = shared_from_this();
 
-  // Size of m_notes is decreased only in this method.
-  size_t size = m_notes.size();
-  osm::ServerApi06 api(auth);
-
-  while (size > 0)
+  auto const doUpload = [self, auth]()
   {
-    try
-    {
-      dataAccessLock.unlock();
-      auto const id = api.CreateNote(m_notes.front().m_point, m_notes.front().m_note);
-      dataAccessLock.lock();
-      LOG(LINFO, ("A note uploaded with id", id));
-    }
-    catch (osm::ServerApi06::ServerApi06Exception const & e)
-    {
-      LOG(LERROR, ("Can't upload note.", e.Msg()));
-      // Don't attempt upload for other notes as they will likely suffer from the same error.
-      return;
-    }
+    std::unique_lock<std::mutex> ulock(self->m_mu);
+    // Size of m_notes is decreased only in this method.
+    auto & notes = self->m_notes;
+    size_t size = notes.size();
+    osm::ServerApi06 api(auth);
 
-    m_notes.pop_front();
-    --size;
-    ++m_uploadedNotesCount;
-    Save(m_fileName, m_notes, m_uploadedNotesCount);
-  }
+    while (size > 0)
+    {
+      try
+      {
+        ulock.unlock();
+        auto const id = api.CreateNote(notes.front().m_point, notes.front().m_note);
+        ulock.lock();
+        LOG(LINFO, ("A note uploaded with id", id));
+      }
+      catch (osm::ServerApi06::ServerApi06Exception const & e)
+      {
+        LOG(LERROR, ("Can't upload note.", e.Msg()));
+        // We believe that next iterations will suffer from the same error.
+        return;
+      }
+
+      notes.pop_front();
+      --size;
+      ++self->m_uploadedNotesCount;
+      Save(self->m_fileName, self->m_notes, self->m_uploadedNotesCount);
+    }
+  };
+
+  static auto future = std::async(std::launch::async, doUpload);
+  auto const status = future.wait_for(std::chrono::milliseconds(0));
+  if (status == std::future_status::ready)
+    future = std::async(std::launch::async, doUpload);
 }
 
 std::list<Note> Notes::GetNotes() const
 {
-  std::lock_guard<std::mutex> g(m_dataAccessMutex);
+  std::lock_guard<std::mutex> g(m_mu);
   return m_notes;
 }
 
 size_t Notes::NotUploadedNotesCount() const
 {
-  std::lock_guard<std::mutex> g(m_dataAccessMutex);
+  std::lock_guard<std::mutex> g(m_mu);
   return m_notes.size();
 }
 
 size_t Notes::UploadedNotesCount() const
 {
-  std::lock_guard<std::mutex> g(m_dataAccessMutex);
+  std::lock_guard<std::mutex> g(m_mu);
   return m_uploadedNotesCount;
 }
 }  // namespace editor

libs/editor/editor_notes.hpp

@@ -46,8 +46,7 @@ private:
   explicit Notes(std::string const & fileName);
 
   std::string const m_fileName;
-  mutable std::mutex m_dataAccessMutex;
-  mutable std::mutex m_uploadingNotesMutex;
+  mutable std::mutex m_mu;
 
   // m_notes keeps the notes that have not been uploaded yet.
   // Once a note has been uploaded, it is removed from m_notes.

libs/editor/osm_editor.cpp

@@ -126,7 +126,7 @@ bool IsObsolete(editor::XMLFeature const & xml, FeatureID const & fid)
 }
 }  // namespace
 
-Editor::Editor() : m_configLoader(m_config), m_notes(editor::Notes::MakeNotes())
+Editor::Editor() : m_configLoader(m_config), m_notes(editor::Notes::MakeNotes()), m_isUploadingNow(false)
 {
   SetDefaultStorage();
 }
@@ -576,165 +576,217 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags, Finish
   if (m_notes->NotUploadedNotesCount())
     m_notes->Upload(OsmOAuth::ServerAuth(oauthToken));
 
-  if (!HaveMapEditsToUpload(*m_features.Get()))
+  auto const features = m_features.Get();
+
+  if (!HaveMapEditsToUpload(*features))
   {
     LOG(LDEBUG, ("There are no local edits to upload."));
     return;
   }
 
-  std::unique_lock<std::mutex> uploadingEditsLock(m_uploadingEditsMutex, std::defer_lock);
-  if (!uploadingEditsLock.try_lock()) {
-    // Do not run more than one uploading task at a time.
-    LOG(LDEBUG, ("OSM edits upload is already running"));
-    return;
-  }
-
-  int uploadedFeaturesCount = 0, errorsCount = 0;
-  ChangesetWrapper changeset(oauthToken, std::move(tags));
-  auto const features = m_features.Get();
-
-  for (auto const & id : *features)
+  auto upload = [this](string secret, ChangesetTags tags, FinishUploadCallback callback)
   {
-    if (!id.first.IsAlive())
-      continue;
+    int uploadedFeaturesCount = 0, errorsCount = 0;
+    ChangesetWrapper changeset(secret, std::move(tags));
+    auto const features = m_features.Get();
 
-    for (auto const & index : id.second)
+    for (auto const & id : *features)
     {
-      FeatureTypeInfo const & fti = index.second;
-      // Do not process already uploaded features or those failed permanently.
-      if (!NeedsUpload(fti.m_uploadStatus))
+      if (!id.first.IsAlive())
         continue;
 
-      // TODO(a): Use UploadInfo as part of FeatureTypeInfo.
-      UploadInfo uploadInfo = {fti.m_uploadAttemptTimestamp, fti.m_uploadStatus, fti.m_uploadError};
-
-      LOG(LDEBUG, ("Content of editJournal:\n", fti.m_object.GetJournal().JournalToString()));
-
-      // Don't use new editor for Legacy Objects
-      auto const & journalHistory = fti.m_object.GetJournal().GetJournalHistory();
-      bool useNewEditor =
-          journalHistory.empty() || journalHistory.front().journalEntryType != JournalEntryType::LegacyObject;
-
-      try
+      for (auto const & index : id.second)
       {
-        if (useNewEditor)
+        FeatureTypeInfo const & fti = index.second;
+        // Do not process already uploaded features or those failed permanently.
+        if (!NeedsUpload(fti.m_uploadStatus))
+          continue;
+
+        // TODO(a): Use UploadInfo as part of FeatureTypeInfo.
+        UploadInfo uploadInfo = {fti.m_uploadAttemptTimestamp, fti.m_uploadStatus, fti.m_uploadError};
+
+        LOG(LDEBUG, ("Content of editJournal:\n", fti.m_object.GetJournal().JournalToString()));
+
+        // Don't use new editor for Legacy Objects
+        auto const & journalHistory = fti.m_object.GetJournal().GetJournalHistory();
+        bool useNewEditor =
+            journalHistory.empty() || journalHistory.front().journalEntryType != JournalEntryType::LegacyObject;
+
+        try
         {
-          LOG(LDEBUG, ("New Editor used\n"));
-
-          switch (fti.m_status)
+          if (useNewEditor)
           {
-          case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
-          case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
-          case FeatureStatus::Created:             // fallthrough
-          case FeatureStatus::Modified:
+            LOG(LDEBUG, ("New Editor used\n"));
+
+            switch (fti.m_status)
+            {
+            case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
+            case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
+            case FeatureStatus::Created:             // fallthrough
+            case FeatureStatus::Modified:
+            {
+              std::list<JournalEntry> const & journal = fti.m_object.GetJournal().GetJournal();
+
+              switch (fti.m_object.GetEditingLifecycle())
+              {
+              case EditingLifecycle::CREATED:
+              {
+                // Generate XMLFeature for new object
+                JournalEntry const & createEntry = journal.front();
+                ASSERT(createEntry.journalEntryType == JournalEntryType::ObjectCreated,
+                       ("First item should have type ObjectCreated"));
+                ObjCreateData const & objCreateData = std::get<ObjCreateData>(createEntry.data);
+                XMLFeature feature =
+                    editor::TypeToXML(objCreateData.type, objCreateData.geomType, objCreateData.mercator);
+
+                // Check if place already exists
+                bool mergeSameLocation = false;
+                try
+                {
+                  XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(objCreateData.mercator);
+                  if (objCreateData.mercator == osmFeature.GetMercatorCenter())
+                  {
+                    changeset.AddChangesetTag("info:merged_same_location", "yes");
+                    feature = osmFeature;
+                    mergeSameLocation = true;
+                  }
+                  else
+                  {
+                    changeset.AddChangesetTag("info:feature_close_by", "yes");
+                  }
+                }
+                catch (ChangesetWrapper::OsmObjectWasDeletedException const &)
+                {}
+                catch (ChangesetWrapper::EmptyFeatureException const &)
+                {}
+
+                // Add tags to XMLFeature
+                UpdateXMLFeatureTags(feature, journal);
+
+                // Upload XMLFeature to OSM
+                LOG(LDEBUG, ("CREATE Feature (newEditor)", feature));
+                changeset.AddChangesetTag("info:new_editor", "yes");
+                if (!mergeSameLocation)
+                  changeset.Create(feature);
+                else
+                  changeset.Modify(feature);
+                break;
+              }
+
+              case EditingLifecycle::MODIFIED:
+              {
+                // Load existing OSM object (Throws, see catch below)
+                XMLFeature feature = GetMatchingFeatureFromOSM(changeset, fti.m_object);
+
+                // Update tags of XMLFeature
+                UpdateXMLFeatureTags(feature, journal);
+
+                // Upload XMLFeature to OSM
+                LOG(LDEBUG, ("MODIFIED Feature (newEditor)", feature));
+                changeset.AddChangesetTag("info:new_editor", "yes");
+                changeset.Modify(feature);
+                break;
+              }
+
+              case EditingLifecycle::IN_SYNC:
+              {
+                CHECK(false, ("Object already IN_SYNC should not be here"));
+                continue;
+              }
+              }
+              break;
+            }
+            case FeatureStatus::Deleted:
+              auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
+              if (!originalObjectPtr)
+              {
+                LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
+                GetPlatform().RunTask(Platform::Thread::Gui,
+                                      [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
+                continue;
+              }
+              changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
+              break;
+            }
+          }
+          else  // Use old editor
           {
-            std::list<JournalEntry> const & journal = fti.m_object.GetJournal().GetJournal();
-
-            switch (fti.m_object.GetEditingLifecycle())
+            // Todo: Remove old editor after transition period
+            switch (fti.m_status)
             {
-            case EditingLifecycle::CREATED:
+            case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
+            case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
+            case FeatureStatus::Created:
             {
-              // Generate XMLFeature for new object
-              JournalEntry const & createEntry = journal.front();
-              ASSERT(createEntry.journalEntryType == JournalEntryType::ObjectCreated,
-                     ("First item should have type ObjectCreated"));
-              ObjCreateData const & objCreateData = std::get<ObjCreateData>(createEntry.data);
-              XMLFeature feature =
-                  editor::TypeToXML(objCreateData.type, objCreateData.geomType, objCreateData.mercator);
+              XMLFeature feature = editor::ToXML(fti.m_object, true);
+              if (!fti.m_street.empty())
+                feature.SetTagValue(kAddrStreetTag, fti.m_street);
 
-              // Check if place already exists
-              bool mergeSameLocation = false;
+              ASSERT_EQUAL(feature.GetType(), XMLFeature::Type::Node,
+                           ("Linear and area features creation is not supported yet."));
               try
               {
-                XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(objCreateData.mercator);
-                if (objCreateData.mercator == osmFeature.GetMercatorCenter())
+                auto const center = fti.m_object.GetMercator();
+                // Throws, see catch below.
+                XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(center);
+
+                // If we are here, it means that object already exists at the given point.
+                // To avoid nodes duplication, merge and apply changes to it instead of creating a new one.
+                XMLFeature const osmFeatureCopy = osmFeature;
+                osmFeature.ApplyPatch(feature);
+                // Check to avoid uploading duplicates into OSM.
+                if (osmFeature == osmFeatureCopy)
                 {
-                  changeset.AddChangesetTag("info:merged_same_location", "yes");
-                  feature = osmFeature;
-                  mergeSameLocation = true;
+                  LOG(LWARNING, ("Local changes are equal to OSM, feature has not been uploaded.", osmFeatureCopy));
+                  // Don't delete this local change right now for user to see it in profile.
+                  // It will be automatically deleted by migration code on the next maps update.
                 }
                 else
                 {
-                  changeset.AddChangesetTag("info:feature_close_by", "yes");
+                  LOG(LDEBUG, ("Create case: uploading patched feature", osmFeature));
+                  changeset.AddChangesetTag("info:old_editor", "yes");
+                  changeset.AddChangesetTag("info:features_merged", "yes");
+                  changeset.Modify(osmFeature);
                 }
               }
               catch (ChangesetWrapper::OsmObjectWasDeletedException const &)
-              {}
-              catch (ChangesetWrapper::EmptyFeatureException const &)
-              {}
-
-              // Add tags to XMLFeature
-              UpdateXMLFeatureTags(feature, journal);
-
-              // Upload XMLFeature to OSM
-              LOG(LDEBUG, ("CREATE Feature (newEditor)", feature));
-              changeset.AddChangesetTag("info:new_editor", "yes");
-              if (!mergeSameLocation)
+              {
+                // Object was never created by anyone else - it's safe to create it.
+                changeset.AddChangesetTag("info:old_editor", "yes");
                 changeset.Create(feature);
-              else
-                changeset.Modify(feature);
-              break;
-            }
-
-            case EditingLifecycle::MODIFIED:
-            {
-              // Load existing OSM object (Throws, see catch below)
-              XMLFeature feature = GetMatchingFeatureFromOSM(changeset, fti.m_object);
-
-              // Update tags of XMLFeature
-              UpdateXMLFeatureTags(feature, journal);
-
-              // Upload XMLFeature to OSM
-              LOG(LDEBUG, ("MODIFIED Feature (newEditor)", feature));
-              changeset.AddChangesetTag("info:new_editor", "yes");
-              changeset.Modify(feature);
-              break;
-            }
-
-            case EditingLifecycle::IN_SYNC:
-            {
-              CHECK(false, ("Object already IN_SYNC should not be here"));
-              continue;
-            }
+              }
+              catch (ChangesetWrapper::EmptyFeatureException const &)
+              {
+                // There is another node nearby, but it should be safe to create a new one.
+                changeset.AddChangesetTag("info:old_editor", "yes");
+                changeset.Create(feature);
+              }
+              catch (...)
+              {
+                // Pass network or other errors to outside exception handler.
+                throw;
+              }
             }
             break;
-          }
-          case FeatureStatus::Deleted:
-            auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
-            if (!originalObjectPtr)
-            {
-              LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
-              GetPlatform().RunTask(Platform::Thread::Gui,
-                                    [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
-              continue;
-            }
-            changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
-            break;
-          }
-        }
-        else  // Use old editor
-        {
-          // Todo: Remove old editor after transition period
-          switch (fti.m_status)
-          {
-          case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
-          case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
-          case FeatureStatus::Created:
-          {
-            XMLFeature feature = editor::ToXML(fti.m_object, true);
-            if (!fti.m_street.empty())
-              feature.SetTagValue(kAddrStreetTag, fti.m_street);
 
-            ASSERT_EQUAL(feature.GetType(), XMLFeature::Type::Node,
-                         ("Linear and area features creation is not supported yet."));
-            try
+            case FeatureStatus::Modified:
             {
-              auto const center = fti.m_object.GetMercator();
-              // Throws, see catch below.
-              XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(center);
+              // Do not serialize feature's type to avoid breaking OSM data.
+              // TODO: Implement correct types matching when we support modifying existing feature types.
+              XMLFeature feature = editor::ToXML(fti.m_object, false);
+              if (!fti.m_street.empty())
+                feature.SetTagValue(kAddrStreetTag, fti.m_street);
 
-              // If we are here, it means that object already exists at the given point.
-              // To avoid nodes duplication, merge and apply changes to it instead of creating a new one.
+              auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
+              if (!originalObjectPtr)
+              {
+                LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
+                GetPlatform().RunTask(Platform::Thread::Gui,
+                                      [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
+                continue;
+              }
+
+              XMLFeature osmFeature = GetMatchingFeatureFromOSM(changeset, *originalObjectPtr);
               XMLFeature const osmFeatureCopy = osmFeature;
               osmFeature.ApplyPatch(feature);
               // Check to avoid uploading duplicates into OSM.
@@ -746,129 +798,86 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags, Finish
               }
               else
               {
-                LOG(LDEBUG, ("Create case: uploading patched feature", osmFeature));
+                LOG(LDEBUG, ("Uploading patched feature", osmFeature));
                 changeset.AddChangesetTag("info:old_editor", "yes");
-                changeset.AddChangesetTag("info:features_merged", "yes");
                 changeset.Modify(osmFeature);
               }
             }
-            catch (ChangesetWrapper::OsmObjectWasDeletedException const &)
-            {
-              // Object was never created by anyone else - it's safe to create it.
-              changeset.AddChangesetTag("info:old_editor", "yes");
-              changeset.Create(feature);
-            }
-            catch (ChangesetWrapper::EmptyFeatureException const &)
-            {
-              // There is another node nearby, but it should be safe to create a new one.
-              changeset.AddChangesetTag("info:old_editor", "yes");
-              changeset.Create(feature);
-            }
-            catch (...)
-            {
-              // Pass network or other errors to outside exception handler.
-              throw;
-            }
-          }
-          break;
-
-          case FeatureStatus::Modified:
-          {
-            // Do not serialize feature's type to avoid breaking OSM data.
-            // TODO: Implement correct types matching when we support modifying existing feature types.
-            XMLFeature feature = editor::ToXML(fti.m_object, false);
-            if (!fti.m_street.empty())
-              feature.SetTagValue(kAddrStreetTag, fti.m_street);
-
-            auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
-            if (!originalObjectPtr)
-            {
-              LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
-              GetPlatform().RunTask(Platform::Thread::Gui,
-                                    [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
-              continue;
-            }
-
-            XMLFeature osmFeature = GetMatchingFeatureFromOSM(changeset, *originalObjectPtr);
-            XMLFeature const osmFeatureCopy = osmFeature;
-            osmFeature.ApplyPatch(feature);
-            // Check to avoid uploading duplicates into OSM.
-            if (osmFeature == osmFeatureCopy)
-            {
-              LOG(LWARNING, ("Local changes are equal to OSM, feature has not been uploaded.", osmFeatureCopy));
-              // Don't delete this local change right now for user to see it in profile.
-              // It will be automatically deleted by migration code on the next maps update.
-            }
-            else
-            {
-              LOG(LDEBUG, ("Uploading patched feature", osmFeature));
-              changeset.AddChangesetTag("info:old_editor", "yes");
-              changeset.Modify(osmFeature);
-            }
-          }
-          break;
-
-          case FeatureStatus::Deleted:
-            auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
-            if (!originalObjectPtr)
-            {
-              LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
-              GetPlatform().RunTask(Platform::Thread::Gui,
-                                    [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
-              continue;
-            }
-            changeset.AddChangesetTag("info:old_editor", "yes");
-            changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
             break;
+
+            case FeatureStatus::Deleted:
+              auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
+              if (!originalObjectPtr)
+              {
+                LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
+                GetPlatform().RunTask(Platform::Thread::Gui,
+                                      [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
+                continue;
+              }
+              changeset.AddChangesetTag("info:old_editor", "yes");
+              changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
+              break;
+            }
           }
+          uploadInfo.m_uploadStatus = kUploaded;
+          uploadInfo.m_uploadError.clear();
+          ++uploadedFeaturesCount;
         }
-        uploadInfo.m_uploadStatus = kUploaded;
-        uploadInfo.m_uploadError.clear();
-        ++uploadedFeaturesCount;
-      }
-      catch (ChangesetWrapper::OsmObjectWasDeletedException const & ex)
-      {
-        uploadInfo.m_uploadStatus = kDeletedFromOSMServer;
-        uploadInfo.m_uploadError = ex.Msg();
-        ++errorsCount;
-        LOG(LWARNING, (ex.what()));
-        changeset.AddToChangesetKeyList("upload_attempt_error", kDeletedFromOSMServer);
-      }
-      catch (ChangesetWrapper::EmptyFeatureException const & ex)
-      {
-        uploadInfo.m_uploadStatus = kMatchedFeatureIsEmpty;
-        uploadInfo.m_uploadError = ex.Msg();
-        ++errorsCount;
-        LOG(LWARNING, (ex.what()));
-        changeset.AddToChangesetKeyList("upload_attempt_error", kMatchedFeatureIsEmpty);
-      }
-      catch (RootException const & ex)
-      {
-        uploadInfo.m_uploadStatus = kNeedsRetry;
-        uploadInfo.m_uploadError = ex.Msg();
-        ++errorsCount;
-        LOG(LWARNING, (ex.what()));
-        changeset.AddToChangesetKeyList("upload_attempt_error", ex.Msg());
-      }
-      // TODO(AlexZ): Use timestamp from the server.
-      uploadInfo.m_uploadAttemptTimestamp = time(nullptr);
+        catch (ChangesetWrapper::OsmObjectWasDeletedException const & ex)
+        {
+          uploadInfo.m_uploadStatus = kDeletedFromOSMServer;
+          uploadInfo.m_uploadError = ex.Msg();
+          ++errorsCount;
+          LOG(LWARNING, (ex.what()));
+          changeset.AddToChangesetKeyList("upload_attempt_error", kDeletedFromOSMServer);
+        }
+        catch (ChangesetWrapper::EmptyFeatureException const & ex)
+        {
+          uploadInfo.m_uploadStatus = kMatchedFeatureIsEmpty;
+          uploadInfo.m_uploadError = ex.Msg();
+          ++errorsCount;
+          LOG(LWARNING, (ex.what()));
+          changeset.AddToChangesetKeyList("upload_attempt_error", kMatchedFeatureIsEmpty);
+        }
+        catch (RootException const & ex)
+        {
+          uploadInfo.m_uploadStatus = kNeedsRetry;
+          uploadInfo.m_uploadError = ex.Msg();
+          ++errorsCount;
+          LOG(LWARNING, (ex.what()));
+          changeset.AddToChangesetKeyList("upload_attempt_error", ex.Msg());
+        }
+        // TODO(AlexZ): Use timestamp from the server.
+        uploadInfo.m_uploadAttemptTimestamp = time(nullptr);
 
-      GetPlatform().RunTask(Platform::Thread::Gui, [this, id = fti.m_object.GetID(), uploadInfo]()
-      {
-        // Call Save every time we modify each feature's information.
-        SaveUploadedInformation(id, uploadInfo);
-      });
+        GetPlatform().RunTask(Platform::Thread::Gui, [this, id = fti.m_object.GetID(), uploadInfo]()
+        {
+          // Call Save every time we modify each feature's information.
+          SaveUploadedInformation(id, uploadInfo);
+        });
+      }
     }
-  }
 
-  if (callback)
+    if (callback)
+    {
+      UploadResult result = UploadResult::NothingToUpload;
+      if (uploadedFeaturesCount)
+        result = UploadResult::Success;
+      else if (errorsCount)
+        result = UploadResult::Error;
+      callback(result);
+    }
+
+    m_isUploadingNow = false;
+  };
+
+  // Do not run more than one uploading task at a time.
+  if (!m_isUploadingNow)
   {
-    UploadResult result = UploadResult::NothingToUpload;
-    if (uploadedFeaturesCount)
-      result = UploadResult::Success;
-    else if (errorsCount)
-      result = UploadResult::Error;
-    callback(result);
+    m_isUploadingNow = true;
+    GetPlatform().RunTask(Platform::Thread::Network, [upload = std::move(upload), oauthToken, tags = std::move(tags),
+                                                      callback = std::move(callback)]()
+    { upload(std::move(oauthToken), std::move(tags), std::move(callback)); });
   }
 }
 

libs/editor/osm_editor.hpp

@@ -260,7 +260,7 @@ private:
 
   std::unique_ptr<editor::StorageBase> m_storage;
 
-  std::mutex m_uploadingEditsMutex;
+  std::atomic<bool> m_isUploadingNow;
 
   DECLARE_THREAD_CHECKER(MainThreadChecker);
 };  // class Editor

libs/indexer/ftypes_matcher.cpp

@@ -30,8 +30,8 @@ public:
     m_map[c.GetTypeByPath({"route", "ferry"})] = HighwayClass::Transported;
     m_map[c.GetTypeByPath({"route", "shuttle_train"})] = HighwayClass::Transported;
 
-    m_map[c.GetTypeByPath({"highway", "motorway"})] = HighwayClass::Motorway;
-    m_map[c.GetTypeByPath({"highway", "motorway_link"})] = HighwayClass::Motorway;
+    m_map[c.GetTypeByPath({"highway", "motorway"})] = HighwayClass::Trunk;
+    m_map[c.GetTypeByPath({"highway", "motorway_link"})] = HighwayClass::Trunk;
     m_map[c.GetTypeByPath({"highway", "trunk"})] = HighwayClass::Trunk;
     m_map[c.GetTypeByPath({"highway", "trunk_link"})] = HighwayClass::Trunk;
 
@@ -83,7 +83,6 @@ char const * HighwayClassToString(HighwayClass const cls)
   {
   case HighwayClass::Undefined: return "Undefined";
   case HighwayClass::Transported: return "Transported";
-  case HighwayClass::Motorway: return "Motorway";
   case HighwayClass::Trunk: return "Trunk";
   case HighwayClass::Primary: return "Primary";
   case HighwayClass::Secondary: return "Secondary";

libs/indexer/ftypes_matcher.hpp

@@ -674,7 +674,6 @@ uint64_t GetPopulationByRadius(double r);
 enum class HighwayClass
 {
   Undefined = 0,  // There has not been any attempt of calculating HighwayClass.
-  Motorway,
   Trunk,
   Primary,
   Secondary,

libs/indexer/indexer_tests/checker_test.cpp

@@ -107,7 +107,7 @@ UNIT_TEST(GetHighwayClassTest)
 
   feature::TypesHolder types2;
   types2.Add(c.GetTypeByPath({"highway", "motorway_link", "tunnel"}));
-  TEST_EQUAL(ftypes::GetHighwayClass(types2), ftypes::HighwayClass::Motorway, ());
+  TEST_EQUAL(ftypes::GetHighwayClass(types2), ftypes::HighwayClass::Trunk, ());
 
   feature::TypesHolder types3;
   types3.Add(c.GetTypeByPath({"highway", "unclassified"}));

libs/indexer/road_shields_parser.cpp

@@ -94,7 +94,7 @@ class RoadShieldParser
 public:
   explicit RoadShieldParser(std::string const & baseRoadNumber) : m_baseRoadNumber(baseRoadNumber) {}
   virtual ~RoadShieldParser() = default;
-  virtual RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const = 0;
+  virtual RoadShield ParseRoadShield(std::string_view rawText) const = 0;
 
   RoadShieldType FindNetworkShield(std::string network) const
   {
@@ -127,20 +127,18 @@ public:
   RoadShieldsSetT GetRoadShields() const
   {
     RoadShieldsSetT result, defaultShields;
-    
-    uint8_t index = 0;
+
     strings::Tokenize(m_baseRoadNumber, ";", [&](std::string_view rawText)
     {
-      ++index;
       RoadShield shield;
       auto slashPos = rawText.find('/');
       if (slashPos == std::string::npos)
       {
-        shield = ParseRoadShield(rawText, index);
+        shield = ParseRoadShield(rawText);
       }
       else
       {
-        shield = ParseRoadShield(rawText.substr(slashPos + 1), index);
+        shield = ParseRoadShield(rawText.substr(slashPos + 1));
         // TODO: use a network-based shield type override only if a parser couldn't make it
         // more specific than country's default shield type.
         // E.g. "94" is set to Generic_Orange by Estonia parser, but then
@@ -178,7 +176,7 @@ class USRoadShieldParser : public RoadShieldParser
 {
 public:
   explicit USRoadShieldParser(std::string const & baseRoadNumber) : RoadShieldParser(baseRoadNumber) {}
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     std::string shieldText(rawText);
 
@@ -238,7 +236,7 @@ class IndiaRoadShieldParser : public RoadShieldParser
 {
 public:
   explicit IndiaRoadShieldParser(std::string const & baseRoadNumber) : RoadShieldParser(baseRoadNumber) {}
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     std::string shieldText(rawText);
 
@@ -271,7 +269,7 @@ public:
     , m_type(defaultType)
   {}
 
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     if (rawText.size() > kMaxRoadShieldBytesSize)
       return RoadShield();
@@ -306,7 +304,7 @@ public:
     , m_defaultType(defaultType)
   {}
 
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     if (rawText.size() > kMaxRoadShieldBytesSize)
       return RoadShield();
@@ -331,72 +329,6 @@ private:
   RoadShieldType const m_defaultType;
 };
 
-// Matches by a list of given highway classes for the first shield.
-// Falls back to matching by a list of given substrings (identical to SimpleRoadShieldParser) for all other shields.
-class HighwayClassRoadShieldParser : public RoadShieldParser
-{
-public:
-  struct Entry
-  {
-    Entry() = default;
-    Entry(std::string_view name, HighwayClass highwayClass, RoadShieldType type, bool isRedundant = false) : m_name(name), m_highwayClass(highwayClass), m_type(type), m_isRedundant(isRedundant) {}
-
-    std::string_view m_name;
-    HighwayClass m_highwayClass = HighwayClass::Undefined;
-    RoadShieldType m_type = RoadShieldType::Default;
-    /* Hides a specific secondary etc. sign, if there is a primary one */
-    bool m_isRedundant = false;
-  };
-
-  using ShieldTypes = buffer_vector<Entry, 8>;
-
-  HighwayClassRoadShieldParser(std::string const & baseRoadNumber, HighwayClass highwayClass, ShieldTypes && types, RoadShieldType defaultType = RoadShieldType::Default)
-    : RoadShieldParser(baseRoadNumber)
-    , m_highwayClass(highwayClass)
-    , m_types(std::move(types))
-    , m_defaultType(defaultType)
-  {}
-
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
-  {
-    if (rawText.size() > kMaxRoadShieldBytesSize)
-      return RoadShield();
-    
-    RoadShieldType type = m_defaultType;
-    if (index == 1) {
-      for (auto const & p : m_types)
-      {
-        if (p.m_highwayClass == m_highwayClass)
-        {
-          return RoadShield(p.m_type, rawText);
-        }
-      }
-    } else {
-      size_t idx = std::numeric_limits<size_t>::max();
-      for (auto const & p : m_types)
-      {
-        auto const i = rawText.find(p.m_name);
-        if (i != std::string::npos && i < idx)
-        {
-          if (p.m_isRedundant) {
-            type = RoadShieldType::Hidden;
-          } else {
-            type = p.m_type;
-          }
-          idx = i;
-        }
-      }
-    }
-
-    return {type, rawText};
-  }
-
-private:
-  HighwayClass const m_highwayClass;
-  ShieldTypes const m_types;
-  RoadShieldType const m_defaultType;
-};
-
 uint16_t constexpr kAnyHigherRoadNumber = std::numeric_limits<uint16_t>::max();
 
 // Matches by a list of numeric ranges (a first matching range is used).
@@ -422,7 +354,7 @@ public:
     , m_types(std::move(types))
   {}
 
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     if (rawText.size() > kMaxRoadShieldBytesSize)
       return RoadShield();
@@ -471,7 +403,7 @@ public:
     , m_defaultType(defaultType)
   {}
 
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     uint32_t constexpr kMaxRoadShieldSymbolsSize = 4 * kMaxRoadShieldBytesSize;
 
@@ -497,15 +429,14 @@ private:
 
 // Implementations of "ref" parses for some countries.
 
-class AustriaRoadShieldParser : public HighwayClassRoadShieldParser
+class AustriaRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
-  explicit AustriaRoadShieldParser(std::string const & baseRoadNumber, HighwayClass const & highwayClass)
-    : HighwayClassRoadShieldParser(baseRoadNumber, highwayClass,
-                                   {{"A", HighwayClass::Motorway, RoadShieldType::Generic_Blue_Bordered},
-                                    {"S", HighwayClass::Trunk, RoadShieldType::Generic_Blue_Bordered},
-                                    {"B", HighwayClass::Primary, RoadShieldType::Generic_Blue},
-                                    {"L", HighwayClass::Secondary, RoadShieldType::Generic_Pill_White_Bordered}})
+  explicit AustriaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Blue_Bordered},
+                                              {"S", RoadShieldType::Generic_Blue_Bordered},
+                                              {"B", RoadShieldType::Generic_Blue},
+                                              {"L", RoadShieldType::Generic_Pill_White_Bordered}})
   {}
 };
 
@@ -523,7 +454,7 @@ class GreeceRoadShieldParser : public SimpleRoadShieldParser
 public:
   explicit GreeceRoadShieldParser(std::string const & baseRoadNumber)
     : SimpleRoadShieldParser(baseRoadNumber,
-                             {{"Α", RoadShieldType::Highway_Hexagon_Green}, {"Ε", RoadShieldType::Generic_Blue}})
+                             {{"Α", RoadShieldType::Generic_Green}, {"Ε", RoadShieldType::Generic_Blue}})
   {}
 };
 
@@ -549,23 +480,6 @@ public:
   {}
 };
 
-class TurkeyRoadShieldParser : public SimpleRoadShieldParser
-{
-public:
-  explicit TurkeyRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"O", RoadShieldType::Highway_Hexagon_Turkey},
-                                              {"D", RoadShieldType::Generic_Blue}})
-  {}
-};
-
-class HungaryRoadShieldParser : public SimpleRoadShieldParser
-{
-public:
-  explicit HungaryRoadShieldParser(std::string const & baseRoadNumber)
-  : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Hungary_Blue}}, RoadShieldType::Hungary_Green)
-  {}
-};
-
 class LativaRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
@@ -610,7 +524,7 @@ class SerbiaRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit SerbiaRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Highway_Hexagon_Green}})
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Green}})
   {}
 };
 
@@ -626,7 +540,7 @@ class SloveniaRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit SloveniaRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Highway_Hexagon_Green}})
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Green}})
   {}
 };
 
@@ -634,7 +548,7 @@ class SwitzerlandRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit SwitzerlandRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Highway_Hexagon_Red}})
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red}})
   {}
 };
 
@@ -642,7 +556,7 @@ class LiechtensteinRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit LiechtensteinRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Highway_Hexagon_Red}})
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red}})
   {}
 };
 
@@ -662,16 +576,11 @@ public:
   {}
 };
 
-class UKRoadShieldParser : public HighwayClassRoadShieldParser
+class UKRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
-  explicit UKRoadShieldParser(std::string const & baseRoadNumber, HighwayClass const & highwayClass)
-    : HighwayClassRoadShieldParser(baseRoadNumber, highwayClass,
-                                   {{"M", HighwayClass::Motorway, RoadShieldType::Generic_Blue, true},
-                                    {"E", HighwayClass::Motorway, RoadShieldType::Hidden},
-                                    {"A", HighwayClass::Trunk, RoadShieldType::UK_Highway, true},
-                                    {"A", HighwayClass::Primary, RoadShieldType::Generic_White_Bordered},
-                                    {"B", HighwayClass::Secondary, RoadShieldType::Generic_White_Bordered}})
+  explicit UKRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Generic_Blue}, {"A", RoadShieldType::UK_Highway}})
   {}
 };
 
@@ -687,17 +596,14 @@ public:
   {}
 };
 
-class GermanyRoadShieldParser : public HighwayClassRoadShieldParser
+class GermanyRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
-  explicit GermanyRoadShieldParser(std::string const & baseRoadNumber, HighwayClass const & highwayClass)
-    : HighwayClassRoadShieldParser(baseRoadNumber, highwayClass,
-                                   {{"A", HighwayClass::Motorway, RoadShieldType::Highway_Hexagon_Blue},
-                                    {"D", HighwayClass::Motorway, RoadShieldType::Hidden},
-                                    {"B", HighwayClass::Trunk, RoadShieldType::Generic_Orange_Bordered},
-                                    {"B", HighwayClass::Primary, RoadShieldType::Generic_Orange_Bordered},
-                                    {"L", HighwayClass::Secondary, RoadShieldType::Generic_White_Bordered},
-                                    {"K", HighwayClass::Secondary, RoadShieldType::Generic_White_Bordered}})
+  explicit GermanyRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Blue},
+                                              {"B", RoadShieldType::Generic_Orange_Bordered},
+                                              {"L", RoadShieldType::Generic_White_Bordered},
+                                              {"K", RoadShieldType::Generic_White_Bordered}})
   {}
 };
 
@@ -804,7 +710,7 @@ class MexicoRoadShieldParser : public RoadShieldParser
 public:
   explicit MexicoRoadShieldParser(std::string const & baseRoadNumber) : RoadShieldParser(baseRoadNumber) {}
 
-  RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
+  RoadShield ParseRoadShield(std::string_view rawText) const override
   {
     std::string shieldText(rawText);
 
@@ -847,10 +753,6 @@ RoadShieldsSetT GetRoadShields(FeatureType & f)
   if (ref.empty())
     return {};
 
-  auto const & highwayClass = ftypes::GetHighwayClass(feature::TypesHolder(f));
-  if (highwayClass == HighwayClass::Undefined)
-    return {};
-  
   // Find out country name.
   std::string mwmName = f.GetID().GetMwmName();
   ASSERT(!mwmName.empty(), (f.GetID()));
@@ -859,19 +761,19 @@ RoadShieldsSetT GetRoadShields(FeatureType & f)
   if (underlinePos != std::string::npos)
     mwmName = mwmName.substr(0, underlinePos);
 
-  return GetRoadShields(mwmName, ref, highwayClass);
+  return GetRoadShields(mwmName, ref);
 }
 
-RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & roadNumber, HighwayClass const & highwayClass)
+RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & roadNumber)
 {
   if (mwmName == "US")
     return USRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "UK")
-    return UKRoadShieldParser(roadNumber, highwayClass).GetRoadShields();
+    return UKRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "India")
     return IndiaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Austria")
-    return AustriaRoadShieldParser(roadNumber, highwayClass).GetRoadShields();
+    return AustriaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Belgium")
     return BelgiumRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Greece")
@@ -880,10 +782,6 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
     return IrelandRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Italy")
     return ItalyRoadShieldParser(roadNumber).GetRoadShields();
-  if (mwmName == "Turkey")
-    return TurkeyRoadShieldParser(roadNumber).GetRoadShields();
-  if (mwmName == "Hungary")
-    return HungaryRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Lativa")
     return LativaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Moldova")
@@ -907,7 +805,7 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
   if (mwmName == "France")
     return FranceRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Germany")
-    return GermanyRoadShieldParser(roadNumber, highwayClass).GetRoadShields();
+    return GermanyRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Spain")
     return SpainRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Ukraine")
@@ -976,16 +874,10 @@ std::string DebugPrint(RoadShieldType shieldType)
   case RoadShieldType::Generic_Pill_Blue_Bordered: return "blue pill bordered";
   case RoadShieldType::Generic_Pill_Red_Bordered: return "red pill bordered";
   case RoadShieldType::Generic_Pill_Orange_Bordered: return "orange pill bordered";
-  case RoadShieldType::Highway_Hexagon_Green: return "highway hexagon green";
-  case RoadShieldType::Highway_Hexagon_Blue: return "highway hexagon blue";
-  case RoadShieldType::Highway_Hexagon_Red: return "highway hexagon red";
-  case RoadShieldType::Highway_Hexagon_Turkey: return "highway hexagon turkey";
   case RoadShieldType::US_Interstate: return "US interstate";
   case RoadShieldType::US_Highway: return "US highway";
   case RoadShieldType::UK_Highway: return "UK highway";
   case RoadShieldType::Italy_Autostrada: return "Italy autostrada";
-  case RoadShieldType::Hungary_Green: return "hungary green";
-  case RoadShieldType::Hungary_Blue: return "hungary blue";
   case RoadShieldType::Hidden: return "hidden";
   case RoadShieldType::Count: CHECK(false, ("RoadShieldType::Count is not to be used as a type"));
   }