diff --git a/.forgejo/workflows/map-generator.yml b/.forgejo/workflows/map-generator.yml index 230985fff..216f1b406 100644 --- a/.forgejo/workflows/map-generator.yml +++ b/.forgejo/workflows/map-generator.yml @@ -5,10 +5,10 @@ on: jobs: description: 'Which job(s) to run right now?' required: true - default: 'all' + default: 'all-except-upload' type: choice options: - - all + - all-except-upload - copy-coasts - planet - wiki @@ -16,30 +16,82 @@ on: - subways - tiger - maps + - upload + map-generator-continue: + description: 'Continue previous map generation?' + required: false + default: false + type: boolean + map-generator-countries: + description: 'Generate specific MWMs? (i.e. "US_New York_*, foo")' + required: false + type: string + reset: + description: 'Reset part of the system?' + required: false + default: 'no' + type: choice + options: + - 'no' + - wiki-ratelimit + +## 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 }} + MWMCONTINUE: ${{ inputs.map-generator-continue }} + MWMCOUNTRIES: ${{ inputs.map-generator-countries }} DEBIAN_FRONTEND: noninteractive TZ: Etc/UTC jobs: - copy-coasts: - if: inputs.jobs == 'copy-coasts' || inputs.jobs == 'all' - name: Copy Previously Generated Coasts + clone-repos: + name: Clone Git Repos runs-on: mapfilemaker container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal:/mnt/4tbexternal + concurrency: + group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + steps: + - uses: actions/cache@v4 + with: + path: "~" + key: cache-${{ github.run_id }}-${{ github.run_attempt }} + - name: Checkout main repo + shell: bash + run: | + echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME" + cd ~ + git clone --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps + - name: Checkout wikiparser repo + shell: bash + run: | + cd ~ + git clone https://codeberg.org/comaps/wikiparser.git + - name: Checkout subways repo + shell: bash + run: | + cd ~ + git clone https://codeberg.org/comaps/subways.git + + copy-coasts: + if: inputs.jobs == 'copy-coasts' || inputs.jobs == 'all-except-upload' + name: Copy Previously Generated Coasts + runs-on: mapfilemaker + needs: + - clone-repos + container: + image: codeberg.org/comaps/maps_generator:f6d53d54f794 + volumes: + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet concurrency: group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true @@ -47,336 +99,403 @@ 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 + echo "WorldCoasts available:" + ls -al /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.* + + if [ -f /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom ]; then + + echo "Before:" + ls -al /home/planet/latest_coasts* + + cp -p /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom /home/planet/latest_coasts.geom + cp -p /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.rawgeom /home/planet/latest_coasts.rawgeom + + echo "After:" + ls -al /home/planet/latest_coasts* + + else + + echo "No WorldCoasts found." + fi update-planet: - if: inputs.jobs == 'planet' || inputs.jobs == 'all' + if: inputs.jobs == 'planet' || inputs.jobs == 'all-except-upload' name: Update Planet runs-on: mapfilemaker + needs: + - clone-repos container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet 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 + # TODO: replace wget2 with curl -Z 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 + else + echo "planet-latest.osm.pbf was found, raw download not required." fi - name: Update Planet shell: bash run: | - cd /media/4tbexternal/osm-planet/planet/ - pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -vv --size 16384 + cd /home/planet/planet/ + rm -f planet-latest-new.osm.pbf + pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384 mv planet-latest-new.osm.pbf planet-latest.osm.pbf - name: Converting planet-latest.osm.pbf to planet.o5m - run: /root/OM/osmctools/osmconvert planet-latest.osm.pbf -o=planet.o5m + # TODO: better to run osmupdate (not convert) just before starting the maps jobs - for max fresh data. + run: | + echo "Starting..." + cd /home/planet/planet/ + osmconvert -v --drop-author --drop-version --hash-memory=4000 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' + if: inputs.jobs == 'wiki' || inputs.jobs == 'all-except-upload' name: Update Wikipedia runs-on: mapfilemaker + needs: + - clone-repos container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet 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 + - uses: actions/cache@v4 + with: + path: "~" + key: cache-${{ github.run_id }}-${{ github.run_attempt }} - name: Check for planet file shell: bash + # TODO: remove debug output 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: Only get new dumps once per 30 days + shell: bash + run: | + if [[ '${{ inputs.reset }}' == 'wiki-ratelimit' ]]; then + echo "Bypassing wiki rate limit upon request." + exit 0 + fi + + datediff() { + d1=$(date -d "$1" +%s) + d2=$(date -d "$2" +%s) + echo $(( (d1 - d2) / 86400 )) + } + RECENTDUMPDATE=$(find /home/planet/wikipedia/dumps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6) + TODAY=$(date +%Y%m%d) + DATEDIFF=$(datediff $TODAY $RECENTDUMPDATE) + if [ $DATEDIFF -lt 30 ]; then + echo "ERROR: The most recent wiki dump is from $RECENTDUMPDATE, $DATEDIFF days ago. Wikimedia limits users to 15 snapshot requests per month." + echo "Set the 'reset' option to 'wiki-ratelimit' to bypass this." + ls -al /home/planet/wikipedia/dumps/ 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? pastk: no need, its being updated / augmented + mkdir -p /home/planet/wikipedia/dumps + mkdir -p /home/planet/wikipedia/build + cd ~/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" + - name: Check that the latest dumps are present, recent, and not super tiny + shell: bash + run: | + FAILCHECK=0 + + # Check all .tar.gz files in /home/planet/wikipedia/dumps/latest/ + for file in /home/planet/wikipedia/dumps/latest/*.tar.gz; do + # Check if file exists (handles case where glob doesn't match) + [ -e "$file" ] || continue + + # Get file size in MB and modification time in days + size_mb=$(stat -f%z "$file" 2>/dev/null | awk '{print int($1/1024/1024)}' || stat -c%s "$file" | awk + '{print int($1/1024/1024)}') + days_old=$(find "$file" -mtime -7 | wc -l) + + # Verify conditions + if [ "$size_mb" -lt 100 ]; then + echo "FAIL: $file is only ${size_mb}MB (< 100MB)" + FAILCHECK=1 + elif [ "$days_old" -eq 0 ]; then + echo "FAIL: $file is older than 7 days" + ls -al $file + FAILCHECK=1 + else + echo "PASS: $file (${size_mb}MB, modified within 7 days)" + fi + done + + exit $FAILCHECK + - 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=Wiki update is done!' update-isolines: - if: inputs.jobs == 'isolines' || inputs.jobs == 'all' + if: inputs.jobs == 'isolines' || inputs.jobs == 'all-except-upload' name: Update Isolines runs-on: mapfilemaker + needs: + - clone-repos container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet 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 + - uses: actions/cache@v4 + with: + path: "~" + key: cache-${{ github.run_id }}-${{ github.run_attempt }} + # 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 + # TODO: preserve previous isolines version? + # TODO: cleanup the tmp-tiles dir after completion run: | - cd /media/4tbexternal/comaps-init/ - ./tools/unix/build_omim.sh -R topography_generator_tool - rm -rf ../osm-planet/isolines/ - mkdir ../osm-planet/isolines/ - ../omim-build-relwithdebinfo/topography_generator_tool \ + cd ~/comaps/ + ./tools/unix/build_omim.sh -p ~ -R topography_generator_tool + 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/ \ - --threads=22 + --srtm_path=/home/planet/SRTM-patched-europe/ \ + --threads=96 + - name: Check isolines + shell: bash + run: | + NUMISO=$(ls -al /home/planet/isolines/*.isolines | wc -l) + echo "Found $NUMISO isolines" + if [ $NUMISO -lt 10 ]; then + echo "ERROR: Did generation fail?" + exit 1 + 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=Isolines are done!' update-subways: - if: inputs.jobs == 'subways' || inputs.jobs == 'all' + if: inputs.jobs == 'subways' || inputs.jobs == 'all-except-upload' name: Update Subways runs-on: mapfilemaker + needs: + - clone-repos container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet 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 + - uses: actions/cache@v4 + with: + path: "~" + key: cache-${{ github.run_id }}-${{ github.run_attempt }} - name: Update Subways shell: bash run: | - cd /media/4tbexternal/comaps-init/ + cd ~/comaps/ cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh ./tools/unix/maps/generate_subways.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=Subways are done!' update-tiger: - if: inputs.jobs == 'tiger' || inputs.jobs == 'all' + if: inputs.jobs == 'tiger' || inputs.jobs == 'all-except-upload' name: Update TIGER runs-on: mapfilemaker + needs: + - clone-repos container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet 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 + - uses: actions/cache@v4 + with: + path: "~" + key: cache-${{ github.run_id }}-${{ github.run_attempt }} - name: Build address_parser shell: bash run: | - cd /media/4tbexternal/comaps-init - rm -rf ../omim-build-relwithdebinfo/CMakeCache.txt - rm -rf ../omim-build-relwithdebinfo/CMakeFiles - ./tools/unix/build_omim.sh -R address_parser_tool + cd ~/comaps + #rm -rf ~/omim-build-relwithdebinfo/CMakeCache.txt + #rm -rf ~/omim-build-relwithdebinfo/CMakeFiles + ./tools/unix/build_omim.sh -p ~ -R address_parser_tool - name: Update TIGER from Nominatim shell: bash + # TODO: use curl instead of wget2 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 ~/comaps + tar -xOzf /home/planet/tiger-nominatim-preprocessed-latest.csv.tar.gz | ~/omim-build-relwithdebinfo/address_parser_tool --output_path=/home/planet/tiger generate-maps: - if: inputs.jobs == 'maps' || inputs.jobs == 'all' + if: inputs.jobs == 'maps' || inputs.jobs == 'all-except-upload' name: Generate Maps runs-on: mapfilemaker + needs: + - clone-repos + timeout-minutes: 40320 container: - image: ubuntu:latest + image: codeberg.org/comaps/maps_generator:f6d53d54f794 volumes: - - /media/4tbexternal:/media/4tbexternal + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet 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 + - uses: actions/cache@v4 + with: + path: "~" + key: cache-${{ github.run_id }}-${{ github.run_attempt }} - name: Make output folders if necessary shell: bash run: | - if [ ! -d /media/4tbexternal/osm-maps ]; then - mkdir -p /media/4tbexternal/osm-maps + if [ ! -d /mnt/4tbexternal/osm-maps ]; then + mkdir -p /mnt/4tbexternal/osm-maps fi - name: Get SRTM if necessary + # TODO: it should be a separate step like Wiki or isolines 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 \ No newline at end of file + cd ~/comaps + bash ./tools/unix/maps/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' + name: Upload Maps + runs-on: mapfilemaker + container: + image: codeberg.org/comaps/maps_generator:f6d53d54f794 + volumes: + - /mnt/4tbexternal/:/mnt/4tbexternal/ + - /mnt/4tbexternal/osm-planet:/home/planet + concurrency: + group: ${{ github.workflow }}-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 + - name: Upload map files to CDNs + shell: bash + run: | + shopt -s nullglob + buildfolder=$(find /mnt/4tbexternal/osm-maps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f5) + builddate=$(find /mnt/4tbexternal/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6) + mwmfiles=( /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/*.mwm ) + + if (( ${#mwmfiles[@]} )); then + echo "<$(date +%T)> Uploading maps from $buildfolder/$builddate..." + cd ~/comaps/tools/unix/maps + ./upload_to_cdn.sh /mnt/4tbexternal/osm-maps/$buildfolder/$builddate + echo "<$(date +%T)> Finished uploading maps from $buildfolder/$builddate." + else + echo "<$(date +%T)> No MWM files in /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps." + echo "<$(date +%T)> Found top level: $(ls -alt /mnt/4tbexternal/osm-maps/*)" + echo "<$(date +%T)> Found second level: $(ls -alt /mnt/4tbexternal/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!' + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 917d1ef11..d6419bc01 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ Makefile.Release object_script.*.Debug object_script.*.Release compile_commands.json +*.local.* stxxl.errlog stxxl.log diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ba193a9d..a1791f75e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,10 +175,10 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6) set(MINIMUM_REQUIRED_QT_VERSION 6.4.0) - if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION}) - message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}") + if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION}) + message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}") else() - message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}") + message(STATUS "Found Qt version: ${Qt6_VERSION}") endif() endif() @@ -222,6 +222,11 @@ if (PLATFORM_DESKTOP AND NOT WITH_SYSTEM_PROVIDED_3PARTY) include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include") endif() +# Android fails to find boost in many cases, this fixes it. +if (PLATFORM_ANDROID) + include_directories("${OMIM_ROOT}/3party/boost") +endif() + # Used in qt/ and shaders/ find_package(Python3 REQUIRED COMPONENTS Interpreter) diff --git a/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt b/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/android/app/src/fdroid/play/listings/da-DK/full-description.txt b/android/app/src/fdroid/play/listings/da-DK/full-description.txt new file mode 100644 index 000000000..99177587f --- /dev/null +++ b/android/app/src/fdroid/play/listings/da-DK/full-description.txt @@ -0,0 +1,33 @@ +En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME. + +Læs mere om grundlaget for projektet og dets udviklingsretnign på codeberg.org/comaps. +Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden. +• Brug appen og fortæl andre om den +• Giv feedback anmeld fejl +• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden. + +‣ Offlinefokuseret: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse. +‣ Respekt for privatlivets fred: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri. +‣ Enkel og elegant: de essentielle funktioner er nemme at bruge, og de virker bare. +‣ Sparer på batteriet og på lagerpladsen: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug. +‣ Gratis og bygget i fællesskab: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge. +‣ Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source. + +Hovedfunktioner +• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort. +• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm. +• Gangstier og cykelstier +• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre. +• Søg efter stednavn, adresse, eller type af sted. +• Gem dine yndlingssteder som bogmærker med et enkelt tryk. +• iCloud synkronisering af bogmærker og optagede spor. +• Offline artikler fra Wikipedia. +• Metro-lag med navigation. +• Optagelse af spor. +• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX. +• Mørk tilstand til brug om natten. +• Mulighed for at forbedre kortet vha. en indbygget editor. +• CarPlay understøttes. + +Friheden er ankommet +Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet! diff --git a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt index c5f73ec74..09adddc92 100644 --- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt +++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt @@ -1,8 +1,11 @@ -• OpenStreetMap-Daten vom 4. November -• 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 -Weitere Änderungen finden in unseren Codeberg-Versionshinweisen! +• OpenStreetMap-Daten vom 16. November +• Bäume hinzugefügt +• Kleine Bushaltestellen-Icons die früher angezeigt werden +• Sichtbarkeit von Eingängen reduziert +• Neue POI-Typen hinzugefügt +• Sandflächen werden auf Karte angezeigt +• Option „Geschäft ist leerstehend” zum OSM-Editor hinzugefügt +• Straßenbeschilderung in Europa verbessert +• Option „Asphaltierte Straßen vermeiden” hinzugefügt +• Icons in den Einstellungen hinzugefügt +Weitere Änderungen in unseren Codeberg-Versionshinweisen! diff --git a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png index 770a7195f..4e8b72711 100644 Binary files a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png and b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png differ diff --git a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png index d04905e08..13c50f680 100644 Binary files a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png and b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png differ diff --git a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png index 8e97d1c84..66bea2275 100644 Binary files a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png and b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png differ diff --git a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png index 9d66dc997..48fd90bc2 100644 Binary files a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png and b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png differ diff --git a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png index 74b8ed30b..20cc6282f 100644 Binary files a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png and b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png differ diff --git a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png index 79f62979c..130a80757 100644 Binary files a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png and b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png differ diff --git a/android/app/src/fdroid/play/listings/en-US/release-notes.txt b/android/app/src/fdroid/play/listings/en-US/release-notes.txt index 46a6a62a0..14bcd78f6 100644 --- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt +++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt @@ -1,8 +1,11 @@ -• 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 +• OpenStreetMap data as of November 16 +• Added trees +• Made bus stop icons smaller and show up earlier +• Reduce visibility of entrances +• Added several other POI types +• Show sand areas on the map +• Add business is vacant option to the OSM editor +• Improved road shields in Europe +• Avoid paved roads routing option +• Added icons to the settings page Check our Codeberg release notes for more changes! diff --git a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt index e44843c59..8e684aaef 100644 --- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt +++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt @@ -1,7 +1,11 @@ -• Datos OSM del 04/11 -• 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 +• Nuevos datos OSM a 16.11.25 +• Se añaden árboles +• Se reducen los iconos de paradas de autobús y aparecen antes +• Se reduce visibilidad de entradas +• Se añaden muchos tipos de puntos de interés +• Se muestran las zonas de arena en el mapa +• Se añade la opción «negocio vacío» al editor +• Se mejoran las señales de tráfico en Europa +• Nueva opción «evitar caminos asfaltadas» +• Nuevos iconos en la página de configuración Más detalles en Codeberg diff --git a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png index 4c86924be..5324867fd 100644 Binary files a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png and b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png differ diff --git a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png index d04905e08..13c50f680 100644 Binary files a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png and b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png differ diff --git a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png index 8e97d1c84..a354cd881 100644 Binary files a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png and b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png differ diff --git a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png index 9d66dc997..ff372433e 100644 Binary files a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png and b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png differ diff --git a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png index df287d0b7..c821a3e2c 100644 Binary files a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png and b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png differ diff --git a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png index 79f62979c..e1c9d9f6a 100644 Binary files a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png and b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png differ diff --git a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt index 208394539..fac593f6f 100644 --- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt +++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt @@ -1,8 +1,11 @@ -• Données OpenStreetMap au 4 novembre -• 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 +• Données OpenStreetMap du 16 novembre +• Ajout des arbres +• Les icônes des arrêts de bus sont plus petites et apparaissent plus tôt +• Réduction de la visibilité des entrées +• Ajout de nouveaux types de POI +• Affichage des zones de sable +• Nouveau bouton pour signaler un commerce vacant +• Amélioration des badges routiers en Europe +• Ajout d'une option pour éviter les routes pavées +• Ajout d'icônes dans les paramètres Plus d'informations sur notre Codeberg diff --git a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt new file mode 100644 index 000000000..4886fd635 --- /dev/null +++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt @@ -0,0 +1,11 @@ +• Mappe OSM al 16 Novembre +• Aggiunti alberi +• Fermate bus più piccole e visibili prima +• Entrate rese meno ingombranti +• Aggiunti diversi POI +• Le zone sabbiose sono ora visibili +• Aggiunta l'opzione di POI vacante nell'editor OSM +• Migliorate le insegne stradali in Europa +• Aggiunta opzione per evitare strade pavimentate +• Aggiunte icone nelle impostazioni +Visita Codeberg per ulteriori dettagli diff --git a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt index 8d1ebb202..3deabb02c 100644 --- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt +++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt @@ -1,7 +1,11 @@ -• Dados OSM de 04/11 -• Í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 -Confira nossas notas de lançamento no Codeberg para mais detalhes! +• Dados OSM de 16/11 +• Adição de árvores ao mapa +• Ícones de pontos de ônibus menores e exibidos mais cedo +• Visibilidade reduzida das entradas +• Adição de diversos outros tipos de Pontos de Interesse +• Exibição de áreas de areia no mapa +• Adição de opção de "Estabelecimento vazio" ao editor do OSM +• Melhorias nas placas de rodovias na Europa +• Opção para evitar rotas por estradas pavimentadas +• Adição de ícones nas configurações +Confira as notas de lançamento do Codeberg para mais detalhes! diff --git a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt index 10b3ac6b5..40e8ed7cd 100644 --- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt +++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt @@ -1,8 +1,10 @@ -• Карты OpenStreetMap от 4 ноября -• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов -• На зарядных станциях показываются имеющиеся типы разъёмов -• Добавлены эстрады, скамейки без спинок и лежаки -• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов -• Несколько улучшений и исправлений в поиске -• Улучшены голосовые подсказки при навигации +• Карты OpenStreetMap от 16 ноября +• Добавлены деревья и песчаные области +• Автобусные остановки показываются раньше, но маленькими иконами +• Входы разделены по типам +• В OSM редакторе можно отметить место как неиспользуемое +• Улучшения в иконках номеров дорог в Европе +• Возможность избегать дорог с покрытием при построении маршрута +• Иконки в экране настроек +• На карту добавлены несколько новых типов объектов Подробнее смотрите на codeberg.org/comaps/comaps/releases diff --git a/android/app/src/fdroid/play/listings/sl/full-description.txt b/android/app/src/fdroid/play/listings/sl/full-description.txt new file mode 100644 index 000000000..6d112fd90 --- /dev/null +++ b/android/app/src/fdroid/play/listings/sl/full-description.txt @@ -0,0 +1,31 @@ +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 codeberg.org/comaps. +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 + +‣ Osredotočeno na uporabo brez povezave: 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. +‣ Spoštovanje zasebnosti: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov. +‣ Preprosto in dodelano: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo. +‣ Prihrani vašo baterijo in prostor.: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu. +‣ Brezplačno in ustvarjeno v skupnosti: 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. +‣ Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno. + +Glavne zmogljivosti: +• 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 + +Svoboda je tu +Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju! diff --git a/android/app/src/fdroid/play/listings/sr/release-notes.txt b/android/app/src/fdroid/play/listings/sr/release-notes.txt new file mode 100644 index 000000000..332728494 --- /dev/null +++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt @@ -0,0 +1,11 @@ +• Подaци са OpenStreetMap-а закључно са 16. новембром +• Додате ознаке за дрвеће +• Смањене иконе аутобуских стајалишта и ранији приказ +• Смањена видљивост улаза +• Додато неколико нових типова ознака на мапу +• Приказ пешчаних површина на мапи +• Додата опција „пословни простор је празан“ у OSM едитору +• Побољшани путокази у Европи +• Опција рутирања „избегавај асфалтиране путеве“ +• Додате иконе на страници подешавања +Погледајте детаље на Codeberg-у за списак свих промена! diff --git a/android/app/src/fdroid/play/listings/sv-SE/title.txt b/android/app/src/fdroid/play/listings/sv-SE/title.txt new file mode 100644 index 000000000..3d2c9da71 --- /dev/null +++ b/android/app/src/fdroid/play/listings/sv-SE/title.txt @@ -0,0 +1 @@ +Comaps- Vandra, Cykla, Kör Offline, Privat diff --git a/android/app/src/fdroid/play/listings/ta-IN/full-description.txt b/android/app/src/fdroid/play/listings/ta-IN/full-description.txt new file mode 100644 index 000000000..5f63a15e6 --- /dev/null +++ b/android/app/src/fdroid/play/listings/ta-IN/full-description.txt @@ -0,0 +1,32 @@ +OpenStreetMap தரவை அடிப்படையாகக் கொண்ட சமூகம் தலைமையிலான இலவச மற்றும் திறந்த மூல வரைபட பயன்பாடு மற்றும் வெளிப்படைத்தன்மை, தனியுரிமை மற்றும் இலாப நோக்கற்றது ஆகியவற்றுக்கான அர்ப்பணிப்புடன் வலுவூட்டப்பட்டது. CoMaps என்பது ஆர்கானிக் மேப்சின் ஃபோர்க்/ச்பின்-ஆஃப் ஆகும், இது Maps.ME இன் ஃபோர்க் ஆகும். + +திட்டத்திற்கான காரணங்கள் மற்றும் அதன் திசையை codeberg.org/comaps இல் படிக்கவும். +அங்குள்ள சமூகத்தில் சேர்ந்து சிறந்த வரைபட பயன்பாட்டை உருவாக்க உதவுங்கள் +• பயன்பாட்டைப் பயன்படுத்தி, அதைப் பற்றிய தகவலைப் பரப்புங்கள் +• கருத்துக்களை வழங்கவும் மற்றும் சிக்கல்களைப் புகாரளிக்கவும் +• பயன்பாட்டில் அல்லது OpenStreetMap இணையதளத்தில் வரைபடத் தரவைப் புதுப்பிக்கவும் + +‣ ஆஃப்லைனில் கவனம் செலுத்தப்பட்டது: செல்லுலார் சேவையின் தேவையின்றி உங்களின் வெளிநாட்டுப் பயணத்தைத் திட்டமிட்டு வழிநடத்துங்கள், தொலைதூர பயணத்தில் இருக்கும் போது வழிப் புள்ளிகளைத் தேடுங்கள். +‣ தனியுரிமைக்கு மதிப்பளித்தல்: பயன்பாடு தனியுரிமையை மனதில் கொண்டு வடிவமைக்கப்பட்டுள்ளது - நபர்களை அடையாளம் காணாது, கண்காணிக்காது மற்றும் தனிப்பட்ட தகவல்களைச் சேகரிக்காது. விளம்பரங்கள் இல்லாதது. +‣ எளிமையான மற்றும் மெருகூட்டப்பட்டது: செயல்படும் நற்பொருத்தங்கள் பயன்படுத்த எளிதானது. +‣ உங்கள் பேட்டரி மற்றும் இடத்தைச் சேமிக்கிறது: மற்ற வழிசெலுத்தல் பயன்பாடுகளைப் போல உங்கள் பேட்டரியை வெளியேற்றாது. சிறிய வரைபடங்கள் உங்கள் தொலைபேசியில் விலைமதிப்பற்ற இடத்தை சேமிக்கின்றன. +‣ இலவசம் மற்றும் சமூகத்தால் உருவாக்கப்பட்டது: OpenStreetMap இல் இடங்களைச் சேர்ப்பதன் மூலமும், சோதனை செய்து, அம்சங்களைப் பற்றிய கருத்துக்களை வழங்குவதன் மூலமும், அவர்களின் மேம்பாட்டுத் திறன்களையும் பணத்தையும் பங்களிப்பதன் மூலமும் உங்களைப் போன்றவர்கள் பயன்பாட்டை உருவாக்க உதவியுள்ளனர். +‣ திறந்த மற்றும் வெளிப்படையான முடிவெடுக்கும் மற்றும் நிதியியல், இலாப நோக்கற்ற மற்றும் முழு திறந்த மூல. + +முக்கிய அம்சங்கள்: +• கூகுள் மேப்சில் இல்லாத இடங்களுடன் தரவிறக்கம் செய்யக்கூடிய விரிவான வரைபடங்கள் +• ஐகிங் பாதைகள், முகாம்கள், நீர் ஆதாரங்கள், சிகரங்கள், விளிம்பு கோடுகள் போன்றவற்றைக் கொண்ட வெளிப்புறப் பயன்முறை +• நடைபாதைகள் மற்றும் சைக்கிள் பாதைகள் +• உணவகங்கள், எரிவாயு நிலையங்கள், ஓட்டல்கள், கடைகள், சுற்றிப்பார்க்கும் இடங்கள் மற்றும் பல போன்ற ஆர்வமுள்ள இடங்கள் +• பெயர் அல்லது முகவரி அல்லது ஆர்வமுள்ள வகை மூலம் தேடவும் +• நடைபயிற்சி, சைக்கிள் ஓட்டுதல் அல்லது வண்டி ஓட்டுவதற்கான குரல் அறிவிப்புகளுடன் வழிசெலுத்தல் +• ஒரே தட்டினால் உங்களுக்குப் பிடித்த இடங்களை புத்தகக்குறி செய்யவும் +• இணைப்பில்லாத விக்கிபீடியா கட்டுரைகள் +• சுரங்கப்பாதை போக்குவரத்து அடுக்கு மற்றும் திசைகள் +• ட்ராக் ரெக்கார்டிங் +• KML, KMZ, GPX வடிவங்களில் புக்மார்க்குகள் மற்றும் டிராக்குகளை ஏற்றுமதி மற்றும் இறக்குமதி செய்யுங்கள் +• இரவில் பயன்படுத்த ஒரு இருண்ட பயன்முறை +• அடிப்படை உள்ளமைக்கப்பட்ட எடிட்டரைப் பயன்படுத்தி அனைவருக்கும் வரைபடத் தரவை மேம்படுத்தவும் + +சுதந்திரம் இங்கே உள்ளது +உங்கள் பயணத்தைக் கண்டறியவும், தனியுரிமை மற்றும் சமூகத்தை முன்னணியில் கொண்டு உலகிற்கு செல்லவும்! diff --git a/android/app/src/fdroid/play/listings/ta-IN/short-description.txt b/android/app/src/fdroid/play/listings/ta-IN/short-description.txt new file mode 100644 index 000000000..305a39245 --- /dev/null +++ b/android/app/src/fdroid/play/listings/ta-IN/short-description.txt @@ -0,0 +1 @@ +எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது diff --git a/android/app/src/google/play/listings/sv-SE/title.txt b/android/app/src/google/play/listings/sv-SE/title.txt new file mode 100644 index 000000000..f3d5711fa --- /dev/null +++ b/android/app/src/google/play/listings/sv-SE/title.txt @@ -0,0 +1 @@ +Comaps- Navigera Privat diff --git a/android/app/src/google/play/listings/ta-IN/short-description.txt b/android/app/src/google/play/listings/ta-IN/short-description.txt new file mode 100644 index 000000000..305a39245 --- /dev/null +++ b/android/app/src/google/play/listings/ta-IN/short-description.txt @@ -0,0 +1 @@ +எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது diff --git a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java index cd4945903..7be2eb16d 100644 --- a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java +++ b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java @@ -1,11 +1,13 @@ 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; @@ -35,7 +37,11 @@ public class OsmUploadWork extends Worker if (Editor.nativeHasSomethingToUpload() && OsmOAuth.isAuthorized()) { final Constraints c = new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(); - final OneTimeWorkRequest wr = new OneTimeWorkRequest.Builder(OsmUploadWork.class).setConstraints(c).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(); WorkManager.getInstance(context).beginUniqueWork("UploadOsmChanges", ExistingWorkPolicy.KEEP, wr).enqueue(); } } diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java index 0f5c054ff..42d87a19e 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java @@ -18,9 +18,7 @@ import androidx.fragment.app.FragmentManager; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.SplashActivity; -import app.organicmaps.sdk.util.Config; import app.organicmaps.sdk.util.log.Logger; -import app.organicmaps.util.RtlUtils; import com.google.android.material.appbar.MaterialToolbar; import java.util.Objects; @@ -42,7 +40,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity { super.onCreate(savedInstanceState); EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); - RtlUtils.manageRtl(this); if (!MwmApplication.from(this).getOrganicMaps().arePlatformAndCoreInitialized()) { final Intent intent = Objects.requireNonNull(getIntent()); diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java index 90624f414..f7c6a0154 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java @@ -32,7 +32,8 @@ public class DrivingOptionsScreen extends BaseMapScreen new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved), new DrivingOption(RoadType.Ferry, R.string.avoid_ferry), new DrivingOption(RoadType.Motorway, R.string.avoid_motorways), - new DrivingOption(RoadType.Steps, R.string.avoid_steps)}; + new DrivingOption(RoadType.Steps, R.string.avoid_steps), + new DrivingOption(RoadType.Paved, R.string.avoid_paved)}; @NonNull private final Map mInitialDrivingOptionsState = new HashMap<>(); diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java index b6bdde58e..344be4734 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java +++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java @@ -357,7 +357,7 @@ class DownloaderAdapter extends RecyclerView.Adapter onCancelActionSelected(mSelectedItem)); + return new MenuBottomSheetItem(R.string.cancel, R.drawable.ic_close, () -> onCancelActionSelected(mSelectedItem)); } private class ItemViewHolder extends BaseInnerViewHolder diff --git a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java index a08f20e71..5945ad8c8 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java +++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java @@ -4,6 +4,7 @@ import android.location.Location; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import app.organicmaps.MwmActivity; @@ -26,6 +27,10 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener { private static boolean sAutodownloadLocked; + private static final int HIDE_THRESHOLD = 2; + // Default bundles (e.g., world/coasts). Used to approximate “user-downloaded” count. + private static final int DEFAULT_MAP_BASELINE = 2; + private final MwmActivity mActivity; private final View mFrame; private final MaterialTextView mParent; @@ -33,6 +38,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener private final MaterialTextView mSize; private final WheelProgressView mProgress; private final MaterialButton mButton; + private final View mOfflineExplanation; private int mStorageSubscriptionSlot; @@ -43,8 +49,10 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener @Override public void onStatusChanged(List data) { - if (mCurrentCountry == null) + if (mCurrentCountry == null) { + updateOfflineExplanationVisibility(); return; + } for (MapManager.StorageCallbackData item : data) { @@ -58,7 +66,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener { mCurrentCountry.update(); updateProgressState(false); - + updateOfflineExplanationVisibility(); return; } } @@ -101,6 +109,12 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener return enqueued || progress || applying; } + private void updateOfflineExplanationVisibility() { + if (mOfflineExplanation == null) return; + // hide once threshold reached; safe to call repeatedly. + app.organicmaps.util.UiUtils.showIf(MapManager.nativeGetDownloadedCount() < (DEFAULT_MAP_BASELINE + HIDE_THRESHOLD), mOfflineExplanation); + } + private void updateProgressState(boolean shouldAutoDownload) { updateStateInternal(shouldAutoDownload); @@ -108,6 +122,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener private void updateStateInternal(boolean shouldAutoDownload) { + updateOfflineExplanationVisibility(); + boolean showFrame = (mCurrentCountry != null && !mCurrentCountry.present && !RoutingController.get().isNavigating()); if (showFrame) @@ -191,6 +207,9 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener mProgress = controls.findViewById(R.id.wheel_downloader_progress); mButton = controls.findViewById(R.id.downloader_button); + mOfflineExplanation = mFrame.findViewById(R.id.offline_explanation); + updateOfflineExplanationVisibility(); + mProgress.setOnClickListener(v -> { if (mCurrentCountry == null) return; @@ -247,6 +266,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener public void onResume() { + updateOfflineExplanationVisibility(); if (mStorageSubscriptionSlot == 0) { mStorageSubscriptionSlot = MapManager.nativeSubscribe(mStorageCallback); diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java index 336358569..0a728c985 100644 --- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java @@ -153,6 +153,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe private final Map mDetailsBlocks = new HashMap<>(); private final Map mSocialMediaBlocks = new HashMap<>(); private MaterialButton mReset; + private MaterialButton mDisused; private EditorHostFragment mParent; @@ -827,6 +828,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe osmInfo.setMovementMethod(LinkMovementMethod.getInstance()); mReset = view.findViewById(R.id.reset); mReset.setOnClickListener(this); + mDisused = view.findViewById(R.id.disused); + mDisused.setOnClickListener(this); mDetailsBlocks.put(Metadata.MetadataType.FMD_OPEN_HOURS, blockOpeningHours); mDetailsBlocks.put(Metadata.MetadataType.FMD_PHONE_NUMBER, blockPhone); @@ -894,6 +897,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe mParent.addLanguage(); else if (id == R.id.reset) reset(); + else if (id == R.id.disused) + placeDisused(); else if (id == R.id.block_outdoor_seating) mOutdoorSeating.toggle(); } @@ -939,9 +944,12 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe if (mParent.addingNewObject()) { UiUtils.hide(mReset); + UiUtils.hide(mDisused); return; } + mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE); + if (Editor.nativeIsMapObjectUploaded()) { mReset.setText(R.string.editor_place_doesnt_exist); @@ -1014,6 +1022,19 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe dialogFragment.setTextSaveListener(this::commitPlaceDoesntExists); } + private void placeDisused() + { + new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + .setTitle(R.string.editor_mark_business_vacant_title) + .setMessage(R.string.editor_mark_business_vacant_description) + .setPositiveButton(R.string.editor_submit, (dlg, which) -> { + Editor.nativeMarkPlaceAsDisused(); + mParent.processEditedFeatures(); + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); + } + private void commitPlaceDoesntExists(@NonNull String text) { Editor.nativePlaceDoesNotExist(text); diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java index 72ffc99b0..89b0cd961 100644 --- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java @@ -358,7 +358,7 @@ public class EditorHostFragment .show(); } - private void processEditedFeatures() + public void processEditedFeatures() { if (OsmOAuth.isAuthorized()) { diff --git a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java index 75ee40a7f..1355ad4a7 100644 --- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java @@ -1,7 +1,10 @@ package app.organicmaps.editor; +import android.content.res.Configuration; import android.os.Bundle; import androidx.annotation.NonNull; +import androidx.core.os.ConfigurationCompat; +import androidx.core.os.LocaleListCompat; import androidx.fragment.app.Fragment; import app.organicmaps.base.BaseMwmRecyclerFragment; import app.organicmaps.sdk.editor.Editor; @@ -11,6 +14,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Set; public class LanguagesFragment extends BaseMwmRecyclerFragment @@ -32,10 +36,23 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment Set existingLanguages = args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>(); + Configuration config = requireContext().getResources().getConfiguration(); + LocaleListCompat systemLocales = ConfigurationCompat.getLocales(config); + List languages = new ArrayList<>(); + List systemLanguages = new ArrayList<>(); + for (Language lang : Editor.nativeGetSupportedLanguages(false)) { - if (existingLanguages.contains(lang.code)) + // Separately extract system languages + for (int i = 0; i < systemLocales.size(); i++) + { + Locale locale = systemLocales.get(i); + if (locale != null && locale.getLanguage().equals(lang.code)) + systemLanguages.add(lang); + } + + if (existingLanguages.contains(lang.code) || systemLanguages.contains(lang)) continue; languages.add(lang); @@ -43,6 +60,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment Collections.sort(languages, Comparator.comparing(lhs -> lhs.name)); + languages.addAll(0, systemLanguages); + return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()])); } diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java index 5d972a7fb..1f9d2a346 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java @@ -1,5 +1,6 @@ package app.organicmaps.editor; +import android.content.res.ColorStateList; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -11,6 +12,7 @@ import androidx.annotation.IdRes; import androidx.annotation.IntRange; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; @@ -381,6 +383,29 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter { + private static final int SHORT_HORIZON_CLOSE_MIN = 60; + private static final int SHORT_HORIZON_OPEN_MIN = 15; + private final SearchFragment mSearchFragment; @Nullable private SearchResult[] mResults; @@ -149,41 +152,32 @@ class SearchAdapter extends RecyclerView.Adapter - { - if (result.description.minutesUntilClosed < 60) // less than 1 hour - { - final String time = result.description.minutesUntilClosed + " " + resources.getString(R.string.minute); - final String string = resources.getString(R.string.closes_in, time); - - UiUtils.setTextAndShow(mOpen, string); - mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow)); - } - else - { - UiUtils.setTextAndShow(mOpen, resources.getString(R.string.editor_time_open)); - mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_green)); - } + // Hide if unknown opening hours state + UiUtils.hide(mOpen); + return; } - case SearchResult.OPEN_NOW_NO -> - { - if (result.description.minutesUntilOpen < 60) // less than 1 hour - { - final String time = result.description.minutesUntilOpen + " " + resources.getString(R.string.minute); - final String string = resources.getString(R.string.opens_in, time); - UiUtils.setTextAndShow(mOpen, string); - mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red)); - } - else - { - UiUtils.setTextAndShow(mOpen, resources.getString(R.string.closed)); - mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red)); - } + final boolean isOpen = result.description.openNow == SearchResult.OPEN_NOW_YES; + final int minsToNextState = isOpen ? result.description.minutesUntilClosed : result.description.minutesUntilOpen; + + final boolean shortHorizonClosing = isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_CLOSE_MIN; + final boolean shortHorizonOpening = !isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_OPEN_MIN; + + if (shortHorizonClosing || shortHorizonOpening) + { + final String minsToChangeStr = resources.getQuantityString( + R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1)); + final String nextChangeFormatted = resources.getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr); + + UiUtils.setTextAndShow(mOpen, nextChangeFormatted); + mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow)); } - default -> UiUtils.hide(mOpen); + else + { + UiUtils.setTextAndShow(mOpen, isOpen ? resources.getString(R.string.editor_time_open) : resources.getString(R.string.closed)); + mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), isOpen ? R.color.base_green : R.color.base_red)); } } diff --git a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java index aee0aa2ce..6e1a213e4 100644 --- a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java @@ -90,28 +90,36 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment { SwitchCompat tollsBtn = root.findViewById(R.id.avoid_tolls_btn); tollsBtn.setChecked(RoutingOptions.hasOption(RoadType.Toll)); - CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll); + CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll, root); tollsBtn.setOnCheckedChangeListener(tollBtnListener); SwitchCompat motorwaysBtn = root.findViewById(R.id.avoid_motorways_btn); motorwaysBtn.setChecked(RoutingOptions.hasOption(RoadType.Motorway)); - CompoundButton.OnCheckedChangeListener motorwayBtnListener = new ToggleRoutingOptionListener(RoadType.Motorway); + CompoundButton.OnCheckedChangeListener motorwayBtnListener = + new ToggleRoutingOptionListener(RoadType.Motorway, root); motorwaysBtn.setOnCheckedChangeListener(motorwayBtnListener); SwitchCompat ferriesBtn = root.findViewById(R.id.avoid_ferries_btn); ferriesBtn.setChecked(RoutingOptions.hasOption(RoadType.Ferry)); - CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry); + CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry, root); ferriesBtn.setOnCheckedChangeListener(ferryBtnListener); SwitchCompat dirtyRoadsBtn = root.findViewById(R.id.avoid_dirty_roads_btn); dirtyRoadsBtn.setChecked(RoutingOptions.hasOption(RoadType.Dirty)); - CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty); + dirtyRoadsBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Paved) || RoutingOptions.hasOption(RoadType.Dirty)); + CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty, root); dirtyRoadsBtn.setOnCheckedChangeListener(dirtyBtnListener); SwitchCompat stepsBtn = root.findViewById(R.id.avoid_steps_btn); stepsBtn.setChecked(RoutingOptions.hasOption(RoadType.Steps)); - CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps); + CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps, root); stepsBtn.setOnCheckedChangeListener(stepsBtnListener); + + SwitchCompat pavedBtn = root.findViewById(R.id.avoid_paved_roads_btn); + pavedBtn.setChecked(RoutingOptions.hasOption(RoadType.Paved)); + pavedBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Dirty) || RoutingOptions.hasOption(RoadType.Paved)); + CompoundButton.OnCheckedChangeListener pavedBtnListener = new ToggleRoutingOptionListener(RoadType.Paved, root); + pavedBtn.setOnCheckedChangeListener(pavedBtnListener); } private static class ToggleRoutingOptionListener implements CompoundButton.OnCheckedChangeListener @@ -119,9 +127,13 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment @NonNull private final RoadType mRoadType; - private ToggleRoutingOptionListener(@NonNull RoadType roadType) + @NonNull + private final View mRoot; + + private ToggleRoutingOptionListener(@NonNull RoadType roadType, @NonNull View root) { mRoadType = roadType; + mRoot = root; } @Override @@ -131,6 +143,27 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment RoutingOptions.addOption(mRoadType); else RoutingOptions.removeOption(mRoadType); + + SwitchCompat dirtyRoadsBtn = mRoot.findViewById(R.id.avoid_dirty_roads_btn); + SwitchCompat pavedBtn = mRoot.findViewById(R.id.avoid_paved_roads_btn); + if (mRoadType == RoadType.Dirty) + { + pavedBtn.setEnabled(!isChecked); + if (isChecked) + { + pavedBtn.setChecked(false); + dirtyRoadsBtn.setEnabled(true); + } + } + else if (mRoadType == RoadType.Paved) + { + dirtyRoadsBtn.setEnabled(!isChecked); + if (isChecked) + { + dirtyRoadsBtn.setChecked(false); + pavedBtn.setEnabled(true); + } + } } } } diff --git a/android/app/src/main/java/app/organicmaps/util/RtlUtils.java b/android/app/src/main/java/app/organicmaps/util/RtlUtils.java deleted file mode 100644 index b138cad17..000000000 --- a/android/app/src/main/java/app/organicmaps/util/RtlUtils.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.organicmaps.util; - -import android.app.Activity; -import android.view.View; -import androidx.annotation.NonNull; -import androidx.core.text.TextUtilsCompat; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -public class RtlUtils -{ - private final static List rtlLocalesWithTranslation = Arrays.asList("ar", "fa"); - - public static void manageRtl(@NonNull final Activity activity) - { - final String currentLanguage = Locale.getDefault().getLanguage(); - final boolean isRTL = - TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL; - if (isRTL && rtlLocalesWithTranslation.contains(currentLanguage)) - activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_RTL); - else - activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_LTR); - } -} diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/OpenStateTextFormatter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/OpenStateTextFormatter.java new file mode 100644 index 000000000..0078902d7 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/OpenStateTextFormatter.java @@ -0,0 +1,49 @@ +package app.organicmaps.widget.placepage; + +import java.time.ZonedDateTime; +import java.time.format.TextStyle; +import java.util.Locale; + +public class OpenStateTextFormatter +{ + private OpenStateTextFormatter() {} + + static String formatHoursMinutes(int hour, int minute, boolean use24h) + { + if (use24h) + return String.format(Locale.ROOT, "%02d:%02d", hour, minute); + + int h = hour % 12; + if (h == 0) h = 12; + String ampm = (hour < 12) ? "AM" : "PM"; + return String.format(Locale.ROOT, "%d:%02d %s", h, minute, ampm); + } + + static boolean isSameLocalDate(ZonedDateTime a, ZonedDateTime b) + { + return a.toLocalDate().isEqual(b.toLocalDate()); + } + + static String dayShort(ZonedDateTime t, Locale locale) + { + return t.getDayOfWeek().getDisplayName(TextStyle.SHORT, locale); + } + + static String buildAtLabel( + boolean opens, + boolean isToday, + String dayShort, + String time, + String opensAtLocalized, + String closesAtLocalized, + String opensDayAtLocalized, + String closesDayAtLocalized + ) + { + if (isToday) + return opens ? String.format(Locale.ROOT, opensAtLocalized, time) // Opens at %s + : String.format(Locale.ROOT, closesAtLocalized, time); // Closes at %s + return opens ? String.format(Locale.ROOT, opensDayAtLocalized, dayShort, time) // Opens %s at %s + : String.format(Locale.ROOT, closesDayAtLocalized, dayShort, time); // Closes %s at %s + } +} diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index 46cf8439f..fb1b6f4a8 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -31,6 +31,8 @@ import androidx.fragment.app.FragmentFactory; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; + +import app.organicmaps.BuildConfig; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; @@ -85,9 +87,11 @@ import com.google.android.material.textview.MaterialTextView; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.time.format.TextStyle; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Locale; public class PlacePageView extends Fragment implements View.OnClickListener, View.OnLongClickListener, LocationListener, SensorListener, Observer, @@ -105,6 +109,9 @@ public class PlacePageView extends Fragment private static final String LINKS_FRAGMENT_TAG = "LINKS_FRAGMENT_TAG"; private static final String TRACK_SHARE_MENU_ID = "TRACK_SHARE_MENU_ID"; + private static final int SHORT_HORIZON_CLOSE_MIN = 60; + private static final int SHORT_HORIZON_OPEN_MIN = 15; + private static final List visibleCoordsFormat = Arrays.asList(CoordinatesFormat.LatLonDMS, CoordinatesFormat.LatLonDecimal, CoordinatesFormat.OLCFull, CoordinatesFormat.UTM, CoordinatesFormat.MGRS, CoordinatesFormat.OSMLink); @@ -797,57 +804,127 @@ public class PlacePageView extends Fragment final String ohStr = mMapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS); final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(ohStr); - if (timetables != null && timetables.length != 0) + // No valid timetable + if (timetables == null || timetables.length == 0) { - final Context context = requireContext(); - final OhState poiState = OpeningHours.nativeCurrentState(timetables); + UiUtils.hide(mTvOpenState); + return; + } - // Ignore unknown rule state - if (poiState.state == OhState.State.Unknown) + final Context context = requireContext(); + final OhState poiState = OpeningHours.nativeCurrentState(timetables); + + // Ignore unknown rule state + if (poiState.state == OhState.State.Unknown) + { + UiUtils.hide(mTvOpenState); + return; + } + + // Get colours + final ForegroundColorSpan colorGreen = + new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_green)); + final ForegroundColorSpan colorYellow = + new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_yellow)); + final ForegroundColorSpan colorRed = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_red)); + + // Get next state info + final SpannableStringBuilder openStateString = new SpannableStringBuilder(); + final boolean isOpen = (poiState.state == OhState.State.Open); // False == Closed due to early exit for Unknown + final long nextStateTime = isOpen ? poiState.nextTimeClosed : poiState.nextTimeOpen; // Unix time (seconds) + + ZonedDateTime nextChangeLocal = null; + boolean hasFiniteNextChange = false; + + final long nowSec = System.currentTimeMillis() / 1000; + final int minsToNextState = (int) ((nextStateTime - nowSec) / 60); + + // Try to resolve a finite next-change time; handle 24/7 case + final boolean looksLike247 = "24/7".equals(ohStr.trim()); + final int ONE_WEEK_MIN = 7 * 24 * 60; + final boolean noRealNextChange = looksLike247 || minsToNextState >= ONE_WEEK_MIN; + + if (!noRealNextChange) + { + try { - UiUtils.hide(mTvOpenState); - return; + if (nextStateTime > 0 && nextStateTime < Long.MAX_VALUE / 2) + { + // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone. + nextChangeLocal = ZonedDateTime.ofInstant( + Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault() + ); + hasFiniteNextChange = true; + } } + catch (Throwable ignored) {} + } - // Get colours - final ForegroundColorSpan colorGreen = - new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_green)); - final ForegroundColorSpan colorYellow = - new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_yellow)); - final ForegroundColorSpan colorRed = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_red)); - - // Get next state info - final SpannableStringBuilder openStateString = new SpannableStringBuilder(); - final boolean isOpen = (poiState.state == OhState.State.Open); // False == Closed due to early exit for Unknown - final long nextStateTime = isOpen ? poiState.nextTimeClosed : poiState.nextTimeOpen; // Unix time (seconds) - final int minsToNextState = (int) ((nextStateTime - (System.currentTimeMillis() / 1000)) / 60); - - if (minsToNextState <= 60) // POI opens/closes in 60 mins - { - final String minsToChangeStr = minsToNextState + " " + getString(R.string.minute); - final String nextChangeFormatted = getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr); - final ForegroundColorSpan nextChangeColor = isOpen ? colorYellow : colorRed; - // TODO: We should check closed/open time for specific feature's timezone. - ZonedDateTime time = ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault()); - String localizedTime = - new HoursMinutes(time.getHour(), time.getMinute(), DateUtils.is24HourFormat(context)).toString(); - - openStateString.append(nextChangeFormatted, nextChangeColor, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) - .append(" • ") // Add spacer - .append(getString(R.string.at, localizedTime)); - } - else if (isOpen) + if (!hasFiniteNextChange) // No valid next change + { + if (isOpen) openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - // TODO: Add "Closes at 18:00" etc - else // Closed + else openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - // TODO: Add "Opens at 18:00" etc UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString); return; } - // No valid timetable - UiUtils.hide(mTvOpenState); + + String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes( + nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context)); + + final boolean shortHorizonClosing = isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_CLOSE_MIN; + final boolean shortHorizonOpening = !isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_OPEN_MIN; + + if (shortHorizonClosing || shortHorizonOpening) // POI Opens/Closes in 60 mins • at 18:00 + { + final String minsToChangeStr = getResources().getQuantityString( + R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1)); + final String nextChangeFormatted = getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr); + + openStateString.append(nextChangeFormatted, colorYellow, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + .append(" • ") // Add spacer + .append(getString(R.string.at, localizedTimeString)); + } + else + { + final String opensAtStr = getString(R.string.opens_at); // "Opens at %s" + final String closesAtStr = getString(R.string.closes_at); // "Closes at %s" + final String opensDayAtStr = getString(R.string.opens_day_at); // "Opens %1$s at %2$s" + final String closesDayAtStr = getString(R.string.closes_day_at); // "Closes %1$s at %2$s" + + final boolean isToday = + OpenStateTextFormatter.isSameLocalDate(nextChangeLocal, ZonedDateTime.now(nextChangeLocal.getZone())); + // Full weekday name per design feedback. + final String dayName = + nextChangeLocal.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault()); + + if (isOpen) // > 60 minutes OR negative (safety). Show “Open now • Closes at 18:00” + { + openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + + final String atLabel = + OpenStateTextFormatter.buildAtLabel(false, isToday, dayName, localizedTimeString, + opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr); + + if (!TextUtils.isEmpty(atLabel)) + openStateString.append(" • ").append(atLabel); + } + else // Closed + { + openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + + final String atLabel = + OpenStateTextFormatter.buildAtLabel(true, isToday, dayName, localizedTimeString, + opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr); + + if (!TextUtils.isEmpty(atLabel)) + openStateString.append(" • ").append(atLabel); + } + } + + UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString); } private void addPlace() diff --git a/android/app/src/main/res/drawable-night/ic_category_atm.xml b/android/app/src/main/res/drawable-night/ic_category_atm.xml index 15bb41f97..6e128e7e2 100644 --- a/android/app/src/main/res/drawable-night/ic_category_atm.xml +++ b/android/app/src/main/res/drawable-night/ic_category_atm.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_bank.xml b/android/app/src/main/res/drawable-night/ic_category_bank.xml index 383ee5e6f..179a34ffc 100644 --- a/android/app/src/main/res/drawable-night/ic_category_bank.xml +++ b/android/app/src/main/res/drawable-night/ic_category_bank.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_children.xml b/android/app/src/main/res/drawable-night/ic_category_children.xml index 81e85f719..1b367665f 100644 --- a/android/app/src/main/res/drawable-night/ic_category_children.xml +++ b/android/app/src/main/res/drawable-night/ic_category_children.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_eat.xml b/android/app/src/main/res/drawable-night/ic_category_eat.xml index c8c7031f3..754297441 100644 --- a/android/app/src/main/res/drawable-night/ic_category_eat.xml +++ b/android/app/src/main/res/drawable-night/ic_category_eat.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_entertainment.xml b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml index 995b1eadb..59d955b01 100644 --- a/android/app/src/main/res/drawable-night/ic_category_entertainment.xml +++ b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_food.xml b/android/app/src/main/res/drawable-night/ic_category_food.xml index 6855997e2..e2180f489 100644 --- a/android/app/src/main/res/drawable-night/ic_category_food.xml +++ b/android/app/src/main/res/drawable-night/ic_category_food.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_fuel.xml b/android/app/src/main/res/drawable-night/ic_category_fuel.xml index a6e3b3bc6..4b8db7284 100644 --- a/android/app/src/main/res/drawable-night/ic_category_fuel.xml +++ b/android/app/src/main/res/drawable-night/ic_category_fuel.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_hospital.xml b/android/app/src/main/res/drawable-night/ic_category_hospital.xml index cded0e193..5644ca360 100644 --- a/android/app/src/main/res/drawable-night/ic_category_hospital.xml +++ b/android/app/src/main/res/drawable-night/ic_category_hospital.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_hotel.xml b/android/app/src/main/res/drawable-night/ic_category_hotel.xml index b91fcd69d..b5ead3a8e 100644 --- a/android/app/src/main/res/drawable-night/ic_category_hotel.xml +++ b/android/app/src/main/res/drawable-night/ic_category_hotel.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_nightlife.xml b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml index ee4132e8c..e398f979a 100644 --- a/android/app/src/main/res/drawable-night/ic_category_nightlife.xml +++ b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_parking.xml b/android/app/src/main/res/drawable-night/ic_category_parking.xml index 4d356bff7..78b459014 100644 --- a/android/app/src/main/res/drawable-night/ic_category_parking.xml +++ b/android/app/src/main/res/drawable-night/ic_category_parking.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml index 9142c07d1..963468d60 100644 --- a/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml +++ b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_police.xml b/android/app/src/main/res/drawable-night/ic_category_police.xml index d6e34393e..71eb3cb85 100644 --- a/android/app/src/main/res/drawable-night/ic_category_police.xml +++ b/android/app/src/main/res/drawable-night/ic_category_police.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_post.xml b/android/app/src/main/res/drawable-night/ic_category_post.xml index 32c20338a..703f25311 100644 --- a/android/app/src/main/res/drawable-night/ic_category_post.xml +++ b/android/app/src/main/res/drawable-night/ic_category_post.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_recycling.xml b/android/app/src/main/res/drawable-night/ic_category_recycling.xml index 174d3c5d8..23da63c76 100644 --- a/android/app/src/main/res/drawable-night/ic_category_recycling.xml +++ b/android/app/src/main/res/drawable-night/ic_category_recycling.xml @@ -5,7 +5,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_rv.xml b/android/app/src/main/res/drawable-night/ic_category_rv.xml index 16bde5ebe..b790b9e51 100644 --- a/android/app/src/main/res/drawable-night/ic_category_rv.xml +++ b/android/app/src/main/res/drawable-night/ic_category_rv.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_secondhand.xml b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml index 57416845e..7594da661 100644 --- a/android/app/src/main/res/drawable-night/ic_category_secondhand.xml +++ b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_shopping.xml b/android/app/src/main/res/drawable-night/ic_category_shopping.xml index 245ac5b3b..984f6c6bb 100644 --- a/android/app/src/main/res/drawable-night/ic_category_shopping.xml +++ b/android/app/src/main/res/drawable-night/ic_category_shopping.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_toilet.xml b/android/app/src/main/res/drawable-night/ic_category_toilet.xml index ff8f84bb5..39a945a8d 100644 --- a/android/app/src/main/res/drawable-night/ic_category_toilet.xml +++ b/android/app/src/main/res/drawable-night/ic_category_toilet.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_tourism.xml b/android/app/src/main/res/drawable-night/ic_category_tourism.xml index 7f972a181..0d4a5b615 100644 --- a/android/app/src/main/res/drawable-night/ic_category_tourism.xml +++ b/android/app/src/main/res/drawable-night/ic_category_tourism.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable-night/ic_category_wifi.xml b/android/app/src/main/res/drawable-night/ic_category_wifi.xml index 52732cb30..eb6914478 100644 --- a/android/app/src/main/res/drawable-night/ic_category_wifi.xml +++ b/android/app/src/main/res/drawable-night/ic_category_wifi.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_avoid_motoways_enabled.xml b/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_avoid_motoways_enabled.xml rename to android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml diff --git a/android/app/src/main/res/drawable/ic_browse_activity.xml b/android/app/src/main/res/drawable/ic_browse_activity.xml new file mode 100644 index 000000000..4bb647699 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_browse_activity.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_cancel.xml b/android/app/src/main/res/drawable/ic_cancel.xml deleted file mode 100644 index 719b1172b..000000000 --- a/android/app/src/main/res/drawable/ic_cancel.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/android/app/src/main/res/drawable/ic_category_children.xml b/android/app/src/main/res/drawable/ic_category_children.xml index 34c738fe5..3e95f1360 100644 --- a/android/app/src/main/res/drawable/ic_category_children.xml +++ b/android/app/src/main/res/drawable/ic_category_children.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_category_entertainment.xml b/android/app/src/main/res/drawable/ic_category_entertainment.xml index 5593afa6e..ad3cd9924 100644 --- a/android/app/src/main/res/drawable/ic_category_entertainment.xml +++ b/android/app/src/main/res/drawable/ic_category_entertainment.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_category_fuel.xml b/android/app/src/main/res/drawable/ic_category_fuel.xml index 191d0b0fe..8fc14bcc1 100644 --- a/android/app/src/main/res/drawable/ic_category_fuel.xml +++ b/android/app/src/main/res/drawable/ic_category_fuel.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_category_toilet.xml b/android/app/src/main/res/drawable/ic_category_toilet.xml index 16c40c0ea..afe726e48 100644 --- a/android/app/src/main/res/drawable/ic_category_toilet.xml +++ b/android/app/src/main/res/drawable/ic_category_toilet.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_close.xml b/android/app/src/main/res/drawable/ic_close.xml index 70db409b3..a0d529468 100644 --- a/android/app/src/main/res/drawable/ic_close.xml +++ b/android/app/src/main/res/drawable/ic_close.xml @@ -1,5 +1,10 @@ - - + + diff --git a/android/app/src/main/res/drawable/ic_dark_mode.xml b/android/app/src/main/res/drawable/ic_dark_mode.xml new file mode 100644 index 000000000..c6b7262cf --- /dev/null +++ b/android/app/src/main/res/drawable/ic_dark_mode.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_download_st.xml b/android/app/src/main/res/drawable/ic_download_st.xml new file mode 100644 index 000000000..08a289df9 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_download_st.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_eco.xml b/android/app/src/main/res/drawable/ic_eco.xml new file mode 100644 index 000000000..4bd684b94 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_eco.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_instant_mix.xml b/android/app/src/main/res/drawable/ic_instant_mix.xml new file mode 100644 index 000000000..adf850e9f --- /dev/null +++ b/android/app/src/main/res/drawable/ic_instant_mix.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml b/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml new file mode 100644 index 000000000..c0411073b --- /dev/null +++ b/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_network_manage.xml b/android/app/src/main/res/drawable/ic_network_manage.xml new file mode 100644 index 000000000..b4c178fb3 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_network_manage.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_profile.xml b/android/app/src/main/res/drawable/ic_profile.xml new file mode 100644 index 000000000..6e5e353df --- /dev/null +++ b/android/app/src/main/res/drawable/ic_profile.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_record_voice_over.xml b/android/app/src/main/res/drawable/ic_record_voice_over.xml new file mode 100644 index 000000000..c28155d04 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_record_voice_over.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_sd_card.xml b/android/app/src/main/res/drawable/ic_sd_card.xml new file mode 100644 index 000000000..a6cab9650 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_sd_card.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_search_recent_st.xml b/android/app/src/main/res/drawable/ic_search_recent_st.xml new file mode 100644 index 000000000..a1f716d2d --- /dev/null +++ b/android/app/src/main/res/drawable/ic_search_recent_st.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_settings_backup_restore.xml b/android/app/src/main/res/drawable/ic_settings_backup_restore.xml new file mode 100644 index 000000000..3b41cadbf --- /dev/null +++ b/android/app/src/main/res/drawable/ic_settings_backup_restore.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_storage_light.xml b/android/app/src/main/res/drawable/ic_storage_light.xml deleted file mode 100644 index 69c026c2f..000000000 --- a/android/app/src/main/res/drawable/ic_storage_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/android/app/src/main/res/drawable/ic_straighten.xml b/android/app/src/main/res/drawable/ic_straighten.xml new file mode 100644 index 000000000..6387d0044 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_straighten.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_text_fields.xml b/android/app/src/main/res/drawable/ic_text_fields.xml new file mode 100644 index 000000000..57cfb91c6 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_text_fields.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_three_d_rotation.xml b/android/app/src/main/res/drawable/ic_three_d_rotation.xml new file mode 100644 index 000000000..e52933669 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_three_d_rotation.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_translate.xml b/android/app/src/main/res/drawable/ic_translate.xml new file mode 100644 index 000000000..70907350f --- /dev/null +++ b/android/app/src/main/res/drawable/ic_translate.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_translate_indic.xml b/android/app/src/main/res/drawable/ic_translate_indic.xml new file mode 100644 index 000000000..6b22bfd80 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_translate_indic.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_triangle_elevation.xml b/android/app/src/main/res/drawable/ic_triangle_elevation.xml index 9f7880e08..91d7e85bc 100644 --- a/android/app/src/main/res/drawable/ic_triangle_elevation.xml +++ b/android/app/src/main/res/drawable/ic_triangle_elevation.xml @@ -3,7 +3,13 @@ android:height="20dp" android:viewportWidth="960" android:viewportHeight="960"> + + android:pathData="M640,760 L200,480l440,-280v560Z" + android:fillColor="#FFFFFF"/> + diff --git a/android/app/src/main/res/drawable/ic_wifi_find.xml b/android/app/src/main/res/drawable/ic_wifi_find.xml new file mode 100644 index 000000000..7cb82c07c --- /dev/null +++ b/android/app/src/main/res/drawable/ic_wifi_find.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/layout-land/onmap_downloader.xml b/android/app/src/main/res/layout-land/onmap_downloader.xml index 1e50694d0..377d49079 100644 --- a/android/app/src/main/res/layout-land/onmap_downloader.xml +++ b/android/app/src/main/res/layout-land/onmap_downloader.xml @@ -26,27 +26,33 @@ android:clipChildren="false" android:gravity="center" tools:ignore="UselessParent"> - - - + android:orientation="vertical"> + + + + + - + - + + + + + + - + - + + style="@style/MwmWidget.Editor.CardView" + android:layout_marginBottom="@dimen/margin_base"> + @@ -57,10 +57,8 @@ android:layout_height="wrap_content" style="@style/Widget.Material3.Button.TextButton" android:layout_below="@id/opening_hours" - android:layout_marginStart="@dimen/editor_margin_timetable_left" - android:layout_marginTop="@dimen/margin_base_plus" - android:gravity="center_vertical" - android:minHeight="@dimen/height_block_base" + android:layout_marginTop="@dimen/margin_base" + android:gravity="center_horizontal" android:text="@string/edit_opening_hours" android:textColor="?colorSecondary" android:textAppearance="@style/MwmTextAppearance.Body1" /> diff --git a/android/app/src/main/res/layout/item_phone.xml b/android/app/src/main/res/layout/item_phone.xml index 682b43618..bfc8fe6eb 100644 --- a/android/app/src/main/res/layout/item_phone.xml +++ b/android/app/src/main/res/layout/item_phone.xml @@ -28,12 +28,12 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/delete_icon" app:layout_constraintStart_toEndOf="@+id/phone_icon" + app:hintEnabled="false" app:layout_constraintTop_toTopOf="parent"> diff --git a/android/app/src/main/res/layout/item_search_clear_history.xml b/android/app/src/main/res/layout/item_search_clear_history.xml index ae3796515..029ebbef0 100644 --- a/android/app/src/main/res/layout/item_search_clear_history.xml +++ b/android/app/src/main/res/layout/item_search_clear_history.xml @@ -3,4 +3,4 @@ xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/MwmWidget.TextView.Search" android:text="@string/clear_search" - app:drawableStartCompat="@drawable/ic_cancel"/> + app:drawableStartCompat="@drawable/ic_close"/> diff --git a/android/app/src/main/res/layout/item_search_result.xml b/android/app/src/main/res/layout/item_search_result.xml index 001664507..ae05b29de 100644 --- a/android/app/src/main/res/layout/item_search_result.xml +++ b/android/app/src/main/res/layout/item_search_result.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content" android:background="?selectableItemBackground" android:minHeight="@dimen/search_item_height" - android:padding="@dimen/margin_base" + android:padding="@dimen/margin_half_double_plus" tools:background="#20FF0000"> + android:textColor="?android:textColorPrimaryInverse" + android:text="@string/editor_time_add" /> diff --git a/android/app/src/main/res/layout/map_buttons_layers.xml b/android/app/src/main/res/layout/map_buttons_layers.xml index 71d13a7ce..621641f55 100644 --- a/android/app/src/main/res/layout/map_buttons_layers.xml +++ b/android/app/src/main/res/layout/map_buttons_layers.xml @@ -7,4 +7,4 @@ android:tint="?iconTint" android:contentDescription="@string/layers_title" app:tint="?accentColorSelector" - app:srcCompat="@drawable/ic_layers" /> \ No newline at end of file + app:srcCompat="@drawable/ic_layers" /> diff --git a/android/app/src/main/res/layout/onmap_downloader.xml b/android/app/src/main/res/layout/onmap_downloader.xml index 83f2e4cac..83959b579 100644 --- a/android/app/src/main/res/layout/onmap_downloader.xml +++ b/android/app/src/main/res/layout/onmap_downloader.xml @@ -17,29 +17,34 @@ android:layout_gravity="center" android:gravity="center_horizontal" android:background="@drawable/onmap_downloader_background"> - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + diff --git a/android/app/src/main/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml index 359dd1df7..2c32a1d58 100644 --- a/android/app/src/main/res/layout/position_chooser.xml +++ b/android/app/src/main/res/layout/position_chooser.xml @@ -38,8 +38,7 @@ android:id="@+id/done" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="MwmWidget.M3.FAB.Primary" - app:shapeAppearance="@style/ShapeAppearanceOverlay.Material3.FloatingActionButton" + style="@style/MwmWidget.M3.FAB.Primary" android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" android:contentDescription="@string/save" diff --git a/android/app/src/main/res/layout/toolbar_search_controls.xml b/android/app/src/main/res/layout/toolbar_search_controls.xml index 525fdebc1..f78848b6e 100644 --- a/android/app/src/main/res/layout/toolbar_search_controls.xml +++ b/android/app/src/main/res/layout/toolbar_search_controls.xml @@ -54,7 +54,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/clear_the_search" android:scaleType="center" - app:srcCompat="@drawable/ic_cancel"/> + app:srcCompat="@drawable/ic_close"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/values-b+sr+Latn/strings.xml b/android/app/src/main/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..55344e519 --- /dev/null +++ b/android/app/src/main/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml index f1ef3b618..9665bc99c 100644 --- a/android/app/src/main/res/values-cs/strings.xml +++ b/android/app/src/main/res/values-cs/strings.xml @@ -505,8 +505,8 @@ Chcete změnu odeslat všem uživatelům? - Ujistěte se, že jste nezadali žádná soukromá nebo osobní data - Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy + Ujistěte se, že jste nezadali žádná soukromá nebo osobní data. + Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy. Záznam trasy @@ -889,4 +889,19 @@ Vyhnout se schodům Offline mapy Upravit seznam pro přidání popisu + Vyhnout se zpevněným cestám + Otevírá v %s + Zavírá v %s + Otevírá %1$s v %2$s + Zavírá %1$s v %2$s + Podnik je volný + Označit podnik jako volný + Použijte, pokud se podnik přestěhoval a místo je volné a připravené pro nového zájemce. + Odeslat + + %d min + %d min + %d min + %d min + diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml index 144431768..f9097ff8a 100644 --- a/android/app/src/main/res/values-da/strings.xml +++ b/android/app/src/main/res/values-da/strings.xml @@ -880,4 +880,13 @@ Offline kort Der skal downloades et kort for at kunne se og navigere i området.\nDownload kort over de områder, du ønsker at rejse i. Rediger listen for at tilføje en beskrivelse + Undgå veje med fast belægning + Åbner kl. %s + Lukker kl. %s + Åbner %1$s kl. %2$s + Lukker %1$s kl. %2$s + + %d min + %d min + diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml index 177dbe693..6706ef33e 100644 --- a/android/app/src/main/res/values-de/strings.xml +++ b/android/app/src/main/res/values-de/strings.xml @@ -109,11 +109,11 @@ Tankstelle - Parkplätze|Parkplatz|Stellplatz + Parkplätze Shopping - Second-hand|Gebrauchte Artikel|Gebrauchte Ware + Second-hand Hotel @@ -893,4 +893,16 @@ unbekannt ungültige Zahl Liste bearbeiten, um eine Beschreibung hinzuzufügen + Befst. Straßen vermeiden + Öffnet um %s + Schließt um %s + Öffnet am %1$s um %2$s + Schließt am %1$s um %2$s + + %d min + %d min + + Geschäft ist leerstehend + Geschäft als leerstehend markieren + Absenden diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml index d2fa29dd2..fb38d1c97 100644 --- a/android/app/src/main/res/values-es/strings.xml +++ b/android/app/src/main/res/values-es/strings.xml @@ -898,4 +898,19 @@ Mapas sin conexión Se debe descargar un mapa para ver y navegar el área\nDescarga mapas de las áreas que quieras navegar. Describe la situación actual del lugar para enviar una nota de error a la comunidad de OpenStreetMap + Evitar caminos pavimentados + Abre a las %s + Cierra a las %s + Abre el %1$s a las %2$s + Cierra el %1$s a las %2$s + + %d min + %d min + %d min + + Modificar la lista para añadir una descripción + Negocio vacante + Marcar negocio como vacante + Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino. + Enviar diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml index eb0699d83..98df77ad8 100644 --- a/android/app/src/main/res/values-et/strings.xml +++ b/android/app/src/main/res/values-et/strings.xml @@ -516,8 +516,8 @@ Kas soovid saata selle kõigile kasutajatele? - Palun kontrolli, et sa ei sisestanud isiklikke andmeid - OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust + Palun kontrolli, et sa ei sisestanud isiklikke andmeid. + OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust. Lõpeta Rada on salvestamisel @@ -889,4 +889,17 @@ Ilma võrguühenduseta toimivad kaardid Selles piirkonnas liikumiseks ja teekonna juhatamiseks pead vajaliku kaardi alla laadima.\nVali allalaaditav kaart selle piirkonna kohta. Kirjelduse lisamiseks muuda loendit + Väldi sillutatud teid + Avatakse %s + Suletakse %s + Avatakse %1$s kell %2$s + Suletakse %1$s kell %2$s + + %d min + %d min + + Äripind on vaba + Märgi äripind vabaks + Kasuta seda valikut, kui senine rentnik/omanik on kolinud välja ja äripind on tühi ja uue ootel. + Saada diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml index 310d4a83d..2b1c05db4 100644 --- a/android/app/src/main/res/values-eu/strings.xml +++ b/android/app/src/main/res/values-eu/strings.xml @@ -246,7 +246,7 @@ Dohaintza eman - Proiektuari laguntza eman + Izan bolondres eta hobetu CoMaps Egile eskubideak @@ -863,4 +863,9 @@ Ireki orain Orain itxita %s-etan + %s ean irekitzen da + %s ean itxiko da + 1$s ean %2$s tan irekitzen da + %1$s ean %2$s etan itxiko da + Deskribatu nolakoa den lekua orain OpenStreetMap komunitateari errore-ohar bat bidaltzeko. diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml index 56f941edb..a72052169 100644 --- a/android/app/src/main/res/values-fa/strings.xml +++ b/android/app/src/main/res/values-fa/strings.xml @@ -765,7 +765,7 @@ مسیر خالی است - چیزی برای ذخیره کردن وجود ندارد امکان نمایش گفتگوی انتخاب پوشه وجود ندارد زیرا برنامه مناسبی روی دستگاه شما نصب نشده است. لطفاً یک برنامه مدیریت فایل نصب کنید و دوباره امتحان کنید. - انتخاب رنگ + گزیدن رنگ ویرایش مسیر هیچ برنامه ای نصب نشده است که بتواند مکان را باز کند diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index bd049a383..4759273a4 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -898,4 +898,18 @@ Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter. Modifier la liste pour ajouter une description + Éviter les routes goudronnées + Ouvre à %s + Ferme à %s + Ouverture le %1$s à %2$s + Fermeture le %1$s à %2$s + + %d min + %d min + %d min + + Local commercial vacant + Marquer l\'établissement comme vacant + Utilisez cette option si l\'entreprise a déménagé et que l\'espace est vide et prêt à accueillir un nouveau locataire. + Soumettre diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml index 548966e6c..0be27a867 100644 --- a/android/app/src/main/res/values-gl/strings.xml +++ b/android/app/src/main/res/values-gl/strings.xml @@ -623,7 +623,21 @@ Outro ou descoñecido engache descoñecido Describe a aparencia do lugar para enviar unha nota co erro á comunidade OpenStreetMap - Evitar pasos + Evitar escaleiras Mapas sen conexión Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar. + Editar a lista para engadir unha descrición + Abre ás %s + Fecha ás %s + Abre o %1$s ás %2$s + Fecha o %1$s ás %2$s + + %d min + %d min + + Usa isto se a empresa marchou e o espazo está baleiro e preparado para un novo proxecto. + Enviar + Evitar estradas asfaltadas + Dispoñible para empresas + Marcar como dispoñible para negocios diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml index 9dfbf4b99..305318143 100644 --- a/android/app/src/main/res/values-it/strings.xml +++ b/android/app/src/main/res/values-it/strings.xml @@ -891,4 +891,8 @@ sconosciuto Il valore deve essere positivo Numero non valido + L\'attività è vacante + Contrassegna l\'attività come vacante + Utilizza questa opzione se l\'azienda ha traslocato e lo spazio è vuoto e pronto per un nuovo inquilino. + Conferma diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml index 8ede49cbf..d938baabe 100644 --- a/android/app/src/main/res/values-lv/strings.xml +++ b/android/app/src/main/res/values-lv/strings.xml @@ -506,9 +506,9 @@ Norādiet šīs vietas dzēšanas iemeslu - Ierakstiet derīgu tālruņa numuru - Ierakstiet derīgu tīmekļa vietnes adresi - Ierakstiet e-pasta adresi + Jāievada derīgs tālruņa numurs + Jāievada derīga tīmekļa adrese + Jāievada derīga e-pasta adrese Ierakstiet „Facebook“ lapas adresi, kontu vai mājaslapas nosaukumu Ierakstiet „Instagram“ vietnes adresi vai konta nosaukumu Ierakstiet „Twitter“ vietnes adresi vai lietotājvārdu @@ -518,8 +518,8 @@ Vai vēlaties to nosūtīt visiem lietotājiem? - Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus - OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi + Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus. + OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi. Apturēt Maršruta reģistrēšana @@ -844,4 +844,6 @@ Ik dienu Notīrīt Šobrīd slēgts + Izvairīties no ceļiem ar cietu mākslīgo segumu + Iesniegt diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml index 0e550e72c..f77fb68c7 100644 --- a/android/app/src/main/res/values-nb/strings.xml +++ b/android/app/src/main/res/values-nb/strings.xml @@ -522,8 +522,8 @@ Vil du sende det til alle brukere? - Sørg for at du ikke har angitt noen private eller personlige data - OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål + Sørg for at du ikke har angitt noen private eller personlige data. + OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål. Stopp Tar opp sporet @@ -885,4 +885,14 @@ Rediger kontakt Type 1 Opprett nye kontakter eller rediger eksisterende. + Unngå asfalterte veier + + %d min + %d min + + Stenger %1$s %2$s + Åpner %1$s %2$s + Stenger %s + Åpner %s + Send diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml index 57442cb92..c6d756e20 100644 --- a/android/app/src/main/res/values-night/colors.xml +++ b/android/app/src/main/res/values-night/colors.xml @@ -3,7 +3,7 @@ #FF7CBC7B #FF588157 - #FFC4C6C7 + #FFF #FF76797C diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml index 9eaa5b25b..a7c4e92bc 100644 --- a/android/app/src/main/res/values-nl/strings.xml +++ b/android/app/src/main/res/values-nl/strings.xml @@ -520,8 +520,8 @@ Wil je het naar alle gebruikers sturen? - Controleer dat je geen persoonlijke gegevens hebt ingevoerd - OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben + Controleer dat je geen persoonlijke gegevens hebt ingevoerd. + OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben. Stop Spoor opnemen @@ -555,8 +555,8 @@ Gebruik zoeken of tik op de kaart om een startpunt voor de route toe te voegen Gebruik Zoeken of tik op de kaart om een bestemmingspunt toe te voegen - Beheer route - Plan + Route beheren + Plannen Verwijder tussenstop Voeg tussenstop toe Probleem met opslagtoegang @@ -871,4 +871,39 @@ Bevestigd %s Geen tekst-naar-spraak processor gevonden, controleer de app-instellingen Offline kaarten + Er moet een kaart worden gedownload om het gebied te kunnen bekijken en navigeren.\nDownload kaarten voor gebieden waar u wilt reizen. + Beschrijf hoe de plaats er nu uitziet om een foutbericht te sturen naar de OpenStreetMap-community + Trappen vermijden + Verharde wegen vermijden + Type 2 (geen kabel) + Type 2 (met kabel) + Type 2 combinatie + Type 1 + NACS + onbekend + CHAdeMO + onbekende stekker + onbekende stekker + onbekend + ongeldig aantal + Maak nieuwe stekkers aan of bewerk bestaande. + Beschikbare stekkers + Andere of onbekend + Aantal + Vermogen (kW) + Stekker bewerken + De waarde moet positief zijn + Bewerk de lijst om een beschrijving toe te voegen + + %d min. + %d min. + + Opent om %s + Sluit om %s + Opent op %1$s om %2$s + Sluit op %1$s om %2$s + Indienen + Bedrijfsruimte is leeg + Bedrijfsruimte leeg markeren + Gebruik dit als het bedrijf is verhuisd en de ruimte leeg is en klaar is voor een nieuwe huurder. diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml index b5bfe04e5..8400adefa 100644 --- a/android/app/src/main/res/values-pl/strings.xml +++ b/android/app/src/main/res/values-pl/strings.xml @@ -372,7 +372,7 @@ Pobierz region, w którym szukasz lub spróbuj dodać nazwę pobliskiego miasta/wsi. Historia wyszukiwania - Uzyskaj szybki dostęp do ostatniego hasła wyszukiwania. + Zobacz swoje ostatnie wyszukiwania Wyczyść historię wyszukiwania Wikipedia diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml index 489794148..928d6c6e3 100644 --- a/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/android/app/src/main/res/values-pt-rBR/strings.xml @@ -462,8 +462,8 @@ Deseja enviar para todos os usuários? - Certifique-se de não ter incluído nenhum dado privado ou pessoal - Os mapeadores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida + Certifique-se de não ter incluído nenhum dado privado ou pessoal. + Os mapeadores do OpenStreetMap verificarão as alterações e entrarão em contato caso tenham alguma dúvida. Registro da pista @@ -870,4 +870,18 @@ Mapas offline Descreva com detalhes como está o local agora mesmo para enviar uma nota de erro à comunidade do OpenStreetMap Edite a lista para adicionar uma descrição + Evitar vias pavimentadas + Abre às %s + Fecha às %s + Abre %1$s às %2$s + Fecha %1$s às %2$s + + %d min + %d min + %d min + + Local está desocupado + Marcar local como desocupado + Use isto se o estabelecimento mudou de endereço ou o local está vago e disponível para outra empresa. + Enviar diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml index f8adf2986..24b14e89c 100644 --- a/android/app/src/main/res/values-pt/strings.xml +++ b/android/app/src/main/res/values-pt/strings.xml @@ -885,4 +885,5 @@ desconhecido O valor tem que ser positivo Número inválido + Evitar rotas pavimentadas diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml index ab6541af7..82eb457a2 100644 --- a/android/app/src/main/res/values-ro/strings.xml +++ b/android/app/src/main/res/values-ro/strings.xml @@ -387,10 +387,10 @@ Deschis Închis Adaugă ore de închidere - Ore de deschidere + Program Mod Avansat Mod simplu - Ore de închidere + Pauză Exemple Corectare greșeală Selectați locația @@ -867,4 +867,16 @@ Nu s-a găsit un motor de text-to-speech, verifică setările aplicației Sau, alternativ, lăsați un mesaj comunității OpenStreetMap, astfel încât altcineva să poată adăuga sau corecta un loc aici. Nota va fi trimisă către OpenStreetMap + Deschide la %s + Închide la %s + Deschide %1$s la %2$s + Închide %1$s la %2$s + Magazinul este vacant + Machează magazinul ca vacant + Descrie cum arată locul acum ca să trimiți o notiță comunității OpenStreetMap + Folosește acest buton dacă magazinul a plecat din spațiu și spațiul este gol, aștepând alt magazin. + Trimite + Evită drumurile pavate + Evită treptele + O hartă trebuie descărcată ca să vezi și si să nevighezi prin zonă.\nDescarcă hărți pentru zonele în care vrei să mergi. diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml index 8ba8f0a62..74b40c464 100644 --- a/android/app/src/main/res/values-sr/strings.xml +++ b/android/app/src/main/res/values-sr/strings.xml @@ -84,7 +84,7 @@ слободно %1$s од %2$s - Преместаш мапу? + Преместити мапу? Грешка приликом премештања мапа @@ -240,7 +240,7 @@ Донација - Волонтирај и унапреди CoMaps + Волонтирајте и побољшајте CoMaps Пријавите проблем @@ -513,8 +513,8 @@ Да ли желите да поделите са свим другим корисницима? - Проверите да нисте унели приватне или личне податке - OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања + Проверите да нисте унели приватне или личне податке. + OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања. Стоп Снимање путање @@ -871,7 +871,7 @@ Неисправан број Вредност мора бити већа од нуле непознато - Непознато напајање + непознато Тип 2 (без кабла) Тип 2 (са каблом) Тип 2 комбо @@ -890,4 +890,19 @@ Офлајн мапе Опишите како место сада изгледа та бисте послали поруку о грешци OpenStreetMap заједници Избегавај степенице + Избегавај асфалтиране путеве + Промените листу да бисте додали опис + Отвара се у %s + Затвара се у %s + Отвара се у %1$s у %2$s + Затвара се у %1$s у %2$s + + %d мин + %d мин + %d мин + + Пословни простор је празан + Означи пословни простор као празан + Користите да бисте назначили да се фирма иселила и да је пословни простор празан и спреман да прими новог закупца. + Пошаљи diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index cc9b89f1b..aa0527416 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -833,4 +833,7 @@ Våningsplan (0 är bottenplan) Ange ett giltigt nummer för våningsplan Undvik trappor + Undvik asfalterade vägar + Värdet måste vara positivt + ogiltigt tal diff --git a/android/app/src/main/res/values-sw360dp/values-preference.xml b/android/app/src/main/res/values-sw360dp/values-preference.xml deleted file mode 100644 index 822f4c072..000000000 --- a/android/app/src/main/res/values-sw360dp/values-preference.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - diff --git a/android/app/src/main/res/values-ta/strings.xml b/android/app/src/main/res/values-ta/strings.xml new file mode 100644 index 000000000..b43ba697b --- /dev/null +++ b/android/app/src/main/res/values-ta/strings.xml @@ -0,0 +1,643 @@ + + + ரத்துசெய் + நீக்கு + வரைபடத்தைப் பதிவிறக்கவும் + பதிவிறக்குகிறது… + இணைப்பில்லாத வரைபடங்கள் + அந்தப் பகுதியைப் பார்க்கவும் வழிசெலுத்தவும் ஒரு வரைபடம் பதிவிறக்கம் செய்யப்பட வேண்டும். \nநீங்கள் பயணிக்க விரும்பும் பகுதிகளுக்கான வரைபடங்களைப் பதிவிறக்கவும். + கிலோமீட்டர்கள் + மைல்கள் + தேடல் + புக்மார்க்குகள் மற்றும் தடங்கள் + பின்னர் + வரைபடத்தில் காட்டு + பதிவிறக்கம் தோல்வியடைந்தது + சமூகத்தால் இயக்கப்படும் திறந்த திட்டம் + மூடு + பதிவிறக்கம் + தொடரவும் + புதிய பட்டியலைச் சேர்க்கவும் + புத்தகக்குறி பட்டியல் பெயர் + புக்மார்க்குகள் + முகவரி + அமைப்புகள் + அளவீட்டு அலகுகள் + எங்கே சாப்பிடுவது + மளிகை பொருட்கள் + போக்குவரத்து + வளிமம் + பார்க்கிங் + சாப்பிங் + இரண்டாவது கை + ஓட்டல் + காட்சிகள் + பொழுதுபோக்கு + ஏடிஎம் + இரவு வாழ்க்கை + குடும்ப விடுமுறை + வைப்பகம் + மருந்தகம் + மருத்துவமனை + கழிப்பறை + இடுகை + போலீச் + மறுசுழற்சி + தண்ணீர் + RV வசதிகள் + புக்மார்க்குகளை ஏற்றுகிறது + புக்மார்க்குகள் வெற்றிகரமாக ஏற்றப்பட்டன! வரைபடத்தில் அல்லது புக்மார்க்ச் மேலாளர் திரையில் அவற்றைக் காணலாம். + புக்மார்க்குகளை ஏற்றுவதில் தோல்வி. கோப்பு சிதைந்திருக்கலாம் அல்லது குறைபாடுடையதாக இருக்கலாம். + தொகு + உங்கள் இருப்பிடம் இன்னும் தீர்மானிக்கப்படவில்லை + ஏய், CoMaps இல் எனது பின்னை பாருங்கள்! + ஏய், CoMaps வரைபடத்தில் எனது தற்போதைய இருப்பிடத்தைப் பாருங்கள்! + மின்னஞ்சல் + முடிந்தது + தடங்கள் + நீளம் + எனது இருப்பிடத்தைப் பகிரவும் + வானோடல் + பெரிதாக்கு பொத்தான்கள் + அணை + அன்று + தானி + முன்னோக்கு பார்வை + 3டி கட்டிடங்கள் + மின் சேமிப்பு பயன்முறையில் 3D கட்டிடங்கள் முடக்கப்பட்டுள்ளன + தெரு பெயர்களை அறிவிக்கவும் + இயக்கப்பட்டால், தெருவின் பெயர் அல்லது வெளியேறும் இடம் உரக்கப் பேசப்படும். + குரல் மொழி + குரல் வழிகளை சோதிக்கவும் + ஆட்டோ சூம் + தூரம் + வரைபடத்தில் பார்க்கவும் + இணையதளம் + செய்தி + பயன்பாட்டை மதிப்பிடவும் + உதவி + அடிக்கடி கேட்கப்படும் கேள்விகள் + நன்கொடை + காப்புரிமை + பிழையைப் புகாரளிக்கவும் + இடைமுகத்தைப் பார்க்க மீண்டும் வரைபடத்தில் நீண்ட நேரம் தட்டவும் + அனைத்தையும் புதுப்பிக்கவும் + பதிவிறக்கம் செய்யப்பட்டது + வரிசையில் நிற்கிறது + என் அருகில் + வரைபடங்கள் + அனைத்தையும் பதிவிறக்கவும் + பதிவிறக்குகிறது: + ஒரு பகுதியின் வரைபடத்தில் முழுமையாகக் கொண்டிருக்கும் வழிகளை மட்டுமே உருவாக்க முடியும். + வரைபடத்தைப் பதிவிறக்கவும் + மீண்டும் முயற்சிக்கவும் + வரைபடத்தை நீக்கு + உங்கள் பாதையில் உள்ள அனைத்து வரைபடங்களையும் பதிவிறக்கவும் + வழியை உருவாக்க, உங்கள் இருப்பிடத்திலிருந்து நீங்கள் சேருமிடத்திற்கு அனைத்து வரைபடங்களையும் பதிவிறக்கம் செய்து புதுப்பிக்க வேண்டும். + சேமி + உருவாக்க + சிவப்பு + மஞ்சள் + நீலம் + பச்சை + ஊதா + ஆரஞ்சு + பழுப்பு + இளஞ்சிவப்பு + அடர் ஊதா + வெளிர் நீலம் + சியான் + டீல் + சுண்ணாம்பு + ஆழமான ஆரஞ்சு + சாம்பல் + நீல சாம்பல் + வழியைப் பின்தொடரும் போது, தயவுசெய்து நினைவில் கொள்ளுங்கள்: + - வழிசெலுத்தல் குறிப்புகளை விட சாலை நிலைமைகள், போக்குவரத்து சட்டங்கள் மற்றும் சாலை அடையாளங்கள் எப்போதும் முன்னுரிமை பெறுகின்றன; + — வரைபடம் துல்லியமற்றதாக இருக்கலாம், மேலும் பரிந்துரைக்கப்பட்ட பாதை எப்போதும் இலக்கை அடைய மிகவும் உகந்த வழியாக இருக்காது; + - பரிந்துரைக்கப்பட்ட வழிகள் பரிந்துரைகளாக மட்டுமே புரிந்து கொள்ளப்பட வேண்டும்; + — எல்லை மண்டலங்களில் உள்ள வழிகளில் எச்சரிக்கையாக இருங்கள்: எங்கள் ஆப்ச் உருவாக்கிய வழிகள் சில நேரங்களில் அங்கீகரிக்கப்படாத இடங்களில் நாட்டின் எல்லைகளைக் கடக்கலாம். + சாலைகளில் எச்சரிக்கையாகவும் பாதுகாப்பாகவும் இருங்கள்! + சிபிஎச் சிக்னலைச் சரிபார்க்கவும் + வழியை உருவாக்க முடியவில்லை. தற்போதைய சிபிஎச் ஒருங்கிணைப்புகளை அடையாளம் காண முடியவில்லை. + உங்கள் சிபிஎச் சிக்னலைச் சரிபார்க்கவும். வைஃபையை இயக்குவது உங்கள் இருப்பிடத் துல்லியத்தை மேம்படுத்தும். + இருப்பிட சேவைகளை இயக்கவும் + தற்போதைய சிபிஎச் ஆயத்தொலைவுகளைக் கண்டறிய முடியவில்லை. வழியைக் கணக்கிட, இருப்பிடச் சேவைகளை இயக்கவும். + வழியைக் கண்டறிய முடியவில்லை + உங்கள் தொடக்கப் புள்ளி அல்லது சேருமிடத்தைச் சரிசெய்யவும். + தொடக்க புள்ளியை சரிசெய்யவும் + பாதை உருவாக்கப்படவில்லை. தொடக்கப் புள்ளியைக் கண்டறிய முடியவில்லை. + சாலைக்கு அருகில் ஒரு தொடக்கப் புள்ளியைத் தேர்ந்தெடுக்கவும். + இலக்கை சரிசெய்யவும் + பாதை உருவாக்கப்படவில்லை. சேருமிடத்தைக் கண்டறிய முடியவில்லை. + கணினி பிழை + மீண்டும் முயற்சிக்கவும் + வரைபடத்தைப் பதிவிறக்கம் செய்து, ஒன்றுக்கும் மேற்பட்ட வரைபடத்தில் மிகவும் உகந்த வழியை உருவாக்க விரும்புகிறீர்களா? + இந்த வரைபடத்தின் எல்லைகளைக் கடக்கும் சிறந்த வழியை உருவாக்க கூடுதல் வரைபடங்களைப் பதிவிறக்கவும். + காட்டு + மறை + வகைகள் + வரலாறு + நீங்கள் தேடும் பகுதியைப் பதிவிறக்கவும் அல்லது அருகிலுள்ள நகரம்/கிராமத்தின் பெயரைச் சேர்க்க முயற்சிக்கவும். + தேடல் வரலாறு + தேடல் வரலாற்றை அழிக்கவும் + விக்கிபீடியா + விக்கிமீடியா காமன்ச் + உங்கள் இருப்பிடம் + தொடங்கு + இருந்து வழி + செல்லும் பாதை + உங்கள் தற்போதைய இருப்பிடத்திலிருந்து ஒரு வழியைத் திட்டமிட விரும்புகிறீர்களா? + அட்டவணையைச் சேர்க்கவும் + அட்டவணையை நீக்கு + நாள் முழுவதும் (24 மணிநேரம்) + திற + மூடப்பட்டது + வணிகம் அல்லாத நேரத்தைச் சேர்க்கவும் + வணிக நேரம் + மேம்பட்ட பயன்முறை + எளிய முறை + வணிகம் அல்லாத நேரம் + எடுத்துக்காட்டு மதிப்புகள் + இருப்பிடத்தைத் தேர்ந்தெடுக்கவும் + அனுப்பு + வரைபடங்களைத் தானாகப் பதிவிறக்கவும் + இப்போது மூடப்பட்டுள்ளது + நாள்தோறும் + 24/7 + இன்று மூடப்பட்டது + மூடப்பட்டது + மூடப்பட்டது + இடத்தைத் திருத்து + ஒரு மொழியைச் சேர்க்கவும் + கட்டிட எண் + விவரங்கள் + ஒரு தெருவைச் சேர்க்கவும் + ஒரு மொழியை தேர்வு செய்யவும் + ஒரு தெருவைத் தேர்ந்தெடுக்கவும் + சமையல் + சமையலைத் தேர்ந்தெடுக்கவும் + மாடி + வரைபடத்தைப் புதுப்பிக்கவும் + வரைபடத்தைக் கண்டுபிடி + போதுமான இடம் இல்லை + தேவையற்ற தரவுகளை நீக்கவும் + சரிபார்க்கப்பட்ட மாற்றங்கள் + இடம் அல்லது வணிகத்தின் இடத்தில் சிலுவையை வைக்க வரைபடத்தை இழுக்கவும். + திருத்துதல் + சேர்த்தல் + இடத்தின் பெயர் + அச் it is written in the local மொழி + வகை + எந்தப் பொருளையும் இங்கு வைக்க முடியாது + %1$d / %2$d + செல்லுலார் பிணையம் இணைப்பு மூலம் பதிவிறக்கவா? + சரியான கட்டிட எண்ணை உள்ளிடவும் + மாடிகளின் எண்ணிக்கை %d ஐ விட அதிகமாக இருக்கக்கூடாது + குறியீடு + சரியான அஞ்சல் குறியீட்டை உள்ளிடவும் + OpenStreetMap தன்னார்வலர்களுக்கான குறிப்பு (விரும்பினால்) + OpenStreetMap பற்றி மேலும் + ஆபரேட்டர் + பொருத்தமான வகையைக் கண்டுபிடிக்க முடியவில்லையா? + CoMaps எளிய புள்ளி வகைகளை மட்டும் சேர்க்க அனுமதிக்கிறது, அதாவது நகரங்கள், சாலைகள், ஏரிகள், கட்டிட அவுட்லைன்கள் போன்றவை இல்லை. அத்தகைய வகைகளை நேரடியாக OpenStreetMap.org இல் சேர்க்கவும். விரிவான படிப்படியான வழிமுறைகளுக்கு எங்கள் வழிகாட்டியைப் பார்க்கவும். + நீங்கள் எந்த வரைபடத்தையும் பதிவிறக்கம் செய்யவில்லை + கிமீ/ம + mph + ம + மணித்துளி + டி + மேலும் + புக்மார்க்கைத் திருத்து + தனிப்பட்ட குறிப்புகள் (உரை அல்லது html) + அனைத்து உள்ளக மாற்றங்களையும் நிராகரிக்கவா? + நிராகரிக்கவும் + சேர்க்கப்பட்ட இடத்தை நீக்கவா? + நீக்கு + இடம் இல்லை + OpenStreetMap சமூகத்திற்கு பிழைக் குறிப்பை அனுப்ப, அந்த இடம் இப்போது எப்படி இருக்கிறது என்பதை விவரிக்கவும் + சரியான தொலைபேசி எண்ணை உள்ளிடவும் + சரியான இணைய முகவரியை உள்ளிடவும் + சரியான மின்னஞ்சலை உள்ளிடவும் + OpenStreetMap இல் இடத்தைச் சேர்க்கவும் + எல்லா பயனர்களுக்கும் அனுப்ப விரும்புகிறீர்களா? + நிறுத்து + ஏற்றுக்கொள் + நிராகரி + விரிவான தகவலைக் காட்ட மொபைல் இணையத்தைப் பயன்படுத்தவா? + எப்போதும் பயன்படுத்தவும் + இன்று மட்டும் + இன்று பயன்படுத்த வேண்டாம் + மொபைல் இணையம் + ஒருபோதும் பயன்படுத்த வேண்டாம் + எப்போதும் கேள் + வரைபட லேபிள்களுக்கான அளவை அதிகரிக்கவும் + போக்குவரத்து தரவு கிடைக்கவில்லை + பதிவு செய்வதை இயக்கு + லத்தீன் எழுத்துக்களில் ஒலிபெயர்ப்பு + பாதையின் தொடக்கப் புள்ளியைச் சேர்க்க, தேடலைப் பயன்படுத்தவும் அல்லது வரைபடத்தில் தட்டவும் + இலக்கு புள்ளியைச் சேர்க்க, தேடலைப் பயன்படுத்தவும் அல்லது வரைபடத்தில் தட்டவும் + வழியை நிர்வகிக்கவும் + திட்டம் + நிறுத்தத்தை அகற்று + நிறுத்தத்தைச் சேர்க்கவும் + சேமிக்கப்பட்டது + சரியான பெயரை உள்ளிடவும் + பட்டியல்கள் + அனைத்தையும் மறை + அனைத்தையும் காட்டு + புதிய பட்டியலை உருவாக்கவும் + புக்மார்க்குகள் மற்றும் தடங்களை இறக்குமதி செய்யவும் + பயன்பாட்டுப் பிழை காரணமாகப் பகிர முடியவில்லை + பகிர்வதில் பிழை + வெற்று பட்டியலைப் பகிர முடியாது + பட்டியல் பெயரை உள்ளிடவும் + இந்த பெயர் ஏற்கனவே எடுக்கப்பட்டது + OpenStreetMap சுயவிவரம் + மீட்டமை + தனியுரிமைக் கொள்கை + பயன்பாட்டு விதிமுறைகள் + வரைபட நடைகள் மற்றும் அடுக்குகள் + ஏற்றுமதி KMZ + GPX ஐ ஏற்றுமதி செய்யவும் + பட்டியலை நீக்கு + வேக கேமராக்கள் + இட விளக்கம் + வேகமாக சென்றால் எச்சரிக்கவும் + எப்போதும் எச்சரிக்கவும் + எச்சரிக்க வேண்டாம் + ஆற்றல் சேமிப்பு முறை + ஒருபோதும் + பேட்டரி குறைவாக இருக்கும்போது + எப்போதும் + உதவி உரையாடலில் \"பிழையைப் புகாரளி\" என்பதைப் பயன்படுத்தி, உங்கள் சிக்கலைப் பற்றிய விரிவான கண்டறியும் பதிவுகளைப் பதிவுசெய்து கைமுறையாக எங்களுக்கு அனுப்ப இந்த விருப்பத்தை தற்காலிகமாக இயக்கவும். பதிவுகளில் இருப்பிடத் செய்தி இருக்கலாம். + ரூட்டிங் விருப்பங்கள் + சுங்கச்சாவடிகளைத் தவிர்க்கவும் + செப்பனிடப்படாத சாலைகளைத் தவிர்க்கவும் + நடைபாதை சாலைகளைத் தவிர்க்கவும் + படிக்கட்டுகளைத் தவிர்க்கவும் + படகுகளைத் தவிர்க்கவும் + தனிவழிப்பாதைகளைத் தவிர்க்கவும் + வழியைக் கணக்கிட முடியவில்லை + ஒரு வழியைக் கண்டுபிடிக்க முடியவில்லை. இது உங்கள் ரூட்டிங் விருப்பங்கள் அல்லது முழுமையடையாத OpenStreetMap தரவு காரணமாக இருக்கலாம். உங்கள் ரூட்டிங் விருப்பங்களை மாற்றி மீண்டும் முயற்சிக்கவும். + தவிர்க்க வேண்டிய சாலைகளை வரையறுக்கவும் + ரூட்டிங் விருப்பங்கள் இயக்கப்பட்டன + சுங்கச்சாவடி + செப்பனிடப்படாத சாலை + படகு கடப்பு + ஆம் + இல்லை + ஆம் + இல்லை + நீங்கள் வந்துவிட்டீர்கள்! + சரி + வரிசைப்படுத்து… + ஒரு வாரம் முன்பு + ஒரு மாதம் முன்பு + ஒரு மாதத்திற்கும் மேலாக + ஒரு வருடத்திற்கு முன்பு + என் அருகில் + மற்றவை + உணவு + காட்சிகள் + அருங்காட்சியகங்கள் + பூங்காக்கள் + நீந்தவும் + மலைகள் + விலங்குகள் + ஓட்டல்கள் + கட்டிடங்கள் + பணம் + கடைகள் + பார்க்கிங் + எரிவாயு நிலையங்கள் + மருந்து + பட்டியலில் தேடவும் + மத இடங்கள் + இந்தப் பகுதியில் சுரங்கப்பாதை வழிசெலுத்தல் இன்னும் கிடைக்கவில்லை + சுரங்கப்பாதை பாதை இல்லை + சுரங்கப்பாதை நிலையத்திற்கு அருகில் உள்ள தொடக்க அல்லது முடிவுப் புள்ளியைத் தேர்வு செய்யவும் + விளிம்பு கோடுகள் + விளிம்பு கோடுகளைச் செயல்படுத்த, இந்தப் பகுதிக்கான வரைபடத் தரவைப் பதிவிறக்க வேண்டும் + இந்த பகுதியில் இன்னும் விளிம்பு கோடுகள் கிடைக்கவில்லை + ஏற்றம் + இறக்கம் + குறைந்தபட்சம் உயரம் + அதிகபட்சம். உயரம் + ஐசோலைன்களை ஆராய பெரிதாக்கவும் + பதிவிறக்குகிறது + எங்கள் சமூகத்தால் உருவாக்கப்பட்ட வரைபடங்களைப் பயன்படுத்தியதற்கு நன்றி! + உங்கள் நன்கொடைகள் மற்றும் ஆதரவுடன், உலகில் சிறந்த வரைபடங்களை உருவாக்க முடியும்! + எங்கள் பயன்பாட்டை விரும்புகிறீர்களா? வளர்ச்சிக்கு ஆதரவளிக்க நன்கொடை வழங்குங்கள்! இன்னும் பிடிக்கவில்லையா? ஏன் என்று எங்களுக்குத் தெரியப்படுத்துங்கள், நாங்கள் அதை சரிசெய்வோம்! + உங்களுக்கு ஒரு மென்பொருள் உருவாக்குநரைத் தெரிந்திருந்தால், உங்களுக்குத் தேவையான அம்சத்தை செயல்படுத்தும்படி அவரிடம் அல்லது அவளிடம் கேட்கலாம். + எதையும் தேர்ந்தெடுக்க வரைபடத்தில் எங்கும் தட்டவும். இடைமுகத்தை மறைக்க மற்றும் காட்ட ஒரு நீண்ட தட்டு பயன்படுத்தப்படுகிறது. + வரைபடத்தில் உங்கள் தற்போதைய இருப்பிடத்தைத் தேர்ந்தெடுக்க முடியும் என்பது உங்களுக்குத் தெரியுமா? + எங்கள் பயன்பாட்டை உங்கள் மொழியில் மொழிபெயர்க்க நீங்கள் உதவலாம். + எங்கள் பயன்பாடு சில ஆர்வலர்கள் மற்றும் சமூகத்தால் உருவாக்கப்பட்டது. + வரைபடத் தரவை நீங்கள் எளிதாகச் சரிசெய்து மேம்படுத்தலாம். + நீங்கள் விரும்பும் வேகமான, தனியுரிமையை மையமாகக் கொண்ட, பயன்படுத்த எளிதான வரைபடங்களை உருவாக்குவதே எங்கள் முக்கிய குறிக்கோள். + நீங்கள் இப்போது ஃபோன் திரையில் CoMaps ஐப் பயன்படுத்துகிறீர்கள் + நீங்கள் இப்போது கார் திரையில் CoMaps ஐப் பயன்படுத்துகிறீர்கள் + தொலைபேசியில் தொடரவும் + கார் திரைக்கு + வெளியில் + அனைத்து புக்மார்க்குகளையும் தடங்களையும் ஏற்றுமதி செய்யவும் + டிரைவ்-த்ரூ + பட்டியல் இணைப்பு + மற்றொரு பயன்பாட்டில் திறக்கவும் + தன்வய பணி + வெளிப்புற இருக்கை + தெளிவு + பதிவு தடம் + ட்ராக் ரெக்கார்டிங்கை நிறுத்துங்கள் + சேமிக்காமல் நிறுத்து + பதிவைத் தொடரவும் + புக்மார்க்குகள் மற்றும் தடங்களில் சேமிக்கவா? + ட்ராக் காலியாக உள்ளது - சேமிக்க எதுவும் இல்லை + தடத்தை திருத்து + https://comaps.app/ + பின் + பதிவிறக்கம் தோல்வியடைந்தது, மீண்டும் முயற்சிக்க தட்டவும் + தேடு வரைபடம் + இந்தச் சாதனம் அல்லது பயன்பாட்டிற்கான அனைத்து இருப்பிடச் சேவைகளும் தற்போது முடக்கப்பட்டுள்ளன. அமைப்புகளில் அவற்றை இயக்கவும். + வரையறுக்கப்பட்ட துல்லியம் + துல்லியமான வழிசெலுத்தலை உறுதிசெய்ய, அமைப்புகளில் துல்லியமான இருப்பிடத்தை இயக்கவும் + மீண்டும் முயற்சிக்கவும் + CoMaps பற்றி + • பயன்படுத்த எளிதானது மற்றும் மெருகூட்டப்பட்டது + • தனியுரிமையை மையமாகக் கொண்டது மற்றும் விளம்பரங்கள் இல்லாதது + • இணைப்பில்லாத, வேகமான மற்றும் கச்சிதமான + முற்றிலும் திறந்த மூலமாக, லாபத்திற்காக அல்ல, வெளிப்படையான முடிவெடுத்தல் மற்றும் பொருள். + இருப்பிட அமைப்புகள் + பயன்பாட்டிற்கு வன்பொருள் துரிதப்படுத்தப்பட்ட OpenGL தேவை. எதிர்பாராதவிதமாக, உங்கள் சாதனம் ஆதரிக்கப்படவில்லை. + CoMaps ஐப் பயன்படுத்த USB கேபிளைத் துண்டிக்கவும் அல்லது நினைவக கார்டைச் செருகவும் + பயன்பாட்டைப் பயன்படுத்த, முதலில் SD கார்டு/USB சேமிப்பகத்தில் சிறிது இடத்தைக் காலியாக்கவும் + பயன்பாட்டைப் பயன்படுத்தத் தொடங்கும் முன், உங்கள் சாதனத்தில் உலக மேலோட்ட வரைபடத்தைப் பதிவிறக்கவும். \nஇது %s சேமிப்பகத்தைப் பயன்படுத்தும். + வரைபடத்திற்குச் செல்லவும் + %1$s (%2$s) பதிவிறக்குகிறது. உங்களால் இப்போது முடியும் \nவரைபடத்திற்கு செல்லவும். + %1$s ஐப் பதிவிறக்கவா? (%2$s) + %1$sஐப் புதுப்பிக்கவா? (%2$s) + இடைநிறுத்தம் + %s பதிவிறக்கம் தோல்வியடைந்தது + பெயர் + பட்டியல் + வரைபடங்களைச் சேமிக்கவும் + வரைபடங்களைப் பதிவிறக்குவதற்கான கோப்புறையைத் தேர்ந்தெடுக்கவும் + பதிவிறக்கம் செய்யப்பட்ட வரைபடங்கள் + %2$s இல் %1$s இலவசம் + வரைபடங்களை நகர்த்தவா? + வரைபடக் கோப்புகளை நகர்த்துவதில் பிழை + இதற்கு பல நிமிடங்கள் ஆகலாம். \nதயவுசெய்து காத்திருங்கள்… + மைல்கள் மற்றும் கிலோமீட்டர்களுக்கு இடையே தேர்வு செய்யவும் + குறிப்புகள் + CoMaps புக்மார்க்குகள் உங்களுடன் பகிரப்பட்டன + வணக்கம்! \n\nஎனது புக்மார்க்குகள் இணைக்கப்பட்டுள்ளன; அவற்றை CoMaps இல் திறக்கவும். நீங்கள் அதை நிறுவவில்லை என்றால், அதை இங்கே பதிவிறக்கம் செய்யலாம்: https://www.comaps.app/download/ \n\nCoMaps மூலம் பயணம் செய்து மகிழுங்கள்! + பயன்பாட்டால் கோப்பு வகை அங்கீகரிக்கப்படவில்லை: \n%1$s + %1$s கோப்பைத் திறக்க முடியவில்லை \n\n%2$s + மன்னிக்கவும், வரைபட சேமிப்பக அமைப்புகள் தற்போது முடக்கப்பட்டுள்ளன + வரைபடப் பதிவிறக்கம் இப்போது செயலில் உள்ளது + CoMaps இல் எனது தற்போதைய இருப்பிடத்தைப் பார்க்கவும்! %1$s அல்லது %2$s இணைப்பில்லாத வரைபடங்கள் இல்லையா? இங்கே பதிவிறக்கவும்: https://www.comaps.app/download/ + வணக்கம், \n\nநான் இப்போது இங்கே இருக்கிறேன்: %1$s. வரைபடத்தில் இடத்தைப் பார்க்க, இந்த இணைப்பை %2$s அல்லது இந்த %3$sஐக் சொடுக்கு செய்யவும். \n\nநன்றி. + பங்கு + இடைநிலைப்பலகைக்கு நகலெடுக்கப்பட்டது: %s + OpenStreetMap தரவு: %s + பொது அமைப்புகள் + தகவல் + வரைபடத்தில் காட்டவும் + இரவு முறை + குரல் வழிமுறைகள் + இப்போது குரல் கேட்கவில்லை என்றால், ஒலியளவு அல்லது சிச்டம் டெக்ச்ட்-டு-ச்பீச் அமைப்புகளைச் சரிபார்க்கவும் + கிடைக்கவில்லை + பட்டியல் + Panoramax படம் + பின்னூட்டம் + தன்னார்வத் தொண்டு மற்றும் CoMaps ஐ மேம்படுத்தவும் + திசைகாட்டியை அளவீடு செய்ய, எண்-எட்டு இயக்கத்தில் தொலைபேசியை நகர்த்துவதன் மூலம் அம்புக்குறியின் திசையை மேம்படுத்தவும். + திசைகாட்டியை அளவீடு செய்ய மற்றும் வரைபடத்தில் அம்புக்குறியின் திசையை சரிசெய்ய, எண்-எட்டு இயக்கத்தில் தொலைபேசியை நகர்த்தவும். + அனைத்தையும் நீக்கறல் + வரைபடத்தை நீக்க, வழிசெலுத்தலை நிறுத்தவும் + வரைபடத்தைப் புதுப்பிக்கவும் + கூகுள் இணைந்த இருப்பிடச் பணி + GPS, Wi-Fi, செல்லுலார் நெட்வொர்க்குகள் போன்றவற்றை ஒருங்கிணைத்து உங்கள் இருப்பிடத்தை மிகவும் துல்லியமாகத் தீர்மானிக்கும் தனியுரிமைச் பணி. இது Google சேவையகங்களுடன் இணைக்கப்படலாம். + போதுமான இடம் இல்லை + இருப்பிடச் சேவைகளை இயக்கவும் + வழியை உருவாக்க முடியவில்லை + சாலைக்கு அருகாமையில் உள்ள இலக்கைத் தேர்ந்தெடுக்கவும் + இடைநிலைப் புள்ளியைக் கண்டறிய முடியவில்லை + உங்கள் இடைநிலைப் புள்ளியைச் சரிசெய்யவும் + பயன்பாட்டுப் பிழையின் காரணமாக வழியை உருவாக்க முடியவில்லை + இப்போது இல்லை + வழிகளைத் தேடவும் உருவாக்கவும் தொடங்க, வரைபடத்தைப் பதிவிறக்கவும். அதன் பிறகு உங்களுக்கு இணைய இணைப்பு தேவைப்படாது. + வரைபடத்தைத் தேர்ந்தெடுக்கவும் + அச்சச்சோ, முடிவுகள் எதுவும் கிடைக்கவில்லை + உங்கள் அண்மைக் கால தேடல்களைக் காண்க + உங்களின் தற்போதைய இருப்பிடத்திலிருந்து மட்டுமே வழிசெலுத்தல் கிடைக்கும் + அடுத்தது + இருந்து + பெறுநர் + சரியான தவறு + சிக்கலை விரிவாக விவரிக்கவும், இதனால் OpenStreetMap சமூகம் அதை சரிசெய்ய முடியும். + அல்லது https://www.openstreetmap.org/ இல் நீங்களே செய்யுங்கள் + சிக்கல் + இந்த இடம் இல்லை + பராமரிப்புக்காக மூடப்பட்டுள்ளது + நகல் இடம் + %s இல் திறக்கப்படும் + %s இல் மூடப்படும் + %s இல் திறக்கப்படும் + %s இல் மூடப்படும் + %1$s அன்று %2$sக்கு திறக்கப்படும் + %1$s அன்று %2$s இல் மூடப்படும் + + %d நிமையம் + %d நிமையங்கள் + + %s உறுதிப்படுத்தப்பட்டது + இருப்பு உறுதிப்படுத்தப்பட்டது %s + வணிக நேரத்தைத் திருத்தவும் + OpenStreetMap கணக்கு இல்லையா? + OpenStreetMap இல் பதிவு செய்யவும் + புகுபதிவு + உள்நுழையவில்லை + OpenStreetMap இல் உள்நுழைக + விடுபதிகை + தெரு + சமூக ஊடகங்கள் + கட்டிடம் + தெருவின் பெயரை உள்ளிடவும் + தொலைபேசியைச் சேர்க்கவும் + நிலை: %s + உங்கள் வரைபடத் திருத்தங்கள் அனைத்தும் வரைபடத்துடன் நீக்கப்படும் + வழியை உருவாக்க, நீங்கள் அனைத்து வரைபடங்களையும் புதுப்பித்து, மீண்டும் பாதையைத் திட்டமிட வேண்டும். + உங்கள் சாதனம் இணையத்துடன் இணைக்கப்பட்டுள்ளதை உறுதிசெய்யவும் + உள்நுழைவு பிழை + சிக்கலின் விரிவான விளக்கம் + வித்தியாசமான சிக்கல் + %s இன் சமூகத்தால் உருவாக்கப்பட்ட OpenStreetMap தரவு. OpenStreetMap.org இல் வரைபடத்தை எவ்வாறு திருத்துவது மற்றும் புதுப்பிப்பது என்பது பற்றி மேலும் அறிக + OpenStreetMap.org (OSM) என்பது ஒரு இலவச மற்றும் திறந்த வரைபடத்தை உருவாக்குவதற்கான ஒரு சமூக திட்டமாகும். CoMaps இல் உள்ள வரைபடத் தரவின் முக்கிய சான்று இது மற்றும் விக்கிபீடியாவைப் போலவே செயல்படுகிறது. நீங்கள் இடங்களைச் சேர்க்கலாம் அல்லது திருத்தலாம் மற்றும் அவை உலகம் முழுவதும் உள்ள மில்லியன் கணக்கான பயனர்களுக்குக் கிடைக்கும். \nசமூகத்தில் சேர்ந்து அனைவருக்கும் சிறந்த வரைபடத்தை உருவாக்க உதவுங்கள்! + OpenStreetMap கணக்கை உருவாக்கவும் அல்லது உங்கள் வரைபட திருத்தங்களை உலகிற்கு வெளியிட உள்நுழையவும் + சில திட்டங்கள் அல்லது ரோமிங்கில் இது கணிசமாக விலை உயர்ந்ததாக இருக்கலாம் + மாடிகள் (இன்க். தரை தளம், கூரை தவிர) + வரைபடத்தில் உள்ள பிழைகள் அல்லது CoMaps மூலம் திருத்த முடியாத விசயங்களை விவரிக்கவும் + உங்கள் திருத்தங்கள் பொது OpenStreetMap தரவுத்தளத்தில் பதிவேற்றப்படும். தயவுசெய்து தனிப்பட்ட அல்லது பதிப்புரிமை பெற்ற தகவலைச் சேர்க்க வேண்டாம். + உங்கள் திருத்துதல் வரலாறு + உங்கள் வரைபடத் தரவு குறிப்புகள் + ஆபரேட்டர்: %s + ஆஃப்லைனில் தேட மற்றும் செல்ல வரைபடங்களைப் பதிவிறக்கவும் + தற்போதைய இடம் தெரியவில்லை + இடத்தை நீக்குவதற்கான காரணத்தைக் குறிப்பிடவும் + தளம் (0 என்பது தரை தளம்) + சரியான தரை எண்ணை உள்ளிடவும் + சரியான Facebook இணைய முகவரி, கணக்கு அல்லது பக்கத்தின் பெயரை உள்ளிடவும் + சரியான Instagram பயனர்பெயர் அல்லது இணைய முகவரியை உள்ளிடவும் + சரியான Twitter பயனர்பெயர் அல்லது இணைய முகவரியை உள்ளிடவும் + சரியான VK பயனர்பெயர் அல்லது இணைய முகவரியை உள்ளிடவும் + சரியான வரி அடையாளம் அல்லது இணைய முகவரியை உள்ளிடவும் + சரியான Mastodon பயனர்பெயர் அல்லது இணைய முகவரியை உள்ளிடவும் + சரியான Bluesky பயனர்பெயர் அல்லது இணைய முகவரியை உள்ளிடவும் + அல்லது, இதற்கு மாற்றாக, OpenStreetMap சமூகத்திற்கு ஒரு குறிப்பை விடுங்கள், இதன் மூலம் வேறு யாராவது ஒரு இடத்தைச் சேர்க்கலாம் அல்லது சரிசெய்யலாம். + குறிப்பு OpenStreetMap க்கு அனுப்பப்படும் + நீங்கள் தனிப்பட்ட அல்லது தனிப்பட்ட தரவு எதையும் உள்ளிடவில்லை என்பதை உறுதிப்படுத்தவும் + OpenStreetMap எடிட்டர்கள் மாற்றங்களைச் சரிபார்த்து, அவர்களுக்கு ஏதேனும் கேள்விகள் இருந்தால் உங்களைத் தொடர்புகொள்வார்கள் + தடத்தை பதிவு செய்தல் + வரைபட புதுப்பிப்பு அறிவிப்புகள் மற்றும் திருத்தங்களை பதிவேற்ற மொபைல் இணையம் தேவை + ட்ராஃபிக் தரவைக் காட்ட, வரைபடங்கள் புதுப்பிக்கப்பட வேண்டும் + CoMaps ஐப் புதுப்பிக்கவும் + பொதுவான கருத்து + குரல் வழிமுறைகளுக்கு TTS சிச்டத்தைப் பயன்படுத்துகிறோம். பல ஆண்ட்ராய்டு சாதனங்கள் Google TTS ஐப் பயன்படுத்துகின்றன, நீங்கள் அதை Google Play இலிருந்து பதிவிறக்கம் செய்யலாம் அல்லது புதுப்பிக்கலாம் (https://play.google.com/store/apps/details?id=com.google.android.tts) + சில மொழிகளுக்கு, ஆப் ச்டோரில் (Google Play, விண்மீன் மண்டலம்/விண்மீன் கூட்டம்/விண்மீன் திரள் Store, பயன்பாடு Gallery, FDroid) ச்பீச் சின்தசைசர் அல்லது கூடுதல் மொழி பேக்கை நிறுவ வேண்டும். \nஉங்கள் சாதனத்தின் அமைப்புகளைத் திறக்கவும் → மொழி மற்றும் உள்ளீடு → பேச்சு → உரையிலிருந்து பேச்சு வெளியீடு. \nபேச்சு தொகுப்புக்கான அமைப்புகளை இங்கே நீங்கள் நிர்வகிக்கலாம் (உதாரணமாக, இணைப்பில்லாத பயன்பாட்டிற்கான மொழிப் பேக்கைப் பதிவிறக்கவும்) மற்றும் மற்றொரு உரை-க்கு-பேச்சு இயந்திரத்தைத் தேர்ந்தெடுக்கவும். + மேலும் தகவலுக்கு, இந்த வழிகாட்டியைப் பார்க்கவும் + மேலும் அறிக + சேமிப்பக அணுகல் சிக்கல் + வெளிப்புற சேமிப்பகத்தை அணுக முடியாது. SD அட்டை அகற்றப்பட்டிருக்கலாம், சேதமடைந்திருக்கலாம் அல்லது கோப்பு முறைமை படிக்க மட்டுமே. தயவுசெய்து, உங்கள் SD கார்டைச் சரிபார்க்கவும் அல்லது support@comaps.app இல் எங்களைத் தொடர்பு கொள்ளவும் + மோசமான சேமிப்பகத்தைப் பின்பற்றவும் + + %d புத்தகக்குறி + %d புக்மார்க்குகள் + + பெயர் காலியாக இருக்கக்கூடாது + புதிய பட்டியல் + தயவுசெய்து வேறு பெயரைத் தேர்வு செய்யவும் + தயவுசெய்து காத்திருங்கள்… + தொலைபேசி எண் + + %d கோப்பு கண்டறியப்பட்டது. மாற்றிய பின் பார்க்கலாம். + %d கோப்புகள் கண்டறியப்பட்டன. மாற்றத்திற்குப் பிறகு அவற்றைப் பார்க்கலாம். + + + %d டிராக் + %d டிராக்குகள் + + தனியுரிமை + போக்குவரத்து + சுரங்கப்பாதை + இந்தப் பட்டியல் காலியாக உள்ளது + புக்மார்க்கைச் சேர்க்க, வரைபடத்தில் ஒரு இடத்தைத் தட்டவும், பின்னர் நட்சத்திர ஐகானைத் தட்டவும் + …மேலும் + வரைபடம் பதிவிறக்குபவர் + சில செயல்பாடுகளின் இழப்பில் மின் பயன்பாட்டைக் குறைக்க முயற்சிக்கவும் + திறன்: %s + நெட்வொர்க்: %s + புக்மார்க்குகளை வரிசைப்படுத்தவும் + இயல்பாக + வகை மூலம் + தூரம் மூலம் + தேதிப்படி + பெயரால் + பட்டியலைத் தேர்ந்தெடு + தொல்லை + மாவட்டம்: + நேரம்: + உலக மேலோட்ட வரைபடத்தைப் பதிவிறக்கவும் + உள் சாதனத்தின் நினைவகம் அல்லது sdcard இல் கோப்புறையை உருவாக்க மற்றும் கோப்புகளை நகர்த்த முடியவில்லை + வட்டு பிழை + இணைப்பு தோல்வி + USB கேபிளைத் துண்டிக்கவும் + திரையை இயக்கவும் + இயக்கப்பட்டால், வரைபடத்தைக் காண்பிக்கும் போது திரை எப்போதும் இயக்கத்தில் இருக்கும். + பூட்டுத் திரையில் காட்டு + இயக்கப்பட்டால், சாதனம் பூட்டப்பட்டிருந்தாலும் கூட பூட்டுத் திரையில் பயன்பாடு செயல்படும். + வரைபட மொழி + OpenStreetMap இலிருந்து வரைபடத் தரவு + https://t.me/CoMapsApp/ + https://www.instagram.com/comaps.app/ + https://www.comaps.app/support/tts-configuration-guide-for-android/ + https://comaps.app/ + https://wiki.openstreetmap.org/wiki/About_OpenStreetMap + %1$s, %2$s + நீங்கள் ஆண்ட்ராய்டு தானி உடன் இணைக்கப்பட்டுள்ளீர்கள் + CoMaps க்கு இருப்பிட அணுகல் தேவை. பாதுகாப்பாக இருக்கும்போது, உங்கள் மொபைலில் உள்ள அறிவிப்பைச் சரிபார்க்கவும். + இந்த பயன்பாட்டிற்கு உங்கள் இசைவு தேவை + ஆண்ட்ராய்டு தானி இல் CoMaps திறம்பட செயல்பட, இருப்பிட அனுமதிகள் தேவை + அனுமதிகளை வழங்கவும் + இணைய உலாவி கிடைக்கவில்லை + தொகுதி + பேச்சு தொகுப்பு அமைப்பு அமைப்புகள் + பேச்சு தொகுப்பு அமைப்புகள் காணப்படவில்லை, உங்கள் சாதனம் அதை ஆதரிக்கிறதா? + தேடலை அழிக்கவும் + பெரிதாக்கு + சிறிதாக்கு + மெனுவைப் பார்க்கவும் + விருப்பத்தைத் தேர்ந்தெடுக்கவும் + மிகவும் துல்லியமான வழிசெலுத்தலுக்கு, தொலைபேசியின் பேட்டரி அமைப்புகளில் மின் சேமிப்பு பயன்முறையை முடக்க பரிந்துரைக்கிறோம். + உங்கள் சாதனத்தில் பொருத்தமான பயன்பாடு எதுவும் நிறுவப்படாததால் கோப்புறை தேர்வு உரையாடலைக் காட்ட முடியவில்லை. கோப்பு மேலாளர் பயன்பாட்டை நிறுவி மீண்டும் முயற்சிக்கவும். + வண்ணத்தைத் தேர்ந்தெடுக்கவும் + இருப்பிடத்தைத் திறக்கக்கூடிய பயன்பாடு எதுவும் நிறுவப்படவில்லை + வழிசெலுத்தலில் தானியங்கு + இடது பொத்தான் அமைப்பு + முடக்கு + புக்மார்க்குகள் மற்றும் டிராக்குகள் காப்புப்பிரதி + உங்கள் சாதனத்தில் உள்ள கோப்புறையில் தானாகவே காப்புப் பிரதி எடுக்கவும் + இப்போது காப்புப்பிரதி எடுக்கவும் + உடனடியாக காப்புப்பிரதியை உருவாக்கவும் + காப்புப்பிரதி செயலில் உள்ளது… + காப்புப்பிரதி வெற்றிகரமாக முடிந்தது + காப்புப் பிரதி எடுக்க புக்மார்க்குகள் மற்றும் தடங்கள் இல்லை + காப்புப்பிரதி தோல்வியடைந்தது + காப்பு கோப்புறை கிடைக்கவில்லை + கடைசி வெற்றிகரமான காப்புப்பிரதி + காப்புப் பிரதி இடம் + முதலில் ஒரு கோப்புறையைத் தேர்ந்தெடுத்து இசைவு வழங்கவும் + வைத்திருக்க வேண்டிய காப்புப்பிரதிகளின் எண்ணிக்கை + தானியங்கி காப்புப்பிரதி + நாள்தோறும் + வாரந்தோறும் + ஆஃப் (கையேடு மட்டும்) + தேர்ந்தெடுக்கப்பட்ட காப்புப்பிரதி இடம் கிடைக்கவில்லை அல்லது எழுதக்கூடியதாக இல்லை. தயவுசெய்து வேறு இடத்தைத் தேர்ந்தெடுக்கவும். + பிழை அறிக்கையை எங்களுக்கு அனுப்பவும்: \n- அமைப்புகளில் \"பதிவு செய்வதை இயக்கு\" \n- சிக்கலை மீண்டும் உருவாக்கவும் \n- \"பற்றி & உதவி\" திரையில் \"ஒரு பிழையைப் புகாரளி\" பொத்தானை அழுத்தி மின்னஞ்சல் அல்லது அரட்டை வழியாக அனுப்பவும் \n- பதிவு செய்வதை முடக்கு + பாதை வகை + வண்டி + பாதசாரி + சைக்கிள் + ஆட்சியாளர் + புத்தகக்குறி நிறம் + பற்றி & உதவி + இப்போது திறக்கவும் + %s இல் + ட்ராக்கைப் பகிரவும் + %s ஐ நீக்கவா? + உரையிலிருந்து பேச்சு இயந்திரம் எதுவும் இல்லை, பயன்பாட்டு அமைப்புகளைச் சரிபார்க்கவும் + தெரியவில்லை + வகை 2 (கேபிள் இல்லை) + வகை 2 (w/ கேபிள்) + வகை 2 சேர்க்கை + வகை 1 + NACS + சேட்மோ + தெரியாத சாக்கெட் + தெரியாத சாக்கெட் + புதிய சாக்கெட்டுகளை உருவாக்கவும் அல்லது ஏற்கனவே உள்ளவற்றைத் திருத்தவும். + கிடைக்கும் சாக்கெட்டுகள் + மற்றவை அல்லது தெரியாதவை + எண்ணுங்கள் + ஆற்றல் (kW) + சாக்கெட்டை திருத்து + தெரியவில்லை + மதிப்பு நேர்மறையாக இருக்க வேண்டும் + தவறான எண் + விளக்கத்தைச் சேர்க்க பட்டியலைத் திருத்தவும் + வணிகம் காலியாக உள்ளது + வணிகம் காலியாக இருப்பதாகக் குறி + வணிகம் வெளியேறி, இடம் காலியாக இருந்தால் மற்றும் புதிய குத்தகைதாரருக்கு தயாராக இருந்தால் இதைப் பயன்படுத்தவும். + சமர்ப்பி + diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml index 6088cb38b..aebbaf9f9 100644 --- a/android/app/src/main/res/values-zh/strings.xml +++ b/android/app/src/main/res/values-zh/strings.xml @@ -27,7 +27,7 @@ 精度有限 - 为确保准确导航，请在设置中启用确切位置 + 为确保导航准确，请在设置中启用 \"精确定位\" 在地图上显示 @@ -36,13 +36,13 @@ 再试一次 关于 CoMaps - 由社区推动的开放项目 + 由社区驱动的开源项目 - • 使用方便，外观精美 + • 简单易用，精工细作 - •注重隐私，毫无广告 + • 专注隐私，绝无广告 - • 离线、快速、精简 + • 离线、迅捷、轻量 完全开源、决策问责、财务透明的非营利应用。 @@ -416,12 +416,12 @@ 自动下载 每天 - 24/7 全天候营业 - 今天不营业 - 不营业 - 将于 %s 后开业 - 将于 %s 后歇业 - 已停止营业 + 24/7 + 今天关闭 + 关闭 + %s 开放 + %s 关闭 + 已关闭 编辑营业时间 没有 OpenStreetMap 账号吗？ 注册 OpenStreetMap 账号 @@ -530,8 +530,8 @@ 您想要发送给所有用户吗？ - 请确保您没有输入任何私人或个人数据 - OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系 + 请确保您没有输入任何私人或个人数据。 + OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系。 停止 记录轨迹 @@ -634,7 +634,7 @@ 避开收费公路 - 避开未铺砌道路 + 避开非铺装道路 避开轮渡 避开高速公路 @@ -643,7 +643,7 @@ 选择要避开的道路 绕行设置已开启 收费公路 - 未铺砌道路 + 非铺装道路 轮渡 是 @@ -718,9 +718,9 @@ 磁盘错误 - 磁盘错误 + 连接失败 - 断开 USB 线缆 + 断开 USB 线连接 保持屏幕打开 启用后，显示地图时屏幕将始终打开。 @@ -863,8 +863,8 @@ 关闭（仅手动） 所选备份位置不可用或不可写入。请选择其他位置。 请向我们发送错误报告：\n - 在设置中“启用日志记录”\n - 重现问题\n - 在“关于和帮助”屏幕中点击“报告错误”按钮，然后通过电子邮件或聊天软件发送\n - 禁用日志记录 - 已歇业 - 营业中 + 已关闭 + 已开放 %s 或者，也可以给 OpenStreetMap 社区留下注记，以便其他人可以在此添加或修复地点。 注记将发送至 OpenStreetMap @@ -896,4 +896,16 @@ 离线地图 需要下载地图才能查看并在该区域内导航。\n请为您计划前往的区域下载地图。 编辑列表以添加描述 + %s 开放 + %s 关闭 + %1$s %2$s 开放 + %1$s %2$s 关闭 + + %d 分钟 + + 商铺空置 + 将商铺标记为空置 + 如果商铺已搬离且场地空置待租，请使用此选项。 + 提交 + 避开铺装道路 diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 717751f5a..fcca0dba8 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -74,8 +74,8 @@ #66000000 - @color/bg_primary - @color/bg_primary + #588157 + #588157 #f8b42e #fefdf6 diff --git a/android/app/src/main/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml index f38701efc..3908e20a6 100644 --- a/android/app/src/main/res/values/donottranslate.xml +++ b/android/app/src/main/res/values/donottranslate.xml @@ -105,4 +105,5 @@ Pixelfed × %d %s kW + + XX X XX XX XX diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 164c02b29..2cbd33132 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -442,6 +442,14 @@ Opens in %s Closes in %s Closed + Opens at %s + Closes at %s + Opens on %1$s at %2$s + Closes on %1$s at %2$s + + %d min + %d min + Confirmed %s @@ -544,6 +552,14 @@ Describe what the place looks like now to send an error note to the OpenStreetMap community Please indicate the reason for deleting the place + + Business is vacant + + Mark business as vacant + + Use this if the business has moved out and the space is empty and ready for a new tenant. + + Submit Enter a valid phone number Enter a valid web address @@ -563,8 +579,8 @@ Do you want to send it to all users? - Make sure you did not enter any private or personal data - OpenStreetMap editors will check the changes and contact you if they have any questions + Make sure you did not enter any private or personal data. + OpenStreetMap editors will check the changes and contact you if they have any questions. Stop Recording the track @@ -678,6 +694,7 @@ Avoid ferries Avoid freeways Avoid stairs + Avoid paved roads Unable to calculate route A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry. Define roads to avoid diff --git a/android/app/src/main/res/xml/prefs_backup.xml b/android/app/src/main/res/xml/prefs_backup.xml index ce8d1d034..68d3008c9 100644 --- a/android/app/src/main/res/xml/prefs_backup.xml +++ b/android/app/src/main/res/xml/prefs_backup.xml @@ -1,24 +1,29 @@ - + + android:title="@string/pref_backup_location_title" + app:iconSpaceReserved="false" /> + android:title="@string/pref_backup_now_title" + app:iconSpaceReserved="false" /> + android:title="@string/pref_backup_interval_title" + app:iconSpaceReserved="false" /> + android:title="@string/pref_backup_history_title" + app:iconSpaceReserved="false" /> diff --git a/android/app/src/main/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml index 1ae66695f..a5ea81e55 100644 --- a/android/app/src/main/res/xml/prefs_main.xml +++ b/android/app/src/main/res/xml/prefs_main.xml @@ -7,6 +7,7 @@ @@ -17,6 +18,7 @@ @@ -116,6 +127,7 @@ android:key="@string/pref_backup" android:title="@string/pref_backup_title" android:summary="@string/pref_backup_summary" + app:icon="@drawable/ic_settings_backup_restore" app:singleLineTitle="false" android:persistent="false" android:order="19"/> @@ -128,12 +140,14 @@ + android:title="@string/driving_options_title" + app:icon="@drawable/ic_instant_mix"> @@ -197,12 +213,14 @@ android:key="@string/pref_play_services" android:title="@string/google_play_services" app:singleLineTitle="false" + app:icon="@drawable/ic_wifi_find" android:summary="@string/pref_use_google_play" android:defaultValue="true" android:order="1"/> diff --git a/android/app/src/main/res/xml/prefs_voice_instructions.xml b/android/app/src/main/res/xml/prefs_voice_instructions.xml index 66862510b..557ab234d 100644 --- a/android/app/src/main/res/xml/prefs_voice_instructions.xml +++ b/android/app/src/main/res/xml/prefs_voice_instructions.xml @@ -5,45 +5,54 @@ + android:title="@string/pref_tts_enable_title" + app:iconSpaceReserved="false"/> + android:defaultValue="false" + app:iconSpaceReserved="false"/> + android:title="@string/pref_tts_language_title" + app:iconSpaceReserved="false"/> + android:title="@string/volume" + app:iconSpaceReserved="false"/> + android:title="@string/pref_tts_test_voice_title" + app:iconSpaceReserved="false"/> + android:title="@string/pref_tts_open_system_settings" + app:iconSpaceReserved="false"/> + android:summary="@string/prefs_languages_information" + app:iconSpaceReserved="false" /> + android:summary="@string/prefs_languages_information_off_link" + app:iconSpaceReserved="false" /> + android:defaultValue="@string/auto_enum_value" + app:iconSpaceReserved="false" /> diff --git a/android/app/src/test/java/app/organicmaps/widget/placepage/OpenStateTextFormatterTest.java b/android/app/src/test/java/app/organicmaps/widget/placepage/OpenStateTextFormatterTest.java new file mode 100644 index 000000000..621f1bee1 --- /dev/null +++ b/android/app/src/test/java/app/organicmaps/widget/placepage/OpenStateTextFormatterTest.java @@ -0,0 +1,72 @@ +package app.organicmaps.widget.placepage; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Locale; + +public class OpenStateTextFormatterTest +{ + private static final String OPENS_AT = "Opens at %s"; + private static final String CLOSES_AT = "Closes at %s"; + private static final String OPENS_DAY_AT = "Opens %1$s at %2$s"; + private static final String CLOSES_DAY_AT = "Closes %1$s at %2$s"; + + @Test + public void formatHoursMinutes_24h() + { + assertEquals("09:00", OpenStateTextFormatter.formatHoursMinutes(9, 0, true)); + assertEquals("18:05", OpenStateTextFormatter.formatHoursMinutes(18, 5, true)); + } + + @Test + public void formatHoursMinutes_12h() + { + assertEquals("9:00 AM", OpenStateTextFormatter.formatHoursMinutes(9, 0, false)); + assertEquals("6:05 PM", OpenStateTextFormatter.formatHoursMinutes(18, 5, false)); + assertEquals("12:00 PM", OpenStateTextFormatter.formatHoursMinutes(12, 0, false)); + assertEquals("12:00 AM", OpenStateTextFormatter.formatHoursMinutes(0, 0, false)); + } + + @Test + public void buildAtLabel_today_open_close() + { + String open = OpenStateTextFormatter.buildAtLabel(true, true, "Sat", "09:00", + OPENS_AT, CLOSES_AT, OPENS_DAY_AT, CLOSES_DAY_AT); + String close = OpenStateTextFormatter.buildAtLabel(false, true, "Sat", "18:00", + OPENS_AT, CLOSES_AT, OPENS_DAY_AT, CLOSES_DAY_AT); + assertEquals("Opens at 09:00", open); + assertEquals("Closes at 18:00", close); + } + + @Test + public void buildAtLabel_other_day() + { + String open = OpenStateTextFormatter.buildAtLabel(true, false, "Sat", "09:00", + OPENS_AT, CLOSES_AT, OPENS_DAY_AT, CLOSES_DAY_AT); + String close = OpenStateTextFormatter.buildAtLabel(false, false, "Tue", "18:00", + OPENS_AT, CLOSES_AT, OPENS_DAY_AT, CLOSES_DAY_AT); + assertEquals("Opens Sat at 09:00", open); + assertEquals("Closes Tue at 18:00", close); + } + + @Test + public void isSameLocalDate_and_dayShort_helpers() + { + ZonedDateTime a = ZonedDateTime.of(2025, 3, 1, 10, 0, 0, 0, ZoneId.of("Europe/Paris")); + ZonedDateTime b = ZonedDateTime.of(2025, 3, 1, 22, 0, 0, 0, ZoneId.of("Europe/Paris")); + ZonedDateTime c = a.plusDays(1); + + assertTrue(OpenStateTextFormatter.isSameLocalDate(a, b)); + assertFalse(OpenStateTextFormatter.isSameLocalDate(a, c)); + + String day = OpenStateTextFormatter.dayShort(c, Locale.US); + // March 2, 2025 is a Sunday; "Sun" in US locale + assertEquals("Sun", day); + } +} diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp index bd0bfea2a..cfa01c107 100644 --- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp +++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp @@ -277,6 +277,12 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsNameEd return g_editableMapObject.IsNameEditable(); } +JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCanMarkPlaceAsDisused(JNIEnv * env, + jclass clazz) +{ + return g_editableMapObject.CanMarkPlaceAsDisused(); +} + JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsPointType(); @@ -434,6 +440,11 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeRollbackMapO g_framework->NativeFramework()->RollBackChanges(g_editableMapObject.GetID()); } +JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeMarkPlaceAsDisused(JNIEnv * env, jclass clazz) +{ + g_framework->NativeFramework()->MarkPlaceAsDisused(g_editableMapObject); +} + JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring jLang) diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java index b73198b55..9e99bfac8 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java @@ -99,6 +99,7 @@ public final class Editor public static native boolean nativeIsAddressEditable(); public static native boolean nativeIsNameEditable(); + public static native boolean nativeCanMarkPlaceAsDisused(); public static native boolean nativeIsPointType(); public static native boolean nativeIsBuilding(); @@ -164,6 +165,7 @@ public final class Editor public static native void nativeCreateNote(String text); public static native void nativePlaceDoesNotExist(@NonNull String comment); public static native void nativeRollbackMapObject(); + public static native void nativeMarkPlaceAsDisused(); public static native void nativeCreateStandaloneNote(double lat, double lon, String text); /** diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java index 976702e68..5abde19e4 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java @@ -7,5 +7,6 @@ public enum RoadType Motorway, Ferry, Dirty, - Steps + Steps, + Paved } diff --git a/android/sdk/src/main/res/values-b+sr+Latn/strings.xml b/android/sdk/src/main/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..55344e519 --- /dev/null +++ b/android/sdk/src/main/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml b/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml new file mode 100644 index 000000000..55344e519 --- /dev/null +++ b/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/android/sdk/src/main/res/values-cs/types_strings.xml b/android/sdk/src/main/res/values-cs/types_strings.xml index 7eaa045db..3e236f970 100644 --- a/android/sdk/src/main/res/values-cs/types_strings.xml +++ b/android/sdk/src/main/res/values-cs/types_strings.xml @@ -306,7 +306,7 @@ Vchod Hlavní vchod - Východ + Východ (Pouze) Zdarma Lékařská laboratoř Fyzioterapeut @@ -1001,7 +1001,7 @@ Klenotnictví Prodejna kuchyní Prádelna - Obchoďák + Obchodní centrum Masážní salon Obchod s mobilními telefony Půjčovatel peněz @@ -1433,4 +1433,67 @@ Plavecké centrum Neobsazený prostor Studio jógy + Půjčovna lodí + Mobilní peněžní agent + Platební centrum + Vnitřní herní centrum + Telekomunikační obchod + Spolujízda + Teleskop + Jachtařská škola + Letecká škola + Přípravná škola + Nouzový bod záchrany + Záchranný kruh + Denní lázně + Potravinová banka + Teleskop (optický) + Teleskop (rádio) + Teleskop (gamma) + Observatoř + Vývařovna + Food sharing + Give Box + Kardinální baken + Kardinální baken + Kardinální baken + Kardinální baken + Izolovaný výstražný baken + Laterální baken + Laterální baken + Baken pro bezpečnou vodu + Baken pro speciální účely + Kardinální bóje + Kardinální bóje + Kardinální bóje + Kardinální bóje + Izolovaná výstražná bóje + Laterální bóje + Laterální bóje + Bóje pro bezpečnou vodu + Bóje pro speciální účely + Sférická kardinální bóje + Sférická kardinální bóje + Sférická kardinální bóje + Sférická kardinální bóje + Sférická izolovaná výstražná bóje + Sférická laterální bóje + Sférická laterální bóje + Sférická bóje pro bezpečnou vodu + Sférická bóje pro speciální účely + Levobok + Pravobok + Východ + Sever + Jih + Západ + Vchod do domu + Vchod do garáže + Služební vchod + Vstup (Pouze) + Nouzový východ + Písek + Strom + Nehtový salón + Vánoční strom diff --git a/android/sdk/src/main/res/values-da/types_strings.xml b/android/sdk/src/main/res/values-da/types_strings.xml index cc5a4cdb3..5768de0f6 100644 --- a/android/sdk/src/main/res/values-da/types_strings.xml +++ b/android/sdk/src/main/res/values-da/types_strings.xml @@ -28,9 +28,9 @@ Gambling Spillehal for voksne Arkadespil - Ladestander - Cykelladestander - Billadestander + Ladestation + Ladestation til elcykler + Ladestation til elbiler Vuggestue Biograf Bowlinghal @@ -83,17 +83,17 @@ Parkeringslomme Parkeringslomme Privat parkeringslomme - Parkering i vejside - Parkering i vejside - Privat parkering i vejside - Parkeringsindkørsel - Privat parkeringsindkørsel - Parkeringsindkørsel - Parkeringsplads - Parkeringsplads - Parkeringsplads - Parkeringsplads - Handicapparkeringsplads + Gadeparkering + Gadeparkering + Privat gadeparkering + Indkørsel til parkeringshus + Indkørsel til privat parkeringshus + Indkørsel til parkeringshus + Parkeringsbås + Parkeringsbås + Parkeringsbås + Parkeringsbås + Handicapparkeringsbås Betalingsautomat Apotek Tilbedelsessted @@ -393,7 +393,7 @@ Bro Tunnel - Sækunder hovedvej + Sekundær hovedvej Bro @@ -964,7 +964,7 @@ Gardinhandel Delikatessebutik Stormagasin - Isenkræmmer + Byggemarked Renseri Elektronikbutik Erotikbutik @@ -984,7 +984,7 @@ Høreapparatbutik Urtebutik HiFi lyd - Husholdningsartikler butik + Isenkræmmer Smykkebutik Køkkenforretning Vaskeri @@ -993,21 +993,21 @@ Mobiltelefonbutik Pengeudlåner Motorcykelforhandler - Motorcykel reparation + Motorcykelværksted Pladebutik - Butik med musikinstrumenter + Instrumentbutik Avis-kiosk Optiker - Fritidsudstyr + Friluftsbutik Afhentningssted - Pasta butik + Pastabutik Bagværk Pantelåner Dyrehandel Kæledyrspleje Fotobutik Udlejningsbutik - Cykeludlejningsbutik + Cykeludlejning Fiskehandler Genbrugsbutik Skobutik @@ -1015,7 +1015,7 @@ Kontorartikler Supermarked Tatovør - Tebutik + Tehandel Billetkontor Legetøjsbutik Rejsebureau @@ -1026,7 +1026,7 @@ Vinhandel Landbrugsbutik Antikvitetsbutik - Hvidevarer butik + Hvidevareforretning Kunstbutik Børnebutik @@ -1036,8 +1036,8 @@ Velgørenhedsbutik Ostebutik Kunst og kunsthåndværk - Mejeriprodukter - El-butik + Mejeributik + Elektrikerbutik Fiskeributik Brugskunsthandel Lottobutik @@ -1058,7 +1058,7 @@ Australsk fodbold Baseball Basketball - Beachvolley + Strandvolley Skak Curling Ridesport @@ -1163,7 +1163,7 @@ Ridesti Elevator Ridesti - Traktørsted + Biergarten Svævebane Kabinelift Træklift @@ -1220,7 +1220,7 @@ Boblete Mur Fish and Chips - Hovedvej + Vej Rasteplads Internet Trådløst internet @@ -1305,7 +1305,7 @@ Metrolinje Stoppested Metrolinjetunnel - Byggemarked + Isenkræmmer Ankerlift Vejbump Færgerute @@ -1389,8 +1389,35 @@ Portlåge Rørskov Lysbutik - Rygløs bænk - Opladningspunkt til biler - Sportscenter - Sportscenter + Bænk + Ladestander til biler + Idrætscenter + Idrætscenter + Samkørsel + Telefonibutik + Ledig forretning + Bådudlejning + Observatorium + Solseng + Scenepavillon + Legeland + Bueskydningscenter + Atletikcenter + Baseballcenter + Badmintoncenter + Basketballcenter + Golfcenter + Gymnastikcenter + Teleskop + Teleskop (Optisk) + Teleskop (Radio) + Teleskop (Gamma) + Svømmehal + Fødevarebank + Suppekøkken + Fødevarerdeling + Bytteboks + Sejlerskole + Flyveskole + Kraftværksportal diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml index 9da61de53..ef5286305 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -27,6 +27,7 @@ Sitzbank Sitzbank ohne Rückenlehne Fahrradständer + Bootsverleih Fahrradverleih Fahrrad-Reparaturstation Bordell @@ -336,19 +337,59 @@ Vegetarisch Vietnamesisch Notfall + Rettungspunkt Notfall-Sammelpunkt + Rettungsring Defibrillator Hydrant Notruftelefon Rettungsschwimmer + Kardinalbake + Kardinalbake + Kardinalbake + Kardinalbake + Einzelgefahrenbake + Lateralbake + Lateralbake + Mittefahrwasserbarke + Spezialbake + Kardinalboje + Kardinalboje + Kardinalboje + Kardinalboje + Einzelgefahrenboje + Lateralboje + Lateralboje + Mittefahrwasserboje + Spezialboje + Kugelförmige Kardinalboje + Kugelförmige Kardinalboje + Kugelförmige Kardinalboje + Kugelförmige Kardinalboje + Kugelförmige Einzelgefahrenboje + Kugelförmige Lateralboje + Kugelförmige Lateralboje + Kugelförmige Mittefahrwasserboje + Kugelförmige Spezialboje + Backbord + Steuerbord + Ost + Nord + Süd + West Bergrettungsstation Eingang Haupteingang - Ausgang + Hauseingang + Garageneingang + Serviceeingang + (Nur) Eingang + (Nur) Ausgang + Notausgang Kostenlos Medizinisches Labor Physiotherapie @@ -747,6 +788,7 @@ Quelle Quelle Meerenge + Baum Baumreihe Weinberg Vulkan @@ -1119,6 +1161,7 @@ Bäckerei Badezimmerausstattung Schönheitssalon + Nagelstudio Getränkemarkt Fahrradladen Wettbüro @@ -1437,4 +1480,24 @@ Abspannportal Lampenladen Leerstehendes Geschäft + Indoor-Spielplatz + Fahrgemeinschaften + Telekommunikationsgeschäft + Teleskop + Teleskop (Optisch) + Teleskop (Radio) + Teleskop (Gamma) + Observatorium + Zahlungszentrum + Suppenküche + Tafel + Flugschule + Segelschule + Nachhilfeschule + Tages-Spa + Spendenbox + Weihnachtsbaum + Mobile Money Vertretung + Food Sharing + Sand diff --git a/android/sdk/src/main/res/values-es/types_strings.xml b/android/sdk/src/main/res/values-es/types_strings.xml index 9480e79bd..b1370a8c1 100644 --- a/android/sdk/src/main/res/values-es/types_strings.xml +++ b/android/sdk/src/main/res/values-es/types_strings.xml @@ -1437,4 +1437,66 @@ Estudio de yoga Local comercial vacante Tumbona + Alquiler de botes + Telescopio + Telescopio (óptico) + Radiotelescopio + Telescopio Fermi + Observatorio + Agencia de efectivo móvil + Punto de Vehículo Compartido + Centro de pagos + Salvavidas + Tienda de telecomunicaciones + Banco de alimentos + Punto de rescate de emergencia + Centro de actividades en interior + Comedor social + Alimentos compartidos + Give Box + Escuela de vela + Escuela de aviación + Escuela de tutoría + Marca cardinal + Marca cardinal + Marca cardinal + Marca cardinal + Marca de peligro aislado + Marca lateral + Marca lateral + Marca de aguas navegables + Marca especial + Boya cardinal + Boya cardinal + Boya cardinal + Boya cardinal + Boya de peligro aislado + Boya lateral + Boya lateral + Boya de aguas navegables + Boya de uso especial + Boya cardinal especial + Boya esférica cardinal + Boya esférica cardinal + Boya esférica cardinal + Boya esférica de peligro aislado + Boya esférica lateral + Boya esférica lateral + Boya esférica de aguas navegables + Boya esférica de uso especial + Babor + Estribor + Este + Norte + Sur + Oeste + Entrada de casa + Entrada de garaje + Entrada de servicio + Entrada (únicamente) + Salida de emergencia + Arena + Árbol + Spa + Árbol de Navidad diff --git a/android/sdk/src/main/res/values-et/types_strings.xml b/android/sdk/src/main/res/values-et/types_strings.xml index 5bb5e0b4d..4984b8436 100644 --- a/android/sdk/src/main/res/values-et/types_strings.xml +++ b/android/sdk/src/main/res/values-et/types_strings.xml @@ -345,20 +345,20 @@ Täistaimetoidukoht Taimetoit Vietnami - Pääste- ja abiteenused + Pääste- ja hädaolukorra teenused Kogunemiskoht hädaolukorras Defibrillaator Tuletõrjehüdrant Hädaabi telefon - Päästja + Vetelpäästja Mäepäästejaam Sissepääs Peasissepääs - Väljapääs + Vaid väljapääs Tasuta Meditsiinilabor Füsioterapeut @@ -1436,4 +1436,60 @@ Joogakeskus Vaba äripind Rannatool + Paadirent + Teleskoop + Optiline teleskoop + Raadioteleskoop + Gammateleskoop + Observatoorium + Nutiraha müüja + Ühiskasutusautode peatus + Maksekeskus + Mängusaal/Mängutuba + Sideteenuste pood + Supiköök + Toidupank + Toidujagamine + Annetuskast + Asukohatuvastuspunkt hädaolukorras + Päästerõngas + Päevaspaa + Lennukool + Tugiõpe + Purjetamiskool + Maja sissepääs + Garaaži sissepääs + Teenistuskäik + Vaid sissepääs + Avariiväljapääs + Liiv + Üksik puu + Jõulupuu + Idatooder + Põhjatooder + Lõunatooder + Läänetooder + Idapoi + Põhjapoi + Lõunapoi + Läänepoi + Lateraalpoi pakpoordis + Lateraalpoi tüürpoordis + Eriotstarbeline poi + Kerapoi idas + Kerapoi põhjas + Kerapoi lõunas + Kerapoi läänes + Kerapoi pakpoordis + Kerapoi tüürpoordis + Eritistarbeline kerapoi + Kerapoi eraldiasetseva ohu märkimiseks + Poi eraldiasetseva ohu märkimiseks + Tooder eraldiasetseva ohu märkimiseks + Lateraalne tooder tüürpoordis + Lateraalne tooder pakpoordis + Eriotstarbeline tooder + Faarvaatri tooder + Faarvaatri poi + Faarvaatri kerapoi diff --git a/android/sdk/src/main/res/values-fa/types_strings.xml b/android/sdk/src/main/res/values-fa/types_strings.xml index 448298699..85f6efa1f 100644 --- a/android/sdk/src/main/res/values-fa/types_strings.xml +++ b/android/sdk/src/main/res/values-fa/types_strings.xml @@ -453,7 +453,7 @@ دفن گاه زباله محدوده راه آهن اب - محدوده مخصوص سگ + بوستان سگ باشگاه بدنسازی پارک سلامت ﺺﻗﺭ ﻦﻟﺎﺳ @@ -462,37 +462,36 @@ زمین گلف هکراسپیس نشستن در فضای باز - پارک - پارک - پارک - پارک - ﮏﯿﻨﮑﯿﭘ ﺰﯿﻣ + بوستان + بوستان خوشیک + بوستان + پارک خوشیک زمین ورزشی زمین بازی سونا - مرکزورزشی + کانون ورزشی مرکز صعود سالن یوگا استادیوم - استخرشنا - استخرشنا - گردشگری + استخرِ شنا + استخرِ شنا + بوستان آبی گردشگری - دوربین نظارتی - برج + دوربین پایشی + بُرگ برج ارتباطات - برج ارتباطات + بُرگ ارتباطات چاه نفت یا گاز مشعل گاز - شیراب - شیراب + شیر آب + شیر آب منبع اب - چاه اب - چاه اب + چاه آب + چاه آب توربین بادی پناهگاه طبیعت @@ -507,7 +506,7 @@ ساحل شنی ساحل شن دماغه - غار + دروازه گال پرتگاه صخره خاک‌ریز @@ -1116,4 +1115,9 @@ رواگ‌صندلی صندلی بی پشتی انبازیدن خودرو + زمین اَمَرکانیگ + کانون ورزشی + کانون ورزشی + کانون ورزشی + کانون ورزشی diff --git a/android/sdk/src/main/res/values-fr/types_strings.xml b/android/sdk/src/main/res/values-fr/types_strings.xml index 6148f1655..571de4ef7 100644 --- a/android/sdk/src/main/res/values-fr/types_strings.xml +++ b/android/sdk/src/main/res/values-fr/types_strings.xml @@ -1434,6 +1434,68 @@ Complexe sportif Complexe sportif Salle de yoga - Locaux commerciaux libres + Magasin vacant Chaise longue + Vente de bateau + Centre de paiement + Agent d\'argent liquide + Complexe de jeux intérieurs + Boutique télécom + Télescope (optique) + Télescope (radio) + Observatoire + Banque alimentaire + Repas partagé + Télescope (Gamma) + Covoiturage + Soupe populaire + Boîte à don + Télescope + École de voile + École de pilotage + École de soutien scolaire + Point de secours d\'urgence + Bouée de sauvetage + Spa de jour + Phare cardinal + Phare cardinal + Phare cardinal + Phare cardinal + Balise de danger isolée + Balise latérale + Balise latérale + Balise d\'eau potable + Balise à usage spécial + Bouée cardinale + Bouée cardinale + Bouée cardinale + Bouée cardinale + Bouée de danger isolée + Bouée latérale + Bouée latérale + Bouée en eau sûre + Bouée à usage spécial + Bouée cardinale sphérique + Bouée cardinale sphérique + Bouée cardinale sphérique + Bouée cardinale sphérique + Bouée de danger sphérique isolée + Bouée latérale sphérique + Bouée latérale sphérique + Bouée sphérique de sécurité en eau + Bouée sphérique à usage spécial + Port + Tribord + Est + Nord + Sud + Ouest + Entrée de la maison + Entrée du garage + Entrée de service + Entrée (uniquement) + Issue de secours + Arbre de Noël + Arbre + Sable diff --git a/android/sdk/src/main/res/values-hu/types_strings.xml b/android/sdk/src/main/res/values-hu/types_strings.xml index f67965fc8..6b5e61ff2 100644 --- a/android/sdk/src/main/res/values-hu/types_strings.xml +++ b/android/sdk/src/main/res/values-hu/types_strings.xml @@ -1431,4 +1431,10 @@ Sportközpont Jógastúdió Elektromos töltőpont + Hajóbérlés + Távcső + Távcső (Optikai) + Távcső (Rádió) + Távcső (Gamma) + Csillagvizsgáló diff --git a/android/sdk/src/main/res/values-it/types_strings.xml b/android/sdk/src/main/res/values-it/types_strings.xml index ed3ecabef..40dfaa47c 100644 --- a/android/sdk/src/main/res/values-it/types_strings.xml +++ b/android/sdk/src/main/res/values-it/types_strings.xml @@ -1400,4 +1400,5 @@ Negozio di illuminazione Panchina senza schienale Colonnina di ricarica + Osservatorio diff --git a/android/sdk/src/main/res/values-lv/types_strings.xml b/android/sdk/src/main/res/values-lv/types_strings.xml index 28b38b3a7..95e363162 100644 --- a/android/sdk/src/main/res/values-lv/types_strings.xml +++ b/android/sdk/src/main/res/values-lv/types_strings.xml @@ -33,7 +33,7 @@ Jūra Bārs Divriteņu novietne - Velosipēdu īre + Velosipēdu noma Alus dārzs Valūtas maiņa Autoosta @@ -136,4 +136,50 @@ Kāpšana Niršana Krikets + Tālsaziņas preču veikals + Biļešu tirdzniecības vieta + Rotaļlietu veikals + Ceļojumu aģentūra + Riepu veikals + Maksājumu centrs + Aptieka + Pielūgsmes vieta + Budistu templis + Baznīca + Laivu noma + Divriteņu darbnīca + Teleskops (Gamma) + Observatorija + Teleskops + Teleskops (optiskais) + Teleskops (radio) + Zupas virtuve + Ēdiena kopīgošana + Glābšanas boja + Defibrillators + Ugunsdzēsēju ūdens ņemšanas vieta + Ārkārtas tālrunis + Ārkārtas glābšanas punkts + Ārkārtas tikšanās punkts + Dienas spa + Masāžas salons + Smiltis + Geizers + Ledājs + Pļava + Tīrelis + Karstais avots + Ezers + Koks + Koku rinda + Vīnogu dārzs + Vulkāns + Ūdens + Mitrājs + Muklājs + Dumbrājs + Sāļūdens dumbrājs + Ziemassvētku egle + Ārkārtas izeja + Osta diff --git a/android/sdk/src/main/res/values-nb/types_strings.xml b/android/sdk/src/main/res/values-nb/types_strings.xml index bb1363b73..b58895d3d 100644 --- a/android/sdk/src/main/res/values-nb/types_strings.xml +++ b/android/sdk/src/main/res/values-nb/types_strings.xml @@ -200,7 +200,7 @@ Snekker Konditori Elektriker - Elektronikk reparasjon + Elektronikkreparasjon Anleggsgartner Slipemølle Kunsthåndverk @@ -314,7 +314,7 @@ Inngang Hovedinngang - Utgang + Utgang (bare) Gratis Medisinsk laboratorium Fysioterapeut @@ -975,7 +975,7 @@ Bokhandel Slakter Cannabisbutikk - Bil butikk + Bilforhandler Bildeler Bilverksted Dekkreparasjon @@ -994,7 +994,7 @@ Varehus Jernvareforretning Renseri - Elektronikk forhandler + Elektronikkbutikk Erotisk butikk Butikk Gårdsmatbutikk @@ -1066,7 +1066,7 @@ Ostebutikk Kunst og Håndverk Meieriprodukter - Elektronisk butikk + Elektroforretning Fiskeutstyrsbutikk Interiørdekorasjoner Lotteribilletter @@ -1353,4 +1353,33 @@ Smalsporet jernbanebru Smalsporet jernbanetunnel Slipp + Post i butikk + Pub + Monument + Kran + Bunker + Jernbanebygging + Kabelbanebru + Kabelbanetunnel + Militært + Utdanningsinstitusjon + Teleskop + Matsentral + Teleskop (Gamma) + Teleskop (Radio) + Suppekjøkken + Samkjøring + Telekommunikasjonsbutikk + Båtutleie + Observatorium + Livbøye + Sand + Tre + Sør + Nord + Øst + Vest + Juletre + Nødutgang + Inngang (bare) diff --git a/android/sdk/src/main/res/values-nl/types_strings.xml b/android/sdk/src/main/res/values-nl/types_strings.xml index 840721cec..6748f0e2e 100644 --- a/android/sdk/src/main/res/values-nl/types_strings.xml +++ b/android/sdk/src/main/res/values-nl/types_strings.xml @@ -355,7 +355,7 @@ Ingang Hoofdingang - Ga naar + Uitgang (enig) Gratis Medisch laboratorium Fysiotherapeut @@ -419,8 +419,8 @@ Moeilijk of slecht zichtbaar pad Zeer moeilijk of niet te onderscheiden spoor - Fietspad - Fietspad + Fiets- & voetpad + Fiets- & voetpad Brug Ruiterpad @@ -641,8 +641,8 @@ Sauna Scheepshelling Sportcentrum - Klimhal - Yogastudio + Klimmen + Yoga Stadion Zwembad Privé zwembad @@ -1112,7 +1112,7 @@ Drogisterij Chocolaterie Kledingwinkel - Koffiewinkel + Koffieverkoop Computerwinkel Snoepwinkel Buurtwinkel @@ -1376,7 +1376,7 @@ Kraan Vangrail Love Hotel - Studio + Mediastudio Klifduiken Metrostation Religieus Land @@ -1398,4 +1398,98 @@ Beveiligingsloket Verdeelstation Verlichtingswinkel + Bankje + Bootverhuur + Telescoop + Telescoop (optisch) + Telescoop (radio) + Telescoop (gamma) + Observatorium + Autolaadpunt + Carpool + Reddingsboei + Muziekpodium + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Sportcentrum + Zwemcentrum + Telecommunicatiewinkel + Leegstand bedrijfspand + Gaarkeuken + Voedselbank + Verzamelpunt + Yogastudio + Lounge + Betaalkantoor + Speelhal + Zeilschool + Vliegschool + Bijscholing + Oost + Noorden + Zuiden + Zand + Boom + Kardinaal baken + Kardinaal baken + Kardinaal baken + Kardinaal baken + Lateraal baken + Lateraal baken + Scheidingsbaken + Speciaal baken + Kardinale boei + Kardinale boei + Kardinale boei + Kardinale boei + Laterale boei + Laterale boei + Scheidingsboei + Speciale boei + Sferische kardinale boei + Sferische kardinale boei + Sferische kardinale boei + Sferische kardinale boei + Sferische laterale boei + Sferische laterale boei + Sferische scheidingsboei + Sferische speciale boei + Haven + Stuurboord + West + Huis entree + Garage entree + Dienstingang + Ingang (enig) + Nooduitgang + Kerstboom + Schoonheidssalon diff --git a/android/sdk/src/main/res/values-pl/types_strings.xml b/android/sdk/src/main/res/values-pl/types_strings.xml index 472e1f081..ca2306b3b 100644 --- a/android/sdk/src/main/res/values-pl/types_strings.xml +++ b/android/sdk/src/main/res/values-pl/types_strings.xml @@ -1435,4 +1435,15 @@ Centrum sportowe Studio Jogi Pusty lokal + Wypożyczalnia łodzi + Teleskop + Teleskop optyczny + Radioteleskop + Teleskop (prom. gamma) + Obserwatorium + Car Pooling + Sklep dostawcy usług telekomunikacyjnych + Bank żywności + Jadłodajnia + Jadłodzielnia diff --git a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml index 10e28da19..ec88f6280 100644 --- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml +++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml @@ -1131,7 +1131,7 @@ Curling Ponto de Reunião de Emergência Estação de resgate na montanha - Saída + Saída (apenas) Centro de artes Churrasqueira Ar comprimido @@ -1425,4 +1425,66 @@ Academia de ioga Estabelecimento vazio Espreguiçadeira + Aluguel de barco + Telescópio + Telescópio (óptico) + Telescópio (rádio) + Telescópio (gama) + Observatório + Agente de Mobile Money + Carona + Centro de pagamentos + Centro de recreação interno + Loja de Telecomunicação + Restaurante popular + Banco de alimentos + Compartilhamento de alimentos + Caixa de doação + Ponto de Resgate de Emergência + Boia salva-vidas + Escola de vela + Escola de aviação + Cursinho + Marca cardinal + Marca cardinal + Marca cardinal + Marco cardinal + Marco de período isolado + Marca lateral + Boia lateral + Boia de águas seguras + Boia para fins especiais + Boia cardinal esférica + Boia cardinal esférica + Boia cardinal esférica + Boia cardinal esférica + Boia esférica de perigo isolado + Boia esférica lateral + Boia esférica lateral + Boia esférica de águas seguras + Boia esférica para fins especiais + Bombordo + Estibordo + Leste + Norte + Sul + Oeste + Entrada de casa + Entrada de garagem + Entrada de serviço + Entrada (apenas) + Saída de emergência + Areia + Árvore + Spa sem alojamento + Árvore de natal + Marco lateral + Marco de águas seguras + Marco de fins especiais + Boia cardeal + Boia cardeal + Boia cardeal + Boia cardeal + Boia de perigo isolado + Boia lateral diff --git a/android/sdk/src/main/res/values-pt/types_strings.xml b/android/sdk/src/main/res/values-pt/types_strings.xml index f89862d4a..67813f0be 100644 --- a/android/sdk/src/main/res/values-pt/types_strings.xml +++ b/android/sdk/src/main/res/values-pt/types_strings.xml @@ -1095,7 +1095,7 @@ Parafarmácia Loja de chocolates Loja de roupas - Loja de café + Loja de Café Loja de informática Confeitaria Loja de conveniência @@ -1348,7 +1348,7 @@ Viveiro de plantas Cartão Escada - Estúdio + Estúdio de Média Dispensador de doces Latas Hotel do Amor @@ -1435,4 +1435,27 @@ Centro Desportivo Centro Desportivo Estúdio de Yoga + Aluguer de Barcos + Telescópio + Telescópio (Ótico) + Telescópio (Rádio) + Telescópio (Gama) + Observatório + Espreguiçadeira + Agente de Mobile Money + Ponto de Veículos Partilhados + Centro de Pagamentos + Ponto de Resgate de Emergência + Salva-vidas + Centro de Atividades Interior + Loja de Telecomunicação + Establecimento Vazio + Sopa Comunitária + Banco Alimentar + Partilha de Comida + Caixa de Doações + Spa Diurno + Escola Náutica + Escola de Aviação + Centro de Explicações diff --git a/android/sdk/src/main/res/values-ro/types_strings.xml b/android/sdk/src/main/res/values-ro/types_strings.xml index f6063189d..5ace8185c 100644 --- a/android/sdk/src/main/res/values-ro/types_strings.xml +++ b/android/sdk/src/main/res/values-ro/types_strings.xml @@ -1142,9 +1142,9 @@ Pârâu Pârâu Cascadă - Acces limitat pentru persoanele în scaun rulant - Nu este utilat pentru invalizi - Utilat pentru invalizi + Acces limitat pentru persoanele în scaun cu rotile + Nu este dotat pentru persoanele cu dizabilități + Dotat pentru persoanele cu dizabilități Parc de iarnă Traseu montan de iarnă Conexiune Piste @@ -1180,7 +1180,7 @@ Bar Parcare acoperită pentru biciclete Hotel cu ora - Garsonieră + Studio Media Stație Reparații Biciclete Utilizare comună a mașinii Dentist @@ -1326,7 +1326,7 @@ Târâtoare cu funie Teleschi cu bară Deversor - Scaun rulant + Scaun cu rotile Teleschi cu dispozitiv de tragere tip J Bandă transportoare Teleschi cu disc @@ -1393,4 +1393,49 @@ Podgorie Rută Magazin vacant + Închiriere Bărci + Telescop + Telescop (Optic) + Telescop (Radio) + Telescop (Gamma) + Observator Astronomic + Șezlong + Centru de Plată + Lanț + Colac de Salvare + Cu plată + Internet + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru Sportiv + Centru de Yoga + Centru Sportiv + Foișor diff --git a/android/sdk/src/main/res/values-ru/types_strings.xml b/android/sdk/src/main/res/values-ru/types_strings.xml index 83b40f04f..ae69642b0 100644 --- a/android/sdk/src/main/res/values-ru/types_strings.xml +++ b/android/sdk/src/main/res/values-ru/types_strings.xml @@ -652,8 +652,8 @@ Сауна Лодочный спуск Спорткомплекс - Скалодром - Йога-центр + Скалолазание + Йога Стадион Плавательный бассейн Плавательный бассейн @@ -1131,7 +1131,7 @@ Бытовая химия Магазин шоколада Магазин одежды - Магазин кофе + Продавец кофе Компьютерный магазин Кондитерская Продуктовый магазин @@ -1248,7 +1248,7 @@ Гандбол Различные виды спорта - Место для ныряния с аквалангом + Подводное плавание с аквалангом Стрельба Скейтбординг Лыжи @@ -1383,7 +1383,7 @@ $ Дорожное ограждение (отбойник) Садовый питомник - Студия + Медиа-студия Кострище Лестница-лаз Высотные прыжки в воду @@ -1399,4 +1399,57 @@ Офис охранника Будка безопасности Портальная опора + Прокат лодок + Телескоп + Телескоп (оптический) + Телескоп (радио) + Телескоп (Гамма) + Обсерватория + Пункт зарядки автомобиля + Шезлонг + Совместное использование авто + Платежный центр + Эстрада + Крытый игровой центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Плавательный центр + Спортивный центр + Спортивный центр + Спортивный центр + Спортивный центр + Студия Йоги + Телекоммуникационный магазин + Вакантный бизнес + Бесплатная столовая + Продовольственный банк + Обмен едой + Подарить коробку + Скамья без спинки + Агент мобильных платежей diff --git a/android/sdk/src/main/res/values-sl/types_strings.xml b/android/sdk/src/main/res/values-sl/types_strings.xml index 4550a32cf..f447c8de9 100644 --- a/android/sdk/src/main/res/values-sl/types_strings.xml +++ b/android/sdk/src/main/res/values-sl/types_strings.xml @@ -153,4 +153,96 @@ Arkadne igre Polnilno mesto za avtomobile Vrtec + Kino + Izposoja čolnov + Teleskop + Teleskop (svetlobni) + Teleskop (radijski) + Teleskop (gama žarki) + Zvezdarna + Višja šola + Središče skupnosti + Stisnjeni zrak + Središče za srečanja + Sodišče + Veleposlaništvo + Pisarna varnostnikov + Stražarnica + Portal daljnovoda + Vodnjak + Bencinska postaja + Cerkveno pokopališče + Pokopališče krščanske cerkve + Spletna kavarna + Otroški vrtec + Knjižnica + Parkirišče + Večnadstropno parkirišče + Večnadstropno parkirišče + Zasebno parkirišče + Parkirišče P+R + Podzemno parkirišče + Obcestno parkirišče + Obcestno parkirišče + Zasebno obcestno parkirišče + Kegljišče + Klinika + Denarno nakazilo + Glasbena šola + Jezikovna šola + Hitra hrana + Trajekt + Prehrambeni prostor + Nakladalna klančina + Ležalnik + Omara za prtljago + Tržnica + Parkirišče za motorje + Dom za ostarele + Parkirišče + Parkiranje na voznem pasu + Plačilno središče + Plačilni terminal + Lekarna + Parkiranje na voznem pasu + Zasebno parkirišče na voznem pasu + Vhod parkirišča + Vhod zasebnega parkirišča + Vhod parkirišča + Souporaba avtomobila + Kraj čaščenja + Budistično svetišče + Cerkev + Partnerska pošta + Zapor + Krčma + Izmenjevalnica knjig + Javno kopališče + Prha + Striptiz klub + Postajališče taksija + Telefon + Gledališče + Stranišče + Stranišče + Mestna hiša + Vseučilišče + Prodajni avtomat + Avtomat za cigrete + Avtomat za kavo + Avtomat za kondome + Avtomat za pijače + Avtomat za hrano + Avtomat za časopis + Avtomat za parkirne listke + Avtomat za sladkarije + Izhod v sili + € + Plačilo + Fizioterapevt + Alternativno zdravljenje + Strokovnjak za sluh + Središče za darovanje krvi + Optometrist + Podiater diff --git a/android/sdk/src/main/res/values-sr/strings.xml b/android/sdk/src/main/res/values-sr/strings.xml index 0866cd802..36271061d 100644 --- a/android/sdk/src/main/res/values-sr/strings.xml +++ b/android/sdk/src/main/res/values-sr/strings.xml @@ -36,11 +36,11 @@ Тачка на мапи Данас Јуче - Пре %s дана - Пре %s недеља - Пре %s месец - Пре %s месеци - Пре %s недеља - Пре %s године - Пре %s година + пре %s дана + пре %s недеља + пре %s месец + пре %s месеци + пре %s недеља + пре %s године + пре %s година diff --git a/android/sdk/src/main/res/values-sr/types_strings.xml b/android/sdk/src/main/res/values-sr/types_strings.xml index 865f842cd..96c1b0cc4 100644 --- a/android/sdk/src/main/res/values-sr/types_strings.xml +++ b/android/sdk/src/main/res/values-sr/types_strings.xml @@ -28,7 +28,7 @@ Грил Клупа Паркинг за бицикле - Рентирање бицикли + Изнајмљивање бицикала Станица за поправку бицикала Пивска башта Јавна кућа @@ -359,7 +359,7 @@ Улаз Главни улаз - Излаз + Излаз (искључиво) Бесплатно Медицинска лабораторија Физиотерапеут @@ -648,7 +648,7 @@ Навоз Спортски центар Вештачка стена - Јога студио + Јога Стадион Базен Приватни базен @@ -1161,7 +1161,7 @@ Грумер Фотограф Центар за изнајмљивање - Изнајмљивање бицикала + Центар за изнајмљивање бицикала Рибарница Половна одећа Обућа @@ -1230,7 +1230,7 @@ Фудбал Пливање Стони тенис - Тенис + Тениски терен Одбојка Куглање Куглање @@ -1375,7 +1375,7 @@ Огњиште Расадник Заштитна ограда - Студио + Медијски студио Мердевине Кран Метро станица @@ -1393,9 +1393,110 @@ Станица за ренџер Соба за бекство (Escape Room) Вратница - Волонтирајте и побољшајте CoMaps + Азил за животиње Канцеларија обезбеђења Кућица обезбеђења Носач електричних водова Продавница расвете + Кутија за поклоне + Дељење хране + Банка хране + Народна кухиња + Опсерваторија + Телескоп + Телескоп (оптички) + Телескоп (радио) + Телескоп (гама) + Заједничка вожња + Плаћање рачуна + Клупа без наслона + Изнајмљивање чамаца + Место за пуњење аутомобила + Лежаљка + Посредник за мобилно плаћање + Бина + Играоница + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Пливачки центар + Спортски центар + Спортски центар + Спортски центар + Спортски центар + Јога студио + Продавница мобилног оператера + Некоришћен пословни простор + Дневни спа + Појас за спасавање + Спасилачка тачка + Школа једрења + Школа летења + Припремна школа + Кардинални светионик + Кардинални светионик + Кардинални светионик + Кардинални светионик + Светионик изоловане опасности + Бочни светионик + Бочни светионик + Светионик безбедне воде + Светионик посебне намене + Кардинална бова + Кардинална бова + Кардинална бова + Кардинална бова + Бова изоловане опасности + Бочна бова + Бочна бова + Бова безбедне воде + Бова посебне намене + Сферна кардинална бова + Сферна кардинална бова + Сферна кардинална бова + Сферна кардинална бова + Сферна бова изоловане опасности + Сферна бочна бова + Сферна бочна бова + Сферна бова безбедне воде + Сферна бова посебне намене + Лево (порт) + Десно (старборд) + Исток + Север + Југ + Запад + Улаз у кућу + Улаз у гаражу + Сервисни улаз + Улаз (искључиво) + Улаз за хитне случајеве + Песак + Дрво + Божићна јелка + Салон за нокте diff --git a/android/sdk/src/main/res/values-sv/types_strings.xml b/android/sdk/src/main/res/values-sv/types_strings.xml index 795e31805..00d8acff8 100644 --- a/android/sdk/src/main/res/values-sv/types_strings.xml +++ b/android/sdk/src/main/res/values-sv/types_strings.xml @@ -619,7 +619,7 @@ Vingård Vulkan Vatten - Sumpmarken + Sumpmark Myr Träsk Kontor @@ -1358,4 +1358,12 @@ Kärlekshotell Djurpark för barn Cykelparkering under tak + Livboj + Räddningspunkt + Soppkök + Observatorium + Teleskop + Båtuthyrning + Bänk utan ryggstöd + Musikpaviljong diff --git a/android/sdk/src/main/res/values-ta/strings.xml b/android/sdk/src/main/res/values-ta/strings.xml new file mode 100644 index 000000000..5cebd6c69 --- /dev/null +++ b/android/sdk/src/main/res/values-ta/strings.xml @@ -0,0 +1,34 @@ + + + எனது நிலை + எனது இடங்கள் + வைஃபை + மீ + மை + அடி + இன்று + நேற்று + %s நாட்களுக்கு முன்பு + %s வாரங்களுக்கு முன்பு + %s மாதங்களுக்கு முன்பு + %s ஆண்டுகளுக்கு முன்பு + கி.மீ + குறியீடு + வரைபட புள்ளி + வெளியேறு + நுழைவாயில் + சுரங்கப்பாதை வரைபடம் கிடைக்கவில்லை + எம்பி + சிபி + உள் தனிப்பட்ட சேமிப்பு + உள் பகிரப்பட்ட சேமிப்பு + SD அட்டை + வெளிப்புற பகிர்ந்த சேமிப்பு + பொது அணுகல் + வரையறுக்கப்பட்ட அணுகல் + தனிப்பட்ட + நிகழ்நிலை திருத்துதல் + %s வாரத்திற்கு முன்பு + %s மாதம் முன்பு + %s வருடத்திற்கு முன்பு + diff --git a/android/sdk/src/main/res/values-ta/types_strings.xml b/android/sdk/src/main/res/values-ta/types_strings.xml index 8fb50f9cd..10ce169dc 100644 --- a/android/sdk/src/main/res/values-ta/types_strings.xml +++ b/android/sdk/src/main/res/values-ta/types_strings.xml @@ -9,4 +9,8 @@ முகவரி/சாலைத் தொகுதி முகவரி/சாலைத் தொகுதி இசை பள்ளிக்கூடம் + கேபிள் கார் + சர்வதேச விமான நிலையம் + ஹெலிபேட் + ஓடுதளம் diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 0b368a635..78a993014 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -30,6 +30,7 @@ Backless Bench Bicycle Parking Covered Bicycle Parking + Boat Rental Bicycle Rental Bicycle Repair Station Biergarten @@ -42,6 +43,11 @@ Motorcycle Rental Car Sharing Car Wash + Telescope + Telescope (Optical) + Telescope (Radio) + Telescope (Gamma) + Observatory Casino Gambling Adult Gaming Centre @@ -68,6 +74,9 @@ Exhibition Center Money Transfer Music School + Sailing School + Flight School + Tutorial School Language School Embassy Security Guards Office @@ -92,6 +101,7 @@ Loading Dock Lounger Luggage Locker + Mobile Money Agent Marketplace Motorcycle Parking Nightclub @@ -121,6 +131,8 @@ Parking Space Parking Space Disabled Parking Space + Car Pooling + Payment Centre Payment Terminal Pharmacy Place of Worship @@ -362,19 +374,59 @@ Vegetarian Vietnamese Emergency + Emergency Rescue Point Emergency Assembly Point + Lifebuoy Defibrillator Fire Hydrant Emergency Phone Lifeguard + Cardinal Beacon + Cardinal Beacon + Cardinal Beacon + Cardinal Beacon + Isolated Danger Beacon + Lateral Beacon + Lateral Beacon + Safe Water Beacon + Special Purpose Beacon + Cardinal Buoy + Cardinal Buoy + Cardinal Buoy + Cardinal Buoy + Isolated Danger Buoy + Lateral Buoy + Lateral Buoy + Safe Water Buoy + Special Purpose Buoy + Spherical Cardinal Buoy + Spherical Cardinal Buoy + Spherical Cardinal Buoy + Spherical Cardinal Buoy + Spherical Isolated Danger Buoy + Spherical Lateral Buoy + Spherical Lateral Buoy + Spherical Safe Water Buoy + Spherical Special Purpose Buoy + Port + Starboard + East + North + South + West Mountain Rescue Station Entrance Main Entrance - Exit + House Entrance + Garage Entrance + Service Entrance + Entry (Only) + Exit (Only) + Emergency Exit $ Free Medical Laboratory @@ -657,6 +709,7 @@ Minigolf Hackerspace Ice Rink + Indoor Play Centre Marina Nature Reserve Outdoor Seating @@ -766,6 +819,7 @@ Embankment Coastline Desert + Sand Geyser Glacier Grassland @@ -787,6 +841,7 @@ Natural Spring Natural Spring Strait + Tree Tree Row Vineyard Volcano @@ -1173,6 +1228,7 @@ Bakery Bathroom Furnishings Beauty Shop + Nail Salon Beverages Bicycle Shop Bookmaker @@ -1224,6 +1280,7 @@ Kitchen Store Laundry Mall + Day Spa Massage Salon Mobile Phone Store Money Lender @@ -1251,6 +1308,7 @@ Supermarket Tattoo Parlour Tea Shop + Telecommunication Shop Ticket Shop Toy Store Travel Agency @@ -1435,10 +1493,15 @@ No self-service Social Facility + Soup Kitchen + Food Bank + Food Sharing + Give Box Emergency Ward Entrance Dojo Sports hall + Christmas Tree diff --git a/configure.sh b/configure.sh index b1abb0ebd..57f3b18d1 100755 --- a/configure.sh +++ b/configure.sh @@ -119,7 +119,7 @@ echo "Generating search categories / synonyms..." if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then echo "Generating symbols..." - bash ./tools/unix/generate_symbols.sh + bash ./tools/unix/generate_symbols.sh || (rm data/symbols_hash; exit 1) fi else echo "Skipping generate symbols..." @@ -128,7 +128,7 @@ fi if [ -z "$SKIP_GENERATE_DRULES" ]; then if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv || [ ! -z "$DRULES_NOT_GENERATED" ]; then echo "Generating drules..." - bash ./tools/unix/generate_drules.sh + bash ./tools/unix/generate_drules.sh || (rm data/drules_hash; exit 1) fi else echo "Skipping generate drules..." diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index 14a9138b9..ec2da5779 100644 --- a/data/categories-strings/de.json/localize.json +++ b/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é|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-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-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", -"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|Kosmetik|Schönheitspflege", +"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-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", @@ -47,7 +47,8 @@ "shop-jewelry|@category_shopping|@shop": "4Juwelier|Juweliergeschäft|Schmuck", "shop-optician|@shop": "4Optiker|5Brillengeschäft|5Augenoptiker", "shop-gift|@category_shopping|@shop": "5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen", -"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung", +"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Kosmetikstudio|Kosmetiksalon", +"shop-beauty-nails": "5Nagelstudio|Nagelsalon|Fingernägel|Fußnägel|Nägel", "shop-greengrocer|@category_food|@shop": "5Gemüseladen|Gemüsehändler", "shop-sports|@category_shopping|@shop": "4Sportgeschäft|Sportartikel|Fitnessgeschäft", "shop-supermarket|@category_food|@shop": "3Supermarkt", @@ -397,7 +398,9 @@ "amenity-payment_terminal": "Bezahlterminal", "amenity-public_bath": "Öffentliches Bad", "amenity-shower": "Dusche", +"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt", "emergency-assembly_point": "Notfall-Sammelpunkt", +"emergency-life_ring": "4Rettungsring", "emergency-defibrillator": "4Defibrillator", "emergency-fire_hydrant": "4Hydrant", "emergency-lifeguard": "Notfall-Rettungsschwimmer|Rettungsschwimmer", @@ -484,7 +487,7 @@ "shop-craft|@shop": "Künstlerbedarf", "shop-pasta|@shop": "Nudelgeschäft", "amenity-luggage_locker": "Gepäckschließfach", -"amenity-studio": "Studio", +"amenity-studio": "Medienstudio|Studio", "shop-cannabis|@shop": "Cannabis", "man_made-cross": "Kreuz", "leisure-dance|@category_entertainment": "4Tanz|Tanzschule", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 5dde3e18d..9db45c128 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -2,28 +2,28 @@ "@category_eat": "Where to eat|eat|Food", "@category_food": "4Groceries|Grocery|Food", "@category_transport": "5Transport", -"@category_fuel": "2Gas|Gasoline|3Petrol|4Diesel|3Fuel", +"@category_fuel": "2Gas|4Gasoline|3Petrol|4Diesel|3Fuel", "@category_parking": "4Parking", -"@category_shopping": "4Shopping", -"@category_hotel": "Hotel|hotels", +"@category_shopping": "4Shopping|shops", +"@category_hotel": "3Hotel|hotels|4Accomodations|accommodation|sleep", "@category_tourism": "3Sights|3Attractions|3Tourism", -"@category_entertainment": "Entertainment", -"@category_nightlife": "Nightlife", -"@category_children": "Family holiday", +"@category_entertainment": "4Entertainment", +"@category_nightlife": "4Nightlife", +"@category_children": "4Family holiday|children|kid|kids|babies|family|family friendly", "@category_atm": "ATM|Cash machine", -"@category_rv": "2RV Facilities|4Caravan|Vanlife|5Campervan|5Motorhome", -"amenity-atm|@category_atm": "money|U+1F3E7|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7", +"@category_rv": "2RV Facilities|RV|4Caravan|Vanlife|5Campervan|5Motorhome|camper", +"amenity-atm|@category_atm": "money|cash|U+1F3E7|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7", "@category_bank": "3Bank", -"@category_secondhand": "4Second Hand", +"@category_secondhand": "4Second Hand|second-hand|vintage|5Vintage shop|4Thrift store|5Resale shop|6Opportunity shop|4Used-goods|thrift|thrifting", "amenity-bank|@category_bank": "money|U+1F3E6|U+1F4B0|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7", "@category_recycling": "4Recycling|Waste utilization|Waste disposal|Recyclables|Separate garbage collection|Waste sorting|Reuse", "amenity-bureau_de_change": "3Currency Exchange|3exchange|money|U+1F4B1|U+1F4B2|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7", -"amenity-studio": "Media Studio|Studio", +"amenity-studio": "5Media studio|studio", "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2pub|beer|drink|U+1F37A|U+1F37B|U+1F376|tavern|bars and pubs|brew pub|cocktail lounge", "amenity-cafe|@category_eat": "3Cafe|U+2615|U+1F356|U+1F357|U+1F35A|U+1F35B|U+1F35C|U+1F35D|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|U+1F377|U+1F60B|U+1F375|coffee|cafeteria", "amenity-fast_food|@category_eat": "4Fast Food|takeaway|U+1F354|U+1F355|U+1F35F|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|food to go|junk food", "amenity-restaurant|@category_eat": "3Restaurant|U+1F356|U+1F357|U+1F35A|U+1F35B|U+1F35C|U+1F35D|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|U+1F377|U+1F60B", -"amenity-fuel|@category_fuel": "Gas Station|Petrol Station|3Filling Station|U+26FD", +"amenity-fuel|@category_fuel": "3Gas station|4Petrol station|3Filling station|fill up|U+26FD", "@shop": "Shop|Store|U+1F3EA|U+1F3EC", "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bakery|3Pastry|Cake|3Cakes|U+1F35E", "shop|@shop": "", @@ -34,13 +34,13 @@ "shop-farm|@category_food|@shop": "Farm food", "shop-garden_centre|@shop": "4Garden Centre|U+1F3E1", "shop-grocery|@category_food|@shop": "Grocery", -"shop-health_food|@category_food|@shop": "Health food", -"shop-hearing_aids|@shop": "Hearing Aids", +"shop-health_food|@category_food|@shop": "7Health food|7Healthy food|healthfood|organic|vegan|vegetarian", +"shop-hearing_aids|@shop": "7Hearing Aids", "shop-mobile_phone|@shop": "4Cell Phones|4Mobile Phones|6smartphones|electronics store|U+1F4F1|U+1F4F2", "shop-florist|@shop": "4Florist|U+1F337|U+1F338|U+1F339|U+1F33A|U+1F33B|U+1F33C|U+1F490|U+1F33E|4flowers|flower shop|floral shop|floral arrangements|same day flowers|bouquet", -"shop-butcher|@category_food|@shop": "4Butcher|U+1F356|U+1F357", +"shop-butcher|@category_food|@shop": "4Butcher|meat|U+1F356|U+1F357", "shop-furniture|@shop": "4Furniture", -"shop-kitchen|@shop": "Kitchen|Kitchen Studio", +"shop-kitchen|@shop": "4Kitchen|Kitchen Studio|kitchenware", "shop-alcohol|@category_food|@shop": "4liquor|4alcohol|U+1F377", "shop-books|@shop": "Bookstore|bookshop|3books|U+1F4D6|U+1F4DA|U+1F4D9|U+1F4D8|U+1F4D7|U+1F4D5", "shop-shoes|@category_shopping|@shop": "Shoe|U+1F461|U+1F460|U+1F462|U+1F45E|U+1F45F|3shoes|4footwear", @@ -48,93 +48,96 @@ "shop-hardware|shop-doityourself|@shop": "4Hardware|4Home Improvement|DIY|U+1F529|U+1F528|do it yourself|do-it-yourself", "shop-houseware|@shop": "4Housewares", "shop-jewelry|@category_shopping|@shop": "4Jewelry|U+1F48D", -"shop-optician|@shop": "4Optician|U+1F453", -"shop-gift|@category_shopping|@shop": "Gift|U+1F381|souvenir|4souvenirs|3gifts|presents", -"shop-beauty": "4Beauty Shop|barber|beautician|hairdresser|hairdressing|haircut|U+1F484|beauty salon|hair salon|beauty parlor|hair and nail salon|nail salon|coloring", +"shop-optician|@shop": "4Optician|glasses|sunglasses|U+1F453", +"shop-gift|@category_shopping|@shop": "Gift|U+1F381|souvenir|souvenirs|3gifts|presents|4Souvenir shop|gift shop|giftshop", +"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|coloring", +"shop-beauty-nails": "4Nail salon|nail technician|nail tech|finger nails|toe nails|nails", "shop-greengrocer|@category_food|@shop": "4Greengrocer|U+1F345|U+1F346|U+1F33D|U+1F360|U+1F348|U+1F347|U+1F349|U+1F34A|U+1F34C|U+1F34D|U+1F34E|U+1F34F|U+1F350|U+1F351|U+1F353", "shop-sports|@category_shopping|@shop": "4Sports Goods|U+1F3BF|U+1F3A3|U+1F3C2|U+1F6B4|U+26BD|U+1F3C0|U+1F3C8|U+26BE|U+1F3BE|U+1F3C9|U+26F3", "shop-supermarket|@category_food|@shop": "3Supermarket", -"shop-mall|@category_shopping|@shop": "Mall|Gallery|shopping arcade|entertainment center|retail", -"shop-department_store|@category_shopping|@shop": "4Department", +"shop-mall|@category_shopping|@shop": "3Mall|Gallery|shopping arcade|entertainment center|retail", +"shop-department_store|@category_shopping|@shop": "4Department|department store", "shop-beverages|@category_food|@shop": "4Beverages|4drinks|U+1F379", -"shop-computer|@shop": "4Computer|U+1F4BB", +"shop-computer|@shop": "4Computer shop|computer|computers|U+1F4BB", "shop-confectionery|craft-confectionery|@category_food|@shop": "4Sweets|4confectionery|candies|candy|U+1F36C|U+1F36D|sweetshop|tuck|Confectioner", "shop-laundry": "4Laundry|Laundrette|laundromat", "shop-toys|@category_children|@shop": "Toy|toyshop|kids|toys|kids toys", "amenity-marketplace|@category_food": "3Marketplace|market", -"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", -"shop-car|@shop": "3Car Dealership|Auto Dealer|U+1F697|U+1F698|U+1F699", -"shop-bicycle|@shop": "4Bicycle|Bike|cycles|bikes|U+1F6B2|U+1F6B4|U+1F6B5", +"amenity-mobile_money_agent": "6Mobile Money Agent|mobile money", +"amenity-money_transfer": "5Money Transfer", +"shop-clothes|@category_shopping|@shop": "3Clothes|U+1F45A|U+1F457|U+1F456|U+1F455|clothing|apparel|wear|fashion|garments ", +"shop-caravan|@category_rv|@shop": "2RV dealership|4Caravan dealership|5Motorhome dealership", +"shop-car|@shop": "3Car Dealership|4Auto Dealer|U+1F697|U+1F698|U+1F699", +"shop-bicycle|@shop": "4Bicycle|Bike|7Cycling shop|cycles|bikes|U+1F6B2|U+1F6B4|U+1F6B5", "shop-kiosk": "3Kiosk|U+1F4F0", "highway-bus_stop|@category_transport": "2Bus Stop|bus|stop|U+1F68C|U+1F68F|U+1F68E|U+1F690", "railway-tram_stop|@category_transport": "3Tram Stop|tram|stop|U+1F683", "amenity-bus_station|@category_transport": "2Bus Station|bus|U+1F68C|U+1F68F|U+1F68D", "railway-station|railway-halt|building-train_station|@category_transport": "3Train Station|trainstation|4railway|railroad|4station|U+1F684|U+1F685|U+1F689|U+1F682|U+1F686|U+1F688|U+1F68A|U+1F68B|Rail Halt", -"railway-station-funicular": "Funicular", -"railway-station-subway|@category_transport": "3Subway Station|3tube|3metro|3underground|U+1F687", +"railway-station-funicular": "4Funicular", +"railway-station-subway|@category_transport": "3Subway Station|subway|3tube|3metro|3underground|U+1F687", "amenity-ferry_terminal|@category_transport": "3Ferry|terminal|U+1F6A2|U+1F6A4|U+2693", -"amenity-taxi|@category_transport": "3Taxi|Taxi Stand|Taxi Rank|U+1F695|U+1F696", +"amenity-taxi|@category_transport": "Taxi|3Taxi Stand|Taxi Rank|U+1F695|U+1F696", "amenity-townhall": "3Town Hall|townhall|city hall|guildhall|village hall|4municipal hall|civic centre", "tourism-attraction|@category_tourism": "4Attraction|U+1F3A0|U+1F3A1|U+1F3A2|U+1F3AA", "tourism-artwork": "3Artwork|U+1F3A8", "tourism-viewpoint|@category_tourism": "4Viewpoint|Vista", "tourism-information": "4Tourist Information|4information|U+1F481", -"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picnic Site|Barbecue Grill|Picnic Table", -"amenity-place_of_worship": "Place of Worship|3temple|U+1F64F", -"amenity-place_of_worship-christian": "4Church|place of worship|temple|4cathedral|basilica|U+1F64F|U+26EA|U+271D|U+2626", -"amenity-place_of_worship-muslim": "4Mosque|tekke|place of worship|temple|U+1F64F|U+262A|U+1F54B|U+1F54C|U+262A", -"amenity-place_of_worship-buddhist": "3Temple|place of worship|U+1F64F|U+26EA|U+2638", -"amenity-place_of_worship-hindu": "3Temple|place of worship|U+1F64F|U+1F549", -"amenity-place_of_worship-shinto": "Shrine|place of worship|3temple|U+1F64F|U+26E9", -"amenity-place_of_worship-jewish": "4Synagogue|place of worship|temple|U+1F64F|U+1F54D|U+2721", -"amenity-place_of_worship-taoist": "3Temple|place of worship|U+1F64F|U+262F", +"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picnic Site|picnic|Barbecue Grill|Picnic Table|bbq|Barbec", +"amenity-place_of_worship": "5Place of Worship|3temple|U+1F64F", +"amenity-place_of_worship-christian": "4Church|place of worship|temple|4cathedral|basilica|christianity|U+1F64F|U+26EA|U+271D|U+2626", +"amenity-place_of_worship-muslim": "4Mosque|tekke|place of worship|temple|islam|U+1F64F|U+262A|U+1F54B|U+1F54C|U+262A", +"amenity-place_of_worship-buddhist": "3Temple|place of worship|4buddist temple|4buddhism|U+1F64F|U+26EA|U+2638", +"amenity-place_of_worship-hindu": "3Temple|place of worship|4hindu temple|4hinduism|U+1F64F|U+1F549", +"amenity-place_of_worship-shinto": "Shrine|place of worship|3temple|4shinto temple|4shinto|U+1F64F|U+26E9", +"amenity-place_of_worship-jewish": "4Synagogue|place of worship|3temple|judaism|U+1F64F|U+1F54D|U+2721", +"amenity-place_of_worship-taoist": "3Temple|place of worship|4taoism|4taoist temple|U+1F64F|U+262F", "tourism-museum|@category_tourism": "2Museum|U+1F3A8|3exhibition|3gallery", "waterway-waterfall|@category_tourism": "2Waterfall", "historic-archaeological_site|@category_tourism": "4Archaeological Site", "historic-battlefield": "Battlefield", -"historic-stone": "Historic Stone", -"historic-boundary_stone": "Boundary Stone", +"historic-stone": "Historic stone", +"historic-boundary_stone": "Boundary stone", "historic-castle|@category_tourism": "4Castle|4Palace|4Fortress|U+1F3EF|U+1F3F0|U+1F451|U+1F478|Hillfort|Kremlin|Manor house", -"historic-city_gate|@category_tourism": "City gate", -"historic-citywalls|@category_tourism": "City Wall", +"historic-city_gate|@category_tourism": "4City gate", +"historic-citywalls|@category_tourism": "4City wall", "historic-fort|@category_tourism": "Fort", "historic-gallows|@category_tourism": "Gallows", "historic-memorial|@category_tourism": "4Memorial|monument|U+1F5FC|U+1F5FD|U+1F5FF", "historic-memorial-cross": "Memorial cross", "historic-memorial-plaque": "Commemorative plaque", -"historic-memorial-sculpture|@category_tourism": "Sculpture", -"historic-memorial-statue|@category_tourism": "Statue", +"historic-memorial-sculpture|@category_tourism": "5Sculpture", +"historic-memorial-statue|@category_tourism": "3Statue", "historic-memorial-stolperstein": "Stolperstein", "historic-memorial-war_memorial|@category_tourism": "War memorial", "historic-monument|@category_tourism": "4Monument|U+1F5FD|U+1F5FF", "historic-pillory|@category_tourism": "Pillory", "historic-cannon": "Cannon", -"historic-anchor": "Historic Anchor", -"historic-ruins|@category_tourism": "4Historic Ruins|3Ruins|U+1F5FF", -"historic-mine": "Historic Mine", +"historic-anchor": "4Historic anchor", +"historic-ruins|@category_tourism": "4Historic ruins|3Ruins|U+1F5FF", +"historic-mine": "4Historic mine", "historic-ship|@category_tourism": "Ship|boat", "historic-wreck": "Shipwreck", -"historic-locomotive|@category_tourism": "Historic Locomotive", -"historic-tank|@category_tourism": "Historic Tank", -"historic-aircraft|@category_tourism": "Historic Aircraft", +"historic-locomotive|@category_tourism": "4Historic locomotive", +"historic-tank|@category_tourism": "4Historic tank", +"historic-aircraft|@category_tourism": "4Historic aircraft", "historic-tomb|@category_tourism": "Tomb|grave|memorial", "man_made-cross": "Cross", "historic-wayside_cross": "Wayside cross", "historic-wayside_shrine": "Wayside shrine", -"leisure-dog_park": "3Dog area|Dog park", +"leisure-dog_park": "Dog area|3Dog park", "leisure-dance|@category_entertainment": "4Dance|Dancing school", "leisure-garden": "3Garden", "leisure-firepit": "5Firepit", "amenity-bench|amenity-bench-backless": "Bench", -"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", -"amenity-car_rental": "3Car Rental|car|rental|U+1F697|U+1F698|U+1F699|car hire|rent a car|auto rental|vehicle rent", -"amenity-motorcycle_rental": "4Motorcycle Rental|bike|hire|4scooter", -"amenity-cinema|@category_entertainment": "3Cinema|3Movie Theatre|Film|Movies|U+1F3A6|U+1F3AC", -"leisure-bowling_alley|@category_entertainment": "4Bowling Alley", +"amenity-boat_rental": "4Boat rental|boat|boats|3Rental", +"amenity-bicycle_rental": "4Bicycle rental|cycling|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|carsharing services|car sharing|4rideshare", +"amenity-car_rental": "3Car rental|car|rental|U+1F697|U+1F698|U+1F699|car hire|rent a car|auto rental|vehicle rent", +"amenity-motorcycle_rental": "4Motorcycle rental|bike|hire|4scooter|4Rental motorcycles|motorcycles", +"amenity-cinema|@category_entertainment": "3Cinema|3Movie theatre|Film|4Movies|U+1F3A6|U+1F3AC", +"leisure-bowling_alley|@category_entertainment": "4Bowling alley", "amenity-theatre|@category_entertainment": "4Theatre|U+1F3AD", "amenity-nightclub|@category_entertainment|@category_nightlife": "3Nightclub|night club|4disco|dance|U+1F378|U+1F379|U+1F46F|U+1F483|club|nightspot|night bar", "amenity-brothel": "Brothel|whorehouse|bordello|U+1F3E9", @@ -164,10 +167,10 @@ "healthcare-psychotherapist": "Psychotherapist", "healthcare-sample_collection": "Sample collection", "healthcare-speech_therapist": "Logopedics|Speech therapist|Speech therapy", -"amenity-hunting_stand": "Hunting Stand", +"amenity-hunting_stand": "4Hunting stand", "amenity-kindergarten": "5Kindergarten|U+1F476|U+1F37C|U+1F6BC|nursery|4Child Care|childcare", -"amenity-library": "3Library|U+1F4D6", -"amenity-parking|amenity-parking_entrance|@category_parking": "U+1F697|U+1F17F|U+1F698|U+1F699", +"amenity-library": "3Library|3books|book|U+1F4D6", +"amenity-parking|amenity-parking_entrance|@category_parking": "car parking|U+1F697|U+1F17F|U+1F698|U+1F699", "@category_pharmacy": "3Pharmacy", "amenity-pharmacy|@category_pharmacy": "4Drugstore|apothecary|4dispensary|U+1F489|U+1F48A", "@category_post": "3Post", @@ -190,15 +193,15 @@ "recycling-shoes|@category_recycling": "4Recycling of Shoes|Shoes Recycling|Donate Shoes|Shoes", "recycling-green_waste|@category_recycling": "4Recycling of Green Waste|5Organic Waste Recycling|5Green Waste Recycling|Food Waste|Garden Waste", "recycling-cartons|@category_recycling": "4Recycling of Bewerage Cartons|5Cartons Recycling|5Bewerage Cartons Recycling|Cartons", -"amenity-sanitary_dump_station|@category_rv": "2RV Dump Station|5Holding Tank Dump Station|4Dump Station|sanitary dump station|sewage|RV waste|5motorhome dump station|5camper dump station|4caravan dump station", +"amenity-sanitary_dump_station|@category_rv": "2RV Dump Station|5Holding Tank Dump Station|4Dump station|sanitary dump station|sewage|RV waste|5motorhome dump station|5camper dump station|4caravan dump station", "amenity-school": "3School|U+1F392|U+1F3EB", "amenity-shelter": "4Shelter|refuge", -"amenity-shelter-basic_hut": "3Bivouac Hut|Bivvy|Bothy|Hut", -"amenity-shelter-lean_to": "3Lean-to Shelter|4Shelter|Refuge", -"amenity-stripclub": "Stripclub", +"amenity-shelter-basic_hut": "basic hut|3Bivouac Hut|Bivvy|Bothy|Hut", +"amenity-shelter-lean_to": "3Lean-to Shelter|4Shelter|Refuge|lean shelter|shelter", +"amenity-stripclub": "Stripclub|strip club", "amenity-telephone": "2Phone|U+260E|U+1F4DE|5Telephone", -"@category_toilet": "3Toilet", -"amenity-toilets|toilets-yes|@category_toilet": "wc|5restroom|4bathroom|loo|lavatory|U+1F6BD|U+1F6BE|U+1F4A9|U+1F6BB|U+1F6B9|U+1F6BA", +"@category_toilet": "3Toilet|toilets|4Restroom|potty|WC|water closet", +"amenity-toilets|toilets-yes|@category_toilet": "wc|4Bathroom|loo|lavatory|U+1F6BD|U+1F6BE|U+1F4A9|U+1F6BB|U+1F6B9|U+1F6BA", "amenity-university": "4University|U+1F393|Uni", "place-continent": "Continent|U+1F30D|U+1F30E|U+1F30F", "place-country": "Country", @@ -210,8 +213,8 @@ "place-region": "Region", "place-island|place-islet": "Island|islet", "place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Suburb|district|quarter|neighbourhood|neighborhood|Residential Area", -"place-hamlet": "Hamlet|village", -"place-village": "Village|hamlet", +"place-hamlet": "Hamlet|village|settlement|civilization", +"place-village": "Village|hamlet|settlement|civilization", "place-locality": "Locality", "place-farm": "Farm|U+1F411|U+1F414|U+1F417|U+1F42E|U+1F404|U+1F430|U+1F407|U+1F40F|U+1F410|U+1F413|U+1F424|U+1F437|U+1F43D|U+1F69C", "highway-raceway": "Racetrack|U+1F3C1", @@ -231,18 +234,18 @@ "tourism-guest_house|@category_hotel": "4Guest House|hostel|U+1F3E8", "tourism-motel|@category_hotel": "3Motel|hostel|U+1F3E8", "tourism-alpine_hut|@category_hotel": "5Mountain Lodge|5backcountry hut|hut|lodge|alpine hut", -"shop-hairdresser": "3Hairdresser|U+2702|U+1F488|hair salon|hairdressing saloon|barbershop|hair cuttery|haircut|beauty parlor|coloring", -"aeroway-aerodrome": "3Airport|3plane|U+2708", -"leisure-stadium": "4Stadium|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|olympic stadium|sports stadium|sports complex|arena", +"shop-hairdresser": "3Hairdresser|U+2702|U+1F488|hair salon|hairdressing saloon|4barbershop|barber|hair cuttery|haircut|beauty parlor|coloring", +"aeroway-aerodrome": "4Aerodrome|3Airport|3plane|U+2708", +"leisure-stadium": "4Stadium|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|olympic stadium|sports stadium|sports complex|arena|sports arena", "leisure-playground|@category_children": "4Playground", -"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sports Center|sport|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum", +"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sports Center|sport|sports|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum", "leisure-sports_centre-sport-swimming": "4Swimmming Centre", -"leisure-golf_course": "Golf Course|U+26F3", +"leisure-golf_course": "4Golf Course|golf|U+26F3", "leisure-miniature_golf": "4Minigolf|Miniature Golf|Putt Putt|mini golf|mini-golf", "leisure-escape_game": "4Escape Room|Escape Game|quest", -"leisure-hackerspace": "Hackerspace", -"leisure-pitch": "4Sports Ground|sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F3C9|U+1F3C3", -"leisure-swimming_pool": "4Swimming Pool|sport|U+1F3CA", +"leisure-hackerspace": "6Hackerspace|hacker space|hacklab|hackspace|5makerspace", +"leisure-pitch": "4Sports Ground|sport|sports|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F3C9|U+1F3C3", +"leisure-swimming_pool": "4Swimming Pool|sport|sports|U+1F3CA", "leisure-swimming_pool-private": "DoNotMatchThisType_OneLanguageDefinitionIsEnoughHere", "sport-american_football": "American Football", "sport-archery": "Archery", @@ -274,16 +277,16 @@ "building": "Building|U+1F3E0|U+1F3E1|U+1F3E2", "building-address": "Address", "@category_police": "4Police|cops", -"amenity-police|@category_police": "U+1F693|U+1F46E|U+1F694|U+1F482|U+1F6A8", -"office-diplomatic": "4Embassy", +"amenity-police|@category_police": "Police station|U+1F693|U+1F46E|U+1F694|U+1F482|U+1F6A8", +"office-diplomatic": "4Embassy|5Consulate", "natural-bay": "Bay", "@category_water": "3Water|water source", "amenity-drinking_water|drinking_water-yes|@category_water": "4Drinking Water|3Potable Water|U+1F6B0", "natural-hot_spring|@category_water": "3Hot Spring", "natural-spring|@category_water": "3Spring|4Natural Spring", "man_made-water_well|@category_water": "Water Well", -"amenity-water_point|@category_water|@category_rv": "Water Tank Refill Point|2RV Water Point|water for rv|water for campervan|water for caravan", -"man_made-water_tap|@category_water": "Water Tap", +"amenity-water_point|@category_water|@category_rv": "5Water tank refill point|2RV water roint|water for rv|water for campervan|water for caravan", +"man_made-water_tap|@category_water": "5Water tap", "@waterbody": "Water body|water surface", "natural-water|@waterbody": "", "natural-water-basin|landuse-basin|@waterbody": "Basin", @@ -292,18 +295,18 @@ "natural-water-reservoir|landuse-reservoir|@waterbody": "5Reservoir", "waterway-river|waterway-stream|natural-water-river": "River|stream|creek|brook", "waterway-canal": "Canal", -"shop-car_repair": "3Car Repair Workshop|4service station|auto|garage|4mechanic|U+1F527", -"tourism-camp_site|@category_hotel": "4Camping|campsite|campground|4tent spot|U+26FA", +"shop-car_repair": "3Car Repair Workshop|4service station|auto|garage|4mechanic|4Repair car|U+1F527", +"tourism-camp_site|@category_hotel": "4Camping|campsite|campground|4Tent spot|U+26FA", "tourism-caravan_site|@category_rv||@category_hotel": "2RV Park|4Caravan Site|RV site|U+1F69A|U+26FA|U+1F69B", "office": "Office|company|U+1F454|U+1F4BC|U+1F3E2|bureau|administrative office|firm|business|corporation", "office-company": "Company Office", -"office-government": "Government Office", -"office-lawyer": "3Lawyer|advocate|attorney|4barrister|counsel|councellor|4solicitor", -"office-telecommunication": "Telecom Company|telecommunications", +"office-government": "6Government office", +"office-lawyer": "3Lawyer|advocate|attorney|4Barrister|counsel|councellor|4Solicitor", +"office-telecommunication": "Telecom Company|6Telecommunication office", "craft-beekeeper": "Beekeeper", "craft-blacksmith": "Blacksmith", "craft-brewery": "Craft brewery|4Brewery|brew house|beer|beer bar|craft beer", -"craft-caterer": "Caterer", +"craft-caterer": "4Caterer", "craft-carpenter": "4Carpenter", "craft-confectionery": "Confectionery|Confectioner", "craft-electrician": "4Electrician", @@ -311,67 +314,69 @@ "craft-gardener": "Gardener", "craft-grinding_mill": "Grinding Mill|Mill", "craft-handicraft": "Handicraft", -"craft-hvac": "HVAC", +"craft-hvac": "3HVAC|AC|aircon|heating|air conditioner|ventilation|climate|climatization", "craft-metal_construction": "5Metal Worker", -"craft-key_cutter": "4Key Cutting|Key Duplication|Key Copying", +"craft-key_cutter": "4Key cutting|Key duplication|Key copying", "craft-locksmith": "Locksmith", "craft-painter": "House Painter|painter|decorator", "craft-photographer": "4Photographer|photography Studio", -"craft-plumber": "Plumber", +"craft-plumber": "4Plumber", "craft-sawmill": "Sawmill", "craft-shoemaker": "4Shoe Repair|shoe maker", -"craft-winery": "4Winery|Wine", +"craft-winery": "Winery|Wine", "craft-tailor": "4Tailor|clothes alteration|alterations", "area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "Square", "place-sea": "Sea|U+1F30A", "place-ocean": "Ocean|U+1F30A", -"@category_wifi": "WiFi|Wi-Fi", +"@category_wifi": "WiFi|Wi-Fi|WLAN", "internet_access|internet_access-wlan|@category_wifi": "3Internet|U+1F4F6", "natural-beach|natural-beach-sand|natural-beach-gravel|leisure-beach_resort": "Beach|U+1F459", -"man_made-lighthouse": "Lighthouse", +"man_made-lighthouse": "5Lighthouse", "man_made-survey_point": "4Survey Point|survey marker|survey benchmark|4geodetic mark|geodetic vertex|4triangulation station|4trigonometrical point|trig point|trig pillar|4trig station|trig beacon|trig", -"man_made-flagpole": "Flagpole", +"man_made-flagpole": "4Flagpole", "man_made-mast": "Mast|pole", "man_made-communications_tower|man_made-tower-communication": "Communications Tower|cell tower|cellular tower|mast", -"man_made-petroleum_well": "Petroleum Well|Oil Well|Boring", +"man_made-petroleum_well": "7Petroleum Well|Oil Well|Boring", "organic-only|organic-yes": "4organic|bio|biological|eco|ecological|healthy", "shop-copyshop": "4Copyshop|copy shop|4printing|4photocopy", "shop-photo|@shop": "4Photo|frames", -"shop-camera|@shop": "3Camera", +"shop-camera|@shop": "3Camera|cameras|photography", "shop-travel_agency": "4Travel Agency|tours|4tour agency|trips|journeys|travel bureau|holidays|travel agent|tourist office|last minute tour", "shop-outdoor|@shop": "4Outdoor Equipment|trekking|hiking|climbing|camping", "shop-dry_cleaning": "3Dry Cleaner|cleaning", -"shop-tyres|@shop": "3Tyre|tyres", +"shop-tyres|@shop": "3Tyre|tyres|tyre shop|3Tires|tire|tire shop", "amenity-car_wash": "3Car Wash", -"amenity-veterinary": "Veterinary Doctor|4veterinary", -"amenity-animal_shelter": "Animal Shelter", +"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Telescope", +"man_made-observatory": "4Observatory", +"amenity-veterinary": "4Veterinary Doctor|3Veterinary|vet|veterinarian", +"amenity-animal_shelter": "6Animal Shelter", "@charging_station": "4Charging Station|charging", "amenity-charging_station|@charging_station": "", "amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging|4Bike Charging", "amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger", "amenity-childcare": "Nursery|4Child Care|childcare", "amenity-bicycle_parking": "4Bicycle Parking|4Bike Parking", -"amenity-waste_basket": "4Trash Bin|4litter bin|waste basket", +"amenity-waste_basket": "4Trash Bin|4litter bin|5waste basket|bin", "emergency-phone": "4Emergency Phone", -"leisure-fitness_centre": "3Fitness Centre|gym|U+1F4AA|fitness|workout|fitness gym|fitness club|health club|fitness studio|workout studio", +"leisure-fitness_centre": "3Fitness Centre|gym|U+1F4AA|fitness|workout|fitness gym|fitness club|health club|fitness studio|workout studio|sport|sports", "leisure-sauna": "3Sauna|sweatbath|sweat lodge|steam room|steam sauna|sauna room", "shop-car_repair-tyres|shop-car_repair": "3Tyre Repair|tyres|4puncture repair|tyre puncture repair|flat tyre repair|tyre replacement", "shop-chemist|@shop": "4Chemist|Pharmacist", "shop-pet|@shop": "3Pet", "tourism-zoo|@category_tourism|@category_children": "2Zoo", "attraction-animal": "Animal Enclosure", -"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourist Office", -"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor Centre", -"amenity-community_centre": "4Community Centre", -"amenity-compressed_air": "Compressed Air", +"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourism office|6Ranger station", +"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station", +"amenity-community_centre": "4Community centre", +"amenity-compressed_air": "6Compressed air", "amenity-courthouse": "4Courthouse", -"amenity-vending_machine-cigarettes": "4Cigarette Dispenser", -"amenity-vending_machine-coffee": "4Coffee Dispenser|Coffee", -"amenity-vending_machine-condoms": "4Condoms Dispenser|Condoms|Condomat", -"amenity-vending_machine-drinks": "4Drinks Dispenser|4Beverages", -"amenity-vending_machine-food|@category_food": "4Food Dispenser|Food|Snacks", -"amenity-vending_machine-parking_tickets|@category_parking": "4Parking Tickets|3Pay and Display|Parkomat|Parking Meter", -"amenity-vending_machine-public_transport_tickets|@category_transport": "Ticket Machine|Transport Tickets|Tickets", +"amenity-vending_machine-cigarettes": "4Cigarette dispenser", +"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee", +"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat", +"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages", +"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks", +"amenity-vending_machine-parking_tickets|@category_parking": "4Parking tickets|3Pay and Display|Parkomat|Parking Meter", +"amenity-vending_machine-public_transport_tickets|@category_transport": "6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing", "amenity-vending_machine-newspapers": "4Newspaper Dispenser|Newspapers", "amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies", "amenity-vending_machine-excrement_bags": "5Excrement Bags Dispenser|4Poop Bags|3Dog Poop Bags|Animal Waste", @@ -379,57 +384,65 @@ "shop-outpost": "4Pickup Point|4Parcel Pickup", "amenity-vending_machine-fuel|@category_fuel": "Fuel Dispenser|Gas Pump", "building-garage": "Garage", -"highway-rest_area|highway-services": "4Rest Area|4Service Area|station", +"highway-rest_area|highway-services": "4Rest area|4Service area|station", "man_made-chimney": "Chimney", "man_made-crane": "Crane", "man_made-tower|man_made-flare": "Tower", -"shop-bookmaker|@gambling": "Bookmaker", +"shop-bookmaker|@gambling": "4Bookmaker", "shop-seafood|@category_food|@shop": "4Fishmonger|4Seafood|fish market|fish|shellfish|marine", -"shop-second_hand|@category_shopping|@shop|@category_secondhand": "Thrift|Flea market", -"shop-charity|@shop|@category_secondhand": "4Charity", -"shop-ticket": "4Ticket Shop|tickets|booking", -"shop-wine|@category_food|@shop": "4Wine|Winery", +"shop-second_hand|@category_shopping|@shop|@category_secondhand": "Thrift|4Thrift store|Flea market", +"shop-charity|@shop|@category_secondhand": "4Charity|charity shop", +"shop-ticket": "4Ticket Shop|tickets|ticket|booking", +"shop-wine|@category_food|@shop": "Wine|Winery", "shop-car_parts|@shop": "3Car Parts|4Auto Parts", -"tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home", +"tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home|4Chalet", "tourism-information-board": "Information Board", -"tourism-information-map": "Tourist Map", -"aerialway-station": "Aerialway Station|Cable Car Station", -"aeroway-helipad": "Helipad", +"tourism-information-map": "Tourist map|map|4Information", +"aerialway-station": "Aerialway Station|5Cable car station", +"aeroway-helipad": "4Helipad", "barrier-border_control": "4Border Control", "leisure-water_park|@category_tourism|@category_children": "Water Park|3aqua park", "man_made-water_tower": "Water Tower", -"man_made-windmill": "Windmill", +"man_made-windmill": "4Windmill", "natural-cave_entrance": "Cave", "natural-volcano|@mountain": "4Volcano", "office-estate_agent": "4Estate Agent|Realtor|4Real Estate", "waterway-lock_gate": "Lock Gate", -"amenity-public_bookcase": "4Book Exchange|Book swap", -"sport-climbing": "4Climbing Centre", +"amenity-public_bookcase": "4Book Exchange|Book swap|book|books|public bookcase|bookcase|free library|street library|sidewalk library", +"sport-climbing": "4Climbing Centre|climbing", "sport-yoga": "Yoga", "leisure-fitness_centre-sport-yoga": "Yoga Studio", "tourism-apartment|@category_hotel": "4Holiday Apartment", "leisure-resort|@category_hotel": "Resort", "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten", -"amenity-driving_school": "4Driving School", -"amenity-music_school": "Music School", -"amenity-language_school": "Language School", -"amenity-ice_cream": "3Ice Cream|Gelato", -"amenity-internet_cafe": "3Internet Cafe", +"amenity-driving_school": "4Driving school", +"amenity-sailing_school": "4Sailing school|4Boating school", +"amenity-flight_school": "5Flight school|Flying school", +"amenity-prep_school": "3Tutorial school|Prep school|Test prep center|Cram school", +"amenity-music_school": "4Music school", +"amenity-language_school": "4Language school", +"amenity-ice_cream": "3Ice cream|Gelato", +"amenity-internet_cafe": "3Internet Cafe|5Cybercafé", "amenity-motorcycle_parking": "4Motorcycle Parking", -"amenity-parking_space-disabled|@category_parking": "Disabled Parking Space", +"amenity-parking_space-disabled|@category_parking": "4Disabled parking space", +"amenity-car_pooling|@category_parking": "4Carpooling|car pooling", "amenity-nursing_home": "4Nursing Home", -"amenity-payment_terminal": "Payment Terminal", -"amenity-public_bath": "Public Bath", +"amenity-payment_terminal": "3Payment Terminal", +"amenity-payment_centre": "3Payment Centre", +"amenity-public_bath": "6Public bath", "amenity-shower": "Shower", -"emergency-assembly_point": "Emergency Assembly Point", +"emergency-access_point": "5Emergency Rescue Point|Emergency Location|Emergency Marker|Emergency Access Point", +"emergency-assembly_point": "5Emergency assembly point", +"emergency-life_ring": "5Lifebuoy|6Life Ring|life-ring|lifering|flotation device|floatation device", "emergency-defibrillator": "4Defibrillator|AED", "emergency-fire_hydrant": "4Fire Hydrant|Fire Plug", "emergency-lifeguard": "Lifeguard|Lifesaver", -"emergency-mountain_rescue": "Mountain Rescue Station|Search and Rescue", -"leisure-fitness_station": "3Fitness Station|street workout", +"emergency-mountain_rescue": "Mountain Rescue Station|Search and Rescue|rescue", +"leisure-fitness_station": "3Fitness Station|street workout|fitness|workout|4Exercise station|Exercise bench|outdoor gym|5Calisthenics park|trim trail", "office-insurance": "4Insurance Office", "office-ngo": "4Non-Governmental Organization|NGO", "shop-erotic|@shop": "4Erotic|4Adult|3Sex", +"shop-beauty-day_spa": "4Day Spa|spa|wellness", "shop-massage": "Massage salon|Massage Parlour|4massage|spa|massage center|massage therapy|massage services|spa treatment|spa services", "shop-motorcycle|@shop": "4Motorcycle", "shop-motorcycle_repair": "4Motorcycle Repair", @@ -437,45 +450,47 @@ "shop-pawnbroker": "4Pawnbroker", "shop-stationery|@shop": "5Stationery", "shop-tattoo": "Tattoo Parlour|4tattoos", -"shop-variety_store|@category_shopping|@shop": "Variety", -"shop-video|@shop": "4Video|3DVD", -"shop-video_games|@shop": "Video games|4videogames|video games|videogames|U+1F47E|U+1F579|U+1F3AE", +"shop-variety_store|@category_shopping|@shop": "4Variety|6Dollar store|5Pound shop|5Five and dime", +"shop-video|@shop": "4Video|3DVD|videoshop|5video shop|video rental|video rental shop|video rental store", +"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|U+1F47E|U+1F579|U+1F3AE", "tourism-wilderness_hut|@category_hotel": "4Wilderness Hut|5backcountry hut|hut|mountain hut|bothy|bivvy", "tourism-gallery|@category_tourism": "3Art Gallery|3Gallery|museum", -"tourism-theme_park|@category_tourism|@category_children": "Theme park|Amusement park", -"boundary-national_park|@category_tourism": "National Park", -"leisure-nature_reserve|@category_tourism": "Nature reserve", +"tourism-theme_park|@category_tourism|@category_children": "5Theme park|Amusement park", +"boundary-national_park|@category_tourism": "5National Park", +"leisure-nature_reserve|@category_tourism": "4Nature reserve", "natural-cape": "Cape", "natural-geyser": "3Geyser", "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", +"shop-chocolate|@category_food|@shop": "5Chocolate", "shop-coffee|@category_food|@shop": "Coffee Retailer|Coffee", "shop-fabric|@shop": "Fabric", -"shop-money_lender": "Money lender", -"shop-music|@shop": "Record|vinyl|Music", -"shop-musical_instrument|@shop": "Musical instruments", +"shop-money_lender": "5Money lender", +"shop-music|@shop": "Record|4vinyl|Music|6Record store", +"shop-musical_instrument|@shop": "7Musical instruments|instruments|guitar|guitars", "shop-tea|@shop": "Tea", -"shop-antiques|@category_shopping|@shop|@category_secondhand": "Antiques", +"shop-telecommunication|@shop": "6Telecommunications shop|Telecommunications|telecom", +"shop-antiques|@category_shopping|@shop|@category_secondhand": "5Antiques", "shop-art|@category_shopping|@shop": "3Artwork|Arts", -"shop-baby_goods|@category_children|@shop": "Baby Goods", +"shop-baby_goods|@category_children|@shop": "4Baby Goods", "shop-bag|@category_shopping|@shop": "Bags", "shop-cheese|@category_food|@shop": "Cheese", "shop-dairy|@category_food|@shop": "Dairy Products", "shop-electrical|@shop": "Electrical Supplies|Electrical|U+1F50B|U+1F50C|U+1F4A1|U+1F526", "shop-fishing|@shop": "Fishing", -"shop-interior_decoration|@shop": "Interior Decorations", +"shop-interior_decoration|@shop": "6Interior decorations|interior design", "shop-lighting|@shop": "4Lighting|Lighting fixtures|4Lamps", "shop-lottery|@gambling": "Lottery Tickets", -"shop-medical_supply|@shop": "Medical Supplies", -"shop-nutrition_supplements|@shop": "Nutrition Supplements", +"shop-medical_supply|@shop": "7Medical supplies", +"shop-nutrition_supplements|@shop": "9Nutrition supplements", "shop-paint|@shop": "Paints", -"shop-perfumery|@category_shopping|@shop": "Perfumery", -"shop-sewing|@shop": "3Sewing Supplies|4Haberdashery", -"shop-storage_rental": "Storage Rental", +"shop-perfumery|@category_shopping|@shop": "5Perfumery|perfume|perfumes", +"shop-sewing|@shop": "3Sewing supplies|4Haberdashery", +"shop-storage_rental": "5Storage rental|4Rent storage", "shop-tobacco|@shop": "Smoke|Tobacco", "shop-trade|@shop": "Trades Supplies|Trade Supplies", "shop-watches|@category_shopping|@shop": "Watches", @@ -486,31 +501,35 @@ "shop-auction|@category_secondhand": "4Auction|Auctioneer|Auction House", "shop-collector|@category_shopping|@category_secondhand": "Collectables|Collector", "man_made-cairn": "4Cairn", -"wheelchair-yes": "5Wheelchair", -"amenity-social_facility": "Social Facility", +"wheelchair-yes": "5Wheelchair|accessible|accessibility|5Handicap accessible", +"amenity-social_facility": "Social Facility|social|group home|nursing home|assisted living|drug clinic|halfway house|disabled workshop|job center|homeless shelter", +"social_facility-soup_kitchen": "4Soup Kitchen|Food", +"social_facility-food_bank": "4Food Bank|foodbank|Food|donate|Free pantry|Free fridge", +"amenity-food_sharing": "Food Sharing|Food|donate", +"amenity-give_box": "Give Box|donate", "leisure-sports_hall": "Sports hall", "amenity-arts_centre|@category_tourism": "Arts Center", -"amenity-prison": "prison", -"amenity-exhibition_centre": "Exhibition Center", -"shop-bathroom_furnishing|@shop": "Bathroom Furnishings", -"shop-bed|@shop": "Bed Shop", -"shop-boutique|@shop": "Boutique", -"amenity-food_court": "Food Court", -"shop-curtain|@shop": "Curtain Shop", -"shop-gas|@shop": "Gas Store", -"shop-pet_grooming": "Pet Grooming", -"shop-hifi|@shop": "HiFi Audio Shop", -"amenity-conference_centre": "Conference Center", -"shop-herbalist|@shop": "Herbalist", -"shop-appliance|@shop": "Appliance Shop", -"shop-agrarian|@shop": "Agricultural Shop", -"shop-fashion_accessories|@shop": "Fashion Accessories", +"amenity-prison": "prison|jail|penitentiary|detention centre|detention center", +"amenity-exhibition_centre": "5Exhibition Center", +"shop-bathroom_furnishing|@shop": "9Bathroom Furnishings", +"shop-bed|@shop": "3Bed Shop", +"shop-boutique|@shop": "4Boutique", +"amenity-food_court": "5Food Court", +"shop-curtain|@shop": "5Curtain Shop", +"shop-gas|@shop": "4Gas Store|gas shop|propane|butane|cooking gas|LNG|CNG|gas bottles", +"shop-pet_grooming": "4Pet Grooming|groomer|dog grooming", +"shop-hifi|@shop": "4HiFi Audio Shop", +"amenity-conference_centre": "5Conference Center", +"shop-herbalist|@shop": "4Herbalist", +"shop-appliance|@shop": "4Appliance Shop|Kitchen appliances|Kitchen gallery", +"shop-agrarian|@shop": "4Agricultural Shop|Feed store|Feed and seed|Farm supply", +"shop-fashion_accessories|@shop": "4Fashion Accessories", "amenity-waste_transfer_station": "Waste Transfer Station", -"shop-carpet|@shop": "Carpet Shop", -"shop-craft|@shop": "Craft", +"shop-carpet|@shop": "4Carpet Shop", +"shop-craft|@shop": "3Craft", "shop-pasta|@shop": "Pasta", -"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraction|Maze", -"amenity-luggage_locker": "Luggage|locker|storage", +"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraction|Maze|Amusement|attractions", +"amenity-luggage_locker": "5Luggage locker|Luggage|locker|4Lockers|storage|5Coin lockers", "office-security": "4Security Office", "building-guardhouse": "4Guard" } \ No newline at end of file diff --git a/data/categories-strings/es.json/localize.json b/data/categories-strings/es.json/localize.json index c7ababbb9..6e5e7f64c 100644 --- a/data/categories-strings/es.json/localize.json +++ b/data/categories-strings/es.json/localize.json @@ -498,5 +498,16 @@ "sport-9pin": "Bolos", "sport-10pin": "Bolos", "shop-bookmaker|@gambling": "Corredor de apuestas", -"leisure-fitness_centre-sport-yoga": "Estudio de yoga" +"leisure-fitness_centre-sport-yoga": "Estudio de yoga", +"amenity-mobile_money_agent": "Agencia de efectivo móvil | agente de dinero móvil | agencia de dinero móvil | agente de efectivo móvil", +"amenity-boat_rental": "4aquiler de botes|alquiler de barcos|bote|botes|barco|barcos|barca|barcas|lancha|lanchas|embarcación|embarcaciones|velero|veleros|nagegar|3alquiler", +"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Telescopio", +"man_made-observatory": "3Observatorio", +"amenity-car_pooling|@category_parking": "Car pooling | Vehículo compartido | Blabla Car", +"amenity-payment_centre": "Centro de pagos", +"leisure-indoor_play": "Parque interior|niños", +"shop-telecommunication|@shop": "Telecomunicaciones", +"leisure-bandstand": "4Tarima", +"social_facility-soup_kitchen": "4Comedor social | Comedor popular | Comedor comunitario | Comida", +"social_facility-food_bank": "Banco de alimentos | alimento | comida | voluntariado" } diff --git a/data/copyright.html b/data/copyright.html index 8e35b1268..f26a3de1f 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -200,6 +200,9 @@
  • Pugixml
    © 2006-2015 Arseny Kapoulkine; MIT License
    • +
  • StreetComplete Taginfo Categorize
    + © 2025; CC0 1.0 Universal
    • +
  • succinct library
    © 2011 Giuseppe Ottaviano; Apache License
    • @@ -223,10 +226,10 @@
  • Skarupke Hash Tables
    © Malte Skarupke 2017; Boost License
    • - - +

    Beyond OpenStreetMap, we also use a few other open data sources to improve our map data:

    +

    Neben OpenStreetMap verwenden wir auch einige andere freie Datenquellen, um die Kartendaten zu verbessern:

    diff --git a/data/countries-strings/ro.json/localize.json b/data/countries-strings/ro.json/localize.json index 479331210..099f9a3b4 100644 --- a/data/countries-strings/ro.json/localize.json +++ b/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", +"Austria_Lower Austria_Wien":"Viena și Austria de Jos", "Austria_Salzburg":"Salzburg", "Austria_Styria":"Stiria", "Austria_Tyrol":"Tirol", diff --git a/data/countries-strings/sr.json/localize.json b/data/countries-strings/sr.json/localize.json index dc87f61b9..b9bcaec78 100644 --- a/data/countries-strings/sr.json/localize.json +++ b/data/countries-strings/sr.json/localize.json @@ -4,7 +4,7 @@ "Afghanistan":"Авганистан", "Alabama":"Алабама", "Algeria":"Алжир", -"Algeria_Coast":"Алжир - Север", +"Algeria_Coast":"Алжир - север", "Algeria_Central":"Алжир - центар", "Andorra":"Андора", "Angola":"Ангола", @@ -67,7 +67,7 @@ "Austria":"Аустрија", "Austria_Burgenland":"Бургенланд", "Austria_Carinthia":"Корушка", -"Austria_Lower Austria_West":"Доња Аустрија — Запад", +"Austria_Lower Austria_West":"Доња Аустрија — запад", "Austria_Salzburg":"Салцбург", "Austria_Styria":"Штајерска", "Austria_Tyrol":"Тирол", @@ -77,8 +77,8 @@ "Bhutan":"Бутан", "Bermuda":"Бермуди", "Bolivia":"Боливија", -"Bolivia_North":"Боливија – Сервер", -"Bolivia_South":"Боливија – Југ", +"Bolivia_North":"Боливија – сервер", +"Bolivia_South":"Боливија – југ", "Bosnia and Herzegovina":"Босна и Херцеговина", "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Брчко", "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Федерација Босне и Херцеговине", @@ -98,10 +98,99 @@ "Canada":"Канада", "Canada_Alberta":"Алберта", "Canada_Alberta_Edmonton":"Едмонтон", -"Canada_Alberta_North":"Алберта — Сервер", +"Canada_Alberta_North":"Алберта — север", "Canada_British Columbia":"Британска Колумбија", "Australia_Western Australia":"Западна Аустралија", -"Austria_Lower Austria_Wien":"Беч и Доња Аустрија — Исток", +"Austria_Lower Austria_Wien":"Беч и Доња Аустрија — исток", "Belgium_East Flanders":"Источна Фландрија", -"Canada_Alberta_South":"Алберта — Југ" +"Canada_Alberta_South":"Алберта — југ", +"Belgium_Flemish Brabant":"Фламански Брабант", +"Belgium_Hainaut":"Ено", +"Belgium_Liege":"Лијеж", +"Belgium_Limburg":"Лимбург", +"Belgium_Luxembourg":"Луксембург", +"Belgium_Namur":"Намир", +"Belgium_Walloon Brabant":"Валонски Брабант", +"Belgium_West Flanders":"Западна Фландрија", +"Brazil_Goias":"Гојас", +"Brazil_Mato Grosso":"Мато Гросо", +"Brazil_Mato Grosso Do Sul":"Мато Гросо до Сул", +"Brazil_North Region":"Северни регион", +"Brazil_Northeast Region":"Североисточни регион", +"Brazil_Paraiba":"Параиба", +"Brazil_Parana":"Парана", +"Brazil_Rio Grande do Norte":"Рио Гранде до Норте", +"Brazil_Santa Catarina":"Санта Катарина", +"Brazil_South Region":"Јужни регион", +"Brazil_Southeast Region_Espirito Santo":"Есприто Санто", +"Brazil_Southeast Region_Minas Gerais_Contagem":"Минас Жераис - Контажем", +"Brazil_Southeast Region_Minas Gerais_North":"Минас Жераис - север", +"Brazil_Southeast Region_Rio de Janeiro":"Рио де Жанеиро", +"Brazil_Southeast Region_Sao Paulo_Campinas":"Сао Пауло - Кампињас", +"Brazil_Southeast Region_Sao Paulo_City":"Сао Пауло - Сантос", +"Brazil_Southeast Region_Sao Paulo_West":"Сао Пауло - Рибеирао Прето", +"British Indian Ocean Territory":"Британска територија у Индијском океану", +"British Virgin Islands":"Британска Девичанска Острва", +"Campo de Hielo Sur":"Јужно патагонско ледено поље", +"Canada_British Columbia_Central":"Британска Колумбија — центар", +"Canada_British Columbia_Far_North":"Британска Колумбија — исток", +"Canada_British Columbia_Islands":"Острво Ванкувер", +"Canada_British Columbia_North":"Британска Колумбија — запад", +"Canada_British Columbia_Northeast":"Британска Колумбија — север", +"Canada_British Columbia_Southeast":"Келоуна", +"Canada_British Columbia_Vancouver":"Ванкувер", +"Canada_Labrador":"Лабрадор", +"Canada_Labrador_North":"Лабрадор — север", +"Canada_Labrador_South":"Лабрадор — југ", +"Canada_Labrador_West":"Лабрадор — запад", +"Canada_Manitoba":"Манитоба", +"Canada_Manitoba_Northeast":"Манитоба — север", +"Canada_Manitoba_Northwest":"Манитоба — запад", +"Canada_Manitoba_South":"Брендон", +"Canada_Manitoba_Winnipeg":"Винипег", +"Canada_New Brunswick":"Њу Бранзвик", +"Canada_Newfoundland":"Њуфаундленд", +"Canada_Newfoundland_East":"Њуфаундленд — исток", +"Canada_Newfoundland_North":"Њуфаундленд — север", +"Canada_Newfoundland_South":"Њуфаундленд — југ", +"Canada_Newfoundland_West":"Њуфаундленд — запад", +"Canada_Northwest Territories":"Северозападне Територије", +"Canada_Northwest Territories_East":"Северозападне Територије — исток", +"Canada_Northwest Territories_North":"Северозападне Територије — север", +"Canada_Northwest Territories_Yellowknife":"Јелоунајф", +"Canada_Nova Scotia":"Нова Шкотска", +"Canada_Nova Scotia_Halifax":"Халифакс", +"Canada_Nova Scotia_Sydney":"Сидни", +"Canada_Nunavut":"Нунавут", +"Canada_Nunavut_North":"Нунавут — север", +"Canada_Nunavut_South":"Нунавут — југ", +"Canada_Ontario":"Онтарио", +"Canada_Ontario_Bame":"Бери", +"Canada_Ontario_Kingston":"Кингстон", +"Canada_Ontario_London":"Лондон", +"Canada_Ontario_Northeastern_Central":"Тиминс", +"Canada_Ontario_Northeastern_North":"Мус Фектори", +"Canada_Ontario_Northeastern_S":"Велики Садбери", +"Canada_Ontario_Northeastern_SE":"Норт Беј", +"Canada_Ontario_Northeastern_SW":"Су Сент Мари", +"Canada_Ontario_Northeastern_Wawa":"Вава", +"Canada_Ontario_Northern":"Тандербеј", +"Canada_Ontario_Northwestern":"Онтарио — север", +"Canada_Ontario_Toronto":"Торонто", +"Canada_Prince Edward Island":"Острво Принца Едварда", +"Canada_Quebec":"Квебек", +"Canada_Quebec_Quebec":"Град Квебек", +"Canada_Quebek_Far North":"Квебек — север", +"Canada_Quebek_Montreal":"Монтреал", +"Canada_Quebek_North":"Септ-Ил", +"Canada_Quebek_Southeast_Rimouski":"Римуски", +"Canada_Quebek_Southeast_Saguenay":"Сагне", +"Canada_Quebek_West_Chibougamau":"Шибугамо", +"Canada_Quebek_West_Rouyn-Noranda":"Руен-Норанда", +"Canada_Saskatchewan":"Саскачеван", +"Canada_Saskatchewan_North":"Саскачеван — север", +"Canada_Saskatchewan_South":"Саскачеван — југ", +"Canada_Yukon":"Јукон", +"Canada_Yukon_North":"Јукон — север", +"Canada_Yukon_Whitehorse":"Вајтхорс" } diff --git a/data/countries-strings/sr_Latn.json/localize.json b/data/countries-strings/sr_Latn.json/localize.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/data/countries-strings/sr_Latn.json/localize.json @@ -0,0 +1 @@ +{} diff --git a/data/countries.txt b/data/countries.txt index 107a00fcd..c1a6d9360 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -1,16 +1,16 @@ { - "v": 251104, + "v": 251116, "id": "Countries", "g": [ { "id": "World", - "s": 52305860, - "sha1_base64": "RrZ7jeFxR1Xegy/0Y+EPAUHBbvY=" + "s": 52122498, + "sha1_base64": "/0gfHcXNZDpI4PHgP56rUbKXRf8=" }, { "id": "WorldCoasts", - "s": 8514922, - "sha1_base64": "dPZI+ZLvqltDngqNGpaj8Qk1jqk=" + "s": 8506467, + "sha1_base64": "ZmIKY0c9SIvvdzYwcV+Ets+/p2k=" }, { "id": "Abkhazia", @@ -22,8 +22,8 @@ "აფხაზეთის ავტონომიური რესპუბლიკა - Аҧсны Автономтә Республика", "საქართველო" ], - "s": 16016482, - "sha1_base64": "IMpV4IYPwy5fuBNZ/gWXmDBEk1k=" + "s": 16043226, + "sha1_base64": "vCtilkVVXuZqi2j7qz3NYtxq9F8=" }, { "id": "Afghanistan", @@ -67,8 +67,8 @@ "ولایت غور", "افغانستان" ], - "s": 188449277, - "sha1_base64": "ZgcLjwzJxq4jaD0TxbE+DoFtdV4=" + "s": 192898261, + "sha1_base64": "FlR9YZ2g29Ne0EceoChjPFY9Q8w=" }, { "id": "Albania", @@ -78,8 +78,8 @@ "affiliations": [ "Shqipëria" ], - "s": 62025982, - "sha1_base64": "end67OniClvctsskXmI+rOAuZUQ=" + "s": 62576430, + "sha1_base64": "N4UzLNqPscD8FB45etn5A3F72VU=" }, { "id": "Algeria", @@ -109,8 +109,8 @@ "Tindouf ⵜⵉⵏⴷⵓⴼ تندوف", "Tébessa - تبسة" ], - "s": 174990801, - "sha1_base64": "OipgBt4j3VjVwV11gyxEViYn1Bk=" + "s": 177485321, + "sha1_base64": "ZwslMiWzQH3c5JyDAGDpG8Pkzkg=" }, { "id": "Algeria_Coast", @@ -151,8 +151,8 @@ "Tizi Ouzou - ⵜⵉⵣⵉ ⵓⵣⵣⵓ - تيزي وزو", "Tlemcen - تلمسان" ], - "s": 194665737, - "sha1_base64": "rbz2m4uuCfzyf1SlGIJziSw2Ibc=" + "s": 195604665, + "sha1_base64": "VnG1tzxSAg3ojxjMKBPjr4lUNaI=" } ] }, @@ -164,8 +164,8 @@ "affiliations": [ "Andorra" ], - "s": 4855307, - "sha1_base64": "1ynfYLU+RRd1+V0zEUkagUR9k3k=" + "s": 4950667, + "sha1_base64": "WxpydaXedAyEucZlRUunDo2YV3s=" }, { "id": "Angola", @@ -193,8 +193,8 @@ "Namibe", "Zaire" ], - "s": 122155175, - "sha1_base64": "Cti+98ydMs3fVSMROoow5IegsMc=" + "s": 123061463, + "sha1_base64": "6KW5FPhZq9oU+O6WTJAh0P+tblQ=" }, { "id": "Anguilla", @@ -204,8 +204,8 @@ "affiliations": [ "Anguilla" ], - "s": 848840, - "sha1_base64": "RAcL2ANDM9lnhfIGfsyk5AbiGMM=" + "s": 906600, + "sha1_base64": "aGxiMwXaZoEBh1+i+Gkzls5B0Tg=" }, { "id": "Antigua and Barbuda", @@ -216,8 +216,8 @@ "Antigua and Barbuda", "Montserrat" ], - "s": 2716979, - "sha1_base64": "0UJaFG2UqyVWxklWw578CXRYnKg=" + "s": 3137576, + "sha1_base64": "gkoSejeqXw4r/yrsTLnX7JK1sG4=" }, { "id": "Barbados", @@ -227,8 +227,8 @@ "affiliations": [ "Barbados" ], - "s": 6738270, - "sha1_base64": "6ersspqj3KWbozMG67Kvo8VvBEc=" + "s": 6765246, + "sha1_base64": "F4RGPD1eQ5wL424HcPcZRtJewNY=" }, { "id": "British Virgin Islands", @@ -238,8 +238,8 @@ "affiliations": [ "British Virgin Islands" ], - "s": 1293757, - "sha1_base64": "+tt06yeMCKxzEhaK7aXmq0n/VCw=" + "s": 1297245, + "sha1_base64": "0L0C6fvKgTFygdo2azkDJgUvsz4=" }, { "id": "Caribisch Nederland", @@ -257,8 +257,8 @@ "Aruba", "Curacao" ], - "s": 10482552, - "sha1_base64": "PTXcEnv0IO4Ph1DC2t3i9jTJNak=" + "s": 10746280, + "sha1_base64": "PETcFszeDaLKBoBcUgD1awzdpzQ=" }, { "id": "Dominica", @@ -278,8 +278,8 @@ "Saint Joseph Parish", "Saint Peter Parish" ], - "s": 3707953, - "sha1_base64": "JRpYhBth03tjEsllPRWRHx1upfM=" + "s": 4170418, + "sha1_base64": "9yHdtR0CIDTskX6wF6NmHvLQ4qo=" }, { "id": "Grenada", @@ -289,8 +289,8 @@ "affiliations": [ "Grenada" ], - "s": 2970814, - "sha1_base64": "NZOaR2qXT3bT2sogRJx1dUZ/dVs=" + "s": 2977551, + "sha1_base64": "RLtHNB4Sif69KpAahBoHRmsr54M=" }, { "id": "Guadeloupe", @@ -302,8 +302,8 @@ "Guadeloupe", "Montserrat" ], - "s": 17989772, - "sha1_base64": "Oc7oGkYGpdJYUW4X+f/w4tM2fc0=" + "s": 18755653, + "sha1_base64": "sKMVGtJRnUR5IK2HIp0P7t7lqZI=" }, { "id": "Martinique", @@ -315,8 +315,8 @@ "Martinique", "Saint Lucia" ], - "s": 14919777, - "sha1_base64": "EZq3NrZ7LP61XAbt9flZK7jvmhw=" + "s": 15612417, + "sha1_base64": "VfvjD004csKxRW4aEh/mRkMY4pI=" }, { "id": "Montserrat", @@ -326,8 +326,8 @@ "affiliations": [ "Montserrat" ], - "s": 626195, - "sha1_base64": "XGNZ11aL6IJUFuPBdx3ycLL2bvs=" + "s": 969212, + "sha1_base64": "AKIx+ZfnZNOPIRjV+xZtOd4YPYM=" }, { "id": "Saint Barthelemy", @@ -337,8 +337,8 @@ "affiliations": [ "France" ], - "s": 924494, - "sha1_base64": "hAW5UteZBhToaDKjb/qU48PAEg8=" + "s": 976942, + "sha1_base64": "UA1FL3hFW4gxdIdTpM6p5FbIvsw=" }, { "id": "Saint Kitts and Nevis", @@ -348,8 +348,8 @@ "affiliations": [ "Saint Kitts and Nevis" ], - "s": 1768104, - "sha1_base64": "IHr1yehH8NCdHHEDdn3Cpb27AqE=" + "s": 1835936, + "sha1_base64": "XNoWOqWQGlEuDPosmo7JSFSSPMk=" }, { "id": "Saint Lucia", @@ -360,8 +360,8 @@ "Saint Lucia", "Saint Vincent and the Grenadines" ], - "s": 4197764, - "sha1_base64": "GpmNWYDWp6niGXHPvTuwysffZ2M=" + "s": 4693556, + "sha1_base64": "zAJNLT2+1ub2473+RyQK2Yvuqdc=" }, { "id": "Saint Martin", @@ -378,8 +378,8 @@ "Saint Martin (Dutch part)", "Sint Maarten (Netherlands)" ], - "s": 2426893, - "sha1_base64": "vaLd58N1o6GtAdae8jsxntfYTmI=" + "s": 2500485, + "sha1_base64": "UwWfUmOY9spSPhWBvuSygi5EoAM=" }, { "id": "Saint Vincent and the Grenadines", @@ -389,8 +389,8 @@ "affiliations": [ "Saint Vincent and the Grenadines" ], - "s": 3072375, - "sha1_base64": "YQsqYRXPYliOAEX1hz3qIN5ZcCg=" + "s": 3102807, + "sha1_base64": "0tq8gJOLiIXCEjHx7ofx3mzJLN8=" }, { "id": "Trinidad and Tobago", @@ -400,8 +400,8 @@ "affiliations": [ "Trinidad and Tobago" ], - "s": 17980938, - "sha1_base64": "8gZzlDcOOaIzJ9yIJBBzOcHFo0E=" + "s": 18026250, + "sha1_base64": "VaZcVu1O9AdbehhuQ/VwKYU5MMQ=" }, { "id": "United States Virgin Islands", @@ -416,8 +416,8 @@ "VI", "United States of America" ], - "s": 3451704, - "sha1_base64": "wGe8Uq9t66k6Y+zXU9k3YWe/STs=" + "s": 3462112, + "sha1_base64": "SPn4p5/8EPuNvanNDCGearKbhjA=" }, { "id": "Argentina", @@ -427,8 +427,8 @@ "affiliations": [ "Acuerdo de Campos de Hielo" ], - "s": 6794832, - "sha1_base64": "o4RvdnHQlm77FE0Y7yZZAReAvRs=" + "s": 7075801, + "sha1_base64": "IhAWDdSd+HCzy62/M7F++mwmFx8=" }, { "id": "Argentina_Buenos Aires_Buenos Aires", @@ -440,8 +440,8 @@ "Ciudad Autónoma de Buenos Aires", "Buenos Aires" ], - "s": 67573724, - "sha1_base64": "9S/vHMFMCl4pi3QsmnT68zCKiwM=" + "s": 67996125, + "sha1_base64": "UEelxrt8klJb+O1DZJnkbpvi074=" }, { "id": "Argentina_Buenos Aires_North", @@ -452,8 +452,8 @@ "Argentina", "Buenos Aires" ], - "s": 40166212, - "sha1_base64": "pR22fUTM3QPLM72xRgCM1NBMJew=" + "s": 41114804, + "sha1_base64": "z/xQe5NbtvcxHKI5BTsjQoJvFm8=" }, { "id": "Argentina_Buenos Aires_South", @@ -464,8 +464,8 @@ "Argentina", "Buenos Aires" ], - "s": 57819460, - "sha1_base64": "Uxz1DEuN37MAGtyPUUb205xetCM=" + "s": 58277204, + "sha1_base64": "gpDl1fCpCO6XKhAR8WxWh7NqzCE=" }, { "id": "Argentina_Patagonia", @@ -480,8 +480,8 @@ "Santa Cruz", "Tierra del Fuego" ], - "s": 243150339, - "sha1_base64": "8Eq7BV2y4F5yhgnMfJ8Z1DrTkaU=" + "s": 247792707, + "sha1_base64": "nCS48rptvoPFww7imsWJgsAHbhU=" }, { "id": "Argentina_Cuyo", @@ -495,8 +495,8 @@ "San Juan", "San Luis" ], - "s": 77376916, - "sha1_base64": "k6y0wo3UTT3Kbz18bf4P/QryfOw=" + "s": 78152532, + "sha1_base64": "64J4jDOYAXCaXXNdKGedzcBsz9M=" }, { "id": "Argentina_Mesopotamia", @@ -517,8 +517,8 @@ "Itapúa", "Misiones" ], - "s": 81862237, - "sha1_base64": "5IYYppsxwgzfna1X9gAvlXXZTns=" + "s": 82818718, + "sha1_base64": "irC7IVlxNNxz2U0fA0wnzQDIyzA=" }, { "id": "Argentina_Northwest", @@ -535,8 +535,8 @@ "Santiago del Estero", "Tucumán" ], - "s": 120004792, - "sha1_base64": "eCkCetn18nrCJV+32i3vzVk045U=" + "s": 120826312, + "sha1_base64": "CF5Ra2700kgpI2QdeqVISt0ssFw=" }, { "id": "Argentina_Pampas", @@ -548,8 +548,8 @@ "Córdoba", "La Pampa" ], - "s": 80843248, - "sha1_base64": "TD0DVXH/2K/lJ769zzisHS3FKwc=" + "s": 82932768, + "sha1_base64": "TVjCOsP6NOpOj5FlvmIG0Yn/o8E=" }, { "id": "Argentina_Santa Fe", @@ -560,8 +560,8 @@ "Argentina", "Santa Fe" ], - "s": 56270197, - "sha1_base64": "WJirzrtRwlkY0RCIwcJeXXZ3C6M=" + "s": 57078293, + "sha1_base64": "w3TjXBFnx6q/iKBBHAkx3Pr+3pI=" } ] }, @@ -586,8 +586,8 @@ "Արագածոտնի մարզ", "Գեղարքունիք" ], - "s": 63722755, - "sha1_base64": "3FN51PZ9uA/mrrYxQI9RcPLmta0=" + "s": 64261507, + "sha1_base64": "0/hA4CdIgiga5S7FwYuSNksp7Ns=" }, { "id": "Austria", @@ -601,8 +601,8 @@ "Burgenland", "Österreich" ], - "s": 41132880, - "sha1_base64": "lJ10Ob4obixDqEtTM9WAf6uPviY=" + "s": 41550760, + "sha1_base64": "bJaDwwgF2/XMW/U9Jf3l+xPFCv8=" }, { "id": "Austria_Carinthia", @@ -613,8 +613,8 @@ "Kärnten", "Österreich" ], - "s": 69286504, - "sha1_base64": "dwJD92ndm9mm83j9pRypubny+Pg=" + "s": 69582600, + "sha1_base64": "efmZSDFCW7mLcQ+xJmoznd4fUpw=" }, { "id": "Austria_Lower Austria_Wien", @@ -626,8 +626,8 @@ "Niederösterreich", "Wien" ], - "s": 132564098, - "sha1_base64": "l0BGMmvbuwrfOb1f6rEcNsuNMyw=" + "s": 136310898, + "sha1_base64": "bv7nd0T0GJXDoZRZjogmSi8JoHs=" }, { "id": "Austria_Styria_Graz", @@ -638,8 +638,8 @@ "Österreich", "Steiermark" ], - "s": 90796393, - "sha1_base64": "wpr2uS3BHavit07Qv2B+nldVwEY=" + "s": 91734609, + "sha1_base64": "E1IkpL9udACBBnOSO1UEaqPy0AQ=" }, { "id": "Austria_Styria_Leoben", @@ -650,8 +650,8 @@ "Österreich", "Steiermark" ], - "s": 61266902, - "sha1_base64": "hf+t266dxCum0rHd1HeV1z9K87M=" + "s": 62046910, + "sha1_base64": "tF7dw8Dm9S/3p7tqBmPnYKPwifc=" }, { "id": "Austria_Upper Austria_Linz", @@ -662,8 +662,8 @@ "Österreich", "Oberösterreich" ], - "s": 58845205, - "sha1_base64": "JkQmqbsOeCv6gQQwuk7hC54+TK4=" + "s": 60068574, + "sha1_base64": "FHlmeFxBGUvoiZe8HPjGptLSwog=" }, { "id": "Austria_Upper Austria_Wels", @@ -674,8 +674,8 @@ "Österreich", "Oberösterreich" ], - "s": 68600783, - "sha1_base64": "lFNkzMNJoT8RbrPZfqhuVaBmH4k=" + "s": 69328895, + "sha1_base64": "JNL9gk1wKp3dgA+DuSqH1OZ2FTw=" }, { "id": "Austria_Lower Austria_West", @@ -686,8 +686,8 @@ "Österreich", "Niederösterreich" ], - "s": 127295279, - "sha1_base64": "UAohmKwRbpd6EJeWEs5T9qB8l9M=" + "s": 129555031, + "sha1_base64": "eghYyPjvTulR9Dw+RB2IT6od3Dk=" }, { "id": "Austria_Tyrol", @@ -698,8 +698,8 @@ "Österreich", "Tirol" ], - "s": 91767873, - "sha1_base64": "hufYQFVsXoDOhbyhhP2sdCuhwJ8=" + "s": 92837833, + "sha1_base64": "GzaA50hYb1OtwEe5MFRolpZ3llY=" }, { "id": "Austria_Salzburg", @@ -710,8 +710,8 @@ "Österreich", "Salzburg" ], - "s": 64165166, - "sha1_base64": "mgvE1lc3QDh4FIDoSSQnO/tF9Ck=" + "s": 64658943, + "sha1_base64": "FTRtL1Yrh5yUpYLm87vrGAVec3Q=" }, { "id": "Austria_Vorarlberg", @@ -722,8 +722,8 @@ "Österreich", "Vorarlberg" ], - "s": 39334154, - "sha1_base64": "/G8GuRTjVzPWwTbqtEoGPRuJmbk=" + "s": 39715130, + "sha1_base64": "ms1sL9bCNNAzhXOV1PH/vv/ReNY=" } ] }, @@ -737,8 +737,8 @@ "Coral Sea Islands Territory", "Willis Island" ], - "s": 186856, - "sha1_base64": "53XHkkc/E5SugH2TwPB/sHuCKCY=" + "s": 186744, + "sha1_base64": "WaqWX/hp3Pr4Ql1V0p7fA9/MI2U=" }, { "id": "Australia_Melbourne", @@ -749,8 +749,8 @@ "Australia", "Victoria" ], - "s": 169284235, - "sha1_base64": "VoHf8UJosb6Uw6YHAF44lLNu3GA=" + "s": 173035483, + "sha1_base64": "YdKaLPtBoiwVjyKZD/UCO2hgXK8=" }, { "id": "Australia_New South Wales", @@ -764,8 +764,8 @@ "New South Wales", "Norfolk Island" ], - "s": 127417418, - "sha1_base64": "nqOGwMZv8mGRXCvQekjDOvYmpuU=" + "s": 128900082, + "sha1_base64": "K4ABiDMFwU1/ilqeFd+/9iiPh0o=" }, { "id": "Australia_Northern Territory", @@ -776,8 +776,8 @@ "Australia", "Northern Territory" ], - "s": 38774961, - "sha1_base64": "DjoaE+U2jr9xU9Iey+VJqaS0nIc=" + "s": 39111297, + "sha1_base64": "e/If/ZLfajuE5HPYotR3Xt2JywY=" }, { "id": "Australia_Queensland", @@ -789,8 +789,8 @@ "Coral Sea Islands Territory", "Queensland" ], - "s": 130960055, - "sha1_base64": "TQjLPkRCDD25c6lsuL6pyq+klfg=" + "s": 131713103, + "sha1_base64": "/wrWjhuoeHb2udbevI2N8hWyP4Q=" }, { "id": "Australia_South Australia", @@ -801,8 +801,8 @@ "Australia", "South Australia" ], - "s": 96977985, - "sha1_base64": "PYY2uaUYqrRaCumd9s61r/pSTx0=" + "s": 98685193, + "sha1_base64": "w9XFgmkFItKa5hrIeKnkwZNNPOs=" }, { "id": "Australia_Tasmania", @@ -813,8 +813,8 @@ "Australia", "Tasmania" ], - "s": 70731339, - "sha1_base64": "UwgGYMZsJLw7iZIBHY+axLGcUXo=" + "s": 71949547, + "sha1_base64": "aH7RlNT2oXApVc82N83+EX0c4KY=" }, { "id": "Australia_Victoria", @@ -825,8 +825,8 @@ "Australia", "Victoria" ], - "s": 130666988, - "sha1_base64": "2XMbuQG8MnGFPcn1oEwKFxJC3uc=" + "s": 134214172, + "sha1_base64": "ZtTmZOjbxi3cXy1kXUFtJOtK3eM=" }, { "id": "Australia_Western Australia", @@ -842,8 +842,8 @@ "Cocos (Keeling) Islands", "Western Australia" ], - "s": 196739818, - "sha1_base64": "aHErI1bpNQBDz2dzUtCY74aSxxM=" + "s": 199863170, + "sha1_base64": "Qnu62RH4JzPhkNFFl1XQeMMehPs=" }, { "id": "Australia_Brisbane", @@ -856,8 +856,8 @@ "France, Nouvelle-Calédonie, Récifs de Bellone (eaux territoriales)", "Queensland" ], - "s": 139391780, - "sha1_base64": "w3cVKNT9Rs9r0wZONy8hQPRUlYE=" + "s": 141322677, + "sha1_base64": "gAv+Xjk2mSKqDB3PFkb0CRZP6KM=" }, { "id": "Australia_Sydney", @@ -870,8 +870,8 @@ "Jervis Bay Territory", "New South Wales" ], - "s": 188841693, - "sha1_base64": "52u0LKMvWJeIsUsiJYjrhbWVNMI=" + "s": 192369301, + "sha1_base64": "MEwbP0Pmn1IfsNx1BsI6npIA9/Q=" } ] }, @@ -894,8 +894,8 @@ "Մարտունու շրջան (Martuni Province)", "Ստեփանակերտ (Stepanakert - Khankendi)" ], - "s": 12441202, - "sha1_base64": "R1H5r6/njgFbcw2gm9rZMaZqXe4=" + "s": 12600146, + "sha1_base64": "hW8fQPVo9e0UAoe8fJEHwMZKUIM=" }, { "id": "Azerbaijan", @@ -975,8 +975,8 @@ "Şəmkir rayonu", "Şərur rayonu" ], - "s": 49685668, - "sha1_base64": "ZD8u1ErpkunbemHYY7xS+W0zPTM=" + "s": 49858412, + "sha1_base64": "21VB/CI6Sro6JL/HvELkrOnag8c=" } ] }, @@ -993,8 +993,8 @@ "المحافظة الجنوبية", "المحافظة الشمالية" ], - "s": 9014403, - "sha1_base64": "ekzjOjA4bjRndfNBn5iFSyEulq4=" + "s": 10836219, + "sha1_base64": "nwEs8zmFVnjYPgclIBzWhqpEgYE=" }, { "id": "Bangladesh", @@ -1012,8 +1012,8 @@ "বাংলাদেশ", "চট্টগ্রাম বিভাগ" ], - "s": 342903298, - "sha1_base64": "bbZK3IGQVMXc0rFllKenoxGOEpg=" + "s": 344639834, + "sha1_base64": "OUbd2/WJm5h4h3A/ppMdUiDzEB4=" }, { "id": "Belarus", @@ -1030,8 +1030,8 @@ "Беларусь", "Витебская область" ], - "s": 80701936, - "sha1_base64": "Quw3W+rQgoFuBTQV2Lobjy0KRVw=" + "s": 81013832, + "sha1_base64": "slb7udZoeBryMTTvAjWLn+e5P18=" }, { "id": "Belarus_Hrodna Region", @@ -1042,8 +1042,8 @@ "Гродненская область", "Беларусь" ], - "s": 56145390, - "sha1_base64": "66FKMnrjdDe4Mt0Qp0M9jXtBkGs=" + "s": 56394622, + "sha1_base64": "JDubQi8hU+Xrw5Ey2TkqA8McU6g=" }, { "id": "Belarus_Brest Region", @@ -1054,8 +1054,8 @@ "Беларусь", "Брестская область" ], - "s": 66851005, - "sha1_base64": "QJHxK326IZQX5np0zpOVGLRmUzw=" + "s": 67333925, + "sha1_base64": "hsoMGUlBBNCqNbjHyJ3ZrLNquic=" }, { "id": "Belarus_Homiel Region", @@ -1066,8 +1066,8 @@ "Гомельская область", "Беларусь" ], - "s": 52545068, - "sha1_base64": "1khceOl7Um+zqYTv4ZYsYWozqrg=" + "s": 52754236, + "sha1_base64": "eQVHq2maFOUcy4/YR0lEIKQMVPs=" }, { "id": "Belarus_Maglieu Region", @@ -1078,8 +1078,8 @@ "Могилёвская область", "Беларусь" ], - "s": 40904218, - "sha1_base64": "QuUs4KCiXrPv6pCA+tJKHGtTOp0=" + "s": 40977082, + "sha1_base64": "ET1z0XLu4Yi8lX7tEkg6aZMsBew=" }, { "id": "Belarus_Minsk Region", @@ -1094,8 +1094,8 @@ "Колодищи", "Национальный аэропорт \"Минск\"" ], - "s": 100103511, - "sha1_base64": "mWLbfZKwXI3QAF1UqqZAlUqU1/o=" + "s": 100577031, + "sha1_base64": "6JSgK3ugc4kFf7UfR71Uc5SMq6Y=" } ] }, @@ -1112,8 +1112,8 @@ "België - Belgique - Belgien", "Vlaanderen" ], - "s": 74090573, - "sha1_base64": "CeBVcV+mtxJhXzldaW4wOF0lpZ0=" + "s": 74813485, + "sha1_base64": "yt2e0k+VBNfQTJbtja8Bp930/aQ=" }, { "id": "Belgium_Antwerp", @@ -1125,8 +1125,8 @@ "Nederland - Belgique / België / Belgien", "Vlaanderen" ], - "s": 72510572, - "sha1_base64": "lHbRBjH0M3vHCCONzJopi/f9PBU=" + "s": 73143772, + "sha1_base64": "FG9PxRMGtKy5sW8VIwZcxnWoBBQ=" }, { "id": "Belgium_East Flanders", @@ -1137,8 +1137,8 @@ "België - Belgique - Belgien", "Vlaanderen" ], - "s": 78490390, - "sha1_base64": "IBPfIskUZPdMz+rEpdQmhsn+f7o=" + "s": 79747382, + "sha1_base64": "CmoP1NfuCF8dgasVmMfw0/YgOwg=" }, { "id": "Belgium_Hainaut", @@ -1149,8 +1149,8 @@ "België - Belgique - Belgien", "Wallonie" ], - "s": 79652518, - "sha1_base64": "FjoFEnBQu5AJNQHA70Jbp6Eus6A=" + "s": 81285118, + "sha1_base64": "T8ksPetB17YiDChbHcFEGDqoz98=" }, { "id": "Belgium_Walloon Brabant", @@ -1161,8 +1161,8 @@ "België - Belgique - Belgien", "Wallonie" ], - "s": 19905775, - "sha1_base64": "UOuE1+2hn8o8V5sA1HXdrYgC9uI=" + "s": 20203431, + "sha1_base64": "ua2+4cZdHd0/CTTYL6OsQovIkEM=" }, { "id": "Belgium_Namur", @@ -1173,8 +1173,8 @@ "België - Belgique - Belgien", "Wallonie" ], - "s": 31671361, - "sha1_base64": "PFAQFK3DV+0yi7mIiQGRpDrsgVs=" + "s": 32231001, + "sha1_base64": "KDva08qrhdddPG3WobfpwkzGqHQ=" }, { "id": "Belgium_Limburg", @@ -1185,8 +1185,8 @@ "België - Belgique - Belgien", "Vlaanderen" ], - "s": 51378804, - "sha1_base64": "uLA6/qzNdNP9hl6l97NrbeDE92I=" + "s": 51774452, + "sha1_base64": "OYDPr3+Yf0cVo5+NvOZ6fVZEI50=" }, { "id": "Belgium_Luxembourg", @@ -1197,8 +1197,8 @@ "België - Belgique - Belgien", "Wallonie" ], - "s": 36147347, - "sha1_base64": "y9rBBxc3sIYgcLhmsSgVtO1SNKA=" + "s": 36542963, + "sha1_base64": "6xWMAiEdWqtImKWwAeI8z58iy64=" }, { "id": "Belgium_Flemish Brabant", @@ -1210,8 +1210,8 @@ "Région de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest", "Vlaanderen" ], - "s": 82976869, - "sha1_base64": "H7qB4P0bQvrvYH1llXkqi2ywodw=" + "s": 84803517, + "sha1_base64": "F74hLFs46jaxWIxZChV5WwkRITk=" }, { "id": "Belgium_Liege", @@ -1222,8 +1222,8 @@ "België - Belgique - Belgien", "Wallonie" ], - "s": 61992392, - "sha1_base64": "FOpbdSyKq1wQ1YFMj0bbIOKM5jo=" + "s": 63448056, + "sha1_base64": "mB1OdKi6c+WTCM66gOqqSA6JcfQ=" } ] }, @@ -1243,8 +1243,8 @@ "Stann Creek", "Toledo" ], - "s": 28103828, - "sha1_base64": "JoWtVUcSQdpOo0Cq9GiW62aizPo=" + "s": 28274460, + "sha1_base64": "Mj5qHCl6jn2v2iA4mRTUcNYO4A8=" }, { "id": "Benin", @@ -1266,8 +1266,8 @@ "Plateau", "Zou" ], - "s": 51697799, - "sha1_base64": "GSmeK7OKRiKnqiiXPdg6k9HQ6e4=" + "s": 51965215, + "sha1_base64": "+94NXYTrBkR6mlWMj0mqfOwMkEw=" }, { "id": "Bermuda", @@ -1277,8 +1277,8 @@ "affiliations": [ "Bermuda" ], - "s": 2085007, - "sha1_base64": "U01nSIk+CoeOPhZ+OI+dcxRVXCU=" + "s": 2102418, + "sha1_base64": "x4TmNb8CY2BR9OxjMZYAlM5N66I=" }, { "id": "Bhutan", @@ -1308,8 +1308,8 @@ "དབང་འདུས་ཕོ་བྲང་རྫོང་ཁག་", "བསམ་གྲུབ་ལྗོངས་མཁར་རྫོང་ཁག་" ], - "s": 34395731, - "sha1_base64": "dOCCjfDEltPuZ//DmcXmo4vR1Ss=" + "s": 34466011, + "sha1_base64": "02IDN7phKgU9oHICV5qA0U2I4Ys=" }, { "id": "Bolivia", @@ -1326,8 +1326,8 @@ "Pando", "Santa Cruz" ], - "s": 114460097, - "sha1_base64": "NjoVNTFfYghSUhOb6sDflCPIDwg=" + "s": 115889073, + "sha1_base64": "wVpG1YlnSoX5yrRPFwD+SXL601o=" }, { "id": "Bolivia_South", @@ -1342,8 +1342,8 @@ "Potosí", "Tarija" ], - "s": 115881975, - "sha1_base64": "937XOaTp9bPWfatURVRqHpEY8/E=" + "s": 117074143, + "sha1_base64": "OFOSKNBjR7vUTDYFEl1sokUl7sk=" } ] }, @@ -1359,8 +1359,8 @@ "Bosna i Hercegovina", "Federacija Bosne i Hercegovine" ], - "s": 79732087, - "sha1_base64": "QAVHDSsOmJyP1RRjPlOj3szVzy0=" + "s": 80195335, + "sha1_base64": "K63QPa2pArldw2FEXko8sZeBXyQ=" }, { "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina", @@ -1372,8 +1372,8 @@ "Bosna i Hercegovina", "Republika Srpska" ], - "s": 2638352, - "sha1_base64": "TA5Ik3YJEH0a4+4FIio1I/EoKCE=" + "s": 2673120, + "sha1_base64": "y+E9C7iM1pouekahkhO2XuG874s=" }, { "id": "Bosnia and Herzegovina_Republic of Srpska", @@ -1384,8 +1384,8 @@ "Bosna i Hercegovina", "Republika Srpska" ], - "s": 101287021, - "sha1_base64": "IJkmOoJYgrdlFffuFVbzIsY/qvA=" + "s": 101749845, + "sha1_base64": "2JGI5Uds2Mfu972w1LIKePhWQWQ=" } ] }, @@ -1406,8 +1406,8 @@ "South-East District", "Southern District" ], - "s": 87621162, - "sha1_base64": "PsMmA0BDtxd/6WynD3Om8WA+BX8=" + "s": 87974170, + "sha1_base64": "o9kR/9B0HNEl0nV7LVs4zEymVNA=" }, { "id": "Brazil", @@ -1421,8 +1421,8 @@ "Bahia", "Brasil" ], - "s": 133689730, - "sha1_base64": "1HY+xN6SLjykd6ZODIx32fT3QQs=" + "s": 135006642, + "sha1_base64": "NBGdSNBPO2d2dsajfQRaLKAaXnE=" }, { "id": "Brazil_Goias_North", @@ -1433,8 +1433,8 @@ "Brasil", "Goiás" ], - "s": 32457455, - "sha1_base64": "y4WFQCkbe+B5/2cszXnSTapyS7Y=" + "s": 32712679, + "sha1_base64": "ArpICBw8thYsf5IwwBwhPVZHVa0=" }, { "id": "Brazil_Goias_Brasilia", @@ -1446,8 +1446,8 @@ "Distrito Federal", "Goiás" ], - "s": 56864059, - "sha1_base64": "vNdPuVujtK3U4YsV7xgNSe6aQMI=" + "s": 57431259, + "sha1_base64": "qSE+TdJP1NP2ExJU2ITE1alPQV4=" }, { "id": "Brazil_Mato Grosso Do Sul", @@ -1458,8 +1458,8 @@ "Brasil", "Mato Grosso do Sul" ], - "s": 38488576, - "sha1_base64": "ht2+JiVXdeDLJHr6+O2Wi9TCyAw=" + "s": 41257464, + "sha1_base64": "8kc1GNtckfi04qtX3x+ccd2e8h4=" }, { "id": "Brazil_Mato Grosso", @@ -1470,8 +1470,8 @@ "Brasil", "Mato Grosso" ], - "s": 80350022, - "sha1_base64": "3Z44SpKXWNN2PAeco5NDXjEYJJE=" + "s": 82999126, + "sha1_base64": "/4+umJd8kx8npmfsyPS3S6mmeoA=" }, { "id": "Brazil_North Region_East", @@ -1484,8 +1484,8 @@ "Pará", "Tocantins" ], - "s": 129147131, - "sha1_base64": "jSQVithx60y34wVZrGODKeQevfg=" + "s": 131628963, + "sha1_base64": "TYWblpZjHxHY2nybQMEmhYeeoJI=" }, { "id": "Brazil_North Region_West", @@ -1499,8 +1499,8 @@ "Rondônia", "Roraima" ], - "s": 141625175, - "sha1_base64": "bDrw1Ng6mzjY67Wk95Rc6Orsr58=" + "s": 143904063, + "sha1_base64": "E2UJRF9MhltOdam7invCHvC80as=" }, { "id": "Brazil_Northeast Region_East", @@ -1513,8 +1513,8 @@ "Pernambuco", "Sergipe" ], - "s": 92828021, - "sha1_base64": "vj4Kli7s3jEsW1pltSbsG1k47f0=" + "s": 94069525, + "sha1_base64": "QpXCpL9NPbtHY2JqwSV81tmeAus=" }, { "id": "Brazil_Northeast Region_West", @@ -1528,8 +1528,8 @@ "Pernambuco", "Piauí" ], - "s": 221859230, - "sha1_base64": "rD7U+rzVW3uEnaYdQus5s2Bk7b4=" + "s": 224688030, + "sha1_base64": "1Wf/ODzkTBWU28yhLZ372WCbtfg=" }, { "id": "Brazil_Paraiba", @@ -1540,8 +1540,8 @@ "Brasil", "Paraíba" ], - "s": 49652715, - "sha1_base64": "zI8yw8JGHo7EwzpvSiVLsHaTzCs=" + "s": 50175867, + "sha1_base64": "4BKDh80PpXcIS8yZBLStPTQShfc=" }, { "id": "Brazil_Parana_East", @@ -1552,8 +1552,8 @@ "Brasil", "Paraná" ], - "s": 83422199, - "sha1_base64": "JqFYwQdpX9tb4AhsnpL2V19z0JU=" + "s": 83990591, + "sha1_base64": "wD2n/NM+cLYt8fCqDlMhBowRlHE=" }, { "id": "Brazil_Parana_West", @@ -1564,8 +1564,8 @@ "Brasil", "Paraná" ], - "s": 106173201, - "sha1_base64": "iupDrNAxSbTewV9uUWNb+ABRoVM=" + "s": 107007297, + "sha1_base64": "u8g78OJeiuCVc8XgMUohGh5FXEg=" }, { "id": "Brazil_Rio Grande do Norte", @@ -1577,8 +1577,8 @@ "Pernambuco", "Rio Grande do Norte" ], - "s": 28867711, - "sha1_base64": "L4Qvo78s/D28JOix9SbiZH2nk/8=" + "s": 29225983, + "sha1_base64": "zum3OeDrzd/1Ldela1ewGuqyhwg=" }, { "id": "Brazil_Santa Catarina", @@ -1589,8 +1589,8 @@ "Brasil", "Santa Catarina" ], - "s": 153514331, - "sha1_base64": "DIv6Ozh4rNEP0MYYUZzCuRpo2Y0=" + "s": 154455627, + "sha1_base64": "9cFK8jTirLpHVUkkyjRQMVnSFl4=" }, { "id": "Brazil_South Region_East", @@ -1601,8 +1601,8 @@ "Brasil", "Rio Grande do Sul" ], - "s": 105105254, - "sha1_base64": "uVMBSSlEHsJnRPafpdrmVFjzFUM=" + "s": 105474806, + "sha1_base64": "1QiJOmA7fbD9VLpaQZCoHpQfMIk=" }, { "id": "Brazil_South Region_West", @@ -1613,8 +1613,8 @@ "Brasil", "Rio Grande do Sul" ], - "s": 73167944, - "sha1_base64": "HvYn0/cFhXExXihxUz5dcCB+mUk=" + "s": 73668424, + "sha1_base64": "IrxokoumL4DNK07XOdrEtM4pBQA=" }, { "id": "Brazil_Southeast Region_Espirito Santo", @@ -1625,8 +1625,8 @@ "Brasil", "Espírito Santo" ], - "s": 221752961, - "sha1_base64": "Wq1EATcOm2oNJjqYrvX4IrpsHyw=" + "s": 222583729, + "sha1_base64": "rjSGpFSC1UIA9HI5xUIaVpqeiQc=" }, { "id": "Brazil_Southeast Region_Minas Gerais_Contagem", @@ -1637,8 +1637,8 @@ "Brasil", "Minas Gerais" ], - "s": 158335172, - "sha1_base64": "Af4h81lcs79I1W4fSzS4YYMawgk=" + "s": 158940548, + "sha1_base64": "QGOSqdRhm2e8xck4VN33mLkntJw=" }, { "id": "Brazil_Southeast Region_Minas Gerais_North", @@ -1649,8 +1649,8 @@ "Brasil", "Minas Gerais" ], - "s": 139322418, - "sha1_base64": "EzFNaHsZMm8z54npJj15PO/CfBs=" + "s": 140629162, + "sha1_base64": "xUBwPIz4V4ezYDvkI5eFIiJWhDE=" }, { "id": "Brazil_Southeast Region_Rio de Janeiro", @@ -1661,8 +1661,8 @@ "Brasil", "Rio de Janeiro" ], - "s": 92116150, - "sha1_base64": "VFcdJtNcqZk/60TjtEo674WgnT8=" + "s": 94401583, + "sha1_base64": "V0NiUojq4C/bwfCp501D02izEis=" }, { "id": "Brazil_Southeast Region_Sao Paulo_Campinas", @@ -1673,8 +1673,8 @@ "Brasil", "São Paulo" ], - "s": 107792575, - "sha1_base64": "z6Gnlw94wjuDxxpy7wAf6AYxRFQ=" + "s": 108847983, + "sha1_base64": "lT5EL+Vf5Y7FBvN722j0bxUNyfk=" }, { "id": "Brazil_Southeast Region_Sao Paulo_City", @@ -1685,8 +1685,8 @@ "Brasil", "São Paulo" ], - "s": 179807759, - "sha1_base64": "pP2A/jUKjghAoZp1+afZpe0clW4=" + "s": 181346575, + "sha1_base64": "9f8LkPCExC3lssJTC2U9PhocJq4=" }, { "id": "Brazil_Southeast Region_Sao Paulo_West", @@ -1697,8 +1697,8 @@ "Brasil", "São Paulo" ], - "s": 80765936, - "sha1_base64": "GyPQbtpYZbTOp3enxqU/E7xWr8E=" + "s": 81121952, + "sha1_base64": "coUB5m5GCtrmQJAv4pIXP6O7RCg=" } ] }, @@ -1710,8 +1710,8 @@ "affiliations": [ "Brunei Darussalam" ], - "s": 10640850, - "sha1_base64": "Qzju1TLljiK72xi8YtRHPrx4iGo=" + "s": 10693274, + "sha1_base64": "EcwkKuhUdsOCvwxVYtiJp8+dTL4=" }, { "id": "Bulgaria", @@ -1724,8 +1724,8 @@ "affiliations": [ "България" ], - "s": 69618071, - "sha1_base64": "7k1YAvM4zurnrvaDisDbVkPtcmg=" + "s": 71229399, + "sha1_base64": "r56+31mpUK2UnYZbswpbT3oarFg=" }, { "id": "Bulgaria_West", @@ -1735,8 +1735,8 @@ "affiliations": [ "България" ], - "s": 129446923, - "sha1_base64": "jjtJEor3/dXI5g2UacO3aMrNeVo=" + "s": 132080363, + "sha1_base64": "KjOVSHRqx6jyULOViGkdRHsK3nM=" } ] }, @@ -1761,8 +1761,8 @@ "Sahel", "Sud-Ouest" ], - "s": 71083208, - "sha1_base64": "4EUJPhyLQVPpu9eeU90QjAWnQc0=" + "s": 72374928, + "sha1_base64": "gx+0jTCqCAwQCOJfpqcGSQtFFiY=" }, { "id": "Burundi", @@ -1789,8 +1789,8 @@ "Rutana", "Ruyigi" ], - "s": 47202918, - "sha1_base64": "f1mNs9H6hEwyai1LXJyXVKPC6LA=" + "s": 47333734, + "sha1_base64": "ZnLKE85FXdVbYG60rVAOrelAYsc=" }, { "id": "Cambodia", @@ -1825,8 +1825,8 @@ "Tbong Khmum", "ព្រះរាជាណាចក្រកម្ពុជា (Cambodia)" ], - "s": 47168098, - "sha1_base64": "LmzanQcC73JmDmfsadUBltI76e8=" + "s": 47479402, + "sha1_base64": "Z20VuX4klvmgTcRiTTdnp81zYzw=" }, { "id": "Cameroon", @@ -1845,8 +1845,8 @@ "Nord", "Sud" ], - "s": 169035539, - "sha1_base64": "zNjIn1HVFk6S9IM9uGx32fH5+7g=" + "s": 174115587, + "sha1_base64": "WTpWH+IjxZrFJR1rxwm0yC7BLQQ=" }, { "id": "Cameroon_West", @@ -1860,8 +1860,8 @@ "Ouest", "Sud-Ouest" ], - "s": 90629879, - "sha1_base64": "3Pq17zdeEUnOjeQhvkMmNFEbF8c=" + "s": 94225727, + "sha1_base64": "SHs5R3/Mdcjyd3wZn+3oAMpFmG8=" } ] }, @@ -1880,8 +1880,8 @@ "Alberta", "Canada" ], - "s": 109903696, - "sha1_base64": "NRtbZuaIL0dvBKsB/UPEu6pXb4o=" + "s": 111125864, + "sha1_base64": "EUK/5sYkJHlGY/4aySO6zc4ueX4=" }, { "id": "Canada_Alberta_North", @@ -1892,8 +1892,8 @@ "Alberta", "Canada" ], - "s": 148823219, - "sha1_base64": "uBAdhMfAYOqpfxyz7/gSG4+vUfs=" + "s": 148889404, + "sha1_base64": "FG5IopejheZZ5KwHy7xNkHDWN/Y=" }, { "id": "Canada_Alberta_South", @@ -1904,8 +1904,8 @@ "Alberta", "Canada" ], - "s": 99956606, - "sha1_base64": "Qi97MdQ0775t4yaJahsenU88mBs=" + "s": 102664542, + "sha1_base64": "cx2qQkBo2Twg4lLzf2GqBAtVcIU=" } ] }, @@ -1921,8 +1921,8 @@ "British Columbia", "Canada" ], - "s": 135889019, - "sha1_base64": "DFkkv7/uMQ9+RaoDPrThe61m5qA=" + "s": 138113331, + "sha1_base64": "uJhlQYAyxbc3J8Sy1BWwbi2u5cM=" }, { "id": "Canada_British Columbia_Far_North", @@ -1933,8 +1933,8 @@ "British Columbia", "Canada" ], - "s": 35881396, - "sha1_base64": "4KDo2e8qBK3LEoBKnAs6OHBWfrw=" + "s": 35895868, + "sha1_base64": "gNKxPNQYf6tOcN448JJZnGF5lqA=" }, { "id": "Canada_British Columbia_Islands", @@ -1945,8 +1945,8 @@ "British Columbia", "Canada" ], - "s": 86005061, - "sha1_base64": "ZzWFUBx/hTm9vt9yz7zCsfVOOgA=" + "s": 89520678, + "sha1_base64": "My7WUrFBRtpAR6WK2feS+pVtKdU=" }, { "id": "Canada_British Columbia_North", @@ -1957,8 +1957,8 @@ "British Columbia", "Canada" ], - "s": 279371595, - "sha1_base64": "WdS09DjR+BCA1224EAr6mblWtuM=" + "s": 282109028, + "sha1_base64": "ct4z3rhqvsLyrGxA1jA2CQZo49s=" }, { "id": "Canada_British Columbia_Northeast", @@ -1969,8 +1969,8 @@ "British Columbia", "Canada" ], - "s": 113863975, - "sha1_base64": "AzEEAvD1Er3xBc3MY20vjkhv3ME=" + "s": 113866495, + "sha1_base64": "0/18h9z2NKWPhA6M9nhp9vQHftk=" }, { "id": "Canada_British Columbia_Southeast", @@ -1981,8 +1981,8 @@ "British Columbia", "Canada" ], - "s": 127909967, - "sha1_base64": "bKbNMfERy0SzB5TWjI/lBqbouYk=" + "s": 129020215, + "sha1_base64": "mITI5PLEB+NQpL2bACitXbr/uwg=" }, { "id": "Canada_British Columbia_Vancouver", @@ -1993,8 +1993,8 @@ "British Columbia", "Canada" ], - "s": 117193834, - "sha1_base64": "pJnPEYser6E+9qWH8bqDqtPJ7rA=" + "s": 120246562, + "sha1_base64": "VX4PPv329QQB3rowrOk1ySqymm8=" } ] }, @@ -2011,8 +2011,8 @@ "Newfoundland and Labrador", "ᓄᓇᕗᑦ Nunavut" ], - "s": 59440006, - "sha1_base64": "5i+rc5UKFYCBrytvaLgJwUYAV6U=" + "s": 62493246, + "sha1_base64": "oCABOQ4s6EvUPZO99NRPhFpdBlw=" }, { "id": "Canada_Labrador_South", @@ -2023,8 +2023,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 52798653, - "sha1_base64": "e6aIt6RiSKi9/CYBAyL/E8js6Q0=" + "s": 53662773, + "sha1_base64": "u5qMVg7g1S1NRF5QB3pIOceNFDM=" }, { "id": "Canada_Labrador_West", @@ -2035,8 +2035,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 59319699, - "sha1_base64": "rVJsh/Cbfd4hcJ6W6SvQ1r8bjX8=" + "s": 59415491, + "sha1_base64": "j7cwBTldgUP5kXtj85OYWvtdJ88=" } ] }, @@ -2054,8 +2054,8 @@ "Manitoba", "ᓄᓇᕗᑦ Nunavut" ], - "s": 93708447, - "sha1_base64": "VYn++dd0i0XE/aoAMRLinpupHHk=" + "s": 96585415, + "sha1_base64": "tFSM693s87FgZiqFkHkF39ZfliI=" }, { "id": "Canada_Manitoba_Northwest", @@ -2066,8 +2066,8 @@ "Canada", "Manitoba" ], - "s": 59306620, - "sha1_base64": "MPG2Jx0lFC1/JEVMdUYuDbUxBxQ=" + "s": 59395596, + "sha1_base64": "gn5E5YFJhUFYLAbc2y27853n/+M=" }, { "id": "Canada_Manitoba_South", @@ -2078,8 +2078,8 @@ "Canada", "Manitoba" ], - "s": 50581175, - "sha1_base64": "w6vSg2sLeyz0RMISvGHIDk6AV8g=" + "s": 50682399, + "sha1_base64": "usVQYoXqdFuKb8EV+UJc1xcapb4=" }, { "id": "Canada_Manitoba_Winnipeg", @@ -2090,8 +2090,8 @@ "Canada", "Manitoba" ], - "s": 50926252, - "sha1_base64": "U6vuvPcNauGDf92aeO8HE6V448U=" + "s": 51084948, + "sha1_base64": "sR9FySKv7yqaXuEO3yvFBlBsRHg=" } ] }, @@ -2106,8 +2106,8 @@ "New Brunswick", "Oromocto Indian Reserve NO. 26" ], - "s": 68440467, - "sha1_base64": "1Bxi4gRIkyn16sVPYRMrPReJjEI=" + "s": 71719123, + "sha1_base64": "NB5GFHqia0sGYWmA2ZMVRoDANJg=" }, { "id": "Canada_Newfoundland", @@ -2121,8 +2121,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 31655486, - "sha1_base64": "qp6kuzfna97O0+97y5ztHqY4blE=" + "s": 33627718, + "sha1_base64": "a6SzI9COZhde1b7uRjQJtm7XAno=" }, { "id": "Canada_Newfoundland_North", @@ -2133,8 +2133,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 35563907, - "sha1_base64": "+j4ksMW1PdTtfs6HytxnNq4DK+g=" + "s": 37379659, + "sha1_base64": "nItwDGIX6HANTH4vygvNzaymvOk=" }, { "id": "Canada_Newfoundland_South", @@ -2148,8 +2148,8 @@ "Newfoundland and Labrador", "Île Verte" ], - "s": 26883866, - "sha1_base64": "yl7PGDL0CLcNbEf6/shD34M/ql0=" + "s": 27790754, + "sha1_base64": "0UL05kAckNQZtDzGxLHE6wvIF+M=" }, { "id": "Canada_Newfoundland_West", @@ -2160,8 +2160,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 27234937, - "sha1_base64": "lFwtL4lsa7RHNakuykjB8qq88Bc=" + "s": 28292401, + "sha1_base64": "ihaXSW2HmcwwMTWxNbXngNVD1w8=" } ] }, @@ -2177,8 +2177,8 @@ "Canada", "Northwest Territories" ], - "s": 104328861, - "sha1_base64": "EPIwqQCi6TtNvOKkrYgY1bNdT1I=" + "s": 104597125, + "sha1_base64": "bQQRFjFbRhaqplDe4Gge6IL5p9A=" }, { "id": "Canada_Northwest Territories_North", @@ -2189,8 +2189,8 @@ "Canada", "Northwest Territories" ], - "s": 324859742, - "sha1_base64": "LOwf3OUnVMeBj+Se4JcxBQmDqPU=" + "s": 327547926, + "sha1_base64": "jZC+Jb8vcP6zoJhNHazfkA9dBOI=" }, { "id": "Canada_Northwest Territories_Yellowknife", @@ -2201,8 +2201,8 @@ "Canada", "Northwest Territories" ], - "s": 89018117, - "sha1_base64": "Ofm4+Re8rHILGJ2z7YMqVFI09A4=" + "s": 89223021, + "sha1_base64": "H0VTLj9wKPHwgrAtA01EPLkWths=" } ] }, @@ -2218,8 +2218,8 @@ "Canada", "Nova Scotia" ], - "s": 72251146, - "sha1_base64": "YEsCIvodkBiQbTpr3tlI56emzCc=" + "s": 75113018, + "sha1_base64": "1l7Pu7UBeuDrDlLeuAYKG1h2aA4=" }, { "id": "Canada_Nova Scotia_Sydney", @@ -2231,8 +2231,8 @@ "Nova Scotia", "Prince Edward Island" ], - "s": 30886243, - "sha1_base64": "wy7gRiRvPAMaXahQcNH3pccV9oQ=" + "s": 32465147, + "sha1_base64": "yTvmmmx8ayAAW7Mtya7I+fVhkz0=" } ] }, @@ -2248,8 +2248,8 @@ "Canada", "ᓄᓇᕗᑦ Nunavut" ], - "s": 385632461, - "sha1_base64": "5mwG24OHRBwJDLZ3uJPdIhJWhRg=" + "s": 393751133, + "sha1_base64": "XiTWbwn8Jiz8AZpr9f201EkMeEo=" }, { "id": "Canada_Nunavut_South", @@ -2260,8 +2260,8 @@ "Canada", "ᓄᓇᕗᑦ Nunavut" ], - "s": 819356755, - "sha1_base64": "czqZ2Zzyju2rptsaCeScw85BfA0=" + "s": 844878203, + "sha1_base64": "DaGNbjhZG4oI1EJxZrLjIWUn8/A=" } ] }, @@ -2277,8 +2277,8 @@ "Canada", "Ontario" ], - "s": 71446301, - "sha1_base64": "VMXKbfyouKaSi2vmerNs0wmbYu0=" + "s": 71716973, + "sha1_base64": "NBIw2zorhmLDvyC46HXvO8fJNOg=" }, { "id": "Canada_Ontario_Kingston", @@ -2289,8 +2289,8 @@ "Canada", "Ontario" ], - "s": 121292621, - "sha1_base64": "na+Z0VJtIpgSCHVEsIIrVNvZK2g=" + "s": 125299821, + "sha1_base64": "yvo2a3fUfZAoBD5b/3HhXEz1Qik=" }, { "id": "Canada_Ontario_London", @@ -2301,8 +2301,8 @@ "Canada", "Ontario" ], - "s": 99390949, - "sha1_base64": "dwnYpRyILTx9rFi+y9n1e/nU0oM=" + "s": 114055718, + "sha1_base64": "1dOBckP39xrSgw6N1Syh7xKOYHA=" }, { "id": "Canada_Ontario_Northeastern_Central", @@ -2313,8 +2313,8 @@ "Canada", "Ontario" ], - "s": 38783684, - "sha1_base64": "HksRRsFcbks+aSqrLPUHe7xqk2A=" + "s": 38807628, + "sha1_base64": "C0ZwsYO8b1fYQoeyHft+NeHUiZk=" }, { "id": "Canada_Ontario_Northeastern_North", @@ -2327,8 +2327,8 @@ "Ontario", "ᓄᓇᕗᑦ Nunavut" ], - "s": 48261629, - "sha1_base64": "YCHgLPaJUJRDhwz8wlfZZXhp11o=" + "s": 48558589, + "sha1_base64": "gdfbxffMgG7DWZjBle8WbqtjHfM=" }, { "id": "Canada_Ontario_Northeastern_S", @@ -2339,8 +2339,8 @@ "Canada", "Ontario" ], - "s": 45273044, - "sha1_base64": "T04N1IqSFFfPaJuCbGOlwDKZfZ0=" + "s": 45314588, + "sha1_base64": "QzLGuX3+oNZ2JS0i6xWtQi0cpJs=" }, { "id": "Canada_Ontario_Northeastern_SE", @@ -2351,8 +2351,8 @@ "Canada", "Ontario" ], - "s": 35573004, - "sha1_base64": "D4IL5V/9RMfKrxjgHLiuAnXMR+8=" + "s": 35931052, + "sha1_base64": "sRhkv2i47IhNdhxYGOb3DLF8DZU=" }, { "id": "Canada_Ontario_Northeastern_SW", @@ -2363,8 +2363,8 @@ "Canada", "Ontario" ], - "s": 50605885, - "sha1_base64": "kxTvbNSRQFhcUpZp+Vev7Yk4TLk=" + "s": 50698133, + "sha1_base64": "sXwmBCinaqtztx3pMo4ohiH9occ=" }, { "id": "Canada_Ontario_Northeastern_Wawa", @@ -2375,8 +2375,8 @@ "Canada", "Ontario" ], - "s": 34944762, - "sha1_base64": "rcQnOEEVZQxPUwmNb0y4XJTl+Z8=" + "s": 34958882, + "sha1_base64": "zUEhIZby9K+FlQcfZABu/6YD87I=" }, { "id": "Canada_Ontario_Northern", @@ -2387,8 +2387,8 @@ "Canada", "Ontario" ], - "s": 52999398, - "sha1_base64": "Ev8VNCxeElRDdN3eAkByi1lTNuw=" + "s": 53440094, + "sha1_base64": "tRStEXys39iMf7JCEf0FusP75Q8=" }, { "id": "Canada_Ontario_Northwestern", @@ -2402,8 +2402,8 @@ "Ontario", "ᓄᓇᕗᑦ Nunavut" ], - "s": 166181426, - "sha1_base64": "eYRxKaBn3L1QBZoBzfyC2D4yhpU=" + "s": 168586586, + "sha1_base64": "Z+E3f4yGx5HP+F2A79HvQBRoBxM=" }, { "id": "Canada_Ontario_Toronto", @@ -2414,8 +2414,8 @@ "Canada", "Ontario" ], - "s": 143851378, - "sha1_base64": "MbgMkcSyZO7tqNP0MdMd5VjlaHg=" + "s": 146873650, + "sha1_base64": "oUIgiHQk/8HfeiSZpEpiGJzchFI=" } ] }, @@ -2428,8 +2428,8 @@ "Canada", "Prince Edward Island" ], - "s": 13386250, - "sha1_base64": "GiB7l3VMi2JZp0iL9JbHFQ2HWrQ=" + "s": 14509450, + "sha1_base64": "Dt+d1BarZMBflyln747dW5tuVvk=" }, { "id": "Canada_Quebec", @@ -2443,8 +2443,8 @@ "Canada", "Québec" ], - "s": 91165695, - "sha1_base64": "VjmiLETEodyg1gC6o6OyszyrONM=" + "s": 94018559, + "sha1_base64": "OAdD8ng470Lu2a83YrS5UsBUuuE=" }, { "id": "Canada_Quebek_Far North", @@ -2458,8 +2458,8 @@ "Québec", "ᓄᓇᕗᑦ Nunavut" ], - "s": 509623449, - "sha1_base64": "bLpc4VJcX3TcWalmW6GbOmOL4K0=" + "s": 515537705, + "sha1_base64": "C3yzdFdulUpVUA1Itb/Kcd8BR1Y=" }, { "id": "Canada_Quebek_Montreal", @@ -2470,8 +2470,8 @@ "Canada", "Québec" ], - "s": 123729760, - "sha1_base64": "OXeI4bevmToxke12LCbqd634PAc=" + "s": 129237552, + "sha1_base64": "MjFyxUVV3ktAzd3hHpQuNVXyrN4=" }, { "id": "Canada_Quebek_Lachute", @@ -2482,8 +2482,8 @@ "Canada", "Québec" ], - "s": 63034021, - "sha1_base64": "0WwaUGs8+cDAs4tQTJ59eP/4/Ko=" + "s": 63264757, + "sha1_base64": "W9wvXjo1P1LYkv3DAvK9pwwwgjo=" }, { "id": "Canada_Quebek_North", @@ -2494,8 +2494,8 @@ "Canada", "Québec" ], - "s": 98951615, - "sha1_base64": "E0zm9BFo7DwbWxXWAyQXyqluEno=" + "s": 100877455, + "sha1_base64": "rdHzqEFo/iIkzPTzJQpFvBuaaMM=" }, { "id": "Canada_Quebek_Southeast_Rimouski", @@ -2506,8 +2506,8 @@ "Canada", "Québec" ], - "s": 42009014, - "sha1_base64": "LhIUPbAql7q/FV/wvp1AyHRJFpk=" + "s": 43493846, + "sha1_base64": "SN+Khw229FsJ2aYYPmMidpq4Kzc=" }, { "id": "Canada_Quebek_Southeast_Saguenay", @@ -2518,8 +2518,8 @@ "Canada", "Québec" ], - "s": 76440841, - "sha1_base64": "iLH6/2KrZg0+zyjQ8twer/v8qD4=" + "s": 76870753, + "sha1_base64": "bClOMiRJ3XUT5G7iZhhQjpI/Uas=" }, { "id": "Canada_Quebek_West_Chibougamau", @@ -2530,8 +2530,8 @@ "Canada", "Québec" ], - "s": 68554036, - "sha1_base64": "GE6370m06TyvtUS5ktdQELIrvjE=" + "s": 68588484, + "sha1_base64": "QhOaX68Hx3N+bLP741WzVAKNTHQ=" }, { "id": "Canada_Quebek_West_Rouyn-Noranda", @@ -2542,8 +2542,8 @@ "Canada", "Québec" ], - "s": 74009621, - "sha1_base64": "6xlHHDcDcK0S1bCgW1Rmt2qIjEk=" + "s": 74202917, + "sha1_base64": "10yiKSHFWnO99OsY/0vt4RUwy9s=" } ] }, @@ -2559,8 +2559,8 @@ "Canada", "Saskatchewan" ], - "s": 62901960, - "sha1_base64": "uMuL4vIkJoqRCFuxnplMK0TejBs=" + "s": 63149864, + "sha1_base64": "FCH4If5ZDl0Tvb0xieG7fFio/Tg=" }, { "id": "Canada_Saskatchewan_Saskatoon", @@ -2571,8 +2571,8 @@ "Canada", "Saskatchewan" ], - "s": 46595178, - "sha1_base64": "KwZRqtZYHSubbwmFTOOh4l5myrY=" + "s": 46987434, + "sha1_base64": "TBYndU0DuyO0Ntt7Ztra4a5HSAc=" }, { "id": "Canada_Saskatchewan_Regina", @@ -2583,8 +2583,8 @@ "Canada", "Saskatchewan" ], - "s": 57106155, - "sha1_base64": "kOZ1rL2DAnsD+lls3XmKwCTNoO8=" + "s": 57327427, + "sha1_base64": "7w5YDj0mBxMn31aLURnbvnc4rxk=" } ] }, @@ -2600,8 +2600,8 @@ "Canada", "Yukon" ], - "s": 83720151, - "sha1_base64": "obQjPnVXB3vvnuzOMYJKIqmJ4Bw=" + "s": 83873503, + "sha1_base64": "/yb8E5uUx0lZEWVQqDs89q92KiU=" }, { "id": "Canada_Yukon_Whitehorse", @@ -2612,8 +2612,8 @@ "Canada", "Yukon" ], - "s": 56190734, - "sha1_base64": "aYjnYUXeXoYAikJlycvhjLpw7Hc=" + "s": 56400118, + "sha1_base64": "2Jxmc1cYEehnCdmiVJngduF/ZtE=" } ] } @@ -2630,8 +2630,8 @@ "country_name_synonyms": [ "Cabo Verde" ], - "s": 15675231, - "sha1_base64": "7jyZdtOnAvb3RiiVkWN/egR+YrE=" + "s": 16133583, + "sha1_base64": "kuRsTugkWvvlsp36STKslfiH/cY=" }, { "id": "Cayman Islands", @@ -2641,8 +2641,8 @@ "affiliations": [ "Cayman Islands" ], - "s": 1430143, - "sha1_base64": "Eem6Dh7Y86eH0ZIxdkC+FKGClnI=" + "s": 1445311, + "sha1_base64": "/XftAlfok8LszzWBOg9Abf1qAb0=" }, { "id": "Central African Republic", @@ -2668,8 +2668,8 @@ "Sangha-Mbaéré", "Vakaga" ], - "s": 161480829, - "sha1_base64": "zGjo1Yxh/6XVfxJQfoS8cvUWLko=" + "s": 162132389, + "sha1_base64": "sPokLuWXHs7q5ld7fj9zx7opzdo=" }, { "id": "Chad", @@ -2701,8 +2701,8 @@ "Tibesti Region", "Wadi Fira Region" ], - "s": 145186554, - "sha1_base64": "TYrLH24MHRkfFvBTM3vWFMRS8Tk=" + "s": 147270003, + "sha1_base64": "3pTHkTE9YdfaNx6Ax3z8U57l4h0=" }, { "id": "Colombia", @@ -2727,8 +2727,8 @@ "Santander", "Sucre" ], - "s": 148781721, - "sha1_base64": "Rd7XxZ812piRUadvi7aOkHwQUpc=" + "s": 150474985, + "sha1_base64": "xterFMy6CO78Ode92tQRs4E6tDo=" }, { "id": "Colombia_West", @@ -2751,8 +2751,8 @@ "Tolima", "Valle del Cauca" ], - "s": 157749476, - "sha1_base64": "lRqzf+/WSdKfb2WJqHNyuNaYqMI=" + "s": 160163925, + "sha1_base64": "f9LRUQDkl09rP0DKvVbwfy/MJGM=" }, { "id": "Colombia_East", @@ -2772,8 +2772,8 @@ "Vaupés", "Vichada" ], - "s": 81567924, - "sha1_base64": "XER74DQVEuu6+KkbVwwKz23c9D0=" + "s": 82449595, + "sha1_base64": "9197vkdl65PtIwRCU/1sI9TrJVk=" } ] }, @@ -2788,8 +2788,8 @@ "Mwali", "Nzwani / أنجوان" ], - "s": 5502348, - "sha1_base64": "RR/tYegj2R6dAwDqlLm5bkpBNkU=" + "s": 6522109, + "sha1_base64": "B+fYKQZCnkeM3wm1hyMVh+DXheI=" }, { "id": "Congo-Brazzaville", @@ -2814,8 +2814,8 @@ "country_name_synonyms": [ "Republic of the Congo" ], - "s": 44980526, - "sha1_base64": "xzREYNG+QG66m0Y9n2mp4V8hjZk=" + "s": 46476870, + "sha1_base64": "Yzs1C3/eUEI0Fp8DSf2fAlnd4fg=" }, { "id": "Congo-Kinshasa", @@ -2855,8 +2855,8 @@ "Tshuapa", "Équateur" ], - "s": 342194710, - "sha1_base64": "3+ptSdLF8PEaAgyCRz40aC153yY=" + "s": 343329926, + "sha1_base64": "FGqLJ/V1gSoPv0g73dg7E8UWdD4=" }, { "id": "Congo-Kinshasa_Kivu", @@ -2868,8 +2868,8 @@ "Nord-Kivu", "Sud-Kivu" ], - "s": 171551990, - "sha1_base64": "X6Pt52aFMgrLN/L8aRa5UsYB23o=" + "s": 171685662, + "sha1_base64": "riJsV8WmeZaGap4QpsCDtAQS6n8=" } ] }, @@ -2881,8 +2881,8 @@ "affiliations": [ "Cook Islands" ], - "s": 1522979, - "sha1_base64": "6hOPy1z30U+O3Mo0zEGFFBX/6VI=" + "s": 1549627, + "sha1_base64": "tVffl4SiCo2f+mIUnsDKf0xb51U=" }, { "id": "Costa Rica", @@ -2901,8 +2901,8 @@ "Puntarenas", "San José" ], - "s": 48271289, - "sha1_base64": "i+8eMOETELGNkVYBRkRJ1pIYgaI=" + "s": 49231473, + "sha1_base64": "2dtJ/Q5G6z6kIJoqiZW00gNa+G4=" }, { "id": "Croatia", @@ -2915,8 +2915,8 @@ "affiliations": [ "Hrvatska" ], - "s": 94178928, - "sha1_base64": "NvgivwQvQCdRKBe4rw4BdaR7rk4=" + "s": 95594456, + "sha1_base64": "SBgjkU+YgdDomGwKU7zWwvmKtWw=" }, { "id": "Croatia_West", @@ -2927,8 +2927,8 @@ "Hrvatska", "Italia" ], - "s": 92845705, - "sha1_base64": "3eqp9TlYQRGIjKVhb8IC1b8rPQw=" + "s": 94689073, + "sha1_base64": "oyASlWE73TjNDoGLKMvrwa2zGWo=" } ] }, @@ -2954,8 +2954,8 @@ "Santiago de Cuba", "Villa Clara" ], - "s": 74997220, - "sha1_base64": "2izYVhmbG7kd/2r2709R6ZsXNJk=" + "s": 76222724, + "sha1_base64": "MXTr5EjJyPEMNCOZIgKFSwg2IKs=" }, { "id": "Cyprus", @@ -2966,8 +2966,8 @@ "British Sovereign Base Areas", "Κύπρος - Kıbrıs" ], - "s": 46437018, - "sha1_base64": "hKOxkLjEtyOa8V2gy/LmhwNvszg=" + "s": 46750650, + "sha1_base64": "FECPmcQNNhJsxlRrGS4ep67jjJc=" }, { "id": "Czech Republic", @@ -2984,8 +2984,8 @@ "Praha", "Česko" ], - "s": 36739425, - "sha1_base64": "p+Ww4Z9SDwkfatq3yy0GaQdY6HU=" + "s": 37167321, + "sha1_base64": "O93eZRjlB2XOt/lKnIz28wxuxcE=" }, { "id": "Czech_Severovychod_Pardubicky kraj", @@ -2996,8 +2996,8 @@ "Severovýchod", "Česko" ], - "s": 47995405, - "sha1_base64": "AKqrr4mdfFJ8xCmwKDkQSVb08TY=" + "s": 48345285, + "sha1_base64": "XwJKMRZodZJgCXpu1VxKFVzpuG4=" }, { "id": "Czech_Karlovasky kraj", @@ -3008,8 +3008,8 @@ "Severozápad", "Česko" ], - "s": 26298254, - "sha1_base64": "keqnGhUKKdtJuxnp9hA/gsIuvE4=" + "s": 26526838, + "sha1_base64": "widJVsaAiKTMmCZ2O+kAJU2wy5k=" }, { "id": "Czech_Ustecky kraj", @@ -3020,8 +3020,8 @@ "Severozápad", "Česko" ], - "s": 60312062, - "sha1_base64": "VFA40opFeckNbYPNiXwCG6Imw9g=" + "s": 60627342, + "sha1_base64": "M6HolhxEM5ImFhOML9YQoBg9TcQ=" }, { "id": "Czech_Jihozapad_Plzensky kraj", @@ -3032,8 +3032,8 @@ "Jihozápad", "Česko" ], - "s": 62712286, - "sha1_base64": "6Pmb8lLIBOoOpiXZRV4FwJfWdjY=" + "s": 63596238, + "sha1_base64": "5C9TAy5aPk09HYCFeXreZFdhhsY=" }, { "id": "Czech_Severovychod_Kralovehradecky kraj", @@ -3044,8 +3044,8 @@ "Severovýchod", "Česko" ], - "s": 50448852, - "sha1_base64": "IUkIGG18sWmc/KMJz8NuG9DnPY8=" + "s": 50749044, + "sha1_base64": "aVnBL4udq9LYvdWGPe/dPKjABPg=" }, { "id": "Czech_Olomoucky kraj", @@ -3056,8 +3056,8 @@ "Střední Morava", "Česko" ], - "s": 55443292, - "sha1_base64": "WwlvNXR613uJ9gAc/cNbNf0GY6U=" + "s": 56048540, + "sha1_base64": "jR7hb8SHe1TEYeVM2+Y2tWE97rc=" }, { "id": "Czech_Zlinsky Kraj", @@ -3068,8 +3068,8 @@ "Střední Morava", "Česko" ], - "s": 46787146, - "sha1_base64": "1bEUIpbL5/slAKvJwZayf8skwh0=" + "s": 47130674, + "sha1_base64": "AiVMCZxdh4yb9xrsHBx/vgRXX0I=" }, { "id": "Czech_Stredni Cechy_East", @@ -3080,8 +3080,8 @@ "Střední Čechy", "Česko" ], - "s": 66237255, - "sha1_base64": "U3WowkSQ4tC9tsPXhFBvi8+LtR8=" + "s": 66461639, + "sha1_base64": "lV/nGejze+BSIrUnNN041dhuSnQ=" }, { "id": "Czech_Jihozapad_Jihocesky kraj", @@ -3092,8 +3092,8 @@ "Jihozápad", "Česko" ], - "s": 83271264, - "sha1_base64": "wuATcxzbrYgV/0fxC3vwdUcUWng=" + "s": 83762992, + "sha1_base64": "77MaTkuzfHTg56zz5Dbdonfvm4A=" }, { "id": "Czech_Jihovychod_Kraj Vysocina", @@ -3104,8 +3104,8 @@ "Jihovýchod", "Česko" ], - "s": 63701125, - "sha1_base64": "7n4/Vq3zI0G0ase+ex+hULVXkT4=" + "s": 63935853, + "sha1_base64": "+qsRO9uuDC4KWcOSuhTWLL3QcJM=" }, { "id": "Czech_Severovychod_Liberecky kraj", @@ -3116,8 +3116,8 @@ "Severovýchod", "Česko" ], - "s": 40066682, - "sha1_base64": "PF/GtkDhsMsQKxI4kLZ38/MMi7U=" + "s": 40257042, + "sha1_base64": "0bjItvoo1TWPfi8dkWkEWx5236g=" }, { "id": "Czech_Stredni Cechy_West", @@ -3128,8 +3128,8 @@ "Střední Čechy", "Česko" ], - "s": 61241718, - "sha1_base64": "/6D2qWsZOes9Rza+JxridBA6NcM=" + "s": 61533638, + "sha1_base64": "2UtCC3fqbzMfirE4OgQbrWNj5/Y=" }, { "id": "Czech_Moravskoslezsko", @@ -3140,8 +3140,8 @@ "Moravskoslezsko", "Česko" ], - "s": 68851743, - "sha1_base64": "THzVQOB6VA7JU65CVr+kc0Ov3HE=" + "s": 69254447, + "sha1_base64": "w9s1uOJ3KzA1mP4XlysnJCnoRn8=" }, { "id": "Czech_Jihovychod_Jihomoravsky kraj", @@ -3152,8 +3152,8 @@ "Jihovýchod", "Česko" ], - "s": 89916688, - "sha1_base64": "jrPvbBkJhcewljg1AB8tpdIKbks=" + "s": 90513248, + "sha1_base64": "PqxZwVQKWbTtWdJZe2emGgbSLCA=" } ] }, @@ -3183,8 +3183,8 @@ "Côte d'Ivoire", "Ivory Coast" ], - "s": 84902703, - "sha1_base64": "c4YmTlKGInHyomTHntv0ACrUwDI=" + "s": 86606623, + "sha1_base64": "uzvv1IbYodtXh69/RJCZVA9fHQk=" }, { "id": "Denmark", @@ -3198,8 +3198,8 @@ "Danmark", "Region Nordjylland" ], - "s": 56846938, - "sha1_base64": "H4avgMdxxj+kr03MoZLSoPi7mvs=" + "s": 58036355, + "sha1_base64": "UwcMGSMfwE3jDNTdQ4ILdoaR6WM=" }, { "id": "Denmark_Central Denmark Region", @@ -3210,8 +3210,8 @@ "Danmark", "Region Midtjylland" ], - "s": 109308023, - "sha1_base64": "Jk04qZuDAYUa9yuPhFvHiz6Fik4=" + "s": 110874375, + "sha1_base64": "yaWA+uyc5OpFDTbOjn17NU9fG90=" }, { "id": "Denmark_Capital Region of Denmark", @@ -3223,8 +3223,8 @@ "Region Hovedstaden", "Territorial waters of Bornholm" ], - "s": 72070017, - "sha1_base64": "J/6Lk9lYxKJlTwRdFCejTvsWE4g=" + "s": 73275769, + "sha1_base64": "RCS+xSW2XSMjsf6aHnEM6LwRMso=" }, { "id": "Denmark_Region Zealand", @@ -3235,8 +3235,8 @@ "Danmark", "Region Sjælland" ], - "s": 73753949, - "sha1_base64": "/a9lQgqOiiX13q13oQq5BbVGLyY=" + "s": 75535221, + "sha1_base64": "RWaI+f17RKMyH7yONMIrCMSwNtU=" }, { "id": "Denmark_Region of Southern Denmark", @@ -3247,8 +3247,8 @@ "Danmark", "Region Syddanmark" ], - "s": 105386590, - "sha1_base64": "kRGlhInL06uI9ApZRP2bZgEH+QA=" + "s": 107141686, + "sha1_base64": "x+vnSAu72OXaNrzJc0Extn2EUhs=" } ] }, @@ -3266,8 +3266,8 @@ "Obock", "Tadjourah" ], - "s": 12543999, - "sha1_base64": "VgCCkvItUQTa7tHuN47HKKvujq4=" + "s": 12943039, + "sha1_base64": "1r8PD+r3pZ7bZicOFvjN2XTIfms=" }, { "id": "Dominican Republic", @@ -3309,8 +3309,8 @@ "Sánchez Ramírez", "Valverde" ], - "s": 38380013, - "sha1_base64": "jz/P7JMI+J6xhsEcfx4nEt+v7oQ=" + "s": 38530141, + "sha1_base64": "Fb3r5Ts41n1Mp/IVlEAdeH3PPl8=" }, { "id": "East Timor", @@ -3336,8 +3336,8 @@ "Timór Loro Sa'e", "Viqueque" ], - "s": 21373057, - "sha1_base64": "PxePIndo2HZEnzqzDC1QxHnCvAk=" + "s": 21452521, + "sha1_base64": "cer49vAdxpBbKy+E17aiwA1b5mk=" }, { "id": "Chile", @@ -3347,8 +3347,8 @@ "affiliations": [ "Acuerdo de Campos de Hielo" ], - "s": 6794832, - "sha1_base64": "o4RvdnHQlm77FE0Y7yZZAReAvRs=" + "s": 7075801, + "sha1_base64": "IhAWDdSd+HCzy62/M7F++mwmFx8=" }, { "id": "Chile_Central", @@ -3365,8 +3365,8 @@ "VI Región del Libertador General Bernardo O'Higgins", "VII Región del Maule" ], - "s": 119654410, - "sha1_base64": "puszxkdPHgNbT1GIwHo0GytSkpA=" + "s": 122145354, + "sha1_base64": "Ufomzczep02ce3xXm1dN50FvTac=" }, { "id": "Chile_North", @@ -3382,8 +3382,8 @@ "V Región de Valparaíso", "XV Región de Arica y Parinacota" ], - "s": 83426807, - "sha1_base64": "j6WADcMsgvCAtD45lUhJyrgUDxw=" + "s": 84463895, + "sha1_base64": "a9K/lBemfsNFM6BAWaHpGDu1u/E=" }, { "id": "Chile_South", @@ -3399,8 +3399,8 @@ "XII Región de Magallanes y de la Antártica Chilena", "XIV Región de Los Ríos" ], - "s": 232062275, - "sha1_base64": "7HcdYIdDdxUr9MiNighz1W075WE=" + "s": 236470891, + "sha1_base64": "UKtaL+1C2/G9fgp/TJ7frs+AA5o=" } ] }, @@ -3430,8 +3430,8 @@ "Tungurahua", "Zamora Chinchipe" ], - "s": 79932615, - "sha1_base64": "LMPRHJqolG55EEDFJyP8EoV6cAg=" + "s": 80645423, + "sha1_base64": "vLWYuK4EFcZOusCS3P9LUru1p3w=" }, { "id": "Ecuador_West", @@ -3458,8 +3458,8 @@ "Santa Elena", "Santo Domingo de los Tsáchilas" ], - "s": 65233054, - "sha1_base64": "vuoCH0CdpwsrlbE9z7XDXMNAutQ=" + "s": 65830694, + "sha1_base64": "pDJBYXR8sV9HYgLSJzzT8ZfWH4c=" } ] }, @@ -3497,8 +3497,8 @@ "‏البحيرة‎", "الإسكندرية" ], - "s": 303339969, - "sha1_base64": "BZmTGnTgc/HJngj6XyHzoCqKRCA=" + "s": 305913641, + "sha1_base64": "dsf/o0htVEeX29BHkDerDY+q0Ms=" }, { "id": "El Salvador", @@ -3522,8 +3522,8 @@ "Departemento de Chalatenango", "El Salvador" ], - "s": 40581579, - "sha1_base64": "jJ32Pd8kM0r+uE88ExXsEfkWYnY=" + "s": 41125923, + "sha1_base64": "2EAqJLwOFSgxurnuZvTqnegdG/c=" }, { "id": "Equatorial Guinea", @@ -3540,8 +3540,8 @@ "Litoral", "Wele-Nzas" ], - "s": 15308578, - "sha1_base64": "42PjKLZMTOm0m6BXXwFyBq1V/nE=" + "s": 15341354, + "sha1_base64": "BPQiILSicIiQ7vVACB/QT6DHBTE=" }, { "id": "Eritrea", @@ -3557,8 +3557,8 @@ "ዞባ ዓንሰባ", "ጋሽ-ባርካ" ], - "s": 31649844, - "sha1_base64": "/UfmEXquWAnmQrODT9SJ04eRdmQ=" + "s": 31853532, + "sha1_base64": "AkBQEtcKW5mc0KUJguT0Aj/2JBk=" }, { "id": "Estonia", @@ -3571,8 +3571,8 @@ "affiliations": [ "Eesti" ], - "s": 58180486, - "sha1_base64": "7DtzkOva7edOXq7E4496EMOf2TI=" + "s": 59815030, + "sha1_base64": "vtihulZ+kPSgjr6xpo8sGy7DmhY=" }, { "id": "Estonia_East", @@ -3582,8 +3582,8 @@ "affiliations": [ "Eesti" ], - "s": 64879527, - "sha1_base64": "QPZssq1XJSnoJbkUSTcfISgdSvM=" + "s": 65769079, + "sha1_base64": "OFJwr5QYlhzCpAPVJkU8781MwaQ=" } ] }, @@ -3608,8 +3608,8 @@ "Tigray", "ኢትዮጵያ Ethiopia" ], - "s": 173321716, - "sha1_base64": "BCH77wS4qydlnpUz7ZdiLYv5bfg=" + "s": 173968108, + "sha1_base64": "fKgoRsXdMcB+NHYd+htG8EK7pSg=" }, { "id": "Faroe Islands", @@ -3626,8 +3626,8 @@ "Territorial waters of Faroe Islands", "Vága sýsla" ], - "s": 11685855, - "sha1_base64": "qAwKrEQVE+aUoGdlAcxhpXgF+xM=" + "s": 11742887, + "sha1_base64": "9/Vuz8SWMzch36q0mw2bR164ZMc=" }, { "id": "Federated States of Micronesia", @@ -3642,8 +3642,8 @@ "Pohnpei", "Yap" ], - "s": 2919874, - "sha1_base64": "WOLzHjM0G2ZgO21UpHyy3OH104E=" + "s": 2931978, + "sha1_base64": "b0A1wB2+OA0QVAcsoi0+QJW+aRU=" }, { "id": "Fiji", @@ -3656,8 +3656,8 @@ "Northern", "Viti" ], - "s": 19855176, - "sha1_base64": "ca4QEFmG+gAWm8BX5Vq1X6pkPcY=" + "s": 19900704, + "sha1_base64": "p7T7T3f2zTPSmhR8pD/tX0R114Y=" }, { "id": "Finland", @@ -3671,8 +3671,8 @@ "Länsi-Suomi", "Suomi" ], - "s": 46343627, - "sha1_base64": "lyn2k5chjrQg+V03POfbPM7TMKI=" + "s": 46739043, + "sha1_base64": "4kW45Isi5OXttQwmWunMfF2zMGA=" }, { "id": "Finland_Western Finland_Tampere", @@ -3683,8 +3683,8 @@ "Länsi-Suomi", "Suomi" ], - "s": 97719007, - "sha1_base64": "YDD8ycYde1pmd1FJM0Rm2xQSHy4=" + "s": 99686815, + "sha1_base64": "5Qa0jImSy/oPBdx4aTlxnlc2hCU=" }, { "id": "Finland_Northern Finland", @@ -3695,8 +3695,8 @@ "Pohjois-Suomi", "Suomi" ], - "s": 123487169, - "sha1_base64": "O/zw8ZInn7Epd6n3NMnsaLGFj1g=" + "s": 125188609, + "sha1_base64": "GyuAS04kN9DwpYR8jLomwProHN0=" }, { "id": "Finland_Eastern Finland_North", @@ -3707,8 +3707,8 @@ "Itä-Suomi", "Suomi" ], - "s": 126360837, - "sha1_base64": "VLOhEm9QVhrHO7RT2DHgzyMyA3c=" + "s": 127123677, + "sha1_base64": "p+imxuPYPM57UST+oshHQ0uEAII=" }, { "id": "Finland_Eastern Finland_South", @@ -3719,8 +3719,8 @@ "Itä-Suomi", "Suomi" ], - "s": 74714214, - "sha1_base64": "U4MxZQ13RyvHEKhCxcVV5CmzdWY=" + "s": 75631582, + "sha1_base64": "E+pLbaj7TLh1dThLdG9Ly0BlVSw=" }, { "id": "Finland_Southern Finland_West", @@ -3732,8 +3732,8 @@ "Suomi", "Åland" ], - "s": 100442214, - "sha1_base64": "9Okh1lGpeqamHHEidfym6u6SpYc=" + "s": 103037126, + "sha1_base64": "7+iQaLonGvW7SX55qvoZZcoP5Yc=" }, { "id": "Finland_Southern Finland_Helsinki", @@ -3744,8 +3744,8 @@ "Etelä-Suomi", "Suomi" ], - "s": 123446369, - "sha1_base64": "S1GnWPtD3h43W3RCVzYnXaFHwMU=" + "s": 125850393, + "sha1_base64": "hreKyqKwVU5b4GgsgKhvf5udqGs=" }, { "id": "Finland_Southern Finland_Lappeenranta", @@ -3756,8 +3756,8 @@ "Etelä-Suomi", "Suomi" ], - "s": 56214821, - "sha1_base64": "IOIJnUKloYcSgWO9E2e472DG1CQ=" + "s": 57333781, + "sha1_base64": "lghM+ZALF2IDumWZpucZlV5WA1M=" } ] }, @@ -3776,8 +3776,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 68802279, - "sha1_base64": "B6ilO5ocsycF57RP2LS+H1MG5+0=" + "s": 71324543, + "sha1_base64": "N1ImIIXWvNPOuGb8yyd23CeETg4=" }, { "id": "France_Alsace_Haut-Rhin", @@ -3788,8 +3788,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 50046389, - "sha1_base64": "P7zKBVSdHykbWPXAt8uFs6EA00I=" + "s": 50365861, + "sha1_base64": "jk6JGbBUNoBhRqDnRe2Kb0CYmIQ=" } ] }, @@ -3805,8 +3805,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 56595492, - "sha1_base64": "FtDNwtuui7ANClWwuQXWPRHM6oI=" + "s": 56863644, + "sha1_base64": "KjdHGHdSbcHwzDQ+TPbZkd6pz5U=" }, { "id": "France_Aquitaine_Gironde", @@ -3817,8 +3817,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 84108702, - "sha1_base64": "J6/l30yChwBINsSFczj8S7GetaI=" + "s": 86467646, + "sha1_base64": "LNiueCNsKcmtgU6gq4LIKqeRktY=" }, { "id": "France_Aquitaine_Landes", @@ -3829,8 +3829,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 43313891, - "sha1_base64": "QKsVcDKQeoJqT0xDt76te0gviZc=" + "s": 44712140, + "sha1_base64": "nV6g2lNnOxIsNaL4sASSDUOT2t0=" }, { "id": "France_Aquitaine_Lot-et-Garonne", @@ -3841,8 +3841,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 39402322, - "sha1_base64": "xtu4Ycpx1VN0qKQxsleG3Rgs6Bk=" + "s": 39546962, + "sha1_base64": "owsExwZJGNJCW3xDkDzgIopXchM=" }, { "id": "France_Aquitaine_Pyrenees-Atlantiques", @@ -3853,8 +3853,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 70696909, - "sha1_base64": "loA4++Eawhn9OOpBR2w7IM6KWSc=" + "s": 71993277, + "sha1_base64": "W+7EqWkl8lemehpMQW/o/C+T92o=" } ] }, @@ -3870,8 +3870,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 41855364, - "sha1_base64": "t/QsrKsSx6mf8A1wLpQiqeaLhUo=" + "s": 42419452, + "sha1_base64": "cN59UBpUCglzp/tI72jpFIIG4aQ=" }, { "id": "France_Auvergne_Cantal", @@ -3882,8 +3882,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 27376015, - "sha1_base64": "Bg6MTrkNiSv+0MHcz02uuFDuEf0=" + "s": 27756095, + "sha1_base64": "lqFdUIv+upKYlFftaFPz7GsVYCo=" }, { "id": "France_Auvergne_Haute-Loire", @@ -3894,8 +3894,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 40312041, - "sha1_base64": "U19wwClL6AuEGk2/7JlhE5EfLtI=" + "s": 40712242, + "sha1_base64": "hqln46nJSl+yJzfdVno5fgE8lCE=" }, { "id": "France_Auvergne_Puy-de-Dome", @@ -3906,8 +3906,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 62637878, - "sha1_base64": "u45SLZ3CTjrHTciT4qJo8CTxdUQ=" + "s": 63901974, + "sha1_base64": "pqcDM3X+UIqwe307G7W1mvv2fkQ=" } ] }, @@ -3925,8 +3925,8 @@ "Guernsey", "Jersey" ], - "s": 58162413, - "sha1_base64": "rlD4K6daJfxxLEDRIF2uwTdPfDU=" + "s": 58870429, + "sha1_base64": "aKoSPxORj2OCMTXeK2+MBUO4sc0=" }, { "id": "France_Brittany_Finistere", @@ -3937,8 +3937,8 @@ "Bretagne", "France" ], - "s": 80261718, - "sha1_base64": "r2k5tsHJcZO2gl2nm/r4HmY8J44=" + "s": 82237654, + "sha1_base64": "wqAlzEcONGzv15S6jNNaDFtyzO4=" }, { "id": "France_Brittany_Ille-et-Vilaine", @@ -3950,8 +3950,8 @@ "France", "Jersey" ], - "s": 71747478, - "sha1_base64": "ZN9bSeJjVauuobcab6fFsz0GssE=" + "s": 73221406, + "sha1_base64": "gtU+0BGZUG9tauzF7DKdzo8NQTk=" }, { "id": "France_Brittany_Morbihan", @@ -3962,8 +3962,8 @@ "Bretagne", "France" ], - "s": 62117750, - "sha1_base64": "LSDYLTNMA4guyTKw+w9itSA8bws=" + "s": 63628158, + "sha1_base64": "D9brV0G9T0zEHVwZJaKL/E0rBCs=" } ] }, @@ -3979,8 +3979,8 @@ "Bourgogne-Franche-Comté", "France" ], - "s": 48377445, - "sha1_base64": "A0DU1a0PeGk+m5E4YmYyc/wqYy0=" + "s": 49184093, + "sha1_base64": "adLB8pm0tgUdKEMLkAAEf+zcLeg=" }, { "id": "France_Burgundy_Nievre", @@ -3991,8 +3991,8 @@ "Bourgogne-Franche-Comté", "France" ], - "s": 31289162, - "sha1_base64": "fJItFEej5l5HXZQkdPi/LAFRhNs=" + "s": 31487762, + "sha1_base64": "xcvXjibrYpO4c1zmxN9GGBM+4uo=" }, { "id": "France_Burgundy_Saone-et-Loire", @@ -4003,8 +4003,8 @@ "Bourgogne-Franche-Comté", "France" ], - "s": 102491231, - "sha1_base64": "FG8euXY/mjsrgJ7YLzIVQg8SAlw=" + "s": 103803911, + "sha1_base64": "Ws2O1W0/pNP34bDq/WjLkI7tOJI=" }, { "id": "France_Burgundy_Yonne", @@ -4015,8 +4015,8 @@ "Bourgogne-Franche-Comté", "France" ], - "s": 49386501, - "sha1_base64": "nw1eMtKsbWprO9uNyS7j6By9/Xg=" + "s": 49950669, + "sha1_base64": "6L4hduHNbrXoWlJ+1W0oT/fSZV8=" } ] }, @@ -4032,8 +4032,8 @@ "Centre-Val de Loire", "France" ], - "s": 29597305, - "sha1_base64": "yCmbWg4Yzv+M+TO0hOX2qInqnWw=" + "s": 29728761, + "sha1_base64": "mp/r6oU+EIHgRoMzQBYkgWz58h4=" }, { "id": "France_Centre-Val de Loire_Eure-et-Loir", @@ -4044,8 +4044,8 @@ "Centre-Val de Loire", "France" ], - "s": 31746017, - "sha1_base64": "AhO1uOzV4xBWvqtAfLRCJlPHMu0=" + "s": 32081145, + "sha1_base64": "q9bJPP8+Q5zDn8jfarzBUhQX928=" }, { "id": "France_Centre-Val de Loire_Indre", @@ -4056,8 +4056,8 @@ "Centre-Val de Loire", "France" ], - "s": 46571130, - "sha1_base64": "EmcEgO4UGFG8ohIq7eLg8mbd4ss=" + "s": 47007426, + "sha1_base64": "w2RyBHJqvLDN1naTQux+4ZRQ6Fs=" }, { "id": "France_Centre-Val de Loire_Indre-et-Loire", @@ -4068,8 +4068,8 @@ "Centre-Val de Loire", "France" ], - "s": 64490862, - "sha1_base64": "BbGSbeW5GhkFACbF0F3hzZwqejw=" + "s": 65606078, + "sha1_base64": "R90kjDlcXxqTNaUEH3aGLwfq7ps=" }, { "id": "France_Centre-Val de Loire_Loir-et-Cher", @@ -4080,8 +4080,8 @@ "Centre-Val de Loire", "France" ], - "s": 43049690, - "sha1_base64": "YyZQ0UBUpIOlYH6OsuG4Eob1w1M=" + "s": 43745883, + "sha1_base64": "cojRt4CGpl31Ux1kucY63z9YpLc=" }, { "id": "France_Centre-Val de Loire_Loiret", @@ -4092,8 +4092,8 @@ "Centre-Val de Loire", "France" ], - "s": 59858611, - "sha1_base64": "aR7GJnMCh3PfvkiqfD6pAE8sOSs=" + "s": 60775323, + "sha1_base64": "aoNMEHKynjXEz/sPRGUB32Wj9LI=" } ] }, @@ -4106,8 +4106,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 126684312, - "sha1_base64": "mfLuHXd8DVVUzw8PlnM90LBxc7I=" + "s": 128278000, + "sha1_base64": "al3QssVz/srPe4DSay7SUluapbE=" }, { "id": "France_Corsica", @@ -4121,8 +4121,8 @@ "Italia", "Monaco" ], - "s": 35300977, - "sha1_base64": "sH4KkOvxOcrcUiQnOhyRVOjMQbc=" + "s": 36910361, + "sha1_base64": "3307+NZIj5mecjPFhj5pwyRU4mU=" }, { "id": "France_Free County_North", @@ -4133,8 +4133,8 @@ "Bourgogne-Franche-Comté", "France" ], - "s": 69787462, - "sha1_base64": "s3VxATdcv33G0wd8Jop4fc2w5rE=" + "s": 70626878, + "sha1_base64": "iQ172n4cVXatLJvrJwcisTA+3Yo=" }, { "id": "France_Free County_South", @@ -4145,8 +4145,8 @@ "Bourgogne-Franche-Comté", "France" ], - "s": 58372574, - "sha1_base64": "0R6gHYTieIz1fGbB208jxunXUBM=" + "s": 58996055, + "sha1_base64": "tGWdM+fReZ5BrydrAps39eAdiAs=" }, { "id": "France_French Guiana", @@ -4157,8 +4157,8 @@ "France", "Guyane" ], - "s": 25503540, - "sha1_base64": "F11mVxPvzxmSieMJ9EiB+Q8Autw=" + "s": 25820316, + "sha1_base64": "tTFcIL9J0XGjC0WNGLcIVV2WmiM=" }, { "id": "France_Ile-de-France", @@ -4172,8 +4172,8 @@ "France", "Île-de-France" ], - "s": 45085508, - "sha1_base64": "OWw44Y/3Jnzm2IRmKgO4BThWpSo=" + "s": 45970908, + "sha1_base64": "7yEdVgKE2fTsAIpTg15izs8wt5o=" }, { "id": "France_Ile-de-France_Hauts-de-Seine", @@ -4184,8 +4184,8 @@ "France", "Île-de-France" ], - "s": 25507267, - "sha1_base64": "TRH+r0ndcBx3Ms7o4+JdVVr7udA=" + "s": 26193899, + "sha1_base64": "jt5XbJRKR5nuqX2W1CZyV7etLow=" }, { "id": "France_Ile-de-France_Paris", @@ -4196,8 +4196,8 @@ "France", "Île-de-France" ], - "s": 51283384, - "sha1_base64": "tssusFl6bz4S2nhPMPdCksomdQU=" + "s": 54196448, + "sha1_base64": "ZWU/39YmdVs4/UyrfHOyfFRyVSo=" }, { "id": "France_Ile-de-France_Seine-Saint-Denis", @@ -4208,8 +4208,8 @@ "France", "Île-de-France" ], - "s": 26783654, - "sha1_base64": "UPdFrXRaKweRYgwVP4lwjEoy3uA=" + "s": 27401670, + "sha1_base64": "0CAUu5PcmWkwQzsBZuXen35j1t8=" }, { "id": "France_Ile-de-France_Seine-et-Marne", @@ -4220,8 +4220,8 @@ "France", "Île-de-France" ], - "s": 64642940, - "sha1_base64": "BKje8qMRpgQyyRDZvYwbfrszlSU=" + "s": 65556828, + "sha1_base64": "nOUKTvhUCQ3oZI6MRVNCtQzD4Q8=" }, { "id": "France_Ile-de-France_Val-dOise", @@ -4232,8 +4232,8 @@ "France", "Île-de-France" ], - "s": 33998770, - "sha1_base64": "dBLd5EkE6wpanYTt6qgCYBBA9Jw=" + "s": 34515298, + "sha1_base64": "KET25FjcpRdnh8fDXE/+loXY6Lk=" }, { "id": "France_Ile-de-France_Val-de-Marne", @@ -4244,8 +4244,8 @@ "France", "Île-de-France" ], - "s": 26761470, - "sha1_base64": "vmJpkmr8JScvQDupIyPnlYsoYKU=" + "s": 27522159, + "sha1_base64": "sJDsDHdUhEyPfFnBCDRSRYwbTE0=" }, { "id": "France_Ile-de-France_Yvelines", @@ -4256,8 +4256,8 @@ "France", "Île-de-France" ], - "s": 50696917, - "sha1_base64": "S44QJtlfKrhdf74t8l8oJN0pvoA=" + "s": 51393765, + "sha1_base64": "iHk+ocp1IrR6wKYO5KIXksqN36s=" } ] }, @@ -4273,8 +4273,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 50021428, - "sha1_base64": "goe9FHoa+FOrhD4wzXqQ/TQezjg=" + "s": 50581964, + "sha1_base64": "vjJ+s3oKmU0hcVeTbT6ijatcXVc=" }, { "id": "France_Languedoc-Roussillon_Gard", @@ -4285,8 +4285,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 56158645, - "sha1_base64": "mdqUh+tLiVSOBj7AehjuD3hl2yc=" + "s": 57383117, + "sha1_base64": "na41i7Cm0cBCw44vzLI6V2AMdDA=" }, { "id": "France_Languedoc-Roussillon_Herault", @@ -4297,8 +4297,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 81008406, - "sha1_base64": "EZqciTggLfqUJY/IY/g81F5Ow70=" + "s": 82436118, + "sha1_base64": "mIKaxmZ2B5WwIoFrbb3n2+3rPVY=" }, { "id": "France_Languedoc-Roussillon_Lozere", @@ -4309,8 +4309,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 25106727, - "sha1_base64": "4uuJNS9Gxfcnfhz30b8PA3U2/p4=" + "s": 25759440, + "sha1_base64": "i/yFQ6tc294WbATaAZ4YsKkOgCU=" }, { "id": "France_Languedoc-Roussillon_Pyrenees-Orientales", @@ -4321,8 +4321,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 45467116, - "sha1_base64": "CZi6ajfMYfGClD3s7QNxu4xGTbI=" + "s": 45894731, + "sha1_base64": "IG9ZpcKIL5/y3HBQ60LVrgMx/Ls=" } ] }, @@ -4335,8 +4335,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 108096593, - "sha1_base64": "3/Vdkwv2mLoTUg2rtCr45oItMk8=" + "s": 109878449, + "sha1_base64": "RBkptEmV8oS32QFS6gLKzrh3DT0=" }, { "id": "France_Lorraine", @@ -4350,8 +4350,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 53092189, - "sha1_base64": "6BViJ73j9xMOxVHCocQuu/EMmzU=" + "s": 53545942, + "sha1_base64": "MEnTitMVHscdJNRaBY9Es9zvI30=" }, { "id": "France_Lorraine_Meuse", @@ -4362,8 +4362,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 26013210, - "sha1_base64": "EQzHV4KO1LuZlArz95y7Q4Kwmrs=" + "s": 26283986, + "sha1_base64": "VescUZbA5g7HFoN+WJKGRMGQP+I=" }, { "id": "France_Lorraine_Moselle", @@ -4374,8 +4374,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 68818991, - "sha1_base64": "GJlYxfDd2O3ba1RGDdHgKGbkWzA=" + "s": 69667711, + "sha1_base64": "bmxEsWd+n+lEgx5nBnDjb1LmdNo=" }, { "id": "France_Lorraine_Vosges", @@ -4386,8 +4386,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 46354325, - "sha1_base64": "ZP2MYZcuOCUlED09GvBx6xY8Abc=" + "s": 46917373, + "sha1_base64": "ptQe2D7BsJLfWsG7lJrqWxSRyMo=" } ] }, @@ -4403,8 +4403,8 @@ "France", "Normandie" ], - "s": 61437526, - "sha1_base64": "SuFV9dxtc34CmLNre5Gr/QpnzA4=" + "s": 62533166, + "sha1_base64": "5u+3sFhTKzxYUl/oKnnYortpkgY=" }, { "id": "France_Lower Normandy_Manche", @@ -4416,8 +4416,8 @@ "Jersey", "Normandie" ], - "s": 43283245, - "sha1_base64": "CZ3F7xfctwfMzsW/MtHfwGIkhA4=" + "s": 44115701, + "sha1_base64": "niRctkCk/cW09y00T9l1Y8MF7Z0=" }, { "id": "France_Lower Normandy_Orne", @@ -4428,8 +4428,8 @@ "France", "Normandie" ], - "s": 32483553, - "sha1_base64": "Nm0cOWOvlI+UViZWEPe8IU0Clf4=" + "s": 32904273, + "sha1_base64": "G7IFWWbziDDGDkKY0+uMdByZGSI=" } ] }, @@ -4445,8 +4445,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 32284665, - "sha1_base64": "Mvk868AOBt+H6FFywMsY+GRB5HE=" + "s": 32454305, + "sha1_base64": "lbWxCytdq8IaC0+uxYG0OV2gIG4=" }, { "id": "France_Midi-Pyrenees_Aveyron", @@ -4457,8 +4457,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 59731654, - "sha1_base64": "+FkkoFLY2nviDw0PZjcKLfP85DA=" + "s": 60874846, + "sha1_base64": "xyzFJQziyVmXsFmzVEky3nI4lPc=" }, { "id": "France_Midi-Pyrenees_Gers", @@ -4469,8 +4469,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 45039604, - "sha1_base64": "E4q/AY37J0eGR9lBztIDQ4eioco=" + "s": 45318044, + "sha1_base64": "i1wMjYxwvBeRhtI/D1gkF0CObyc=" }, { "id": "France_Midi-Pyrenees_Haute-Garonne", @@ -4481,8 +4481,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 90591822, - "sha1_base64": "LGDQZzD/PhXfqSULKGLsexj63Zc=" + "s": 93734094, + "sha1_base64": "esCXhaaTq71hfybNAWSbsnXme14=" }, { "id": "France_Midi-Pyrenees_Hautes-Pyrenees", @@ -4493,8 +4493,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 48827836, - "sha1_base64": "d3NVGtdmq5ADfPXKR5ajcKNxe5o=" + "s": 49037756, + "sha1_base64": "PaZPji6+FplGZnHK3Uc72uIcb3I=" }, { "id": "France_Midi-Pyrenees_Lot", @@ -4505,8 +4505,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 44320083, - "sha1_base64": "mTWK+oqw/wvQMjsnRWrsr2osdCU=" + "s": 44595691, + "sha1_base64": "Xaxy7qVfu5GfD6HEJJU5h+xhHpM=" }, { "id": "France_Midi-Pyrenees_Tarn", @@ -4517,8 +4517,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 39770315, - "sha1_base64": "aDriXJ1ggdNa4B1WtHZnrlgJyEQ=" + "s": 39968531, + "sha1_base64": "SBW5xh2e3KuWstrba/lgNEBFWQA=" }, { "id": "France_Midi-Pyrenees_Tarn-et-Garonne", @@ -4529,8 +4529,8 @@ "France", "Languedoc-Roussillon-Midi-Pyrénées" ], - "s": 34452353, - "sha1_base64": "USiZQfMFtgOu7I++0X9zwyo3EKk=" + "s": 34663537, + "sha1_base64": "wgrhMwcWHOm6wBRDi0MKhnwDGt0=" } ] }, @@ -4551,8 +4551,8 @@ "France, Nouvelle-Calédonie, Île de Walpole (eaux territoriales)", "France, Nouvelle-Calédonie, Îles Loyauté (eaux territoriales)" ], - "s": 17135675, - "sha1_base64": "WXZH08oaJC7nxoaTaZ/v6bdzURo=" + "s": 17294932, + "sha1_base64": "k+uD731lTR8BLapl0vglFjJXUVg=" }, { "id": "France_Nord-Pas-de-Calais", @@ -4566,8 +4566,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 53199278, - "sha1_base64": "4csQWKtjoq6OjVDa7z4rWAM8ipE=" + "s": 53650342, + "sha1_base64": "WEJ1Cnoc3yR1Oj94T2QlA8MYuc8=" }, { "id": "France_Nord-Pas-de-Calais_Lille", @@ -4578,8 +4578,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 63606733, - "sha1_base64": "hlalzSNwErLQB4Gd/UTQdOP5R7Q=" + "s": 64536501, + "sha1_base64": "LP/jthiFdPl46ttATX0btvOVsHI=" }, { "id": "France_Nord-Pas-de-Calais_Pas-de-Calais", @@ -4592,8 +4592,8 @@ "Nord-Pas-de-Calais-Picardie", "United Kingdom" ], - "s": 82511343, - "sha1_base64": "9hI3XDJ4UEzLoCi8tGgIH51sLtg=" + "s": 83253032, + "sha1_base64": "+8br6VxS70+a9vf0LRJCHUxQhaw=" } ] }, @@ -4609,8 +4609,8 @@ "France", "Pays de la Loire" ], - "s": 56160445, - "sha1_base64": "BSGRbve+wMXPIIIG0tJ4ZWi8CgU=" + "s": 57511389, + "sha1_base64": "n20T6HO4DxGM8weSN54zUXJZvH4=" }, { "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire", @@ -4621,8 +4621,8 @@ "France", "Pays de la Loire" ], - "s": 32366944, - "sha1_base64": "SWaJkmZ7OA9cQLqofzjSdkkJEZw=" + "s": 33816969, + "sha1_base64": "RzfChTRaEWbCSqbhyp0s77qGSEA=" }, { "id": "France_Pays de la Loire_Maine-et-Loire", @@ -4633,8 +4633,8 @@ "France", "Pays de la Loire" ], - "s": 66063222, - "sha1_base64": "iNG27E/tBAmqCtCjR1X052OFk+Q=" + "s": 66831326, + "sha1_base64": "OMaNuh8zUZSaP65R0dtO3qT3woQ=" }, { "id": "France_Pays de la Loire_Mayenne", @@ -4645,8 +4645,8 @@ "France", "Pays de la Loire" ], - "s": 29027561, - "sha1_base64": "Hyl4r4tWTuN++HTgqIVt+inN1gE=" + "s": 29285681, + "sha1_base64": "22zLbgI5xJ4MhKfGkhXmJ9EQD74=" }, { "id": "France_Pays de la Loire_Sarthe", @@ -4657,8 +4657,8 @@ "France", "Pays de la Loire" ], - "s": 47076405, - "sha1_base64": "CFVSYt7vUgkOxCoYuN+blyyfHC0=" + "s": 47437877, + "sha1_base64": "TwQAfMaBVQ6rTKl/jxpepJ9DZwU=" }, { "id": "France_Pays de la Loire_Vendee", @@ -4669,8 +4669,8 @@ "France", "Pays de la Loire" ], - "s": 73691670, - "sha1_base64": "ntTO77e+Nd8nBuhFZftIQohG+u8=" + "s": 75024455, + "sha1_base64": "mgTnYJ+uoyYz1t+uLhWPHajdt1Y=" } ] }, @@ -4686,8 +4686,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 49639316, - "sha1_base64": "D4s3L/C+sPFrNotOaxra1Eab5O8=" + "s": 50023964, + "sha1_base64": "MzL/lNDxf5lDz1nFrAau7mlMecc=" }, { "id": "France_Picardy_Oise", @@ -4698,8 +4698,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 62634020, - "sha1_base64": "3cM4mXab2w+HwAcI0maaO2CoFS0=" + "s": 63347220, + "sha1_base64": "EjyEFwfA18G2tAUYYBiFxvXNEMM=" }, { "id": "France_Picardy_Somme", @@ -4710,8 +4710,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 47162741, - "sha1_base64": "JRbUjtdjh/z1xzgivmXND7mf4KM=" + "s": 47383357, + "sha1_base64": "4oz3F9B+brPvd4jmkdNTmIjxxw4=" } ] }, @@ -4727,8 +4727,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 44770147, - "sha1_base64": "kGPyJnzjm+5OljOtXu84ej2U0oc=" + "s": 45070099, + "sha1_base64": "3LeKpdNSQ7hR9xlSL2nGWe0gNpg=" }, { "id": "France_Poitou-Charentes_Charente-Maritime", @@ -4739,8 +4739,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 74809542, - "sha1_base64": "ad8iF62WMWeK4CL5zM+eY3D50m8=" + "s": 77017318, + "sha1_base64": "1FChjYDYT/oBFQS7sDidUCqXNYU=" }, { "id": "France_Poitou-Charentes_Deux-Sevres", @@ -4751,8 +4751,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 57704651, - "sha1_base64": "WLr07VY1aHvYCXwXnPQEYE8xtpg=" + "s": 59156708, + "sha1_base64": "i3bkEjstsZ1po3KTNb4/OBkGn0Q=" }, { "id": "France_Poitou-Charentes_Vienne", @@ -4763,8 +4763,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 53442516, - "sha1_base64": "jq7SqDb+EZaxQPN8cTn+oEG+rls=" + "s": 53878772, + "sha1_base64": "k4L0oJDhN7GR2R7tQKNyuDfUwdU=" } ] }, @@ -4780,8 +4780,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 33793403, - "sha1_base64": "zSvjZIw1y4t05kOkoNQkrGyafLc=" + "s": 34618475, + "sha1_base64": "kLSGM7jpnxP2zKzCiCxSXplN63U=" }, { "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone", @@ -4792,8 +4792,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 78684996, - "sha1_base64": "UASoTyFBuWVLAPBiIoEKe+qPFoA=" + "s": 80560996, + "sha1_base64": "lse/RfyT1gJq4Wqn+LZ9C4Ava20=" }, { "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes", @@ -4804,8 +4804,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 31561802, - "sha1_base64": "1DilKxWLFIVquRr+tlJ6AjB8lrQ=" + "s": 31981442, + "sha1_base64": "FnTEEsGtN3S1qZ1eqn7t2PL85kg=" }, { "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps", @@ -4817,8 +4817,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 54290838, - "sha1_base64": "DgEc7kLbHvX/VIY6Imtpz7j5jIk=" + "s": 56520614, + "sha1_base64": "cF0SJJKzmp5WOuRFCekqP/L5bB8=" }, { "id": "France_Provence-Alpes-Cote dAzur_Var", @@ -4829,8 +4829,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 63650173, - "sha1_base64": "hOtuHd0dn1GBecjCvBpoJZXNBQc=" + "s": 65656845, + "sha1_base64": "v5ZqpEvNuEUrES//x2b8CMkP6To=" }, { "id": "France_Provence-Alpes-Cote dAzur_Vaucluse", @@ -4841,8 +4841,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 49919509, - "sha1_base64": "KLAZmTsImkzp7xVJmlfzwdnfWCM=" + "s": 50990813, + "sha1_base64": "LZRmAN1yicigD1z5qBAQN00O3J4=" } ] }, @@ -4858,8 +4858,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 57904853, - "sha1_base64": "ypaCFNgY4KY22iKsvIvlZr3HFkM=" + "s": 58508109, + "sha1_base64": "sKFLrlz6LLQniQCUJZCjCubEBeg=" }, { "id": "France_Rhone-Alpes_Ardeche", @@ -4870,8 +4870,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 49683532, - "sha1_base64": "psxtvzkZcQEaFOYALC/3MAEoXj8=" + "s": 50060988, + "sha1_base64": "2J5crVf0iVaNOzNUfsNdp/h5Ivw=" }, { "id": "France_Rhone-Alpes_Drome", @@ -4883,8 +4883,8 @@ "France", "Provence-Alpes-Côte d'Azur" ], - "s": 57354101, - "sha1_base64": "FjwpXOuURXKAg+bOoiY0k24vKwc=" + "s": 58128861, + "sha1_base64": "zWqhtQNlQ07BszX5Yl3f1q48vTw=" }, { "id": "France_Rhone-Alpes_Haute-Savoie", @@ -4895,8 +4895,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 68669093, - "sha1_base64": "DOAYKGfmy9HxY/tA9s1E4X2lRe4=" + "s": 69602637, + "sha1_base64": "uolWKm29lPwkN4Fa4pkRRbbx4CY=" }, { "id": "France_Rhone-Alpes_Isere", @@ -4907,8 +4907,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 89171743, - "sha1_base64": "C6SlL78GpeH6gcHKZYc1a8/8a/s=" + "s": 90893840, + "sha1_base64": "fQLyyA/aAXLWXzVYDgORvIG4woQ=" }, { "id": "France_Rhone-Alpes_Loire", @@ -4919,8 +4919,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 70968325, - "sha1_base64": "ilP+HdGjN6w+YPGB1he0t+xOYfE=" + "s": 71356653, + "sha1_base64": "LpLZbarVWmLr/AeOTvSmvlpJPT4=" }, { "id": "France_Rhone-Alpes_Rhone", @@ -4931,8 +4931,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 90154230, - "sha1_base64": "fPOl3HwFQczqQevR/7bCp7XtoFQ=" + "s": 91831110, + "sha1_base64": "IwgGjJaWuvBqc4DzFOqe7pT0cB0=" }, { "id": "France_Rhone-Alpes_Savoie", @@ -4943,8 +4943,8 @@ "Auvergne-Rhône-Alpes", "France" ], - "s": 58356606, - "sha1_base64": "AqHOxBQpSeS46d2y8PqDT0wnjmc=" + "s": 58846190, + "sha1_base64": "riJBI0pLfT7rlbeQqmCkDZKRQsI=" } ] }, @@ -4968,8 +4968,8 @@ "La Réunion", "Mayotte" ], - "s": 43271586, - "sha1_base64": "fN1p0zmTfFXcGEUKjfO1pfucflA=" + "s": 45148490, + "sha1_base64": "sIAM2mLlziHpVXWxGQuHC2TJKnM=" }, { "id": "France_Upper Normandy", @@ -4980,8 +4980,8 @@ "France", "Normandie" ], - "s": 99376663, - "sha1_base64": "qzEFJxEh69VnM7kkwDs+BnuD5UY=" + "s": 100289111, + "sha1_base64": "PFT82NasaZKy50MhqJAvtr6rsoA=" }, { "id": "French Polynesia", @@ -4999,8 +4999,8 @@ "France, Polynésie française, Îles du Vent (eaux territoriales)", "Polynésie française, Îles du Vent (eaux territoriales)" ], - "s": 19383656, - "sha1_base64": "76KbKjQpxmqHmk3kQ5H1UlUQotk=" + "s": 19528976, + "sha1_base64": "Q56AND/FBNT6frGmryfcdyTDymk=" }, { "id": "Wallis and Futuna", @@ -5011,8 +5011,8 @@ "France", "France, Wallis-et-Futuna (eaux territoriales)" ], - "s": 973619, - "sha1_base64": "jY39lMiLNAcHy65FY0Ypy0ciwmU=" + "s": 975827, + "sha1_base64": "egwzW25iqep9mvQ/ZetWH0OX4iY=" } ] }, @@ -5033,8 +5033,8 @@ "Ogooué-Lolo", "Woleu-Ntem" ], - "s": 51874179, - "sha1_base64": "PVkFqjMBZ7kT9+8FKdc+DER3fQ8=" + "s": 52394755, + "sha1_base64": "vCZGks7KyQ+NW2ycF0iJiaunGKU=" }, { "id": "Georgia Region", @@ -5058,8 +5058,8 @@ "აჭარის ავტონომიური რესპუბლიკა", "საქართველო" ], - "s": 119006640, - "sha1_base64": "5n6oEQvSqvE885U2YZO5IPF4M2s=" + "s": 119872432, + "sha1_base64": "UsKnCnVRD3/Uu0siCSC+aigKr7I=" }, { "id": "Abkhazia", @@ -5071,8 +5071,8 @@ "აფხაზეთის ავტონომიური რესპუბლიკა - Аҧсны Автономтә Республика", "საქართველო" ], - "s": 16016482, - "sha1_base64": "IMpV4IYPwy5fuBNZ/gWXmDBEk1k=" + "s": 16043226, + "sha1_base64": "vCtilkVVXuZqi2j7qz3NYtxq9F8=" }, { "id": "South Ossetia", @@ -5084,8 +5084,8 @@ "Хуссар Ирыстон - Южная Осетия", "საქართველო" ], - "s": 12614849, - "sha1_base64": "tr8GJpcmsANnJ3T18IJD8v9jcRY=" + "s": 12655081, + "sha1_base64": "aYkyqZw8g6FEED2UTPTMKLe/VCI=" } ] }, @@ -5106,8 +5106,8 @@ "Schaffhausen", "Zürich" ], - "s": 141126667, - "sha1_base64": "prQY87F7MnGRsrTF1X2C8FpiExc=" + "s": 146376379, + "sha1_base64": "2TLM84hgUuWhBIJjQhdv2qUYv6s=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe", @@ -5118,8 +5118,8 @@ "Baden-Württemberg", "Deutschland" ], - "s": 132854004, - "sha1_base64": "tEcdlmyyxE4bm3+pVek190FH31w=" + "s": 136647020, + "sha1_base64": "3y0ETHCP3rRhox0C785G/2gIuPY=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn", @@ -5130,8 +5130,8 @@ "Baden-Württemberg", "Deutschland" ], - "s": 57778549, - "sha1_base64": "GxmrYX080pb2tdqUW2BrctnjjFg=" + "s": 58354613, + "sha1_base64": "jn1b4zI+UUZAWynKAO2uHyGZHFs=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart", @@ -5142,8 +5142,8 @@ "Baden-Württemberg", "Deutschland" ], - "s": 131477394, - "sha1_base64": "cO+1pdR8I9hrkfp6yvV5I6imCyw=" + "s": 134462834, + "sha1_base64": "UtBgEr4l691kwGsPWzLKsgpay30=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen", @@ -5154,8 +5154,8 @@ "Baden-Württemberg", "Deutschland" ], - "s": 108328001, - "sha1_base64": "6yofVtTgL8KWZzf3xDs/mvxwYmI=" + "s": 109855369, + "sha1_base64": "Ez2MSbRW5mEZtdHSCAP65ngEkD4=" } ] }, @@ -5168,8 +5168,8 @@ "Berlin", "Deutschland" ], - "s": 92797953, - "sha1_base64": "C9g0cJxre1OQDmkoFvRfsPOYnZo=" + "s": 97755210, + "sha1_base64": "PT2V61Vit7PDJ0OwOAH+gatVGNk=" }, { "id": "Germany_Brandenburg_North", @@ -5180,8 +5180,8 @@ "Brandenburg", "Deutschland" ], - "s": 94249710, - "sha1_base64": "fL9SLb0Ng9Gtapb/jI12qtB/Ds0=" + "s": 97601910, + "sha1_base64": "5UWrqPGKHFtpD6ZoFOnXLvogaVw=" }, { "id": "Germany_Brandenburg_South", @@ -5192,8 +5192,8 @@ "Brandenburg", "Deutschland" ], - "s": 90713529, - "sha1_base64": "ZjvrTGibZYWmAN9XY43WPVUtHY0=" + "s": 93375897, + "sha1_base64": "nE9DH47lQHw+Y9hUOy1m10m1yRM=" }, { "id": "Germany_Free State of Bavaria", @@ -5207,8 +5207,8 @@ "Bayern", "Deutschland" ], - "s": 83338584, - "sha1_base64": "V2+kQhF+8N40s/aoIcK3IVPujAU=" + "s": 84643769, + "sha1_base64": "NtyxhDeyPt7xur633t/RQ9D6aLQ=" }, { "id": "Germany_Free State of Bavaria_Lower Franconia", @@ -5219,8 +5219,8 @@ "Bayern", "Deutschland" ], - "s": 93714064, - "sha1_base64": "WvflTsQmIfH00aS3sbIPpXFESdk=" + "s": 96651224, + "sha1_base64": "sYiBYjIiqqbxYuE74iwQ2FryUqo=" }, { "id": "Germany_Free State of Bavaria_Middle Franconia", @@ -5231,8 +5231,8 @@ "Bayern", "Deutschland" ], - "s": 82186829, - "sha1_base64": "gjAcNQxWJlB8D7ZlYTnIRsPBg6s=" + "s": 83387349, + "sha1_base64": "YTRenaRPDUhFb03+Vdye+LDEL3o=" }, { "id": "Germany_Free State of Bavaria_Swabia", @@ -5243,8 +5243,8 @@ "Bayern", "Deutschland" ], - "s": 115613602, - "sha1_base64": "GKF/HdnoleByTiTZoe4xhph9kRs=" + "s": 117222722, + "sha1_base64": "9fQXd6wpEr9x9kHjee0UfOuSEtw=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_East", @@ -5255,8 +5255,8 @@ "Bayern", "Deutschland" ], - "s": 81760119, - "sha1_base64": "ENVIWFhvUtzvWXQx5efnFGB0OdQ=" + "s": 82964875, + "sha1_base64": "svgTXhrz/FuUVBjzoTc3pLr7MJY=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt", @@ -5267,8 +5267,8 @@ "Bayern", "Deutschland" ], - "s": 38077715, - "sha1_base64": "abesYDad+dlHlSjItQIgPtCc+3I=" + "s": 38806737, + "sha1_base64": "tx4NZgnka/6dQTQg2/D6zXXuBpw=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen", @@ -5279,8 +5279,8 @@ "Bayern", "Deutschland" ], - "s": 68657220, - "sha1_base64": "vg/IpnDqBh93MK+33BSwM6HWwms=" + "s": 70933546, + "sha1_base64": "K9EZTuVDrGjS4KR7bJ/cen2vJ5s=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_South", @@ -5291,8 +5291,8 @@ "Bayern", "Deutschland" ], - "s": 35613385, - "sha1_base64": "dOH4jDxXWE4zEBUHU3OiCeo/G2g=" + "s": 36448596, + "sha1_base64": "jB8x9+rIrM0+1+Xsukh9NJDl8kI=" }, { "id": "Germany_Free State of Bavaria_Upper Franconia", @@ -5303,8 +5303,8 @@ "Bayern", "Deutschland" ], - "s": 79845972, - "sha1_base64": "hG+zdHvdon3Unmv+ct6AjdWXMOo=" + "s": 81541948, + "sha1_base64": "pOcbiAGpiYNmvNuT4z4bFXfIc/Q=" }, { "id": "Germany_Free State of Bavaria_Upper Palatinate", @@ -5315,8 +5315,8 @@ "Bayern", "Deutschland" ], - "s": 75927392, - "sha1_base64": "qlQNJtBisDbnq1mpc9ShnxaOzT0=" + "s": 77917064, + "sha1_base64": "13s+lrtW3GqTmInfWWDE54EwGzY=" } ] }, @@ -5329,8 +5329,8 @@ "Deutschland", "Hamburg" ], - "s": 43270905, - "sha1_base64": "e/Ky/wt+MFfGwwANNix2veCoe1I=" + "s": 47261290, + "sha1_base64": "6QI/tUw1NEdZVO1jVZ68hGnXDcs=" }, { "id": "Germany_Hesse", @@ -5344,8 +5344,8 @@ "Deutschland", "Hessen" ], - "s": 147670939, - "sha1_base64": "fvqvABp7iU3TpEaKzNm6lIAE/TM=" + "s": 150849019, + "sha1_base64": "Sodg7MtSZWZJxGKSMHsIlRfkYPw=" }, { "id": "Germany_Hesse_Regierungsbezirk Giessen", @@ -5356,8 +5356,8 @@ "Deutschland", "Hessen" ], - "s": 62634862, - "sha1_base64": "ArsenQSvR+oMP4c3DglfiEtOsnI=" + "s": 63468118, + "sha1_base64": "KyuFgsMXbG9OpSnYEux1jhSJsjs=" }, { "id": "Germany_Hesse_Regierungsbezirk Kassel", @@ -5368,8 +5368,8 @@ "Deutschland", "Hessen" ], - "s": 95739425, - "sha1_base64": "q52JHu1OiYgZXm8JOA4eRd3QPLk=" + "s": 97899441, + "sha1_base64": "1nv10FmrLrjQgpfxNxQ0Qv98HzI=" } ] }, @@ -5388,8 +5388,8 @@ "Hamburg", "Niedersachsen" ], - "s": 67878600, - "sha1_base64": "dlYO6jQQxvgTEGZXil7goQChKU0=" + "s": 69121640, + "sha1_base64": "ILeweWgE+JTnZOm/R/eGUEkxplg=" }, { "id": "Germany_Lower Saxony_Bremen_Munster", @@ -5400,8 +5400,8 @@ "Deutschland", "Niedersachsen" ], - "s": 73665967, - "sha1_base64": "5+XrdkVbxCJxq/ViCWMbRj/2y5A=" + "s": 74698759, + "sha1_base64": "HVhS39hG+2cXGE75sxknuG6u5ag=" }, { "id": "Germany_Lower Saxony_Hannover", @@ -5412,8 +5412,8 @@ "Deutschland", "Niedersachsen" ], - "s": 78130115, - "sha1_base64": "vt4NOQvrWutOGqK8NvkBysvDmXo=" + "s": 79952395, + "sha1_base64": "Wf2BLH/2jERTK/s5czCA3tCCSIU=" }, { "id": "Germany_Lower Saxony_Braunschweig", @@ -5424,8 +5424,8 @@ "Deutschland", "Niedersachsen" ], - "s": 82201406, - "sha1_base64": "7UCYhf8N1ZukZsG7mlLfT1Twosg=" + "s": 83732726, + "sha1_base64": "DRnYyQ/cDYJyWIadKnZt6zllBkE=" }, { "id": "Germany_Lower Saxony_Oldenburg", @@ -5437,8 +5437,8 @@ "Deutschland", "Niedersachsen" ], - "s": 131111906, - "sha1_base64": "iWVioJSAZPMBrbC09S2QvRWEPVk=" + "s": 132935354, + "sha1_base64": "h601dPdsvL50S6eCzaNbbNYTQQY=" } ] }, @@ -5451,8 +5451,8 @@ "Deutschland", "Mecklenburg-Vorpommern" ], - "s": 120671934, - "sha1_base64": "ilHgyAWfqwCS5i8nIfpdSJ5G5dg=" + "s": 123287078, + "sha1_base64": "gOtOAb/dMmL8kTeGhfEfprMdUnM=" }, { "id": "Germany_North Rhine-Westphalia", @@ -5466,8 +5466,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 67266071, - "sha1_base64": "gebHxv2pgSP+TuCXuOROHLZ878Y=" + "s": 68149335, + "sha1_base64": "2Fs23/H9BrEn1Hra/hCxhKWGabc=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund", @@ -5478,8 +5478,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 95823428, - "sha1_base64": "yR0F8adcO75aL9aJQhwaMNQ2mIg=" + "s": 97199068, + "sha1_base64": "zreXuI+fK4TkiT9C8Xc3jQBJ8cg=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold", @@ -5490,8 +5490,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 112151399, - "sha1_base64": "qF8hwLeip2H8T48K0GgVYydGeq8=" + "s": 114074880, + "sha1_base64": "+BLV5MGj1DYNELNRgffsdcy2YX4=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf", @@ -5502,8 +5502,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 85200652, - "sha1_base64": "g5J+w0cYYSbVSPi/v9ACLv0dcj0=" + "s": 86714100, + "sha1_base64": "eTFScFpKeTLectL7Pg6bUaTTB9o=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim", @@ -5514,8 +5514,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 68308238, - "sha1_base64": "XOUoarppGCZcI217hdMP+NE4PRA=" + "s": 69696366, + "sha1_base64": "gQzn0AQ6BaPPicCH2I8hBcqVbfM=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel", @@ -5526,8 +5526,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 23507552, - "sha1_base64": "aiRzuiJvtqDfDNgUeniNfX38v3c=" + "s": 24063024, + "sha1_base64": "gn53Hjaz6JvJ+Jkrv7KiH4KxAhM=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", @@ -5539,8 +5539,8 @@ "Deutschland - Belgique / België / Belgien", "Nordrhein-Westfalen" ], - "s": 85910935, - "sha1_base64": "Y7SzIQnT13KzdF8JAnvFB1/aRFM=" + "s": 87272679, + "sha1_base64": "kgQ9eCm/1i4ZCbI79wtYzhTIE6U=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln", @@ -5551,8 +5551,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 107506366, - "sha1_base64": "mLnXgCu5tvdnHQhsWGQOzh4kFMk=" + "s": 109366878, + "sha1_base64": "xHuFXqb6CrAja9VGMpLFYGwn2kE=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster", @@ -5563,8 +5563,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 56851189, - "sha1_base64": "UpZLc3EDux0k6DsbuG0URnswCD4=" + "s": 57393045, + "sha1_base64": "vfqySLQNwaLBDOQhHbngCK1HyYo=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen", @@ -5575,8 +5575,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 62175283, - "sha1_base64": "sPte/OV1XofKQ8KCWept+ciMnGo=" + "s": 62880403, + "sha1_base64": "2YBV8LjZdKRhtMdQoeAsZMY8Hes=" } ] }, @@ -5589,8 +5589,8 @@ "Deutschland", "Rheinland-Pfalz" ], - "s": 132289635, - "sha1_base64": "vQtqVQcYq/BfzTGPvX83iBkClcU=" + "s": 135504931, + "sha1_base64": "NTo1dvBSaVToBdiHcSGzzw3zUz4=" }, { "id": "Germany_Rhineland-Palatinate_South", @@ -5601,8 +5601,8 @@ "Deutschland", "Rheinland-Pfalz" ], - "s": 110730736, - "sha1_base64": "VDsqw2tRCOT7r8zbRJK5XSTfzKQ=" + "s": 113239264, + "sha1_base64": "iJU+lfrl+lwj7Ku/8Dcdj6U6lLA=" }, { "id": "Germany_Saarland", @@ -5613,8 +5613,8 @@ "Deutschland", "Saarland" ], - "s": 47533021, - "sha1_base64": "+t6RGTzxwXbYT7goAZM+8x891tk=" + "s": 47996662, + "sha1_base64": "SrW3UzbmVdwBRIlYrYpRPt70LSM=" }, { "id": "Germany_Saxony-Anhalt_Magdeburg", @@ -5625,8 +5625,8 @@ "Deutschland", "Sachsen-Anhalt" ], - "s": 78313080, - "sha1_base64": "oVcu4nQ/U1nKgXt0yMD+zoGSRHo=" + "s": 80898224, + "sha1_base64": "UhB4OPL0GBZc7iIhsieucDDSrRo=" }, { "id": "Germany_Saxony-Anhalt_Halle", @@ -5637,8 +5637,8 @@ "Deutschland", "Sachsen-Anhalt" ], - "s": 70820416, - "sha1_base64": "0wHvVK8OBmMymZb1HcXLm1zvDM4=" + "s": 72122152, + "sha1_base64": "4/eN6OSx+92h7oOIPWnfLgwk3lg=" }, { "id": "Germany_Saxony_Dresden", @@ -5649,8 +5649,8 @@ "Deutschland", "Sachsen" ], - "s": 88298251, - "sha1_base64": "iG/TSX2cYZwOSfWXNKWY+0B5RuI=" + "s": 90220259, + "sha1_base64": "JXH19kRFTCITI7fMS3LrvlE7Ol0=" }, { "id": "Germany_Saxony_Leipzig", @@ -5661,8 +5661,8 @@ "Deutschland", "Sachsen" ], - "s": 144768661, - "sha1_base64": "5WoAfaREi8Sl5gZss/vZF2XbpgI=" + "s": 147622717, + "sha1_base64": "XfNOChE4XpVSBOWYGKbUVlKTRQA=" }, { "id": "Germany_Schleswig-Holstein_Kiel", @@ -5674,8 +5674,8 @@ "Deutschland", "Schleswig-Holstein" ], - "s": 72477344, - "sha1_base64": "I8v+GESJWEjNox+R4m+ERcp3Ia0=" + "s": 73535064, + "sha1_base64": "buSGpHJ22xyZ9ImcbJJ3OfkM40I=" }, { "id": "Germany_Schleswig-Holstein_Flensburg", @@ -5686,8 +5686,8 @@ "Deutschland", "Schleswig-Holstein" ], - "s": 66966085, - "sha1_base64": "GUrXKCWMVkv6LACCPV4GyXzkd/Y=" + "s": 67517229, + "sha1_base64": "j9/nkthEV9AnvXyQDS7lD/mpKKM=" }, { "id": "Germany_Thuringia", @@ -5698,8 +5698,8 @@ "Deutschland", "Thüringen" ], - "s": 154495015, - "sha1_base64": "+qIl4ChzlP03tm5zWT3SiiLfqdo=" + "s": 157183679, + "sha1_base64": "QaMeswfXI/gXzjpfl+Q54tkatwA=" } ] }, @@ -5721,8 +5721,8 @@ "Volta Region", "Western Region" ], - "s": 101648101, - "sha1_base64": "UToULdru5HG3qwufXPx3xkwoJME=" + "s": 102623357, + "sha1_base64": "VzdQOV74nIvdTmsAMTomnFFk3og=" }, { "id": "Gibraltar", @@ -5734,8 +5734,8 @@ "España", "Gibraltar" ], - "s": 974709, - "sha1_base64": "08WXjZeQQUVG4dB9xPCRTpz8Jvg=" + "s": 1004757, + "sha1_base64": "TRTnxLJJ5GXysgxJhx3lEVFEJJE=" }, { "id": "Greece", @@ -5750,8 +5750,8 @@ "Territorial waters of Greece - Gavdos and Gavdopoula", "Αποκεντρωμένη Διοίκηση Κρήτης" ], - "s": 26883622, - "sha1_base64": "FbFZ09dwdsV9dRmsqNLSga9mpDs=" + "s": 27044374, + "sha1_base64": "C9fF8qB8t7JgcNWiOhQEDm6PNVY=" }, { "id": "Greece_Decentralized Administration of West Greece", @@ -5764,8 +5764,8 @@ "Shqipëria", "Αποκεντρωμένη Διοίκηση Πελοποννήσου, Δυτικής Ελλάδας και Ιονίου" ], - "s": 76971193, - "sha1_base64": "Lranu8H8SbGT3AyXHVpTX0NCvqQ=" + "s": 77872065, + "sha1_base64": "wHXRArUvf2+hck7s3q4TtP/Dnnw=" }, { "id": "Greece_Decentralized Administration of Aegean", @@ -5776,8 +5776,8 @@ "Ελλάδα", "Αποκεντρωμένη Διοίκηση Αιγαίου" ], - "s": 34094112, - "sha1_base64": "UwOU5PfGVW+s9KSVRgRlYl6tTLs=" + "s": 34730448, + "sha1_base64": "U9i4f1CW1TFtLKmtJGGmsu4y6so=" }, { "id": "Greece_Decentralized Administration of Epirus - Western Macedonia", @@ -5788,8 +5788,8 @@ "Ελλάδα", "Αποκεντρωμένη Διοίκηση Ηπείρου - Δυτικής Μακεδονίας" ], - "s": 35964313, - "sha1_base64": "OxK0VgwwUnGwRMtLLZ4uKvrTWAY=" + "s": 36075129, + "sha1_base64": "H6WgULEx2EGk4UtZ/WFYtfj5ofQ=" }, { "id": "Greece_Decentralized Administration of Macedonia and Thrace", @@ -5800,8 +5800,8 @@ "Ελλάδα", "Αποκεντρωμένη Διοίκηση Μακεδονίας - Θράκης" ], - "s": 73784150, - "sha1_base64": "s3QmCOIrGerU55P7xaRiWOzqdUI=" + "s": 74097966, + "sha1_base64": "/4W7ZaPt5kcqlTGgUISS11zBSC8=" }, { "id": "Greece_Decentralized Administration of Thessaly - Central Greece", @@ -5813,8 +5813,8 @@ "Αποκεντρωμένη Διοίκηση Αττικής", "Αποκεντρωμένη Διοίκηση Θεσσαλίας - Στερεάς Ελλάδας" ], - "s": 61829710, - "sha1_base64": "ddvoDbFEnJ3+kJ8da3uMji5knk8=" + "s": 62181182, + "sha1_base64": "5qOv6iirN2R/x8oo0WjkZhD6SN0=" }, { "id": "Greece_Decentralized Administration of Attica", @@ -5825,8 +5825,8 @@ "Ελλάδα", "Αποκεντρωμένη Διοίκηση Αττικής" ], - "s": 49004236, - "sha1_base64": "0nIOOTRo1tOURatamFBSTP2jP5s=" + "s": 49765852, + "sha1_base64": "74bqgP/9JY/8CUw36DiZIG9f0qw=" } ] }, @@ -5838,8 +5838,8 @@ "affiliations": [ "Kalaallit Nunaat" ], - "s": 50305605, - "sha1_base64": "jfCcO1FY10qwZ4RxAbGDik0bYAY=" + "s": 53764077, + "sha1_base64": "Nm7YhKxDGH8g4/d8iT2JHV5Hick=" }, { "id": "Guatemala", @@ -5871,8 +5871,8 @@ "Totonicapán", "Zacapa" ], - "s": 162847273, - "sha1_base64": "OFZYBkIbNxsiGK6WtEVXVtdBSLY=" + "s": 163180193, + "sha1_base64": "/LTPTETkpDIpINk9J7AEz26ywaI=" }, { "id": "Guernsey", @@ -5905,8 +5905,8 @@ "Selle Rocque", "Sark" ], - "s": 2174612, - "sha1_base64": "qfHTTefkV8nep2g7sWMfiyHr/Rk=" + "s": 2191444, + "sha1_base64": "C4cpn/xQDHvIEnjhqlabhiW9Qn4=" }, { "id": "Guinea", @@ -5924,8 +5924,8 @@ "Région de Mamou", "Région de Nzérékoré" ], - "s": 99386217, - "sha1_base64": "gQo/t3Z3dTzCZKVE7rcjXVEl1KU=" + "s": 99573577, + "sha1_base64": "ai4jDlqcVCrsrUNJk3OhAgwv4ac=" }, { "id": "Guinea-Bissau", @@ -5943,8 +5943,8 @@ "Região de Quinara", "Região de Tombali" ], - "s": 18798425, - "sha1_base64": "PzFypbOrTcwqKb0KZFd4ztug9FU=" + "s": 18844113, + "sha1_base64": "N7uffzuFw6vof06tbFl++ex1O4Y=" }, { "id": "Guyana", @@ -5954,8 +5954,8 @@ "affiliations": [ "Guyana" ], - "s": 27478618, - "sha1_base64": "iLdxEdaErkdx0uUU4afaSlZ/u7Y=" + "s": 27666546, + "sha1_base64": "WHWfENfpbWCpmrtthANHw2BE2xE=" }, { "id": "Haiti", @@ -5975,8 +5975,8 @@ "Département du Sud", "Département du Sud-Est" ], - "s": 58781431, - "sha1_base64": "y4c/nK25cr293Z6/ITKNErhFI1k=" + "s": 59151791, + "sha1_base64": "Fn8e/KHvFDt6ay93dZBQ7FdzcBc=" }, { "id": "Honduras", @@ -6005,8 +6005,8 @@ "Valle", "Yoro" ], - "s": 78689188, - "sha1_base64": "yyb/XlEVSx+9/RijI3h9aLErEMI=" + "s": 78923132, + "sha1_base64": "+tD/betTVd3pgEgY62s7IoV1t1k=" }, { "id": "Hungary", @@ -6020,8 +6020,8 @@ "Alföld és Észak", "Magyarország" ], - "s": 137311116, - "sha1_base64": "HveP0akf4uFNhoagHNZ5jois41Y=" + "s": 138648260, + "sha1_base64": "9mm6pwswlxJRD0hq0Z7JPMSe43s=" }, { "id": "Hungary_Transdanubia", @@ -6032,8 +6032,8 @@ "Dunántúl", "Magyarország" ], - "s": 126042853, - "sha1_base64": "ZYXS3EaLNT/ORcdRqhiNFN9inoo=" + "s": 127164357, + "sha1_base64": "JtuWJWFsUYpYavBjgusUy96i3pk=" }, { "id": "Hungary_Kozep-Magyarorszag", @@ -6044,8 +6044,8 @@ "Közép-Magyarország", "Magyarország" ], - "s": 70616790, - "sha1_base64": "Zj/BeMmexdtF0hKw18/D3QPTgM0=" + "s": 71787734, + "sha1_base64": "bma6YDMCqiibJtfdqqjb/YEiE+Y=" } ] }, @@ -6057,8 +6057,8 @@ "affiliations": [ "Ísland" ], - "s": 111436040, - "sha1_base64": "Qp94qo9X6EZrUBm58Hropj+VM74=" + "s": 113263896, + "sha1_base64": "lFg6xU3WjFM+q2NSE7azYeyJ/ak=" }, { "id": "India", @@ -6072,8 +6072,8 @@ "Andaman and Nicobar Islands", "India" ], - "s": 9670191, - "sha1_base64": "s5XdbJhEDAHOEJMHxNAb0qx6c0k=" + "s": 9679303, + "sha1_base64": "Gc/2R0URENAAnAp0NTG9g1imMHI=" }, { "id": "India_Lakshadweep", @@ -6084,8 +6084,8 @@ "India", "Lakshadweep" ], - "s": 351358, - "sha1_base64": "DJCZ6t+tIVIQcc6HYpZkqKf9Vwg=" + "s": 353558, + "sha1_base64": "ZO0ZQgpJzwYXrEJshxBKdwLaTsI=" }, { "id": "India_Andhra Pradesh", @@ -6097,8 +6097,8 @@ "India", "Puducherry" ], - "s": 107858102, - "sha1_base64": "9HEqbfPMFRDGycv+EVPM0kILL2c=" + "s": 108999598, + "sha1_base64": "WvN579Ngaw/Xc4Z/tc9aKG9BzE8=" }, { "id": "India_Gujarat", @@ -6111,8 +6111,8 @@ "Union Territory of Dadra & Nagar Haveli", "Union Territory of Damman & Diu" ], - "s": 88027492, - "sha1_base64": "GDqJDPsJD0QcwaBaB0pMowq8pL4=" + "s": 88385804, + "sha1_base64": "ISiiFZlP+IWnRwfkagNcQReoP4Y=" }, { "id": "India_Kerala", @@ -6123,8 +6123,8 @@ "India", "Kerala" ], - "s": 151273007, - "sha1_base64": "S0L4dy3kCdG+b9MHq6cArAfj4x4=" + "s": 151778551, + "sha1_base64": "u3rcNIOSelSZ76WQxDAGyh9ER9E=" }, { "id": "India_Madhya Pradesh", @@ -6135,8 +6135,8 @@ "India", "Madhya Pradesh" ], - "s": 131624847, - "sha1_base64": "b4pBOXlhFUqRODt/SIaH55s5+x0=" + "s": 132069567, + "sha1_base64": "nNDEEQUuZ1GRHXDPjEschsDIvbc=" }, { "id": "India_Rajasthan", @@ -6147,8 +6147,8 @@ "India", "Rajasthan" ], - "s": 127499590, - "sha1_base64": "BAcBQ0/+tuqSxul7uTxqb8oBW4I=" + "s": 128023214, + "sha1_base64": "1ClL/uHNLPm4q0+CPaeSpEM0bvc=" }, { "id": "India_Tamil Nadu", @@ -6165,8 +6165,8 @@ "Sorapattu", "Tamil Nadu" ], - "s": 133399120, - "sha1_base64": "+/qdQLjpTZHIb421TEXqyIQJ9ec=" + "s": 134143448, + "sha1_base64": "F/WkAnuxcv1p0+92Fr1z0P4rR1U=" }, { "id": "India_Haryana", @@ -6177,8 +6177,8 @@ "Haryana", "India" ], - "s": 55792320, - "sha1_base64": "3vqXdX5LB2HfQqmG8MGAd+D8ca4=" + "s": 56084600, + "sha1_base64": "RgkGtQErjlxihO6ykWn4ZVWr54Y=" }, { "id": "India_Goa", @@ -6189,8 +6189,8 @@ "Goa", "India" ], - "s": 9372217, - "sha1_base64": "WTTEh8Y79bYt2nISF4mfjFxcsDk=" + "s": 9471649, + "sha1_base64": "9eoSn9JfbMMjsIr6DJ4XQyPWan0=" }, { "id": "India_Karnataka_North", @@ -6201,8 +6201,8 @@ "India", "Karnataka" ], - "s": 62617842, - "sha1_base64": "Psox6DkADXu7SiYU9YmQZZsj24k=" + "s": 63071106, + "sha1_base64": "IMsoQuztWUR5z+Y6s1sGo5Cq20A=" }, { "id": "India_Karnataka_South", @@ -6213,8 +6213,8 @@ "India", "Karnataka" ], - "s": 70127068, - "sha1_base64": "h7ziKHXr4nv6ONXI1I0zAOMX8Yo=" + "s": 70699300, + "sha1_base64": "NbQpEnkbGOuWwsVwZypyklboha8=" }, { "id": "India_Maharashtra", @@ -6230,8 +6230,8 @@ "Maharashtra", "Rangadhampetha" ], - "s": 146335427, - "sha1_base64": "68nFsRC3TSONE8r6UYgzR3IzO6M=" + "s": 148970779, + "sha1_base64": "3pKIHk0/lk2UdaNhgqyG8wsHE/0=" }, { "id": "India_Telangana", @@ -6242,8 +6242,8 @@ "India", "Telangana" ], - "s": 95652796, - "sha1_base64": "0ichz++ycdXoFlLPbVTdEPqWeTc=" + "s": 95965868, + "sha1_base64": "gF5cS0g8M/VLimWXK9F+uzHTerk=" }, { "id": "India_Delhi", @@ -6254,8 +6254,8 @@ "Delhi", "India" ], - "s": 21701415, - "sha1_base64": "e5l0tmmCWKQ1Uaj7A8aBgarq05g=" + "s": 22181831, + "sha1_base64": "N5k56xO2frHFpAeapjZLj9WfZ1I=" }, { "id": "India_Uttar Pradesh", @@ -6266,8 +6266,8 @@ "Uttar Pradesh", "India" ], - "s": 194921013, - "sha1_base64": "ChSYp3cBECUBoLTY1HdG1jf48DA=" + "s": 195740205, + "sha1_base64": "po2Se9+6rTwzezX81LuD0P8GukM=" }, { "id": "India_Odisha", @@ -6278,8 +6278,8 @@ "India", "Odisha" ], - "s": 53496614, - "sha1_base64": "QWEXwgf8Cj8oDO+z36+ShT3KsJQ=" + "s": 53664942, + "sha1_base64": "fZPACyczsgYga1sYOjOLatu9k5I=" }, { "id": "India_Chhattisgarh", @@ -6290,8 +6290,8 @@ "Chhattisgarh", "India" ], - "s": 44074725, - "sha1_base64": "mFUwetLlrOw+m5Vd+lWpS2t/Zkk=" + "s": 44196197, + "sha1_base64": "yvbob16ntBd6tqsSa/VAy74ElHA=" }, { "id": "India_Jharkhand", @@ -6302,8 +6302,8 @@ "Jharkhand", "India" ], - "s": 38914206, - "sha1_base64": "Qseaojmp0HLSoUIvuEP85dInA/c=" + "s": 39102990, + "sha1_base64": "yCdzRlbygf9TCXfL7HCfWOm1IR4=" }, { "id": "India_Bihar", @@ -6314,8 +6314,8 @@ "Bihar", "India" ], - "s": 74217689, - "sha1_base64": "EprLaHMNJL3P8iq7skvaKu+gQxU=" + "s": 74495745, + "sha1_base64": "dGYBWjWahgblLbW6wPk5hxGjnqY=" }, { "id": "India_Tripura", @@ -6326,8 +6326,8 @@ "India", "Tripura" ], - "s": 14345063, - "sha1_base64": "N3oozv1VGqfim/fv79+dsqHHesU=" + "s": 14353863, + "sha1_base64": "mItqTvG0oL613otDiIbywLOMmAI=" }, { "id": "India_West Bengal", @@ -6340,8 +6340,8 @@ "India", "West Bengal" ], - "s": 106853935, - "sha1_base64": "7OQWNaW3NOPHSbt/qK6YCQs5L5c=" + "s": 107521943, + "sha1_base64": "GtUfY8nsfI1qcGEh77EU9u21HgI=" }, { "id": "India_Sikkim", @@ -6352,8 +6352,8 @@ "India", "Sikkim" ], - "s": 12108234, - "sha1_base64": "PbVfl/sLVNpBCR3d/JKzVOu7+fM=" + "s": 12121010, + "sha1_base64": "A9vYQn4yHV/XLZKO45kullb8k14=" }, { "id": "India_Uttarakhand", @@ -6364,8 +6364,8 @@ "Uttarakhand", "India" ], - "s": 40463838, - "sha1_base64": "ig0IG4ISqLqc1HuTYTkONdNj4bA=" + "s": 40599270, + "sha1_base64": "RN6y7Hj3V6o+ngTEfJQLbt4cTW0=" }, { "id": "India_Mizoram", @@ -6376,8 +6376,8 @@ "India", "Mizoram" ], - "s": 19460995, - "sha1_base64": "XyBJ7/AZs5osmf3+qq4uyJHZR7g=" + "s": 19570291, + "sha1_base64": "Gf1kW/Xzc1sjFpvxm+Q0nb3Ypv4=" }, { "id": "India_Meghalaya", @@ -6388,8 +6388,8 @@ "India", "Meghalaya" ], - "s": 14600636, - "sha1_base64": "bxIELubirL+SnxvdRChjE+z6jCo=" + "s": 14619276, + "sha1_base64": "Da/U+p0Zs/U/5BA4RhPQcRZwW5U=" }, { "id": "India_Manipur", @@ -6400,8 +6400,8 @@ "India", "Manipur" ], - "s": 17996803, - "sha1_base64": "Lbzk69AOTHcYNTwN1iEEs5zukcw=" + "s": 18060611, + "sha1_base64": "Rh31TA7B+OFs6T6YniHyXBqS7H0=" }, { "id": "India_Nagaland", @@ -6412,8 +6412,8 @@ "India", "Nagaland" ], - "s": 14564733, - "sha1_base64": "b45ueLWgZwwx5H/srvKNnpLtlZE=" + "s": 14598781, + "sha1_base64": "BUDMDVAv5XQBez3qTr4yYEJhB9w=" }, { "id": "India_Assam", @@ -6424,8 +6424,8 @@ "Assam", "India" ], - "s": 58635566, - "sha1_base64": "kRovrlARVt8YNb2etc/tbVreK6I=" + "s": 59153430, + "sha1_base64": "YlOVToG1J/ueVCDXphqARhGxJ3E=" }, { "id": "India_Arunachal Pradesh", @@ -6436,8 +6436,8 @@ "Arunachal Pradesh", "India" ], - "s": 19268816, - "sha1_base64": "qqD6U7quOUFNIL5+3XdOph6KL10=" + "s": 19312080, + "sha1_base64": "Uuw9gkeqGkNpKpo+mhi2wOBNEfw=" }, { "id": "India_Himachal Pradesh", @@ -6448,8 +6448,8 @@ "Himachal Pradesh", "India" ], - "s": 35318888, - "sha1_base64": "dO17PWPHnW3dtyAXKEoyjQ1zdQQ=" + "s": 35376320, + "sha1_base64": "hwn7rueN9vTiG03qjYFZB25EOXI=" }, { "id": "India_Jammu and Kashmir", @@ -6460,8 +6460,8 @@ "India", "Jammu and Kashmir" ], - "s": 48304013, - "sha1_base64": "v3eR6Sp3uORxR9uYeuBGTEMHrLE=" + "s": 48380013, + "sha1_base64": "59awPF3yXQf2qbn6JHb5PoMvbJo=" }, { "id": "India_Chandigarh", @@ -6472,8 +6472,8 @@ "India", "Union Territory of Chandīgarh" ], - "s": 1406433, - "sha1_base64": "SEkRqVRXiO1Qsg3Uew0VKOyFAzs=" + "s": 1412649, + "sha1_base64": "h93LuAVcYb8zYlfFd6ouWqKhzyI=" }, { "id": "India_Punjab", @@ -6484,8 +6484,8 @@ "India", "Punjab" ], - "s": 52836568, - "sha1_base64": "hWnRMoSRsBKlGEw0dOwUlTvx+i4=" + "s": 53042736, + "sha1_base64": "ALjiq2ZWapY+mfImlMQX8a2WRCw=" } ] }, @@ -6511,8 +6511,8 @@ "Sulawesi Tengah", "Sulawesi Utara" ], - "s": 338694371, - "sha1_base64": "GQexghR8eQ5KxBN/XQDD1iVJr4o=" + "s": 339074371, + "sha1_base64": "p9sDuYqub7OwYvczJKloYqS2uHY=" }, { "id": "Indonesia_West", @@ -6534,8 +6534,8 @@ "Sumatera Selatan", "Sumatera Utara" ], - "s": 269348115, - "sha1_base64": "PiIP5su87c1NueZuqxy9ixaiMZI=" + "s": 269971349, + "sha1_base64": "XiOY9vxNDm8ZBYYFmjh3NL2FHYA=" }, { "id": "Indonesia_Jawa Tengah", @@ -6547,8 +6547,8 @@ "Indonesia", "Jawa Tengah" ], - "s": 243772943, - "sha1_base64": "53sIvlpj82A7dZxh48VZ2mmNceg=" + "s": 244195376, + "sha1_base64": "SK18ialWkGKZL32oDGGz2xq3JUI=" }, { "id": "Indonesia_Jawa Barat", @@ -6561,8 +6561,8 @@ "Indonesia", "Jawa Barat" ], - "s": 376608179, - "sha1_base64": "Kqb3Lt6jB3wYQ0oa+ewxj6b1a0U=" + "s": 379126507, + "sha1_base64": "WTIq36QFDBPX3P+QtWi5i+9zI8s=" }, { "id": "Indonesia_Nusa Tenggara", @@ -6577,8 +6577,8 @@ "Nusa Tenggara Barat", "Nusa Tenggara Timur" ], - "s": 167243476, - "sha1_base64": "WKKGuaUsmt6MKV7i7gbMmXSRHNM=" + "s": 167916100, + "sha1_base64": "7f3G1zeHoS8WZEDwyD27QLFMEhc=" }, { "id": "Indonesia_Jawa Timur", @@ -6589,8 +6589,8 @@ "Indonesia", "Jawa Timur" ], - "s": 221843320, - "sha1_base64": "jaEO6ll4E2zr2uABesq7iFiIJgM=" + "s": 222379880, + "sha1_base64": "cD7HMeD1NJVjAPhq0k63CX0DR/0=" }, { "id": "Indonesia_East", @@ -6604,8 +6604,8 @@ "Papua Barat", "Papua" ], - "s": 79081632, - "sha1_base64": "PvQa0rncfzKqEUPJO/ysUh+PnVc=" + "s": 79737336, + "sha1_base64": "blOwb3Pi3JTu+nRuusPZC1FE/RA=" } ] }, @@ -6626,8 +6626,8 @@ "خراسان شمالی‎", "جمهوری اسلامی‏ايران‎" ], - "s": 103410277, - "sha1_base64": "WqAPkOVFqVPZ6+7R86Dbu3++tVQ=" + "s": 104056974, + "sha1_base64": "ZpUYwK6z3ZqA/ecyetD+wlATIb4=" }, { "id": "Iran_South", @@ -6650,8 +6650,8 @@ "کرمانشاه‎", "‏هرمزگان‎" ], - "s": 154126209, - "sha1_base64": "0QAUw7p+QOAWCuB9A2W9nqlzKzM=" + "s": 157322016, + "sha1_base64": "lduRBIAvC+YIxjlEawubclqLr94=" }, { "id": "Iran_North", @@ -6675,8 +6675,8 @@ "کرمانشاه‎", "آذربایجان شرقی" ], - "s": 145117465, - "sha1_base64": "Mb0mYubt5K1MZdgmoOXX5SqFvQg=" + "s": 146034058, + "sha1_base64": "ioILNl4l4MBMQaLabQf3Uw1+OXY=" } ] }, @@ -6701,8 +6701,8 @@ "الأنبار", "السليمانية" ], - "s": 74601181, - "sha1_base64": "PdgonzVW/nrZaHBXejluWVPPYEU=" + "s": 75489661, + "sha1_base64": "SYJZ/DkaSuWpGQy+AmCMxGs9xXk=" }, { "id": "Iraq_South", @@ -6725,8 +6725,8 @@ "الأنبار", "القادسية" ], - "s": 60362660, - "sha1_base64": "KQl8QHAVpLBKiCucXbku5o0teng=" + "s": 62963084, + "sha1_base64": "2ixVUzVnd/usieyL9e2KZgCw76o=" } ] }, @@ -6740,8 +6740,8 @@ "Scotland", "United Kingdom" ], - "s": 6139801, - "sha1_base64": "Ap/mMJSUncXp9OgGDTsRlLvrUe8=" + "s": 6210162, + "sha1_base64": "/uA0hw34mDWmvh9PZdCuCqsb8Ts=" }, { "id": "Israel Region", @@ -6756,8 +6756,8 @@ "מחוז ירושלים", "מדינת ישראל" ], - "s": 10104945, - "sha1_base64": "gZMnoNrNQoduyk1Brx2rY0AW7hk=" + "s": 10235609, + "sha1_base64": "wAK/Du3WEId3sIdLjas6RZqMD6o=" }, { "id": "Israel", @@ -6774,8 +6774,8 @@ "מחוז ירושלים", "מדינת ישראל" ], - "s": 106665200, - "sha1_base64": "oNBdbdC3wkkTFOGmQ0pEG6ZPyyo=" + "s": 107866352, + "sha1_base64": "H1TGpww473JW6ebqMLp/vrTXP3E=" } ] }, @@ -6791,8 +6791,8 @@ "Abruzzo", "Italia" ], - "s": 90587887, - "sha1_base64": "E7QhAYfZaMUm669maBeDauEjUU8=" + "s": 101050927, + "sha1_base64": "j03HbEKroLoQDprlMkqXTYVj5g4=" }, { "id": "Italy_Aosta Valley", @@ -6803,8 +6803,8 @@ "Italia", "Valle d'Aosta/Vallée d'Aoste" ], - "s": 23002294, - "sha1_base64": "fCz3HNr84XkXivOak422KPv1r10=" + "s": 23358758, + "sha1_base64": "HAsi0wiFA1WcnGpQbX+sYc5bd5Y=" }, { "id": "Italy_Apulia", @@ -6820,8 +6820,8 @@ "Italia", "Puglia" ], - "s": 111428640, - "sha1_base64": "QsGOAvMiPebWeb3JU0zUBNr4IV0=" + "s": 113140313, + "sha1_base64": "jcnk8Wyq7qK6fkNYy3Lnn2DP8XQ=" }, { "id": "Italy_Basilicata", @@ -6832,8 +6832,8 @@ "Basilicata", "Italia" ], - "s": 40604135, - "sha1_base64": "XVqM69UdllxiINWv967JtGnUHoc=" + "s": 41126767, + "sha1_base64": "NQ7t7oMHyb+OyZo5gR24eQCFZsY=" }, { "id": "Italy_Calabria", @@ -6846,8 +6846,8 @@ "Isola di Dino", "Italia" ], - "s": 49852011, - "sha1_base64": "NupAoE14DLcgvBwtnxrjCkyGIpo=" + "s": 50660603, + "sha1_base64": "RbdxvAXC+iYWEY5zV0K9dXVtnN8=" }, { "id": "Italy_Campania", @@ -6864,8 +6864,8 @@ "La Castelluccia", "Scoglio Rovigliano" ], - "s": 89036048, - "sha1_base64": "ZBp4pKE8eDcjDNxgunDfPB2stXE=" + "s": 89850960, + "sha1_base64": "MqVjIc+5Q63Moqkf3jIdsrX8iRU=" }, { "id": "Italy_Emilia", @@ -6879,8 +6879,8 @@ "Emilia-Romagna", "Italia" ], - "s": 37958282, - "sha1_base64": "wmzfqiueTs+MWUSsGyXmT79e+oo=" + "s": 39718867, + "sha1_base64": "gnGGwAnP/kqp5O3ofvnx3UY/bE8=" }, { "id": "Italy_Emilia-Romagna_Ferrara", @@ -6891,8 +6891,8 @@ "Emilia-Romagna", "Italia" ], - "s": 16411806, - "sha1_base64": "aJlPz8kR4S1I7CcsGgNspzHbEl0=" + "s": 17343478, + "sha1_base64": "VZAJzi4IoZbyriBZqHFh+nnmzZs=" }, { "id": "Italy_Emilia-Romagna_Forli-Cesena", @@ -6903,8 +6903,8 @@ "Emilia-Romagna", "Italia" ], - "s": 21535272, - "sha1_base64": "pp5ut+RdpxdGvuCSUKQ6wbR4Yek=" + "s": 21591528, + "sha1_base64": "s7JmyWVkIWzEUrOcDyFmfGM8cPk=" }, { "id": "Italy_Emilia-Romagna_Modena", @@ -6915,8 +6915,8 @@ "Emilia-Romagna", "Italia" ], - "s": 28904040, - "sha1_base64": "8BIuK4FgXSK3zvKntwB1nj7ZMNg=" + "s": 29083152, + "sha1_base64": "UdKQuhHuHVjCQr2grcgKZX819g8=" }, { "id": "Italy_Emilia-Romagna_Parma", @@ -6927,8 +6927,8 @@ "Emilia-Romagna", "Italia" ], - "s": 24685023, - "sha1_base64": "EjvqCpg4OziPxDovb7KJZ838p1M=" + "s": 24857591, + "sha1_base64": "8iTZjetYSttVVMXnClyIIFVcF90=" }, { "id": "Italy_Emilia-Romagna_Piacenza", @@ -6939,8 +6939,8 @@ "Emilia-Romagna", "Italia" ], - "s": 15198134, - "sha1_base64": "+JouSA3TWRVTOJyniNjlukgZamA=" + "s": 15344174, + "sha1_base64": "tBG1/VdWG01/UD56ikO7ZpVUcks=" }, { "id": "Italy_Emilia-Romagna_Ravenna", @@ -6951,8 +6951,8 @@ "Emilia-Romagna", "Italia" ], - "s": 18311734, - "sha1_base64": "XQryTieN7nS6NOU3HQy4IbQOH10=" + "s": 18641783, + "sha1_base64": "VrZUJOxRmzG0trbmX1I3TJRBmP8=" }, { "id": "Italy_Emilia-Romagna_Reggio Emilia", @@ -6963,8 +6963,8 @@ "Emilia-Romagna", "Italia" ], - "s": 22289663, - "sha1_base64": "8W/5lAAbwZLZIN3q0a6Nm/+AOV8=" + "s": 22624063, + "sha1_base64": "d9dbmbjpY6tEBKL8dZKcb4LhA3o=" }, { "id": "Italy_Emilia-Romagna_Rimini", @@ -6975,8 +6975,8 @@ "Emilia-Romagna", "Italia" ], - "s": 11670844, - "sha1_base64": "OgPdzQUDcnE5qpWW5I1/Kjn7oc8=" + "s": 11746556, + "sha1_base64": "XqqaR5GBsaooGvHsAnnRnIxsyMw=" } ] }, @@ -6992,8 +6992,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 7941682, - "sha1_base64": "YPF47R3ef7sOa6uhvTrFlr9LXVE=" + "s": 8189058, + "sha1_base64": "AnOsZavVAajiDeAZM5qUbFaWmMU=" }, { "id": "Italy_Friuli-Venezia Giulia_Pordenone", @@ -7004,8 +7004,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 26148143, - "sha1_base64": "P3Rwu3mIZpS06x9QyGRk2PRVbCg=" + "s": 26319400, + "sha1_base64": "ZmGAYqUBuE8wMTA2oaBThPNoS1I=" }, { "id": "Italy_Friuli-Venezia Giulia_Trieste", @@ -7016,8 +7016,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 8301419, - "sha1_base64": "ImyYQf4/WcT5DtZjDJuiXWjtcIA=" + "s": 8503667, + "sha1_base64": "egtixa5ftvVSx5pwE1LhxPXUtSk=" }, { "id": "Italy_Friuli-Venezia Giulia_Udine", @@ -7028,8 +7028,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 54872124, - "sha1_base64": "O+17NBC9115tc/f5vReYCVjLQSw=" + "s": 55597988, + "sha1_base64": "M/6BWBYI5FpuhHKOHRLkzC8dmFE=" } ] }, @@ -7051,8 +7051,8 @@ "country_name_synonyms": [ "Vatican City" ], - "s": 122077354, - "sha1_base64": "8fRfyn+aNMyZczTjCurPr/TMVhg=" + "s": 124894170, + "sha1_base64": "+g/ALqWt5E9xQYh42wRm3klzs3U=" }, { "id": "Italy_Liguria", @@ -7063,8 +7063,8 @@ "Italia", "Liguria" ], - "s": 73748037, - "sha1_base64": "rWa3jNTtR2u4YXHr4OHMR6a8LxA=" + "s": 75638853, + "sha1_base64": "El5fhpeoE8WSN75dEu/q+pi8B1k=" }, { "id": "Italy_Lombardy", @@ -7078,8 +7078,8 @@ "Italia", "Lombardia" ], - "s": 32421057, - "sha1_base64": "SvxQ5+yVjIr1HbWaYcZFlKqTJHY=" + "s": 32746625, + "sha1_base64": "vS43WlYfIB0+K2oyKenhzgC+eQU=" }, { "id": "Italy_Lombardy_Brescia", @@ -7090,8 +7090,8 @@ "Italia", "Lombardia" ], - "s": 47113392, - "sha1_base64": "WW5l7uc1Hh0wcqpW+A0IsrAfxE4=" + "s": 48550401, + "sha1_base64": "e0zPxUhg6pjW/hmjvD7vLv9vOAE=" }, { "id": "Italy_Lombardy_Como", @@ -7102,8 +7102,8 @@ "Italia", "Lombardia" ], - "s": 18222096, - "sha1_base64": "npbsPE7AY/4WM905zK4i7P4pMV0=" + "s": 18339136, + "sha1_base64": "tSqWnbd3wygBGidUWLHeVsq5Czw=" }, { "id": "Italy_Lombardy_Cremona", @@ -7114,8 +7114,8 @@ "Italia", "Lombardia" ], - "s": 9187420, - "sha1_base64": "VHdz/1vIWbtqwmn899Nj9CnF74I=" + "s": 9350332, + "sha1_base64": "2TYoMEEuArNCUjRuh5sstO8X3XA=" }, { "id": "Italy_Lombardy_Lecco", @@ -7126,8 +7126,8 @@ "Italia", "Lombardia" ], - "s": 13398055, - "sha1_base64": "eNBlyRtBj4Zj+IPxw6f7utKBfh0=" + "s": 13923624, + "sha1_base64": "fYMRt+pQpXmIBJZqfj0veDkEqaU=" }, { "id": "Italy_Lombardy_Lodi", @@ -7138,8 +7138,8 @@ "Italia", "Lombardia" ], - "s": 7636234, - "sha1_base64": "7VWrf5clurTyOiJt9QE1fr7A3Wg=" + "s": 8890946, + "sha1_base64": "0fQSAsA6uvEyUhkDlJ/bOBBvTFU=" }, { "id": "Italy_Lombardy_Mantua", @@ -7150,8 +7150,8 @@ "Italia", "Lombardia" ], - "s": 10042005, - "sha1_base64": "uFM2HUfnVq0pWxomvWqPIGOS5/s=" + "s": 10143621, + "sha1_base64": "A+c6WiUFXWr83Id0jx3FbDOAvEU=" }, { "id": "Italy_Lombardy_Milan", @@ -7162,8 +7162,8 @@ "Italia", "Lombardia" ], - "s": 43907700, - "sha1_base64": "cmVmxmaztqj86GMzLFjyRZcRlhc=" + "s": 45116740, + "sha1_base64": "WnNzOksnwUm504GmH7nEw+rKVC4=" }, { "id": "Italy_Lombardy_Monza and Brianza", @@ -7174,8 +7174,8 @@ "Italia", "Lombardia" ], - "s": 13454748, - "sha1_base64": "FafBW1XnVcs6VN+iYyLbtHR/VQc=" + "s": 14191140, + "sha1_base64": "TCidHz0Cz1SeO5sDEghLCUeL4EI=" }, { "id": "Italy_Lombardy_Pavia", @@ -7186,8 +7186,8 @@ "Italia", "Lombardia" ], - "s": 34389761, - "sha1_base64": "dmWhJM2YZfxkTxXtXeJdLZGniPs=" + "s": 34679073, + "sha1_base64": "ceoJJ59eRV5PFYMiVu8mU4A3JWM=" }, { "id": "Italy_Lombardy_Sondrio", @@ -7198,8 +7198,8 @@ "Italia", "Lombardia" ], - "s": 21504655, - "sha1_base64": "HNYJMDj4/fqArqxfVts5dGDcD8E=" + "s": 21704551, + "sha1_base64": "wIOg8CX0gNE1jUQ0ePD1liwHt2A=" }, { "id": "Italy_Lombardy_Varese", @@ -7210,8 +7210,8 @@ "Italia", "Lombardia" ], - "s": 21636566, - "sha1_base64": "vdSmyYOCilrtueSHEXRmuW4IAXU=" + "s": 22649016, + "sha1_base64": "9PLZ9urbqwzXxTPJ/qrNSdkcFl4=" } ] }, @@ -7224,8 +7224,8 @@ "Italia", "Marche" ], - "s": 55815502, - "sha1_base64": "9UYBOOyYCi+WhiGU4o/PAPR6FRk=" + "s": 56564318, + "sha1_base64": "aU5TXFkr+Yl78feZxGPvQcMFNoc=" }, { "id": "Italy_Molise", @@ -7236,8 +7236,8 @@ "Italia", "Molise" ], - "s": 15810580, - "sha1_base64": "pgv4HOIoZvk04Dn7fSP1b8hvAhA=" + "s": 16020677, + "sha1_base64": "u5VawDE0MBHu5bOKx7D1wIFjXFo=" }, { "id": "Italy_Piemont", @@ -7251,8 +7251,8 @@ "Italia", "Piemonte" ], - "s": 27991137, - "sha1_base64": "OBv4usUksDO6VhpHPv1cdXTJdy4=" + "s": 28183841, + "sha1_base64": "XvoZAfu74KPBstxs4g22pAU1X1M=" }, { "id": "Italy_Piemont_Asti", @@ -7263,8 +7263,8 @@ "Italia", "Piemonte" ], - "s": 15740708, - "sha1_base64": "EhwDBbI6wVhCT3pwixx9bAPlP2s=" + "s": 15785532, + "sha1_base64": "MvGLvEXl3FoJk+4yr9YW7YjhR2o=" }, { "id": "Italy_Piemont_Biella", @@ -7275,8 +7275,8 @@ "Italia", "Piemonte" ], - "s": 13848732, - "sha1_base64": "2ybVGOFYYyDWn0oqBNk3jhAGaj4=" + "s": 13875876, + "sha1_base64": "RRP0wyE79UJdoXdTwrsKPpLNQO0=" }, { "id": "Italy_Piemont_Cuneo", @@ -7287,8 +7287,8 @@ "Italia", "Piemonte" ], - "s": 61921301, - "sha1_base64": "scaurlgaSB91pjPIg2rGLK0w4xg=" + "s": 62114813, + "sha1_base64": "cETQsZ7S3z/ObnvLdXDf8IVRthI=" }, { "id": "Italy_Piemont_Novara", @@ -7299,8 +7299,8 @@ "Italia", "Piemonte" ], - "s": 15261733, - "sha1_base64": "VqyKigK9NBkL83J0INdjCyPBZGk=" + "s": 15558693, + "sha1_base64": "+VjvGeaXtayZ2ChhkEwNCQ7UMEg=" }, { "id": "Italy_Piemont_Torino", @@ -7311,8 +7311,8 @@ "Italia", "Piemonte" ], - "s": 73170846, - "sha1_base64": "XozLcyyHJ2S5eL/Wh+4famPdXak=" + "s": 73703102, + "sha1_base64": "Sm2CQk1RVakbhmKg11qUjA5+KQ8=" }, { "id": "Italy_Piemont_Verbano-Cusio-Ossola", @@ -7323,8 +7323,8 @@ "Italia", "Piemonte" ], - "s": 21022166, - "sha1_base64": "ZfurAEZDRQskj39HAezG0uNrlXo=" + "s": 21113126, + "sha1_base64": "oiKiyCeHUtdcGGVwvnnHmfsyrNk=" }, { "id": "Italy_Piemont_Vercelli", @@ -7335,8 +7335,8 @@ "Italia", "Piemonte" ], - "s": 18039256, - "sha1_base64": "aO+hMqBLAo9MRcT2Yyck2xGiSwI=" + "s": 18252832, + "sha1_base64": "TfltEzVZ/eMJ7+rlUwrkFNbEKbY=" } ] }, @@ -7359,8 +7359,8 @@ "Sardigna/Sardegna", "Scoglio Il Catalano" ], - "s": 92006553, - "sha1_base64": "yfdzp0ggcMryGxhl9G6nOJhz3ow=" + "s": 93794385, + "sha1_base64": "wi3O6O0WPcpKvnBeaAZhmJNSiI8=" }, { "id": "Italy_Sicily", @@ -7408,8 +7408,8 @@ "Scoglio Palumbo", "Sicilia" ], - "s": 124353054, - "sha1_base64": "kpIaEcDGd4y9jyYhEkuJR0fPKYg=" + "s": 125986038, + "sha1_base64": "KVHSekAtcwm47xP19OI7+PT2Ytw=" }, { "id": "Italy_Trentino-Alto Adige Sudtirol", @@ -7420,8 +7420,8 @@ "Italia", "Trentino-Alto Adige/Südtirol" ], - "s": 110965289, - "sha1_base64": "1Zs5Kv+tpNXUYXtX8uWsARIdat4=" + "s": 112386545, + "sha1_base64": "Qn7q3hFTYoGZLn/2Oc9d4DLi+9w=" }, { "id": "Italy_Tuscany_Grosseto", @@ -7438,8 +7438,8 @@ "Le Scole", "Toscana" ], - "s": 69944671, - "sha1_base64": "zTiEHpnnLAQAulJgQqDE3oAELrM=" + "s": 71365655, + "sha1_base64": "ItXMt+9BDwCEl8I8SegVys4Qgcc=" }, { "id": "Italy_Tuscany_Massa e Carrara", @@ -7457,8 +7457,8 @@ "Scoglio d'Africa", "Toscana" ], - "s": 126607372, - "sha1_base64": "UlnNIZAzoWtP53p0tx+BSkibqNM=" + "s": 129491332, + "sha1_base64": "3MJqzJMCZ2h9flK1Kr0ldh49W2E=" }, { "id": "Italy_Umbria", @@ -7469,8 +7469,8 @@ "Italia", "Umbria" ], - "s": 42149059, - "sha1_base64": "ULia/fDf2/6GntGADvE7YybHuPk=" + "s": 42519499, + "sha1_base64": "LXt3b0lsQkqtA5rCZ57ESmg9MiE=" }, { "id": "Italy_Veneto", @@ -7484,8 +7484,8 @@ "Italia", "Veneto" ], - "s": 28872096, - "sha1_base64": "jJ5K3sLTZcodK5QqPfXM6nLsu7g=" + "s": 29067264, + "sha1_base64": "HCg3yZ95Y0gz+zoAkM6n3Tz9RSc=" }, { "id": "Italy_Veneto_Padova", @@ -7496,8 +7496,8 @@ "Italia", "Veneto" ], - "s": 29861119, - "sha1_base64": "A/L94XL2FafakgSdr69z2xikuQ4=" + "s": 31382136, + "sha1_base64": "3dx7fj0t5gLE0LaBeoI5N+B4pq0=" }, { "id": "Italy_Veneto_Rovigo", @@ -7508,8 +7508,8 @@ "Italia", "Veneto" ], - "s": 9327037, - "sha1_base64": "PN4cvuja9qK0pDJ6cA95JDmVLOU=" + "s": 9541021, + "sha1_base64": "KpxYQmN4pIf3NHJxv2XfehBJ+UU=" }, { "id": "Italy_Veneto_Treviso", @@ -7520,8 +7520,8 @@ "Italia", "Veneto" ], - "s": 37895755, - "sha1_base64": "KuTIzXq/nzTNS4nXMIfi0XiRtt8=" + "s": 38102403, + "sha1_base64": "fzsPH/640buF5yIgL3Timcr9+1w=" }, { "id": "Italy_Veneto_Venezia", @@ -7532,8 +7532,8 @@ "Italia", "Veneto" ], - "s": 31581762, - "sha1_base64": "dCQhLL8UPr2502KTBOqqxzemqiY=" + "s": 32170506, + "sha1_base64": "xuTYZzwpRvrcxy3f2hVcqmOBOQo=" }, { "id": "Italy_Veneto_Verona", @@ -7544,8 +7544,8 @@ "Italia", "Veneto" ], - "s": 36275578, - "sha1_base64": "/F7huxIhSJkDnX8SG1EENez2Rp0=" + "s": 36601338, + "sha1_base64": "/Fe0Zxhz8WWQQq3KrzxXBTaJts8=" }, { "id": "Italy_Veneto_Vicenza", @@ -7556,8 +7556,8 @@ "Italia", "Veneto" ], - "s": 39346313, - "sha1_base64": "4n3y8Xa/zBrYReHT1CKWN5BnOGY=" + "s": 39792593, + "sha1_base64": "/hQsh0CZaKN6qKCPJQisIE1pGS4=" } ] } @@ -7571,8 +7571,8 @@ "affiliations": [ "Jamaica" ], - "s": 37655678, - "sha1_base64": "OWzL/6ay4RFG0hMRFX5oHEDeCe0=" + "s": 37832606, + "sha1_base64": "I0kit4ULZ9PT4bRDElKuOtAvCpw=" }, { "id": "Japan", @@ -7590,8 +7590,8 @@ "三重県", "愛知県" ], - "s": 81751578, - "sha1_base64": "XqELIC9kZGyA9pj7WZpmTS0+/DE=" + "s": 81991394, + "sha1_base64": "FoGjQ1QtzXNYXbCyS4OCq6Muet8=" }, { "id": "Japan_Chubu Region_Aichi_Toyohashi", @@ -7602,8 +7602,8 @@ "日本", "愛知県" ], - "s": 23415765, - "sha1_base64": "OmlGVWxNKbzY//ErM+t9XhEIsM8=" + "s": 23555109, + "sha1_base64": "Xhaywt7nH9JF3+ruAlt/YEvNu+w=" }, { "id": "Japan_Chubu Region_Fukui", @@ -7614,8 +7614,8 @@ "日本", "福井県" ], - "s": 27444566, - "sha1_base64": "j8r/L2FiHgGNVWG+m8iCYrtW9A0=" + "s": 27687302, + "sha1_base64": "FOQElRTRynTsMh0w+ZzsqwkBA08=" }, { "id": "Japan_Chubu Region_Gifu", @@ -7626,8 +7626,8 @@ "日本", "岐阜県" ], - "s": 35249991, - "sha1_base64": "wcSoYLByryeQwJ52N1fX9HEzKqs=" + "s": 35314839, + "sha1_base64": "fxHGeFBDwmlDY+xZ/dz8Qjy5I+A=" }, { "id": "Japan_Chubu Region_Ishikawa", @@ -7638,8 +7638,8 @@ "日本", "石川県" ], - "s": 28976588, - "sha1_base64": "GiYMRhEXe6q8/5u/IAGu8VnfFJ8=" + "s": 29072300, + "sha1_base64": "s17rfBscjCm/FnwR+kNIrSKNX7s=" }, { "id": "Japan_Chubu Region_Nagano", @@ -7650,8 +7650,8 @@ "長野県", "日本" ], - "s": 60326748, - "sha1_base64": "g4NWQkwrPS9GBAKWpIF5+nB56fk=" + "s": 60440052, + "sha1_base64": "cnzHDErZlXzSZp7306p1HhX7GYI=" }, { "id": "Japan_Chubu Region_Niigata", @@ -7663,8 +7663,8 @@ "新潟県", "石川県" ], - "s": 49550890, - "sha1_base64": "hi8BTdBaQk+Kjilt5f0P7cHeZbA=" + "s": 49798434, + "sha1_base64": "CjRwp7bD0IYIo3+mowyNpnyUsEs=" }, { "id": "Japan_Chubu Region_Shizuoka", @@ -7675,8 +7675,8 @@ "静岡県", "日本" ], - "s": 96630565, - "sha1_base64": "U3EemeZrRE9SjTrYDTtvpE7X+IU=" + "s": 97081853, + "sha1_base64": "hRKCeetWH6DLIOtXBxs0oyj4NTQ=" }, { "id": "Japan_Chubu Region_Toyama", @@ -7688,8 +7688,8 @@ "富山県", "石川県" ], - "s": 26589149, - "sha1_base64": "i/zneQJDac+cXFs7o7cC6rrJmDM=" + "s": 26639525, + "sha1_base64": "5ltsoyLncOs5SdZuiP3oyA+Xy6M=" }, { "id": "Japan_Chubu Region_Yamanashi", @@ -7700,8 +7700,8 @@ "日本", "山梨県" ], - "s": 24414142, - "sha1_base64": "ehmCjSJETSAOyYF8mVdkRqnIfzs=" + "s": 24483030, + "sha1_base64": "R4e/jAHHVg0r+pKPDG7IMVN1lAs=" } ] }, @@ -7717,8 +7717,8 @@ "日本", "広島県" ], - "s": 68487313, - "sha1_base64": "g6fJ4DkLyRD/Bj2vSIh/CZe7BFo=" + "s": 68728945, + "sha1_base64": "c1tPDm2ptDBQqSReGV190YvUJ7A=" }, { "id": "Japan_Chugoku Region_Okayama", @@ -7729,8 +7729,8 @@ "日本", "岡山県" ], - "s": 46900531, - "sha1_base64": "BgFQGkda7dQEhgmBpIkWiazgHNM=" + "s": 47184491, + "sha1_base64": "yB/oGzakpseMj2KEiU+Eac+U2EQ=" }, { "id": "Japan_Chugoku Region_Shimane", @@ -7741,8 +7741,8 @@ "日本", "島根県" ], - "s": 29887607, - "sha1_base64": "yRPlKMNCPiyzQ7PTa+fAaU7EbYI=" + "s": 29945783, + "sha1_base64": "zjHWCjjmos7ZDbv2VE7aYQDVVco=" }, { "id": "Japan_Chugoku Region_Tottori", @@ -7753,8 +7753,8 @@ "鳥取県", "日本" ], - "s": 27070036, - "sha1_base64": "Ag+nuuMJE76lVbO3uf6qqiPag9M=" + "s": 27161388, + "sha1_base64": "mcnTup1n4euw5al5UwG3MzcwSeI=" }, { "id": "Japan_Chugoku Region_Yamaguchi", @@ -7765,8 +7765,8 @@ "日本", "山口県" ], - "s": 30991303, - "sha1_base64": "vcgcepjb1cahZNf39TlZgO2AX80=" + "s": 31278247, + "sha1_base64": "SLsQVYCtrkUXYjSX6lFZ7nxt6qA=" } ] }, @@ -7782,8 +7782,8 @@ "日本", "北海道" ], - "s": 39036174, - "sha1_base64": "r9jE6JcwvrrnleWpFPVk3BE4iyI=" + "s": 39327646, + "sha1_base64": "Aa6BWSoqt7x2ACFlFtuFd3YXsBk=" }, { "id": "Japan_Hokkaido Region_North", @@ -7794,8 +7794,8 @@ "日本", "北海道" ], - "s": 52208562, - "sha1_base64": "+kQRdlo34I3u3/IQkV7jsmFb1Ww=" + "s": 52303978, + "sha1_base64": "1k/nV6Ia0/Z8bz2MujR+9X6MByw=" }, { "id": "Japan_Hokkaido Region_West", @@ -7806,8 +7806,8 @@ "日本", "北海道" ], - "s": 35389295, - "sha1_base64": "nejZ3P8d4q7jfhRNScxiw3VNPJE=" + "s": 35639623, + "sha1_base64": "6FSlDeEC1L08gX816bdcULAGlNo=" }, { "id": "Japan_Hokkaido Region_Sapporo", @@ -7818,8 +7818,8 @@ "日本", "北海道" ], - "s": 70540994, - "sha1_base64": "pyIAFsp2GlHVag/2RbscTy/BfoQ=" + "s": 70793946, + "sha1_base64": "iKkqwA5cUk9aqHaJcTO+VhlDYtE=" } ] }, @@ -7837,8 +7837,8 @@ "東京都", "神奈川県" ], - "s": 60595690, - "sha1_base64": "c5K2atOcUNw6yaqydNJajqxFeMg=" + "s": 61063034, + "sha1_base64": "pTDQX0Ym8b4wjntZH8IJryRJpR8=" }, { "id": "Japan_Kanto_Gunma", @@ -7849,8 +7849,8 @@ "日本", "群馬県" ], - "s": 32856631, - "sha1_base64": "GpkwPWxVvp2sAw6mcC3w0i3KWWc=" + "s": 33032783, + "sha1_base64": "rKRoAiAPLLeJU/wHlR4nQMDrv4Y=" }, { "id": "Japan_Kanto_Ibaraki", @@ -7863,8 +7863,8 @@ "千葉県", "福島県" ], - "s": 41963055, - "sha1_base64": "4eLydCuA2I9PpO894L2Jjrr/lnE=" + "s": 42082367, + "sha1_base64": "lRpUt3aVKg5uLw3uHtVx4xlkyRM=" }, { "id": "Japan_Kanto_Kanagawa", @@ -7878,8 +7878,8 @@ "東京都", "神奈川県" ], - "s": 99223637, - "sha1_base64": "B/GG5ZSe8E6cSz414YO5wgf2wm4=" + "s": 100045893, + "sha1_base64": "vOXWt8pYAGSP69B4Kwzmd0+OGTE=" }, { "id": "Japan_Kanto_Saitama", @@ -7890,8 +7890,8 @@ "日本", "埼玉県" ], - "s": 73363655, - "sha1_base64": "ahpAEjahP3MHNke+xRJNSgtH3RA=" + "s": 73964879, + "sha1_base64": "9xnLEuLg6fV/+6tME9hPo6MHww8=" }, { "id": "Japan_Kanto_Tochigi", @@ -7902,8 +7902,8 @@ "日本", "栃木県" ], - "s": 36776607, - "sha1_base64": "ZXqvpMLFftRq+ZQjGEQ/CcKyn6g=" + "s": 36942703, + "sha1_base64": "kH6cHPNrDJ51riZRYWzTu3JmKLU=" }, { "id": "Japan_Kanto_Tokyo", @@ -7915,8 +7915,8 @@ "日本", "東京都" ], - "s": 121277383, - "sha1_base64": "FnuG5F0Jte4Mmgqe2nBhM3CqvfE=" + "s": 122374111, + "sha1_base64": "1CBtwza3Q7Q0R+W4rZ4MAFOZ3eA=" } ] }, @@ -7933,8 +7933,8 @@ "京都府", "滋賀県" ], - "s": 83349685, - "sha1_base64": "rcB7JqT3m/Vo92A38LZ6YTk7Da4=" + "s": 83893357, + "sha1_base64": "NIjHWp/Y6HSvnFchvcFsJI1ARRg=" }, { "id": "Japan_Kinki Region_Mie", @@ -7946,8 +7946,8 @@ "三重県", "愛知県" ], - "s": 35019567, - "sha1_base64": "SfTdoQw9solCr4EU6/JNr5a+uWQ=" + "s": 36048943, + "sha1_base64": "Ck4SwuRgEnFZ+TgUvcCOlMLYTdI=" }, { "id": "Japan_Kinki Region_Nara", @@ -7959,8 +7959,8 @@ "奈良県", "和歌山県" ], - "s": 34145157, - "sha1_base64": "IcuS5jTmgx8aE6H9KErOcefZ2V4=" + "s": 34248885, + "sha1_base64": "ckbuE4gPLjuR6eWPbW1Dq5J0GVo=" }, { "id": "Japan_Kinki Region_Osaka_Osaka", @@ -7972,8 +7972,8 @@ "兵庫県", "大阪府" ], - "s": 104215306, - "sha1_base64": "i6Y+G7RZ166q5lVMY8rTCX+YnbY=" + "s": 104979874, + "sha1_base64": "a92I9BkHXLjcdjn5KzYIFLLKJAE=" }, { "id": "Japan_Kinki Region_Osaka_West", @@ -7984,8 +7984,8 @@ "日本", "兵庫県" ], - "s": 65377531, - "sha1_base64": "cCSQs3OoCJHHYD0puXILL0TVEeA=" + "s": 65633099, + "sha1_base64": "50bbpGCMw0V07BNG4Wd6NW67Ics=" }, { "id": "Japan_Kinki Region_Wakayama", @@ -7996,8 +7996,8 @@ "日本", "和歌山県" ], - "s": 23841126, - "sha1_base64": "YqvYKMBVJaztFFPYQWStiKlYUi0=" + "s": 23897726, + "sha1_base64": "AV9wdfp9JmxwV2cIRRavB9NodHI=" } ] }, @@ -8013,8 +8013,8 @@ "日本", "福岡県" ], - "s": 61160122, - "sha1_base64": "tvpiTnuK0CUdCBadBazCeAm/b4M=" + "s": 61678483, + "sha1_base64": "VV0eauXe9GLXNclD8VfcgUrTdXk=" }, { "id": "Japan_Kyushu Region_Kagoshima", @@ -8025,8 +8025,8 @@ "日本", "鹿児島県" ], - "s": 34792247, - "sha1_base64": "jY+hn+Q1/xMEk78kl9OOdXlyIuk=" + "s": 35631079, + "sha1_base64": "yeOWn0krtzz2rTTu5rVncETGeTA=" }, { "id": "Japan_Kyushu Region_Kumamoto", @@ -8037,8 +8037,8 @@ "日本", "熊本県" ], - "s": 42945072, - "sha1_base64": "XvnOl8MgdYb++YVDtN1vACndiiY=" + "s": 43531160, + "sha1_base64": "+7nqPHu5vyTU2wyGjTGgn1CBP6c=" }, { "id": "Japan_Kyushu Region_Miyazaki", @@ -8049,8 +8049,8 @@ "日本", "宮崎県" ], - "s": 21468549, - "sha1_base64": "6wWPsuVuXxQilUXJFncBqznXtVs=" + "s": 21529997, + "sha1_base64": "MphExzylHrgSI0jCDk/j2/GtKxw=" }, { "id": "Japan_Kyushu Region_Nagasaki", @@ -8061,8 +8061,8 @@ "長崎県", "日本" ], - "s": 34392822, - "sha1_base64": "1PSjDQlk55qS0aUD5J4ZHOGhdzk=" + "s": 35007470, + "sha1_base64": "JPrDpE7SrDeHsnsguGlEebhjGM4=" }, { "id": "Japan_Kyushu Region_Oita", @@ -8073,8 +8073,8 @@ "日本", "大分県" ], - "s": 28325191, - "sha1_base64": "omDNUkynjZTQJgwUy4V3nXmMIi0=" + "s": 28525023, + "sha1_base64": "QxLvWPlOcYpYrZ2E06xS9u3DmA4=" }, { "id": "Japan_Kyushu Region_Okinawa", @@ -8085,8 +8085,8 @@ "日本", "沖縄県" ], - "s": 23888714, - "sha1_base64": "CFiez9HD5DkY/mQ3uDtZdw/BOM8=" + "s": 23990690, + "sha1_base64": "iUTKqi0zO19yP0WTGSiPAqhXVpg=" }, { "id": "Japan_Kyushu Region_Saga", @@ -8097,8 +8097,8 @@ "日本", "佐賀県" ], - "s": 32303909, - "sha1_base64": "C1NH7+iP7egKTakofJUm2B4Yrfw=" + "s": 32517261, + "sha1_base64": "Vk96OsQ7gW7doTtE5bPR1oHWjfc=" } ] }, @@ -8114,8 +8114,8 @@ "日本", "愛媛県" ], - "s": 35741797, - "sha1_base64": "2sgdU+8brd5Xit3Qwl/mjQuP5+c=" + "s": 35896421, + "sha1_base64": "nsoVY76vpkoPk6lfOCWAZP0J7Zc=" }, { "id": "Japan_Shikoku Region_Kagawa", @@ -8126,8 +8126,8 @@ "香川県", "日本" ], - "s": 18197021, - "sha1_base64": "WExxlkoa0nb+M6/cA+i2VHSd5OM=" + "s": 18355605, + "sha1_base64": "ulNq58ephrdGPA+WiypjRn4kX4w=" }, { "id": "Japan_Shikoku Region_Kochi", @@ -8138,8 +8138,8 @@ "高知県", "日本" ], - "s": 22432429, - "sha1_base64": "d5EsxZXlsJatqkylRI1yYhec5ss=" + "s": 22503613, + "sha1_base64": "JOW7N+Az2IrcldWtNTpxNm51qM8=" }, { "id": "Japan_Shikoku Region_Tokushima", @@ -8150,8 +8150,8 @@ "日本", "徳島県" ], - "s": 23121725, - "sha1_base64": "yttK5XA1RzLbmgUM8OqTNpw5iQU=" + "s": 23171909, + "sha1_base64": "t6RoR/1MF9aTqfSq0obYxDHqkUM=" } ] }, @@ -8167,8 +8167,8 @@ "日本", "秋田県" ], - "s": 48106833, - "sha1_base64": "3VybHOMA7DRZo5okVpYY6uDcxnw=" + "s": 48487097, + "sha1_base64": "cezTIZFky16pF5L/6sRr/SPELmY=" }, { "id": "Japan_Tohoku_Aomori", @@ -8179,8 +8179,8 @@ "青森県", "日本" ], - "s": 34230246, - "sha1_base64": "e9/D3orB9MxQlGqtDBq3cTQoDbE=" + "s": 34576198, + "sha1_base64": "7IQJkLHwmicpXTn41pIzeK6u+Z8=" }, { "id": "Japan_Tohoku_Fukushima", @@ -8191,8 +8191,8 @@ "日本", "福島県" ], - "s": 58843440, - "sha1_base64": "yHzYBbq18V424QWsGdHfq3U/3M8=" + "s": 59071241, + "sha1_base64": "53ptG8mrOQ2kcNZXL/DwWWxCFts=" }, { "id": "Japan_Tohoku_Iwate", @@ -8203,8 +8203,8 @@ "日本", "岩手県" ], - "s": 39224926, - "sha1_base64": "jJaM8ud9UgwrUDmkCg+yg8hAbiM=" + "s": 39291718, + "sha1_base64": "d2Ll4DG4H+CkS5JJss21EQMP0uU=" }, { "id": "Japan_Tohoku_Miyagi", @@ -8216,8 +8216,8 @@ "宮城県", "福島県" ], - "s": 66860633, - "sha1_base64": "w4UbyIP8BnWXBI6SGiwT8NlsUWg=" + "s": 67045289, + "sha1_base64": "AUft3nwjoQBK2JKudNIyRFtJ7n4=" }, { "id": "Japan_Tohoku_Yamagata", @@ -8228,8 +8228,8 @@ "日本", "山形県" ], - "s": 26182846, - "sha1_base64": "bEqAFf04GUu4hVWIqrVC0pZkfn8=" + "s": 26253934, + "sha1_base64": "ABM9SbY6HqR9Tqjr5oIf9WM/eSY=" } ] } @@ -8252,8 +8252,8 @@ "Queen's Rock", "The Islet" ], - "s": 2392365, - "sha1_base64": "LJ5HFSwQxqMs55i5u3m5N3B8Ab0=" + "s": 2429765, + "sha1_base64": "/RUK1syMFZeRF7kLrW8ryAAHFeQ=" }, { "id": "Jordan", @@ -8275,8 +8275,8 @@ "Zarqa", "الأردن" ], - "s": 44018065, - "sha1_base64": "CEEBn/WAKDK4B/yRhTgIKulOhE4=" + "s": 44460473, + "sha1_base64": "WDAZ5ENRZOJ/5BKR8YIM255RUrc=" }, { "id": "Kazakhstan", @@ -8295,8 +8295,8 @@ "Павлодарская область", "Карагандинская область" ], - "s": 95120166, - "sha1_base64": "2vOY2BP8YkF3l93RODehNqnMrWA=" + "s": 95628014, + "sha1_base64": "vnNibm2W8kXpReVN3HaAPDu833E=" }, { "id": "Kazakhstan_South", @@ -8316,8 +8316,8 @@ "Мангистауская область", "Кызылординская область" ], - "s": 192306058, - "sha1_base64": "AGGIO6ZmDt2qgpGNatPFB4oEetk=" + "s": 193520314, + "sha1_base64": "tNk7w6QCcd2WgWZpFkkfXpSFWdk=" } ] }, @@ -8376,8 +8376,8 @@ "Wajir", "West Pokot" ], - "s": 368050136, - "sha1_base64": "GhicagD7s14JbO0Z8QUcsSK3sqo=" + "s": 369403648, + "sha1_base64": "/DGbqD4wes3Sz1UI8N8hZJxRM+U=" }, { "id": "Kingdom of Lesotho", @@ -8390,8 +8390,8 @@ "country_name_synonyms": [ "Lesotho" ], - "s": 100710673, - "sha1_base64": "MipYnyUAQcVcSL3+M8TlQudPUPM=" + "s": 104078209, + "sha1_base64": "zTb78cLyqYNxcurnHnudG8ijxMk=" }, { "id": "Kiribati", @@ -8401,8 +8401,8 @@ "affiliations": [ "Kiribati" ], - "s": 3097501, - "sha1_base64": "dS8B9W1K+YWpYDDSLAr7oyrpZXE=" + "s": 3103326, + "sha1_base64": "jeVTTpRDl/4r4wNdjjNth3PFAzA=" }, { "id": "Kuwait", @@ -8418,8 +8418,8 @@ "الفروانية", "‏الكويت‎" ], - "s": 22509422, - "sha1_base64": "QCANPlMezpUQdJv7PvspUGvnnYY=" + "s": 24316830, + "sha1_base64": "0EgvQHTNqZamiCpvvJ2hA4cAodI=" }, { "id": "Kyrgyzstan", @@ -8440,8 +8440,8 @@ "Чуйская область", "Кыргызстан" ], - "s": 82712628, - "sha1_base64": "BvQBhLn/a/Isttc8BzCaYmf9ZE0=" + "s": 83025956, + "sha1_base64": "FrmXGHSNdtH/O4UOnVJb7PxbNh0=" }, { "id": "Laos", @@ -8468,8 +8468,8 @@ "ສະຫວັນນະເຂດ", "ນະຄອນຫຼວງວຽງຈັນ" ], - "s": 78851059, - "sha1_base64": "Ecun/tr1MY6vezoSdjK55Q3o48k=" + "s": 79008131, + "sha1_base64": "M8j3p5/5Lt/IFxsLFt42LuXAnjE=" }, { "id": "Latvia", @@ -8483,8 +8483,8 @@ "Vidzeme", "Zemgale" ], - "s": 132053578, - "sha1_base64": "FsdVPVxlkgG4VqmIhvFcOoHSZ8c=" + "s": 134251138, + "sha1_base64": "xvRs5e+W+T7XuTe5zGMy2wbxI0Y=" }, { "id": "Lebanon", @@ -8519,8 +8519,8 @@ "قضاء البترون", "قضاء النبطية" ], - "s": 47287546, - "sha1_base64": "sN7Bnzzn2ZNyLtDSgoIpg+DxqLY=" + "s": 47390234, + "sha1_base64": "BBvG/JV0fQGPZdQqa5W+HCHkSSU=" }, { "id": "Liberia", @@ -8545,8 +8545,8 @@ "River Gee County", "Sinoe County" ], - "s": 40380861, - "sha1_base64": "3kp5zYcLfnLmZmEOLp/Jcprc0/4=" + "s": 40397613, + "sha1_base64": "Dfl5U+65oHSZ660j7p1+Caa99OM=" }, { "id": "Libya", @@ -8578,8 +8578,8 @@ "الواحات", "الزاوية" ], - "s": 153758084, - "sha1_base64": "iLV1CQ+lzW/LrMtugEocgFVnhAY=" + "s": 155003236, + "sha1_base64": "qGEJUxh1rH2zqVTEPRx0rOtlliY=" }, { "id": "Liechtenstein", @@ -8589,8 +8589,8 @@ "affiliations": [ "Liechtenstein" ], - "s": 3449025, - "sha1_base64": "TFhcXcCw82RVvlVQYy0WhdhML18=" + "s": 3632690, + "sha1_base64": "7DJgMgX9dzhmSNTz/dwld5cz148=" }, { "id": "Lithuania", @@ -8607,8 +8607,8 @@ "Utenos apskritis", "Vilniaus apskritis" ], - "s": 112445480, - "sha1_base64": "EbUbaGHLsX06F/rGQzEhTIXEi3k=" + "s": 113867016, + "sha1_base64": "uufKtKdqkvfcyXgrYdnV0rHzqC4=" }, { "id": "Lithuania_West", @@ -8624,8 +8624,8 @@ "Tauragės apskritis", "Šiaulių apskritis" ], - "s": 93530783, - "sha1_base64": "M7GSMBrPp6B1XJoZOIN85oxQEW0=" + "s": 93932735, + "sha1_base64": "orVh/kjBJSmUzVSbCFxD7i1f9sI=" } ] }, @@ -8637,8 +8637,8 @@ "affiliations": [ "Lëtzebuerg" ], - "s": 44655460, - "sha1_base64": "e3tIEitPyD61peX75YkBDjYGRoY=" + "s": 46160918, + "sha1_base64": "fI4F1p6ITN2GCipFnRrbCvjZxCU=" }, { "id": "Macedonia", @@ -8659,8 +8659,8 @@ "country_name_synonyms": [ "North Macedonia" ], - "s": 31288775, - "sha1_base64": "vLVJ0dsCcY2jr1mE76J3oObKYBQ=" + "s": 31694407, + "sha1_base64": "eNnWG1oNvgxz4u/des49efOhMqQ=" }, { "id": "Madagascar", @@ -8674,8 +8674,8 @@ "Région de Sava", "Préfecture de police de Nosy Be" ], - "s": 396931957, - "sha1_base64": "2l3DE8V/OGPTfq3Sn7xTkH+dPc0=" + "s": 399837213, + "sha1_base64": "x8fJ2HZ9AK/6PKrieTngk1Gq818=" }, { "id": "Malawi", @@ -8691,8 +8691,8 @@ "Northern", "Southern" ], - "s": 150785332, - "sha1_base64": "9UAV9Y6Sw0S6BWpjS/T8WJTzd64=" + "s": 151020972, + "sha1_base64": "Jk//yZFyKur2x/H5VFxbCjZn4Xg=" }, { "id": "Malaysia", @@ -8738,8 +8738,8 @@ "Sarawak", "Singapura" ], - "s": 239018846, - "sha1_base64": "0j7VzzpfwRUpat37iWfVpKESZ1I=" + "s": 241122006, + "sha1_base64": "PORLqcu6JKS0neqArH6/aH0+2zI=" }, { "id": "Maldives", @@ -8758,8 +8758,8 @@ "Medhu-Uthuru Province", "ދިވެހިރާއްޖޭގެ ޖުމުހޫރިއްޔާ" ], - "s": 3970144, - "sha1_base64": "/aol569mzARZCXt63MUufIluXH8=" + "s": 4038048, + "sha1_base64": "nJGPH4BvlftvT3rBEKPwwGKOANw=" }, { "id": "Mali", @@ -8778,8 +8778,8 @@ "Ségou", "Tombouctou" ], - "s": 204864528, - "sha1_base64": "skPYJqMnyHED1/QxPrWROZebAP0=" + "s": 225352320, + "sha1_base64": "zeYL+TzH0O5FxdSn9JKTsY0WaP4=" }, { "id": "Malta", @@ -8796,8 +8796,8 @@ "Malta", "Malta" ], - "s": 9435561, - "sha1_base64": "37y4MqpH+zL0xhq8DHLopWfwZ60=" + "s": 9863185, + "sha1_base64": "tKFog7maHPUTo1Sd5eko6SW0INY=" }, { "id": "Marshall Islands", @@ -8808,8 +8808,8 @@ "Aolepān Aorōkin M̧ajeļ", "MH" ], - "s": 1590361, - "sha1_base64": "IoVOF+PBUmIyGsaGucxGm3WedLg=" + "s": 1605281, + "sha1_base64": "mzbVt4Vv9vPRS4Cc8bdjD1LJrS4=" }, { "id": "Mauritania", @@ -8831,8 +8831,8 @@ "إينشيري", "غيديماغا" ], - "s": 52864830, - "sha1_base64": "YQODOufy0JpgntDEb4wUlfiZh90=" + "s": 53375814, + "sha1_base64": "CQFVTrTmfgRfvyvJLxzrNA2tdls=" }, { "id": "Mauritius", @@ -8867,8 +8867,8 @@ "Île Deux Frères", "Île Frégate" ], - "s": 10675280, - "sha1_base64": "qj85ATpnFSDsfUgLbsjVR9DfaQc=" + "s": 10761032, + "sha1_base64": "wkpyvv07ogbDhTN5NKwGT3LFbdE=" }, { "id": "Mexico", @@ -8887,8 +8887,8 @@ "Colima", "Estados Unidos Mexicanos" ], - "s": 77704604, - "sha1_base64": "mUKLyv/rM5sjA4LJW4N5Ox/Lj9Q=" + "s": 78181244, + "sha1_base64": "oHbbDcgW51u/Y/n/sxwa9M0Qxc8=" }, { "id": "Mexico_Central_East", @@ -8902,8 +8902,8 @@ "San Luis Potosí", "Tamaulipas" ], - "s": 77788470, - "sha1_base64": "6bG4MR3DkjWYx7eYJY3V+kDQ5hU=" + "s": 78312102, + "sha1_base64": "sZqWUM5AVGhZBgSkVCcpQ8mBxjw=" }, { "id": "Mexico_Central_West", @@ -8920,8 +8920,8 @@ "Sinaloa", "Zacatecas" ], - "s": 106160649, - "sha1_base64": "2L4wykIwRbQNCmqt/3RUseohpLg=" + "s": 106558889, + "sha1_base64": "NZ57L9o78+L/vgENxkxXKZUw6+Y=" }, { "id": "Mexico_East", @@ -8939,8 +8939,8 @@ "Veracruz de Ignacio de la Llave", "Yucatán" ], - "s": 86899167, - "sha1_base64": "bnamPo9kT9yx0G2OtZ7X2xoGS1Q=" + "s": 87685751, + "sha1_base64": "3ufjFG4H+tqAiJCnKSNM2yzk00w=" }, { "id": "Mexico_Mexico", @@ -8957,8 +8957,8 @@ "Tlaxcala", "Veracruz de Ignacio de la Llave" ], - "s": 197198557, - "sha1_base64": "sD4k6mzpbkno73Q6dk4kTtJt+AY=" + "s": 198215925, + "sha1_base64": "ylCLs8uNp1s9xHPnPY24J3Vb0R8=" }, { "id": "Mexico_Chihuahua", @@ -8973,8 +8973,8 @@ "Nuevo León", "Sinaloa" ], - "s": 87954949, - "sha1_base64": "a33IAg0jv8KJk0/+o4zRjkPG9TU=" + "s": 88329077, + "sha1_base64": "/ZlHd0e8quBNiZ0pt5Moq0bvpjo=" }, { "id": "Mexico_Sonora", @@ -8988,8 +8988,8 @@ "Sinaloa", "Sonora" ], - "s": 62702732, - "sha1_base64": "l9BIni32gCh/jPnTzUKI8Dzu1sc=" + "s": 63256332, + "sha1_base64": "ehCNt69Plsd2SA9WCHmLL+VOr+0=" }, { "id": "Mexico_South", @@ -9005,8 +9005,8 @@ "Querétaro", "Veracruz de Ignacio de la Llave" ], - "s": 190566851, - "sha1_base64": "+E2oj7WG9JzTFCM0dI3Vf7ARo3w=" + "s": 191032819, + "sha1_base64": "MbavuNPUQiIQl+Graix6e0mr/xA=" } ] }, @@ -9020,8 +9020,8 @@ "Moldova", "Приднестровье" ], - "s": 112467785, - "sha1_base64": "+JWbcxdjalAer2NhXP8KZBuch8k=" + "s": 114792657, + "sha1_base64": "kjj4YXCRGBKITQZcSw9OPBI6gBg=" }, { "id": "Monaco", @@ -9032,8 +9032,8 @@ "France", "Monaco" ], - "s": 876290, - "sha1_base64": "ypBAqq/RKy7Wl5TdImGLZ4Le8Ac=" + "s": 1958236, + "sha1_base64": "9J51VlIbOXZiAsqbMWQjxrfQJ8o=" }, { "id": "Mongolia", @@ -9068,8 +9068,8 @@ "Говьсүмбэр", "Өвөрхангай" ], - "s": 116495410, - "sha1_base64": "u7GUaroaiul8P4b0NbqSMxVj2xM=" + "s": 117054554, + "sha1_base64": "/GKvmfb6nIh45/Ay4MH6tjwrFks=" }, { "id": "Montenegro", @@ -9079,8 +9079,8 @@ "affiliations": [ "Crna Gora" ], - "s": 36532200, - "sha1_base64": "ZXiBN7diiFDiyWdEJBcW7MG57wA=" + "s": 36896864, + "sha1_base64": "t96Bh2kKuLjztAS75bkVndJjcCs=" }, { "id": "Morocco", @@ -9098,8 +9098,8 @@ "Maroc ⵍⵎⵖⵔⵉⴱ المغرب", "Souss-Massa ⵙⵓⵙⵙ-ⵎⴰⵙⵙⴰ سوس-ماسة" ], - "s": 55283404, - "sha1_base64": "zVd/3bYod6CrYBxsbm9yYzCif1o=" + "s": 55782340, + "sha1_base64": "fOun/AcNszbRfmblzMTqloB0TTk=" }, { "id": "Morocco_Southern", @@ -9115,8 +9115,8 @@ "Oriental ⵜⴰⵏⴳⵎⵓⴹⵜ الشرقية", "Souss-Massa ⵙⵓⵙⵙ-ⵎⴰⵙⵙⴰ سوس-ماسة" ], - "s": 108917096, - "sha1_base64": "hmEb1SsgPmFJko/OfGfJZ51TDOg=" + "s": 109146088, + "sha1_base64": "u7LxVaZOiJWAJZV3vO8X1BYcrfs=" }, { "id": "Morocco_Doukkala-Abda", @@ -9129,8 +9129,8 @@ "Maroc ⵍⵎⵖⵔⵉⴱ المغرب", "Marrakech-Safi ⵎⵕⵕⴰⴽⵛ-ⴰⵙⴼⵉ مراكش-أسفي" ], - "s": 79357231, - "sha1_base64": "/k5kK1sx+S4+BxodYI1Fl/YPX7M=" + "s": 79833495, + "sha1_base64": "JbvgN2MTiilM3ZHEw91JC8D/7wQ=" }, { "id": "Morocco_Rabat-Sale-Zemmour-Zaer", @@ -9144,8 +9144,8 @@ "Rabat-Salé-Kénitra ⴻⵔⵔⴱⴰⵟ-ⵙⵍⴰ-ⵇⵏⵉⵟⵔⴰ الرباط-سلا-القنيطرة", "Tanger-Tétouan-Al Hoceima ⵟⴰⵏⵊ-ⵟⵉⵜⴰⵡⵉⵏ-ⵍⵃⵓⵙⵉⵎⴰ طنجة-تطوان-الحسيمة" ], - "s": 60042197, - "sha1_base64": "RvRERqcA3URsvnPYlxjmfb1xBIA=" + "s": 60478622, + "sha1_base64": "jfe/byRa5c4B7V/0sJXRQgSfvZE=" } ] }, @@ -9167,8 +9167,8 @@ "Sofala", "Zambézia" ], - "s": 220842031, - "sha1_base64": "aFdCBqGM7Kdo6zYhQF8xD+HcKJk=" + "s": 225528239, + "sha1_base64": "Tl8sdXEMlGsb5cUPwz2gn9ndCHs=" }, { "id": "Myanmar", @@ -9193,8 +9193,11 @@ "စစ်ကိုင်းတိုင်း (Sagaing)", "ပြည်ထောင်စုမြန်မာနိုင်ငံတော်‌" ], - "s": 336329916, - "sha1_base64": "VtoVMhxRHwlDgFREYSWbmETbf6c=" + "country_name_synonyms": [ + "Burma" + ], + "s": 337264084, + "sha1_base64": "XHD1iHLZQixM13G8dcTNB9L9yP4=" }, { "id": "Namibia", @@ -9226,8 +9229,8 @@ "Zambezi Region", "ǁKaras Region" ], - "s": 83453869, - "sha1_base64": "8vcTD9jGXHbARPXMCJTHzzNrUa0=" + "s": 84583901, + "sha1_base64": "n1hL7bu5OusplxJqnO/tw29dTzI=" }, { "id": "Nauru", @@ -9237,8 +9240,8 @@ "affiliations": [ "Naoero" ], - "s": 460336, - "sha1_base64": "W8LHMSRVF9KgalMzcftRHLproEQ=" + "s": 466424, + "sha1_base64": "ryeKo2qz8ktO9+WENo/DJjZ8RCM=" }, { "id": "Nepal", @@ -9254,8 +9257,8 @@ "सुदुर पश्चिमाञ्चल विकास क्षेत्र", "पश्चिमाञ्चल विकास क्षेत्र" ], - "s": 224408982, - "sha1_base64": "47mzooOE++1IB+2lC26Ot2pu160=" + "s": 225425374, + "sha1_base64": "yyt131+MQ4Xb8jvvrZDzTMzalgU=" }, { "id": "Nepal_Kathmandu", @@ -9266,8 +9269,8 @@ "मध्यमाञ्चल विकास क्षेत्र", "नेपाल" ], - "s": 52023553, - "sha1_base64": "e0NSoxhiM1xELfPBqDAFnhnI3Pw=" + "s": 52170625, + "sha1_base64": "sb68i/FVvedSjI4wX1Ks0Tmz9To=" }, { "id": "Nepal_Madhyamanchal", @@ -9278,8 +9281,8 @@ "मध्यमाञ्चल विकास क्षेत्र", "नेपाल" ], - "s": 76269007, - "sha1_base64": "ixG6pMoR0FXucM43vHR9DGcdlMw=" + "s": 76651215, + "sha1_base64": "hK90YjH5joYzR5I27B6bepFrZkc=" }, { "id": "Nepal_Purwanchal", @@ -9290,8 +9293,8 @@ "पुर्वाञ्चल विकास क्षेत्र", "नेपाल" ], - "s": 113391681, - "sha1_base64": "nRX3gP5e6A1Yh37+IW1OiC7td/8=" + "s": 114157305, + "sha1_base64": "omINu+VVtkK/MU6LN/RXLBuMxkw=" } ] }, @@ -9321,8 +9324,8 @@ "Región Autónoma de la Costa Caribe Sur", "Rivas" ], - "s": 63401156, - "sha1_base64": "fDadjgnO+GJJMqeq3KAVE/AHtRk=" + "s": 64078820, + "sha1_base64": "yvNwJM2uGyNg4hxxh5uI/iV/P9c=" }, { "id": "Niger", @@ -9340,8 +9343,8 @@ "Tillabéri", "Zinder" ], - "s": 114670354, - "sha1_base64": "4OPFmGPyg4yrS646DZR/thbWI/0=" + "s": 115898642, + "sha1_base64": "//JzEpkwfdflJI/AJL3FjbpO6AE=" }, { "id": "Nigeria", @@ -9382,8 +9385,8 @@ "Rivers", "Taraba" ], - "s": 476271524, - "sha1_base64": "LRqJyWnWEBc5JSTK2dHcGSmsC7A=" + "s": 477659365, + "sha1_base64": "V7YtpKBA0cygTL4Iurh1KBfhTiU=" }, { "id": "Nigeria_North", @@ -9404,8 +9407,8 @@ "Yobe", "Zamfara" ], - "s": 226358508, - "sha1_base64": "K9ZokXO9P0xHCXUbIQ5qACM0MFA=" + "s": 226960660, + "sha1_base64": "CFvtqRxX43bM+vyW7of3TalTXy4=" } ] }, @@ -9417,8 +9420,8 @@ "affiliations": [ "Niuē" ], - "s": 519560, - "sha1_base64": "C7iay/+oRxuEkB2Tst4/BL3sTAQ=" + "s": 522096, + "sha1_base64": "j95CwRIuLam3GdePUqmGwxBi2Zc=" }, { "id": "North Korea", @@ -9439,8 +9442,8 @@ "평양직할시", "조선민주주의인민공화국" ], - "s": 100881572, - "sha1_base64": "dw7rJ8qxvNzGnO2MbH5o+MoIunw=" + "s": 103129420, + "sha1_base64": "RNDBxgJasCs2R8isvBJeVaU2n3M=" }, { "id": "Norway", @@ -9455,8 +9458,8 @@ "Norge", "Troms" ], - "s": 249550526, - "sha1_base64": "skYdDtDJG8dVDYfDxerd/7elK+g=" + "s": 250018046, + "sha1_base64": "XpBXJGuwnMeb3L9kXg60UYCNUAU=" }, { "id": "Norway_Hordaland", @@ -9467,8 +9470,8 @@ "Hordaland", "Norge" ], - "s": 86831611, - "sha1_base64": "fo4MojDTn5zrD8yUF5U3fJzOkCE=" + "s": 87215067, + "sha1_base64": "muL0fHGbPD/4xIxlh4jPuiFyoew=" }, { "id": "Norway_Nordland", @@ -9480,8 +9483,8 @@ "Norge", "Troms" ], - "s": 193509150, - "sha1_base64": "u1Nk4kr0J9acpLyM8c1I56YjCZI=" + "s": 193762918, + "sha1_base64": "tkFydY6OrZnw8EN7VruxYy0B8RM=" }, { "id": "Norway_Svalbard", @@ -9492,8 +9495,8 @@ "Norge", "Svalbard" ], - "s": 18121848, - "sha1_base64": "bSffTmp56l+RtnxRnfezsxVnX1s=" + "s": 18307904, + "sha1_base64": "9LdwSQ17FM2uf1bqWTFItskpkuk=" }, { "id": "Norway_Oppland", @@ -9504,8 +9507,8 @@ "Norge", "Oppland" ], - "s": 98720774, - "sha1_base64": "kFRfYQA8nnCG/MDtNFYXA0iST+w=" + "s": 99006838, + "sha1_base64": "rCWZ/DKPRXYXQXBLrQevx2fxmZU=" }, { "id": "Norway_Rogaland", @@ -9516,8 +9519,8 @@ "Norge", "Rogaland" ], - "s": 70758532, - "sha1_base64": "NFSiRaDhjc6GQUQvLySWzEnQetQ=" + "s": 70978428, + "sha1_base64": "RSzNhTmUTt5SY4iPFW6H+waTPAA=" }, { "id": "Norway_Hedmark", @@ -9528,8 +9531,8 @@ "Hedmark", "Norge" ], - "s": 101218477, - "sha1_base64": "y85+ePAoxkHoipRC3xUc4H00wQ8=" + "s": 101371893, + "sha1_base64": "LnGRPzpttlmIxDxIseSoszmORV4=" }, { "id": "Norway_Jan Mayen", @@ -9537,8 +9540,8 @@ "Jan Mayen", "Norge" ], - "s": 1194785, - "sha1_base64": "kDNx7jJAOqTk3tSge2mJHm0xKIc=" + "s": 1198705, + "sha1_base64": "gg8ydSpvTUBHE1t17Que9UFCKxc=" }, { "id": "Norway_North Trondelag", @@ -9550,8 +9553,8 @@ "Norge", "Sør-Trøndelag" ], - "s": 129026185, - "sha1_base64": "Ln4BrxrQMVjV8C5WLr4kOucPmGA=" + "s": 129156297, + "sha1_base64": "WZuiFfmyzflSOZxzQafckjz4QYo=" }, { "id": "Norway_South Trondelag", @@ -9562,8 +9565,8 @@ "Norge", "Sør-Trøndelag" ], - "s": 79972196, - "sha1_base64": "OKUib3D53Kv+f7sswYEO+rnewbU=" + "s": 80474020, + "sha1_base64": "aNJYAMAv+WSU9yPcFZFEeAArrS0=" }, { "id": "Norway_Southern", @@ -9578,8 +9581,8 @@ "Vest-Agder", "Vestfold" ], - "s": 243051874, - "sha1_base64": "nDJwusqHfwl8rwDg14SE0vw6iVs=" + "s": 244119466, + "sha1_base64": "HyzosCbJ7JaRBcBnxGYSUgIwNS8=" }, { "id": "Norway_Western", @@ -9591,8 +9594,8 @@ "Norge", "Sogn og Fjordane" ], - "s": 134340646, - "sha1_base64": "+vnKb0QD66CdpFvIGbBgGW0AM5w=" + "s": 134970174, + "sha1_base64": "1C1qx/Rg/pUN9eiUdrK2zcqI0Tg=" }, { "id": "Norway_Central", @@ -9605,8 +9608,8 @@ "Norge", "Oslo" ], - "s": 160715985, - "sha1_base64": "9jEP8ishSzzbpFkFWI6FNpsMzPk=" + "s": 162118969, + "sha1_base64": "8iW3868qGLKUYlXHRJwWzmNd3No=" }, { "id": "Norway_Bouvet Island", @@ -9617,8 +9620,8 @@ "Bouvetøya", "Norge" ], - "s": 175567, - "sha1_base64": "AhxYspO6bK9B9f/2naR/zna1zmU=" + "s": 180920, + "sha1_base64": "0j0/+YJ7YkJdYMP6LDrPBYqeUXc=" } ] }, @@ -9640,8 +9643,8 @@ "‏سلطنة عمان‎", "محافظة البريمي" ], - "s": 44194347, - "sha1_base64": "ZgSF9kfrgnWIkTTqOOzL9igg7Pg=" + "s": 44914499, + "sha1_base64": "GQ5pci/ql3S6748T8lc+Kzjr12A=" }, { "id": "Pakistan", @@ -9659,8 +9662,8 @@ "بلوچستان / Balochistan", "‏پاکستان‎" ], - "s": 247366994, - "sha1_base64": "SvkJ5jlrhl430EQ3jBN2Ef5ZPHo=" + "s": 249619906, + "sha1_base64": "TJLn+5y7KVJbMeiCIbVfzAICpLU=" }, { "id": "Palau", @@ -9671,8 +9674,8 @@ "Belau", "PW" ], - "s": 1649710, - "sha1_base64": "pRYv/O67wSU1oR+IfahdQXNsBwM=" + "s": 1653206, + "sha1_base64": "0fag273JtcjrvIL49Ogi3ZLGdL8=" }, { "id": "Panama", @@ -9699,8 +9702,8 @@ "Panamá", "Veraguas" ], - "s": 43534848, - "sha1_base64": "Wv5NwKSI8FnfvF+UiC946RlAfqU=" + "s": 44337176, + "sha1_base64": "/CD6Vk1gFABLaSyuT24pc7+OlpE=" }, { "id": "Papua New Guinea", @@ -9733,8 +9736,8 @@ "Western", "Western Highlands" ], - "s": 77770432, - "sha1_base64": "jB77x9dNquEHDlSsBEkIhSNaqxU=" + "s": 78201872, + "sha1_base64": "xV8jR5+/1lgaH0v/Olbvn6PoA74=" }, { "id": "Paraguay", @@ -9764,8 +9767,8 @@ "Presidente Hayes", "San Pedro" ], - "s": 100176384, - "sha1_base64": "1ZEG72ypt2N0kH0VN+IyZtnfnKA=" + "s": 100610168, + "sha1_base64": "3twqAimBEZcPp/ER/cAb4wy4/Ug=" }, { "id": "People's Republic of China", @@ -9782,8 +9785,8 @@ "中国", "安徽省" ], - "s": 52445098, - "sha1_base64": "lDBeosDIMnr57SWFEMKgWa+12gE=" + "s": 52965898, + "sha1_base64": "rxAJJUTAWRNiStvtrkt75X1RlXQ=" }, { "id": "China_Chongqing", @@ -9794,8 +9797,8 @@ "重庆市", "中国" ], - "s": 47255608, - "sha1_base64": "86f8rCkRuDMabUZTVFvZMUY/SqE=" + "s": 47511872, + "sha1_base64": "ZB4FWAHIn2UCuDKq9WBYI2XQXSM=" }, { "id": "China_Fujian", @@ -9806,8 +9809,8 @@ "中国", "福建省" ], - "s": 62487323, - "sha1_base64": "PNPVhFqQJQIZh2+5xcpAz2gJg1w=" + "s": 63005123, + "sha1_base64": "kI6EzfCMZaiS3Sa1P3Umcl4fPwc=" }, { "id": "China_Gansu", @@ -9818,8 +9821,8 @@ "中国", "甘肃省" ], - "s": 112883534, - "sha1_base64": "W7AFYu+pYC43LZ81jLi6mIfnRog=" + "s": 113156238, + "sha1_base64": "9I6wQ4EpjtKXtdpSpMHS+68gclw=" }, { "id": "China_Guangdong", @@ -9834,8 +9837,8 @@ "country_name_synonyms": [ "Hong Kong" ], - "s": 280192568, - "sha1_base64": "xaQ09S5e6BaxfM2SMQZt3k0ZjnI=" + "s": 284758442, + "sha1_base64": "ktbG/J7T2T4ZGoHAGzadLHizebQ=" }, { "id": "China_Guangxi", @@ -9846,8 +9849,8 @@ "广西壮族自治区", "中国" ], - "s": 94892751, - "sha1_base64": "ZgqkEFqXHiViNswKm9CWojjg27I=" + "s": 96783144, + "sha1_base64": "Q5a88ZRcPoMlgsuhDF7Td8ngMXA=" }, { "id": "China_Guizhou", @@ -9858,8 +9861,8 @@ "贵州省", "中国" ], - "s": 51833305, - "sha1_base64": "B6bX/WYkyvWP5aGbj3/WGDZSLb8=" + "s": 51924633, + "sha1_base64": "jEHDCYSeF0bwVo5LsLRB/388RYg=" }, { "id": "China_Hebei", @@ -9872,8 +9875,8 @@ "天津市", "河北省" ], - "s": 144325536, - "sha1_base64": "SS8/q/WAu3rpCO7X3B3kt532wD0=" + "s": 145770264, + "sha1_base64": "YIP6gaiatKZ5JnGlKwos2Y1UqBA=" }, { "id": "China_Heilongjiang", @@ -9884,8 +9887,8 @@ "中国", "黑龙江省" ], - "s": 61281314, - "sha1_base64": "bqs4o3bCIi7VHKLhrB4HWCab8G8=" + "s": 61953610, + "sha1_base64": "W3GGvUT1Hsq+AsYtnDKSh3FTIgA=" }, { "id": "China_Henan", @@ -9896,8 +9899,8 @@ "中国", "河南省" ], - "s": 67706164, - "sha1_base64": "PFDbCpzYS1XaaapUsSQyWHLD5hA=" + "s": 68291268, + "sha1_base64": "JMysRpBSe+SeOM39BiZZB9KdQNQ=" }, { "id": "China_Hubei", @@ -9909,8 +9912,8 @@ "中国", "湖北省" ], - "s": 79910925, - "sha1_base64": "64G6XeJcdB+z91CAKqNPd/vOdws=" + "s": 80360229, + "sha1_base64": "4VvVDL5PRHvIixmok970A5ii380=" }, { "id": "China_Hunan", @@ -9921,8 +9924,8 @@ "中国", "湖南省" ], - "s": 79669716, - "sha1_base64": "zKDo1/7uitxtsRUSIEReFvuIWwE=" + "s": 80046692, + "sha1_base64": "xiJoJ9502CPy9sUOz+uISCoxIdA=" }, { "id": "China_Inner Mongolia", @@ -9933,8 +9936,8 @@ "中国", "内蒙古自治区 / Inner Mongolia" ], - "s": 88996138, - "sha1_base64": "1ybOEfv9Cw+mOR2mA8HdlIxICag=" + "s": 89549410, + "sha1_base64": "ONm8v/9DG7yr0NKYiwNxoxxBBSs=" }, { "id": "China_Jiangsu", @@ -9946,8 +9949,8 @@ "江苏省", "秦山岛" ], - "s": 94160519, - "sha1_base64": "b9lerIF+iOxi5NwIuiOpuFXWTr8=" + "s": 95144599, + "sha1_base64": "BumHinbmfe/VqUwln56wsybai+U=" }, { "id": "China_Jiangxi", @@ -9958,8 +9961,8 @@ "中国", "江西省" ], - "s": 68613403, - "sha1_base64": "3/I+xt5zYrDCc6fUcVZkMUT7DyM=" + "s": 69100867, + "sha1_base64": "3n2zvgzrxeF5abECNrFJYn7RtpI=" }, { "id": "China_Jilin", @@ -9970,8 +9973,8 @@ "中国", "吉林省" ], - "s": 40871823, - "sha1_base64": "3CcQq5fkrRWyxZQqQ04hdDINoY4=" + "s": 41106856, + "sha1_base64": "88UO/5qIHVjFoGzfwtbCHv70u8s=" }, { "id": "China_Liaoning", @@ -9982,8 +9985,8 @@ "辽宁省", "中国" ], - "s": 41661057, - "sha1_base64": "lPE4nEg4hfzwt2+N/BOBMyI4pjc=" + "s": 42478617, + "sha1_base64": "4FX44Ajxbss0XYSTxI+s0BIXt+Q=" }, { "id": "China_Ningxia Hui", @@ -9994,8 +9997,8 @@ "宁夏回族自治区", "中国" ], - "s": 15192989, - "sha1_base64": "1zcxLFVxSm5amrGr9QPJ7oQ1woo=" + "s": 15236573, + "sha1_base64": "NdAgJocUq6y/ZejB6A6PGP+lj0Q=" }, { "id": "China_Qinghai", @@ -10006,8 +10009,8 @@ "青海省", "中国" ], - "s": 78874665, - "sha1_base64": "KH21+7QHP2OJ1MTTadmvq0kGTsA=" + "s": 79140201, + "sha1_base64": "OFGpfZivj50BfNyDgO1al50V/Os=" }, { "id": "China_Shaanxi", @@ -10018,8 +10021,8 @@ "陕西省", "中国" ], - "s": 95910300, - "sha1_base64": "5er9Ole9WE9AFVZgMjvodIhYCug=" + "s": 96288652, + "sha1_base64": "AJN7NPVruRGpmRmdf5RR5DVZXqc=" }, { "id": "China_Shandong", @@ -10030,8 +10033,8 @@ "中国", "山东省" ], - "s": 89175718, - "sha1_base64": "koyrccxe5mutIFEHxxcd+mJJHEE=" + "s": 90348558, + "sha1_base64": "YQNnaJgBkjdoCQhyo6Dg49SEJvE=" }, { "id": "China_Shanghai", @@ -10043,8 +10046,8 @@ "上海市", "浙江省" ], - "s": 31241135, - "sha1_base64": "LhN7OmOpoV7eaVNDp0rG7UfBNcs=" + "s": 31716495, + "sha1_base64": "sqhmSHqRwfIJ7d+bmzSKi4pv21o=" }, { "id": "China_Shanxi", @@ -10055,8 +10058,8 @@ "中国", "山西省" ], - "s": 56118129, - "sha1_base64": "xUZ6MI/wSjBY7vSwIEBEmxJK65I=" + "s": 56426393, + "sha1_base64": "MVvqaPGDE+JSDjBD6/UsvRwf2nA=" }, { "id": "China_Sichuan", @@ -10067,8 +10070,8 @@ "中国", "四川省" ], - "s": 207173486, - "sha1_base64": "5wo3fzOKwyfVVhBTmOuMPSXqZWw=" + "s": 207820478, + "sha1_base64": "GFGiQWPU0jhTMY3ifgGkCB1uYvo=" }, { "id": "China_Tibet Autonomous Region", @@ -10079,8 +10082,8 @@ "中国", "西藏自治区 (བོད་རང་སྐྱོང་ལྗོངས་)" ], - "s": 130019713, - "sha1_base64": "b5FVUOD8F1UcZsIZaoknG0rSMPc=" + "s": 130339442, + "sha1_base64": "xzaHop5r1wHo+YFErP5EPgw4llM=" }, { "id": "China_Xinjiang", @@ -10091,8 +10094,8 @@ "中国", "新疆维吾尔自治区" ], - "s": 149822279, - "sha1_base64": "eTPRuBN22JcPxSfej50E7tOAadU=" + "s": 150071127, + "sha1_base64": "I5/SXTogF1L2A49tUNTRmhnrA1w=" }, { "id": "China_Yunnan", @@ -10103,8 +10106,8 @@ "中国", "云南省" ], - "s": 165250727, - "sha1_base64": "UfcWykaHaf0CJPcpwSa+wZJoFwQ=" + "s": 165681239, + "sha1_base64": "hJQeOfBtl1PbYR993IxY5i/L8LA=" }, { "id": "China_Zhejiang", @@ -10115,8 +10118,8 @@ "中国", "浙江省" ], - "s": 111340361, - "sha1_base64": "RRkWT41iyH+3YTPuWozD/O8jEXg=" + "s": 112331697, + "sha1_base64": "Y0m2DOW8xFIlKG3in44+7wq2Xr4=" } ] }, @@ -10138,8 +10141,8 @@ "臺北市", "中華民國" ], - "s": 265694481, - "sha1_base64": "A72Itl9ReKSADZyIAWTbQeB9M6A=" + "s": 266588089, + "sha1_base64": "Gm8havmvrmJo64EUjcfI8pj7+oE=" }, { "id": "Taiwan_South", @@ -10152,8 +10155,8 @@ "臺中市", "中華民國" ], - "s": 194688001, - "sha1_base64": "d5BhhjQ8sxI++F087h8PlpDnQQM=" + "s": 195031409, + "sha1_base64": "Ocek1Zxdum+bwDX7rbeRNIh5NI0=" } ] }, @@ -10180,8 +10183,8 @@ "Tumbes", "Ucayali" ], - "s": 165840423, - "sha1_base64": "h1gL5fmMoEZaUPE44RypKBvTGlM=" + "s": 168474504, + "sha1_base64": "TJ/kCVTeqUcuIVr45ek3fytXZgA=" }, { "id": "Peru_Lima", @@ -10196,8 +10199,8 @@ "Lima", "Perú" ], - "s": 79832278, - "sha1_base64": "8Rn2vK3ZzcOJaXtWEGFTQhRDlFQ=" + "s": 81217446, + "sha1_base64": "v9rH+kqltzRltsPwy9HBSSBYxaY=" }, { "id": "Peru_South", @@ -10215,8 +10218,8 @@ "Puno", "Tacna" ], - "s": 136556504, - "sha1_base64": "vZ8TP5XVAUf9tRT5okJixr4txNI=" + "s": 138080040, + "sha1_base64": "km+w88p521dxo3CoCzkvf++xGgA=" } ] }, @@ -10262,8 +10265,8 @@ "Zamboanga del Norte", "Zamboanga del Sur" ], - "s": 133101969, - "sha1_base64": "LIyhRMFYuCDRcFh3Ub1aIVERNK0=" + "s": 134578369, + "sha1_base64": "pDgOmZbL/vpxoitdSs9vk/KQLvs=" }, { "id": "Philippines_Visayas", @@ -10294,8 +10297,8 @@ "Southern Leyte", "Sorsogon" ], - "s": 112291694, - "sha1_base64": "OXgzEq1mlB+tLeC6b7N4hhpikas=" + "s": 112697790, + "sha1_base64": "pdRygeOTe25jE1kM7x4wKwL8LBI=" }, { "id": "Philippines_Luzon_South", @@ -10318,8 +10321,8 @@ "Sorsogon", "太平島" ], - "s": 26380756, - "sha1_base64": "k12dRf2vN7GyMH0KxBvCil39mu4=" + "s": 26490796, + "sha1_base64": "iBdQ4KLx96qOszD2eVCnhBLMC60=" }, { "id": "Philippines_Luzon_Manila", @@ -10341,8 +10344,8 @@ "Rizal", "Sorsogon" ], - "s": 159557970, - "sha1_base64": "5GkqQd2Thi8lNK6Qyg2Fkl8nLAg=" + "s": 161036249, + "sha1_base64": "Ri+X+b46Sc+WWAkd+f4KTsd5vL4=" }, { "id": "Philippines_Luzon_North", @@ -10378,8 +10381,8 @@ "Zambales", "海南省" ], - "s": 185939132, - "sha1_base64": "DvvpTPgW//dFBfFj494soGsLR2U=" + "s": 186485476, + "sha1_base64": "3RiblgY5VuJLAtfjoIbUIXlBbdw=" } ] }, @@ -10394,8 +10397,8 @@ "country_name_synonyms": [ "Pitcairn" ], - "s": 373243, - "sha1_base64": "2eYZs1RIT2atrpknPiqZDRS25HI=" + "s": 374724, + "sha1_base64": "RCEzYp1oyb6ZuibHXSE/UuVCmwo=" }, { "id": "Poland", @@ -10410,8 +10413,8 @@ "Territorial waters of Bornholm", "województwo zachodniopomorskie" ], - "s": 91071704, - "sha1_base64": "uB4O976dIY0rTTVo83OAswhLIJ4=" + "s": 94922568, + "sha1_base64": "QSxD3xhyPbl3KD772iRGyVOZM0M=" }, { "id": "Poland_Pomeranian Voivodeship", @@ -10423,8 +10426,8 @@ "Territorial waters of Bornholm", "województwo pomorskie" ], - "s": 108748744, - "sha1_base64": "UYMCGq6sNsLSmpljjZs3V9eLplo=" + "s": 110121297, + "sha1_base64": "1tVXs17u5chE+gPB8E6jWCe0Qrs=" }, { "id": "Poland_Podlaskie Voivodeship", @@ -10435,8 +10438,8 @@ "Polska", "województwo podlaskie" ], - "s": 73351167, - "sha1_base64": "tfNz6FXVnBfKU5jk0Q6fZGzs3cw=" + "s": 73775711, + "sha1_base64": "Oyydn0Z0hCBDill2CYX5XjtBSf0=" }, { "id": "Poland_Masovian Voivodeship", @@ -10447,8 +10450,8 @@ "Polska", "województwo mazowieckie" ], - "s": 269633688, - "sha1_base64": "Rwt8WZtY55sEUZeeyTUNoWxEmzE=" + "s": 274774688, + "sha1_base64": "QdedZHftWG+FVwuy/Os38xw5qgo=" }, { "id": "Poland_Lubusz Voivodeship", @@ -10459,8 +10462,8 @@ "Polska", "województwo lubuskie" ], - "s": 56943100, - "sha1_base64": "N5BJbvhmtgVu+sCUfjMLkdeXrUs=" + "s": 57841052, + "sha1_base64": "eK5v9oDJUCCiB9Ddv58QBR9bpdY=" }, { "id": "Poland_Lublin Voivodeship", @@ -10471,8 +10474,8 @@ "Polska", "województwo lubelskie" ], - "s": 130654579, - "sha1_base64": "Gd5nCPNbD3uOVcL019W6yilnF7g=" + "s": 131787083, + "sha1_base64": "SuaQy2ypm9XZWhPP53GAly1Z2Js=" }, { "id": "Poland_Lower Silesian Voivodeship", @@ -10483,8 +10486,8 @@ "Polska", "województwo dolnośląskie" ], - "s": 147031860, - "sha1_base64": "T0/XkWCJi1YpfEU3QV0ZuJpDtes=" + "s": 149154524, + "sha1_base64": "avrTxJy662SHWB8cNkKbw42LkZs=" }, { "id": "Poland_Warmian-Masurian Voivodeship", @@ -10495,8 +10498,8 @@ "Polska", "województwo warmińsko-mazurskie" ], - "s": 86732888, - "sha1_base64": "gjZ5CIhNuUnONSy6VvaJ8wS6psc=" + "s": 87754720, + "sha1_base64": "Q2B8zvLBjhEBI22KJvZFIDHO+m8=" }, { "id": "Poland_Lodz Voivodeship", @@ -10507,8 +10510,8 @@ "Polska", "województwo łódzkie" ], - "s": 124658873, - "sha1_base64": "1qPzHHWWsQiIPwmQaC6Eaxipxw4=" + "s": 126262353, + "sha1_base64": "XjSlufTl99EGkm5rJRjwsSmtQrQ=" }, { "id": "Poland_Subcarpathian Voivodeship", @@ -10519,8 +10522,8 @@ "Polska", "województwo podkarpackie" ], - "s": 140720523, - "sha1_base64": "scnRIre1AcPpgr28wed3BGJqCg8=" + "s": 142779323, + "sha1_base64": "jfqGiz5obFGLTBMUdOrw77AJ6bo=" }, { "id": "Poland_Lesser Poland Voivodeship", @@ -10531,8 +10534,8 @@ "Polska", "województwo małopolskie" ], - "s": 191566677, - "sha1_base64": "Lbucr279D4m0gfGkmhGpikWKrnw=" + "s": 195106773, + "sha1_base64": "b7V995cXB8Ov64in6ApYT//Tc0Y=" }, { "id": "Poland_Silesian Voivodeship", @@ -10543,8 +10546,8 @@ "Polska", "województwo śląskie" ], - "s": 169730804, - "sha1_base64": "lQKazUoBE8hU+mxzjr/HRtmjdEs=" + "s": 171935900, + "sha1_base64": "3rmyB9Yq0RDuQMXQktzsi38tZMM=" }, { "id": "Poland_Kuyavian-Pomeranian Voivodeship", @@ -10555,8 +10558,8 @@ "Polska", "województwo kujawsko-pomorskie" ], - "s": 101499344, - "sha1_base64": "HAo2r/UIxa35Q9h7mItnExhjzV0=" + "s": 102491264, + "sha1_base64": "8ZQ6bz/tENKcFur0JuqSRAYw8HM=" }, { "id": "Poland_Greater Poland Voivodeship", @@ -10567,8 +10570,8 @@ "Polska", "województwo wielkopolskie" ], - "s": 155166604, - "sha1_base64": "aIa69FqSC1KO0HVsvI/lkP5JJ9c=" + "s": 156489820, + "sha1_base64": "vmHrkSKxnt87YQVdPs9tqU1i1d8=" }, { "id": "Poland_Opole Voivodeship", @@ -10579,8 +10582,8 @@ "Polska", "województwo opolskie" ], - "s": 50662325, - "sha1_base64": "/dooYxAmwI7v/IAhObJxhKvLDmk=" + "s": 51089421, + "sha1_base64": "0DyodpWPQ5S6/YZDJ+D0Bo+cg5M=" }, { "id": "Poland_Swietokrzyskie Voivodeship", @@ -10591,8 +10594,8 @@ "Polska", "województwo świętokrzyskie" ], - "s": 79660495, - "sha1_base64": "UWfhTDba5P9TxvNKL3aA8qLOTzw=" + "s": 80367975, + "sha1_base64": "UG6tXoMr2dg/cAow6B9xmbZ4ETQ=" } ] }, @@ -10609,8 +10612,8 @@ "Norte", "Portugal" ], - "s": 108948610, - "sha1_base64": "GtiVYjPi8C8ACSbHnwy54pEzQDU=" + "s": 111038050, + "sha1_base64": "4RYQiyqxPUz2kijLtY6r+OxKKSQ=" }, { "id": "Portugal_South", @@ -10624,8 +10627,8 @@ "Lisboa", "Portugal" ], - "s": 153293588, - "sha1_base64": "FTInuDkW2nPy/oRA19wK8Slbb+Q=" + "s": 155817260, + "sha1_base64": "+yh0mB5Lzbms646CY048FjTXnEc=" }, { "id": "Portugal_Islands", @@ -10667,8 +10670,8 @@ "Portugal", "Portugal (águas territoriais)" ], - "s": 39109527, - "sha1_base64": "JmG0na8W1yOT4hiQSU/hHvEPECU=" + "s": 40325855, + "sha1_base64": "U+MMqznmpLYVw01uhzbbo/+LQvs=" }, { "id": "Portugal_Viseu", @@ -10680,8 +10683,8 @@ "Norte", "Portugal" ], - "s": 131954122, - "sha1_base64": "/BME2tmpv4mjQQRrlSB8QelMzrQ=" + "s": 133622306, + "sha1_base64": "SqJwtCZw06U2SHYKZiWca+EmckI=" } ] }, @@ -10703,8 +10706,8 @@ "Umm Salal", "‏قطر‎" ], - "s": 28644479, - "sha1_base64": "NJ8JW9VwgKR9OXE6MWV8eiErmZg=" + "s": 30665544, + "sha1_base64": "L9HO9F0JjifZ7Wl9bWHXUjLLUBU=" }, { "id": "Republic of Kosovo", @@ -10717,8 +10720,8 @@ "country_name_synonyms": [ "Kosovo" ], - "s": 36898225, - "sha1_base64": "Re4nzUgHk1Cx/AQiT9DAMaqVNMs=" + "s": 37071081, + "sha1_base64": "cmmoWZtmukm7rLnBDGeFXqvietk=" }, { "id": "Romania", @@ -10737,8 +10740,8 @@ "Tulcea", "Vrancea" ], - "s": 36647171, - "sha1_base64": "UB/GHaYGUl1YbslJ2xde4qo3YAw=" + "s": 36995499, + "sha1_base64": "gR8VdBgSlRVnHNZdTJC2bukhlo8=" }, { "id": "Romania_Centre", @@ -10754,8 +10757,8 @@ "România", "Sibiu" ], - "s": 71334022, - "sha1_base64": "7xcDcV/oxvIoPcExL0JmpS4PsaM=" + "s": 71907286, + "sha1_base64": "an/y88AoVjdM92zRGmnW+tc7DFw=" }, { "id": "Romania_West", @@ -10769,8 +10772,8 @@ "România", "Timiș" ], - "s": 45244251, - "sha1_base64": "y6WkIXfQytD2lOCHr8BZDr7PiEo=" + "s": 45618275, + "sha1_base64": "4775nnHnkerlMVSc/UgBYDvArIQ=" }, { "id": "Romania_North_West", @@ -10786,8 +10789,8 @@ "Satu Mare", "Sălaj" ], - "s": 65214351, - "sha1_base64": "XgDs5lRQwYuR2p99KAwr5EeKKAE=" + "s": 65737295, + "sha1_base64": "x/HZeF6HLyfV/Ut0PJFDd/jkODg=" }, { "id": "Romania_South_West", @@ -10802,8 +10805,8 @@ "România", "Vâlcea" ], - "s": 44420188, - "sha1_base64": "s8MJO7L6h4ulo73qOkQ/7LMzzdE=" + "s": 44773356, + "sha1_base64": "pNCLOzzWBM6xYJWoaxyp+yY9Mqw=" }, { "id": "Romania_North_East", @@ -10819,8 +10822,8 @@ "Suceava", "Vaslui" ], - "s": 51540843, - "sha1_base64": "5t67XBIg642jj/A6qdI6yr4HqLs=" + "s": 51925204, + "sha1_base64": "ZX+KJfzYhtIVsjy4l2MaJSVm5ZE=" }, { "id": "Romania_South", @@ -10840,8 +10843,8 @@ "România", "Teleorman" ], - "s": 64506957, - "sha1_base64": "IHEbI3xoac1q7Wv1RJ/ryHVlxI4=" + "s": 65687877, + "sha1_base64": "DRrNUuoKfgmcxbEBMcM+hdVmafE=" } ] }, @@ -10861,8 +10864,8 @@ "Україна", "Республика Крым" ], - "s": 55320691, - "sha1_base64": "FtLSbuVHHZ6AoD6UCTRE6S1zJRw=" + "s": 55728755, + "sha1_base64": "iRBodnM5K1ewzkybnXGIb1DL8nY=" }, { "id": "Russia_Altai Krai", @@ -10874,8 +10877,8 @@ "Российская Федерация", "Алтайский край" ], - "s": 154599623, - "sha1_base64": "QprfsB3mQ/rzRS8x8dqQCeVbw9o=" + "s": 154920607, + "sha1_base64": "ts/pNza46hDeC3cdok3DLd1sDGU=" }, { "id": "Russia_Altai Republic", @@ -10887,8 +10890,8 @@ "Российская Федерация", "Республика Алтай" ], - "s": 113550577, - "sha1_base64": "P+PHNZJ7Q7H9phnRQMdtkWHfBNM=" + "s": 113821145, + "sha1_base64": "gjf5WhQuoHnxtWsiCi25VZ3Gak8=" }, { "id": "Russia_Amur Oblast", @@ -10900,8 +10903,8 @@ "Российская Федерация", "Амурская область" ], - "s": 47609479, - "sha1_base64": "y6hI5h0OGRnrQGgEbkInw13WJHo=" + "s": 47710783, + "sha1_base64": "f6H74xXL5wM2Q3pXD/6waf9cKYA=" }, { "id": "Russia_Arkhangelsk Oblast_Central", @@ -10913,8 +10916,8 @@ "Российская Федерация", "Архангельская область" ], - "s": 66728259, - "sha1_base64": "7gq5ZdjszwSe+xvY3nOkyq+o9i4=" + "s": 67026019, + "sha1_base64": "cRojlh7EUsIAWTP7eCbfManvvEY=" }, { "id": "Russia_Arkhangelsk Oblast_North", @@ -10928,8 +10931,8 @@ "Ненецкий автономный округ", "Архангельская область" ], - "s": 70319444, - "sha1_base64": "kg6pWy+gg7y4yHir0j3JFtmIpGw=" + "s": 70477172, + "sha1_base64": "jx+e73gybbnNlZtAnSN+t+7LThk=" }, { "id": "Russia_Astrakhan Oblast", @@ -10941,8 +10944,8 @@ "Российская Федерация", "Астраханская область" ], - "s": 34694654, - "sha1_base64": "fuLX/fZkO3UXFShG4xvYdOtgx8Q=" + "s": 34987135, + "sha1_base64": "nyp33P8AwxU2dJBKc/KMnCBMpDg=" }, { "id": "Russia_Bashkortostan", @@ -10954,8 +10957,8 @@ "Российская Федерация", "Башкортостан" ], - "s": 119988550, - "sha1_base64": "ugGupLnJs+OfN0Im5mFI58j8q8g=" + "s": 120360678, + "sha1_base64": "1MVUOHoppC51DKa75xo03RWNcWc=" }, { "id": "Russia_Belgorod Oblast", @@ -10967,8 +10970,8 @@ "Российская Федерация", "Белгородская область" ], - "s": 40227681, - "sha1_base64": "UxYi4G+Q+GegxYo0dc3yWPuZPsc=" + "s": 40373241, + "sha1_base64": "jAq42WD+QMcVyq51JQqK3PerCFc=" }, { "id": "Russia_Bryansk Oblast", @@ -10980,8 +10983,8 @@ "Российская Федерация", "Брянская область" ], - "s": 27020776, - "sha1_base64": "ckaJXu+JWLZzDqltlkYIbJdcweo=" + "s": 27133208, + "sha1_base64": "pjNGPGGgqx75M9f30B8fiEVLa1E=" }, { "id": "Russia_Buryatia", @@ -10993,8 +10996,8 @@ "Российская Федерация", "Бурятия" ], - "s": 47386232, - "sha1_base64": "eM2B6SLAj7BMVDlM4lRNdANjK/E=" + "s": 47554376, + "sha1_base64": "ritAfy+W7OLoBCxIDKF2RRdKdUw=" }, { "id": "Russia_Chechen Republic", @@ -11006,8 +11009,8 @@ "Россия", "Российская Федерация" ], - "s": 27870197, - "sha1_base64": "UuAnq2Iz3N4e2E5CmAzecl8Jfz8=" + "s": 28020341, + "sha1_base64": "OkYxk2VFBX+5yMwCMYtjpsuzFCU=" }, { "id": "Russia_Chelyabinsk Oblast", @@ -11019,8 +11022,8 @@ "Российская Федерация", "Челябинская область" ], - "s": 82479832, - "sha1_base64": "XhZ/fMtdZkeN3inV2dGscPIKquk=" + "s": 82846848, + "sha1_base64": "pscrmHoiOgGz2Siyr0rSKAvZVzI=" }, { "id": "Russia_Chukotka Autonomous Okrug", @@ -11032,8 +11035,8 @@ "Россия", "Российская Федерация" ], - "s": 153460863, - "sha1_base64": "EJyNWj8vxqg4EAya02LvOq/xJ4w=" + "s": 154282463, + "sha1_base64": "TqE67q5URIZWk7vpieQS+1jX1P8=" }, { "id": "Russia_Chuvashia", @@ -11045,8 +11048,8 @@ "Российская Федерация", "Чувашия" ], - "s": 28291727, - "sha1_base64": "etN5r414Kwi0gkXHovoL0CGzxE4=" + "s": 28447479, + "sha1_base64": "sJ2CFDyBO4OBub9Wdm6JaXa6Ws0=" }, { "id": "Russia_Ingushetia", @@ -11058,8 +11061,8 @@ "Российская Федерация", "Ингушетия" ], - "s": 10158208, - "sha1_base64": "/V/6onjEVX1ctXim1QF8pdLEAHw=" + "s": 10172008, + "sha1_base64": "h70ijRZfEDBwiaHhInyKQ7SnIgw=" }, { "id": "Russia_Irkutsk Oblast", @@ -11071,8 +11074,8 @@ "Российская Федерация", "Иркутская область" ], - "s": 130009669, - "sha1_base64": "uvLNfy+ThT7yrE7b8UfAOwBysN0=" + "s": 130560237, + "sha1_base64": "0geeZvcJOsdZ1N7A5CY06Cmg05U=" }, { "id": "Russia_Ivanovo Oblast", @@ -11084,8 +11087,8 @@ "Россия", "Российская Федерация" ], - "s": 29043567, - "sha1_base64": "MTi99GPJwYdzt3fmmOIEjbWB0H4=" + "s": 29132799, + "sha1_base64": "oVQZOvZodY4fb664aX2xdBTarwU=" }, { "id": "Russia_Jewish Autonomous Oblast", @@ -11097,8 +11100,8 @@ "Россия", "Российская Федерация" ], - "s": 14487812, - "sha1_base64": "qHKnQR/xKFJble9oEciZR9sYOEY=" + "s": 14546948, + "sha1_base64": "0pRzs5edGHrXgBVKUdRpjyLPh0E=" }, { "id": "Russia_Kabardino-Balkaria", @@ -11110,8 +11113,8 @@ "Россия", "Российская Федерация" ], - "s": 39700991, - "sha1_base64": "rqjek3Ua9TqpUaMRDJyjFWdy838=" + "s": 39780919, + "sha1_base64": "HUBkOav7X9qkXDqfIfosk+1yt64=" }, { "id": "Russia_Kaliningrad Oblast", @@ -11123,8 +11126,8 @@ "Российская Федерация", "Калининградская область" ], - "s": 29349215, - "sha1_base64": "aY8Dt36xJxI+kn3HZ+kcU8leb/w=" + "s": 29592895, + "sha1_base64": "BcyJYZff9bfk5X6i963C+IzRo3k=" }, { "id": "Russia_Kaluga Oblast", @@ -11136,8 +11139,8 @@ "Российская Федерация", "Калужская область" ], - "s": 40480377, - "sha1_base64": "+MphfrUeF+/kTJCjuGNh8uTRFV8=" + "s": 40706225, + "sha1_base64": "5BZP4YTbFXAtxGMVEKmsru/dgss=" }, { "id": "Russia_Kamchatka Krai", @@ -11149,8 +11152,8 @@ "Российская Федерация", "Камчатский край" ], - "s": 94265208, - "sha1_base64": "uc3qlOMUPfqXgeOtQmaTfxmzchs=" + "s": 94724632, + "sha1_base64": "svyCW9xxzGMBLYTRSMVKchMrzI0=" }, { "id": "Russia_Karachay-Cherkessia", @@ -11162,8 +11165,8 @@ "Россия", "Российская Федерация" ], - "s": 47137431, - "sha1_base64": "jqnQlDVxCEdlSr8cQh8rsZfMnEk=" + "s": 47170167, + "sha1_base64": "CZRhdkP26/0F+8LOf+mwhwV4/fI=" }, { "id": "Russia_Kemerov Oblast", @@ -11175,8 +11178,8 @@ "Российская Федерация", "Кемеровская область" ], - "s": 44408329, - "sha1_base64": "Jan5LLWi8NMU6tjXAhBoT+/KlNY=" + "s": 44612305, + "sha1_base64": "5mpcRtuUU0QzHGz51zH05YiLnyI=" }, { "id": "Russia_Khabarovsk Krai", @@ -11188,8 +11191,8 @@ "Российская Федерация", "Хабаровский край" ], - "s": 178979533, - "sha1_base64": "hwrVNy5YNB/9uAirRLC8PPeMF7s=" + "s": 180122645, + "sha1_base64": "j7PUO31EhL0jI8RlTPSabKmC1DE=" }, { "id": "Russia_Khakassia", @@ -11201,8 +11204,8 @@ "Россия", "Российская Федерация" ], - "s": 21755230, - "sha1_base64": "TIlQlT9sUIxZvONod+TOCKwtBJw=" + "s": 22008846, + "sha1_base64": "E69obFKswfCQGpjWSSY4geH8Pgk=" }, { "id": "Russia_Kirov Oblast", @@ -11214,8 +11217,8 @@ "Российская Федерация", "Кировская область" ], - "s": 132001781, - "sha1_base64": "17Mnx3pZrb0lcOQ4ajmbhLULvUc=" + "s": 132579413, + "sha1_base64": "0J0lWbZ7QvfFibUy4YS2i3pCN1g=" }, { "id": "Russia_Komi Republic", @@ -11227,8 +11230,8 @@ "Российская Федерация", "Республика Коми" ], - "s": 107758836, - "sha1_base64": "35tEbMzUULqlK9qNTWpPaTonYp4=" + "s": 108289836, + "sha1_base64": "UUWKpNVUgWjOMgDV6lsgct2SP0M=" }, { "id": "Russia_Kostroma Oblast", @@ -11240,8 +11243,8 @@ "Российская Федерация", "Костромская область" ], - "s": 31105183, - "sha1_base64": "pJOJSbocvzsPXggkxF2nx8HiKy8=" + "s": 31189151, + "sha1_base64": "xQVIAMo4Pf6uAacXI8DL/pK+eXc=" }, { "id": "Russia_Krasnodar Krai", @@ -11253,8 +11256,8 @@ "Российская Федерация", "Краснодарский край" ], - "s": 101265439, - "sha1_base64": "C0WH4Z5JFtRYSBN9ffl4d3qjKJk=" + "s": 101908367, + "sha1_base64": "+vZt/NMem/I3pVD9DR9qSKymaKw=" }, { "id": "Russia_Krasnodar Krai_Adygeya", @@ -11267,8 +11270,8 @@ "Российская Федерация", "Краснодарский край" ], - "s": 89957879, - "sha1_base64": "NLArGYk9jwzJ8fms/Rildze/oe8=" + "s": 90227487, + "sha1_base64": "QfEA2y0/XnAssYLw1e928/V9YmY=" }, { "id": "Russia_Krasnoyarsk Krai_North", @@ -11280,8 +11283,8 @@ "Российская Федерация", "Красноярский край" ], - "s": 154532743, - "sha1_base64": "kDB9BptZt0yJHbKQwrGY4A1X1Lc=" + "s": 155690671, + "sha1_base64": "BbPhh3TFrGV6kHJcD4XQNe5bTgE=" }, { "id": "Russia_Krasnoyarsk Krai_South", @@ -11293,8 +11296,8 @@ "Российская Федерация", "Красноярский край" ], - "s": 81092670, - "sha1_base64": "NbtqmuI0ViTBen5CeWSoWesq4vo=" + "s": 82041366, + "sha1_base64": "qxAzwnwKz0RD5FcTwTk8l0O6x8U=" }, { "id": "Russia_Kurgan Oblast", @@ -11306,8 +11309,8 @@ "Россия", "Российская Федерация" ], - "s": 36386623, - "sha1_base64": "RuqhKAM6NTa4NAKh/k0KF+8RfYk=" + "s": 36448391, + "sha1_base64": "LQhilT9iKQpiXg14JrLHvjrx1j0=" }, { "id": "Russia_Kursk Oblast", @@ -11319,8 +11322,8 @@ "Российская Федерация", "Курская область" ], - "s": 54433217, - "sha1_base64": "3nnBBNmtaj1Xh4scZt8isF3oOoQ=" + "s": 54689393, + "sha1_base64": "gKPM0Um0Lo6Tcvws2/co82xRjV0=" }, { "id": "Russia_Leningradskaya Oblast_Karelsky", @@ -11332,8 +11335,8 @@ "Российская Федерация", "Ленинградская область" ], - "s": 53060457, - "sha1_base64": "kvbO07SDv0TqKAU/WewR1/YCLYI=" + "s": 54254777, + "sha1_base64": "eI3kkrhbsz8AXB/6GJy1FAR0yyM=" }, { "id": "Russia_Leningradskaya Oblast_Southeast", @@ -11345,8 +11348,8 @@ "Российская Федерация", "Ленинградская область" ], - "s": 86476775, - "sha1_base64": "tVC26nJLZYVzWzl/XTxIagUnr58=" + "s": 87291128, + "sha1_base64": "mrF1PGxLnkDRfW3JwRc7/lihBj4=" }, { "id": "Russia_Lipetsk Oblast", @@ -11358,8 +11361,8 @@ "Российская Федерация", "Липецкая область" ], - "s": 34914544, - "sha1_base64": "2EfkisT1P/D6YtHEoljEq+ho6TI=" + "s": 34981936, + "sha1_base64": "P7H6cfLU6evAO2dF6pP5yFD10TE=" }, { "id": "Russia_Magadan Oblast", @@ -11371,8 +11374,8 @@ "Российская Федерация", "Магаданская область" ], - "s": 58158317, - "sha1_base64": "buOI5icbFgRa6wAsZuEJyxxql7o=" + "s": 58644549, + "sha1_base64": "OZEah3iZd9Ouof7G9nnY1AXq8JA=" }, { "id": "Russia_Mari El", @@ -11384,8 +11387,8 @@ "Российская Федерация", "Марий Эл" ], - "s": 31842782, - "sha1_base64": "PAMTBfjBz8e3Ki07HGqlaBuVO4A=" + "s": 32065790, + "sha1_base64": "wrmduYJcJTXIMoMpWAk6YkWpdjQ=" }, { "id": "Russia_Moscow Oblast_East", @@ -11397,8 +11400,8 @@ "Россия", "Российская Федерация" ], - "s": 106103339, - "sha1_base64": "j+YCxenAiFLIyvAAUbpFJLoZncE=" + "s": 106780131, + "sha1_base64": "ktbKmEZ12aQgNxKY7x4RC82fOfQ=" }, { "id": "Russia_Moscow Oblast_West", @@ -11411,8 +11414,8 @@ "Российская Федерация", "Москва" ], - "s": 72881590, - "sha1_base64": "I07GlsOnTATEerYzcoWhlIEkakU=" + "s": 73468326, + "sha1_base64": "Ems2r0d8W1ttSdI72yUV6blATeQ=" }, { "id": "Russia_Moscow", @@ -11425,8 +11428,8 @@ "Российская Федерация", "Москва" ], - "s": 88494580, - "sha1_base64": "M+OHYYS4+2ISOhX1MHtmuTQZVN4=" + "s": 89785428, + "sha1_base64": "AAIqrOTQ3OSzw9GeGxdnJpzmI2Q=" }, { "id": "Russia_Murmansk Oblast", @@ -11438,8 +11441,8 @@ "Россия", "Российская Федерация" ], - "s": 90174939, - "sha1_base64": "itSE1aGk4e+fQwK3jwKKJmBakHs=" + "s": 90478355, + "sha1_base64": "q6kjhRoaqHnW1626x2/lo76zP4M=" }, { "id": "Russia_Nenets Autonomous Okrug", @@ -11451,8 +11454,8 @@ "Российская Федерация", "Ненецкий автономный округ" ], - "s": 35500964, - "sha1_base64": "blaNembF97lCWXnvloMaGdQ0ToE=" + "s": 35656956, + "sha1_base64": "hC5Gt8XGSZ4yzv2uDLRk5B8NeLc=" }, { "id": "Russia_Nizhny Novgorod Oblast", @@ -11464,8 +11467,8 @@ "Российская Федерация", "Нижегородская область" ], - "s": 79625133, - "sha1_base64": "x9R1Q8PQxzQuHOCVEeux2gGJ898=" + "s": 80135421, + "sha1_base64": "4HieyqFrXXVX7ZC9lHwISZzbPHc=" }, { "id": "Russia_North Ossetia-Alania", @@ -11477,8 +11480,8 @@ "Российская Федерация", "Северная Осетия - Алания" ], - "s": 22457387, - "sha1_base64": "v9k+TkUUr9OzonK36pUNplTYijs=" + "s": 22524531, + "sha1_base64": "PyOPdSSay9Yybq4Sn+Cd60D9Zpw=" }, { "id": "Russia_Novgorod Oblast", @@ -11490,8 +11493,8 @@ "Российская Федерация", "Новгородская область" ], - "s": 33510240, - "sha1_base64": "AvJamx3jdhifj26WZJq0aUhe+XI=" + "s": 33721496, + "sha1_base64": "565m868zFjDLgSqFZicOdwlHpD0=" }, { "id": "Russia_Novosibirsk Oblast", @@ -11503,8 +11506,8 @@ "Российская Федерация", "Новосибирская область" ], - "s": 79882147, - "sha1_base64": "YpLfku+A+7sBdo/5Spg4uaiVrJs=" + "s": 80192331, + "sha1_base64": "QYv5jTtkdAMHoNRoau8aJc3NwxI=" }, { "id": "Russia_Omsk Oblast", @@ -11516,8 +11519,8 @@ "Российская Федерация", "Омская область" ], - "s": 69038123, - "sha1_base64": "E7P7Rb7ggeai3i6X9lbVYaMU/10=" + "s": 69287771, + "sha1_base64": "zRgC/86hJBdTaBZH8jRIk6oOpbI=" }, { "id": "Russia_Orenburg Oblast", @@ -11529,8 +11532,8 @@ "Российская Федерация", "Оренбургская область" ], - "s": 53228099, - "sha1_base64": "NJB+c9C/kZg7+O8WyiYNoH3vV8k=" + "s": 53550411, + "sha1_base64": "AAu5fV9PpMIvdxLtp6yZs0JoF3k=" }, { "id": "Russia_Oryol Oblast", @@ -11542,8 +11545,8 @@ "Россия", "Российская Федерация" ], - "s": 21602870, - "sha1_base64": "Hcnxh8aUkXfTDiH3m7WgHbv26eI=" + "s": 21638926, + "sha1_base64": "H41ZSSswbLi5tZ9re+VNxn+9U2Y=" }, { "id": "Russia_Penza Oblast", @@ -11555,8 +11558,8 @@ "Россия", "Российская Федерация" ], - "s": 34102095, - "sha1_base64": "E6tbcS0FMlkYKc196f3PLRdSuvE=" + "s": 34240623, + "sha1_base64": "1GBrdUmkH816xWN7vViXzBnsN64=" }, { "id": "Russia_Perm Krai_North", @@ -11568,8 +11571,8 @@ "Российская Федерация", "Пермский край" ], - "s": 43888120, - "sha1_base64": "nUQ0VB6FCiWbDSSB3VEIKKdhE5o=" + "s": 44336024, + "sha1_base64": "2qZX3pyT56GmqbhaI4hYiTy/yk0=" }, { "id": "Russia_Perm Krai_South", @@ -11581,8 +11584,8 @@ "Российская Федерация", "Пермский край" ], - "s": 57668774, - "sha1_base64": "yAx2pOiaowiTE28uGq0vCCc3q00=" + "s": 58065846, + "sha1_base64": "DSHBXDkxWNHiX4CrX50PZfPWN3g=" }, { "id": "Russia_Primorsky Krai", @@ -11594,8 +11597,8 @@ "Российская Федерация", "Приморский край" ], - "s": 66485227, - "sha1_base64": "6osnE44jy2YPo6Lhr59yQfhMd18=" + "s": 67404291, + "sha1_base64": "pXvueu6OmJ79+hyKDjAW30J3CT8=" }, { "id": "Russia_Pskov Oblast", @@ -11607,8 +11610,8 @@ "Россия", "Российская Федерация" ], - "s": 59645549, - "sha1_base64": "Ej84sBNrxl8Nl1rzOk5toCT1A9w=" + "s": 59922069, + "sha1_base64": "03ovJWOOG1Lid1GhPWHhXfEWrWs=" }, { "id": "Russia_Republic of Dagestan", @@ -11620,8 +11623,8 @@ "Российская Федерация", "Дагестан" ], - "s": 106669124, - "sha1_base64": "XLrL+7YzYofF4wvTDoK3MxSloNk=" + "s": 106802652, + "sha1_base64": "zUPsT7krlDq5dcbvrCD1mR5MWv4=" }, { "id": "Russia_Republic of Kalmykia", @@ -11634,8 +11637,8 @@ "Калмыкия", "Астраханская область" ], - "s": 15520554, - "sha1_base64": "+jCP0bsRuH4KSNm262LYOUmVTlM=" + "s": 15718258, + "sha1_base64": "CmRBLLPYg/FNUBC3zS/wYe9miuA=" }, { "id": "Russia_Republic of Karelia_North", @@ -11647,8 +11650,8 @@ "Россия", "Российская Федерация" ], - "s": 84591696, - "sha1_base64": "6Ss+0uoQCpS7YBA1d+7G+baggLA=" + "s": 84824800, + "sha1_base64": "+rjnuK0sLr6s3gkUOMPF2PZvAXQ=" }, { "id": "Russia_Republic of Karelia_South", @@ -11660,8 +11663,8 @@ "Россия", "Российская Федерация" ], - "s": 80962035, - "sha1_base64": "ZZw8vwmd/51M6OULZggVpLTHwLY=" + "s": 81835499, + "sha1_base64": "YT72+V+IBuZYz6ESWiY1zsRcBwo=" }, { "id": "Russia_Republic of Mordovia", @@ -11673,8 +11676,8 @@ "Российская Федерация", "Мордовия" ], - "s": 33768894, - "sha1_base64": "bXW6YT4dUo4GfrL7uXT13xMJY2w=" + "s": 33999790, + "sha1_base64": "G5FuhG2BNgsJGUmHs90uK1e0WdE=" }, { "id": "Russia_Rostov Oblast", @@ -11686,8 +11689,8 @@ "Россия", "Российская Федерация" ], - "s": 82321390, - "sha1_base64": "sIM+gS2aL2+4u70wTlx1cH1Vwnk=" + "s": 82945958, + "sha1_base64": "r5dw3n7mpJJMGlBNmqKLlzZbwKs=" }, { "id": "Russia_Ryazan Oblast", @@ -11699,8 +11702,8 @@ "Россия", "Российская Федерация" ], - "s": 36054944, - "sha1_base64": "LDx/e7hYrxT+0/WgvFu/B0b1YbY=" + "s": 36182936, + "sha1_base64": "5Dcb2Nd4ms+zH5LTqjyIme+GQuI=" }, { "id": "Russia_Saint Petersburg", @@ -11713,8 +11716,8 @@ "Российская Федерация", "Ленинградская область" ], - "s": 62495262, - "sha1_base64": "BsXwsraveqTLGDZ+2bBD4WwWM6U=" + "s": 64136294, + "sha1_base64": "SJ3DgGnqAcY+PZpb59SQCPJrQGM=" }, { "id": "Russia_Sakha Republic", @@ -11726,8 +11729,8 @@ "Российская Федерация", "Республика Саха (Якутия)" ], - "s": 326887404, - "sha1_base64": "F/ysPY2X6qBtqgqxupj5xyZjJJM=" + "s": 328003756, + "sha1_base64": "pCstTSUu4YGdn8B4fqulRaOf+jo=" }, { "id": "Russia_Sakhalin Oblast", @@ -11739,8 +11742,8 @@ "Российская Федерация", "Сахалинская область" ], - "s": 51196025, - "sha1_base64": "61rWLdhyxKes2bBF63uX+9I3zbs=" + "s": 52180809, + "sha1_base64": "mv7FVoXi2Ks7ntaX6Ty6W2kxGA4=" }, { "id": "Russia_Samara Oblast", @@ -11752,8 +11755,8 @@ "Россия", "Российская Федерация" ], - "s": 56345316, - "sha1_base64": "i4AS0jk/EWJpEF1iCNW3dbvTHQE=" + "s": 56846436, + "sha1_base64": "qEC67Ov18rVw0nrM2Q0IzIq+u4E=" }, { "id": "Russia_Saratov Oblast", @@ -11765,8 +11768,8 @@ "Российская Федерация", "Саратовская область" ], - "s": 53206859, - "sha1_base64": "D/m9izS/PXC39ejwiV74Sxx7TV0=" + "s": 53366771, + "sha1_base64": "spztMA+Wj2iNFXnuPbFoxOSXudE=" }, { "id": "Russia_Smolensk Oblast", @@ -11778,8 +11781,8 @@ "Россия", "Российская Федерация" ], - "s": 45543850, - "sha1_base64": "/SzV5WFGwZjbrDJVvksaslBxh5s=" + "s": 45762178, + "sha1_base64": "GcEaXzaggonQTilSoUdTEzsLeDg=" }, { "id": "Russia_Stavropol Krai", @@ -11791,8 +11794,8 @@ "Российская Федерация", "Ставропольский край" ], - "s": 41308226, - "sha1_base64": "1noLiESeLXhIfSIOD+O4kNE0J5o=" + "s": 41430570, + "sha1_base64": "ddusqR8MSbIRymv+3dyDL98RMw8=" }, { "id": "Russia_Sverdlovsk Oblast_Ekaterinburg", @@ -11804,8 +11807,8 @@ "Российская Федерация", "Свердловская область" ], - "s": 58235868, - "sha1_base64": "cgJ++NSsNvQH6h6RxRL27HAZP5k=" + "s": 58473028, + "sha1_base64": "EIVvXrjzSjpTJvge5cs9Ho/c1Ps=" }, { "id": "Russia_Sverdlovsk Oblast_North", @@ -11817,8 +11820,8 @@ "Российская Федерация", "Свердловская область" ], - "s": 62749930, - "sha1_base64": "EifkaxbqrS2DC0IMQO31KP1hjQ4=" + "s": 62928258, + "sha1_base64": "qCkGFlcTD84yDm3moRQEqEk1UoA=" }, { "id": "Russia_Tambov Oblast", @@ -11830,8 +11833,8 @@ "Россия", "Российская Федерация" ], - "s": 43204289, - "sha1_base64": "oPIZJoZQxu/FcPQxKW4qzCnCt6w=" + "s": 43492249, + "sha1_base64": "WUvQqNUi5U+33uXGt/M5Xo9XLmg=" }, { "id": "Russia_Tatarstan", @@ -11843,8 +11846,8 @@ "Российская Федерация", "Татарстан" ], - "s": 92006383, - "sha1_base64": "CEhZTXMe8iDn51Vg5sguwl6xSK8=" + "s": 92684199, + "sha1_base64": "Zs+u/gHCRf45pt0pQJ2xN9p6VEE=" }, { "id": "Russia_Tomsk Oblast", @@ -11856,8 +11859,8 @@ "Российская Федерация", "Томская область" ], - "s": 40061495, - "sha1_base64": "WJQHwHiFJnfgXnfO4lrcTJ2QA58=" + "s": 40204831, + "sha1_base64": "BzuwgQ4wQOd17emomJNOtergiic=" }, { "id": "Russia_Tula Oblast", @@ -11869,8 +11872,8 @@ "Российская Федерация", "Тульская область" ], - "s": 33342536, - "sha1_base64": "4Go3d1R9Uf2VMjicGMGI7JLDF3A=" + "s": 33466048, + "sha1_base64": "1RgpsKG28f8xMIXu15CAO+SItts=" }, { "id": "Russia_Tuva", @@ -11882,8 +11885,8 @@ "Российская Федерация", "Тыва" ], - "s": 23879324, - "sha1_base64": "uWz+Io95xxnAgG34oRdNM4RHSHU=" + "s": 23936668, + "sha1_base64": "IsIv8j/PPM58WarG8979Vl10VLU=" }, { "id": "Russia_Tver Oblast", @@ -11895,8 +11898,8 @@ "Российская Федерация", "Тверская область" ], - "s": 76691374, - "sha1_base64": "fHGvKVDfUltgjcWe9IUc5tD2ORo=" + "s": 77328710, + "sha1_base64": "D2Xs66S4TmyZ08iE6/RlA2DQjCs=" }, { "id": "Russia_Tyumen Oblast", @@ -11908,8 +11911,8 @@ "Россия", "Российская Федерация" ], - "s": 55876179, - "sha1_base64": "o92r/FOA2weU8fK4PJkjoxugIRk=" + "s": 56050171, + "sha1_base64": "ntn7T4GvxKATis0ThwhXpXHOFfQ=" }, { "id": "Russia_Udmurt Republic", @@ -11921,8 +11924,8 @@ "Российская Федерация", "Удмуртия" ], - "s": 51561131, - "sha1_base64": "9Wts8ye1AGCn7R4ZrE2z0tpugIg=" + "s": 51912779, + "sha1_base64": "8ARdHYxFMDeDAv1h5d0eKOPdaUc=" }, { "id": "Russia_Ulyanovsk Oblast", @@ -11934,8 +11937,8 @@ "Российская Федерация", "Ульяновская область" ], - "s": 41531379, - "sha1_base64": "EFSQamhKoS/cBejuuTK3hnLrdtE=" + "s": 41702124, + "sha1_base64": "gEjYAactQxNILIN+qYuLTDRgiVE=" }, { "id": "Russia_Vladimir Oblast", @@ -11947,8 +11950,8 @@ "Российская Федерация", "Владимирская область" ], - "s": 60295750, - "sha1_base64": "WaYOZs3o2hpgwzbIMvKG+SfKJpo=" + "s": 60719862, + "sha1_base64": "QuRZBs9qZV8QTMaN6ghki2HBHh8=" }, { "id": "Russia_Volgograd Oblast", @@ -11960,8 +11963,8 @@ "Российская Федерация", "Волгоградская область" ], - "s": 62955571, - "sha1_base64": "E4XU5nlQm0ZUZq77Gfeq7gL+rcM=" + "s": 63295051, + "sha1_base64": "w0ylajvF+Uipp3gCXRrbFPzGNfo=" }, { "id": "Russia_Vologda Oblast", @@ -11973,8 +11976,8 @@ "Российская Федерация", "Вологодская область" ], - "s": 65313117, - "sha1_base64": "qdogokRYF8ZFDn01pGeHuL9ZrME=" + "s": 65426861, + "sha1_base64": "J+zeb+6RknXKpr3tgQMl85o1PX0=" }, { "id": "Russia_Voronezh Oblast", @@ -11986,8 +11989,8 @@ "Российская Федерация", "Воронежская область" ], - "s": 62535532, - "sha1_base64": "CLdiW3JTe0MR+PcVyMb8NBeudmg=" + "s": 62763628, + "sha1_base64": "VFO9b5+auDc5FPuMzs+3HnBgbls=" }, { "id": "Russia_Yamalo-Nenets Autonomous Okrug", @@ -11999,8 +12002,8 @@ "Россия", "Российская Федерация" ], - "s": 43098089, - "sha1_base64": "MdB6BMhYPSUeo+qcIAp4GFH3ZTI=" + "s": 43411313, + "sha1_base64": "GpBKj6YHMQ5vF7GB3tA/FjdpGrs=" }, { "id": "Russia_Yaroslavl Oblast", @@ -12012,8 +12015,8 @@ "Российская Федерация", "Ярославская область" ], - "s": 43600161, - "sha1_base64": "az2eTyFMYBR9q3XjJs0Yeq4aOww=" + "s": 43750665, + "sha1_base64": "Je4h9AWMI2MXgrPJbIVU+iLCnRI=" }, { "id": "Russia_Yugra_Khanty", @@ -12025,8 +12028,8 @@ "Россия", "Российская Федерация" ], - "s": 69302706, - "sha1_base64": "cFxSWNV2FJfrpTOiIknY13371eQ=" + "s": 69734874, + "sha1_base64": "iaYsWSjNB8g3ENASSkUejlT9Ds0=" }, { "id": "Russia_Yugra_Surgut", @@ -12038,8 +12041,8 @@ "Россия", "Российская Федерация" ], - "s": 67198442, - "sha1_base64": "5m68YXiWb/fN2sloHAQyxyt/8vg=" + "s": 67470858, + "sha1_base64": "7hUQwBfap+1YNU4il0BDkDpHxaU=" }, { "id": "Russia_Zabaykalsky Krai", @@ -12051,8 +12054,8 @@ "Российская Федерация", "Забайкальский край" ], - "s": 63430767, - "sha1_base64": "tGutPX1qpPQT2OtCzE615OAsm8I=" + "s": 63560543, + "sha1_base64": "cHIN4YDzRMIUHRf404OOhYAhhJc=" } ] }, @@ -12069,8 +12072,8 @@ "Rwanda", "Umujyi wa Kigali" ], - "s": 60288671, - "sha1_base64": "86kb/shOPlLwpRDAQ9pQ0+sV1Cg=" + "s": 60722807, + "sha1_base64": "XLzi1pI427iYdlIDhuT4Z6PGoFc=" }, { "id": "Sahrawi Arab Democratic Republic", @@ -12082,8 +12085,8 @@ "Maroc ⵍⵎⵖⵔⵉⴱ المغرب", "RASD" ], - "s": 14826843, - "sha1_base64": "5W4hLmGFjZet96EVUjUDqZu44L0=" + "s": 14884931, + "sha1_base64": "OjoSY5rRPBYa2iaaU55lWMAevzc=" }, { "id": "Saint Helena Ascension and Tristan da Cunha", @@ -12097,8 +12100,8 @@ "Saint Helena, Ascension and Tristan da Cunha", "Tristan da Cunha" ], - "s": 1978132, - "sha1_base64": "fsX2BaSELDGr9+z+Mck7s9QXVdo=" + "s": 1994044, + "sha1_base64": "XBZNzxDBjQbmaXRw/7/tEp9rlFo=" }, { "id": "Samoa", @@ -12116,8 +12119,8 @@ "American Samoa", "Sāmoa" ], - "s": 7046256, - "sha1_base64": "1gWH6x7Kkv+07pOiacYrcFLN/OA=" + "s": 7113929, + "sha1_base64": "3j67GlFiUEhzULBcfZLMNwHk0rc=" }, { "id": "San Marino", @@ -12129,8 +12132,8 @@ "Italia", "San Marino" ], - "s": 1730835, - "sha1_base64": "pRF4xVjYuHR9/+PlLx8iLAd1Y3I=" + "s": 1744979, + "sha1_base64": "hAmRjNKc8KHRQ6lC0+/9L+08cXs=" }, { "id": "Saudi Arabia", @@ -12148,8 +12151,8 @@ "الشرقية", "‏المملكة العربية السعودية‎" ], - "s": 122859447, - "sha1_base64": "vKnIMVcTJS7HKVtHfQ+neBFZI4E=" + "s": 125063200, + "sha1_base64": "sT3lLt5F2g9Vv1shZELuFYGUIGs=" }, { "id": "Saudi Arabia_North", @@ -12167,8 +12170,8 @@ "المدينة المنورة", "‏المملكة العربية السعودية‎" ], - "s": 106659117, - "sha1_base64": "RH5r9hORx/YJzhfhyQO4jaBC5Dg=" + "s": 107863349, + "sha1_base64": "E1OPJPMvpoaGojQ66K97HQGOndU=" } ] }, @@ -12184,8 +12187,8 @@ "Região de Cacheu", "Senegal" ], - "s": 104086482, - "sha1_base64": "wdUBuyHOfzdsy7tMX0A0YhbakzM=" + "s": 105108658, + "sha1_base64": "UEsBiRh+3ziOQCTvz/yHxeV+5Rs=" }, { "id": "Serbia", @@ -12197,8 +12200,8 @@ "Војводина", "Централна Србија" ], - "s": 239687383, - "sha1_base64": "YvBZQoqM4WHDFO4gg9gEbMN13iw=" + "s": 242077911, + "sha1_base64": "+PkgFXzrtM3C5YhZyVm/C2z7Evw=" }, { "id": "Seychelles", @@ -12208,8 +12211,8 @@ "affiliations": [ "Sesel" ], - "s": 3016733, - "sha1_base64": "xh2HJRk6wsAdC09c+p6YKuiZrik=" + "s": 3029317, + "sha1_base64": "9vZjSyZj3c/leTpDR4GW42THDhk=" }, { "id": "Sierra Leone", @@ -12223,8 +12226,8 @@ "Southern Province", "Western Area" ], - "s": 47733526, - "sha1_base64": "BGiIqDJXAbX7lDXn0bItY9kUkO8=" + "s": 47800526, + "sha1_base64": "WQG1N37YTovRQ9HbvKi+GUTHtpg=" }, { "id": "Singapore", @@ -12236,8 +12239,8 @@ "Malaysia", "Singapura" ], - "s": 30633031, - "sha1_base64": "TnpAtJmwtDomTvLRlYvEsl6nuI8=" + "s": 30951951, + "sha1_base64": "ov8E+/oCMNUjAgfDQCj+AE4v5kw=" }, { "id": "Slovakia", @@ -12251,8 +12254,8 @@ "Prešovský kraj", "Slovensko" ], - "s": 56304995, - "sha1_base64": "FzLero1fJAu0guH8xfqenAZ6WaE=" + "s": 56974139, + "sha1_base64": "yXaSaqAgMhPQbhvjB89MrNXZIs4=" }, { "id": "Slovakia_Region of Kosice", @@ -12263,8 +12266,8 @@ "Košický kraj", "Slovensko" ], - "s": 52403994, - "sha1_base64": "sWkWATgc4GWtnFaVKaU9lsqDSdw=" + "s": 53186786, + "sha1_base64": "SVdXoCVfycsOEFR6stUwRxMY070=" }, { "id": "Slovakia_Region of Banska Bystrica", @@ -12275,8 +12278,8 @@ "Banskobystrický kraj", "Slovensko" ], - "s": 69088900, - "sha1_base64": "sT6kXe1g3Tw+LH+bksu3IYTQxv4=" + "s": 70312284, + "sha1_base64": "Xwg3QfMBQt2E2Dao020XgdNllT8=" }, { "id": "Slovakia_Region of Trnava", @@ -12287,8 +12290,8 @@ "Slovensko", "Trnavský kraj" ], - "s": 29856680, - "sha1_base64": "dLUBrWq5LyGHTHsStBD1uZk/FrY=" + "s": 30483664, + "sha1_base64": "824V1bbqzJCCjwOjTV9vTVv5LiY=" }, { "id": "Slovakia_Region of Trencin", @@ -12299,8 +12302,8 @@ "Slovensko", "Trenčiansky kraj" ], - "s": 42931466, - "sha1_base64": "20v8MS9yFDHZIiTkRWUULCyLvHw=" + "s": 43728346, + "sha1_base64": "i3/Sa4qJfGTJGjy/r/2wCoAMFB8=" }, { "id": "Slovakia_Region of Nitra", @@ -12311,8 +12314,8 @@ "Nitriansky kraj", "Slovensko" ], - "s": 33264137, - "sha1_base64": "lorKdxqmYeUCXrE2daNVjoJIgr4=" + "s": 34124113, + "sha1_base64": "oLbHDQxY4W2MhnrQ5VyQ1O8rd0s=" }, { "id": "Slovakia_Region of Bratislava", @@ -12323,8 +12326,8 @@ "Bratislavský kraj", "Slovensko" ], - "s": 25995200, - "sha1_base64": "WzKN26+k5V0xz+Sv+yifjOphGiI=" + "s": 26390560, + "sha1_base64": "S3GNgPGtHp/hXfDwnNW2C3k7DQU=" }, { "id": "Slovakia_Region of Zilina", @@ -12335,8 +12338,8 @@ "Slovensko", "Žilinský kraj" ], - "s": 60201011, - "sha1_base64": "5zUYlTiWPXsatbFT7F6iZT6dzl0=" + "s": 60857267, + "sha1_base64": "Lg6OTFwWYxIfpWWzDEJOA2p9e6c=" } ] }, @@ -12352,8 +12355,8 @@ "Border SI-HR", "Slovenija" ], - "s": 179024746, - "sha1_base64": "hyUn3dXB0/8gm0ImpG85V29OvHo=" + "s": 179323498, + "sha1_base64": "nY+DFQ8O1HJ4s3GkPvfDouHOkf8=" }, { "id": "Slovenia_West", @@ -12363,8 +12366,8 @@ "affiliations": [ "Slovenija" ], - "s": 133215049, - "sha1_base64": "IU25TAC5XzXFSxSbQVCM8+5odfA=" + "s": 134311465, + "sha1_base64": "r4kJ/vw1qrB0aH8wzSb5VeR9DsM=" } ] }, @@ -12386,8 +12389,8 @@ "Temotu Province", "Western Province" ], - "s": 19519068, - "sha1_base64": "j8iYEUuuV0/EPtxdtQt3Db3STCY=" + "s": 19611772, + "sha1_base64": "zcLtgl1qZQadS+1QS74KqsEH8cQ=" }, { "id": "Somalia", @@ -12415,8 +12418,8 @@ "Togdheer", "Woqooyi Galbeed" ], - "s": 209246422, - "sha1_base64": "k74g0gVstKmBzQ7UYLj9E8wGeLY=" + "s": 219851006, + "sha1_base64": "F/wg7rBkQ2S7QJe9TX7K6qc6VAM=" }, { "id": "South Africa", @@ -12431,8 +12434,8 @@ "South Africa", "Western Cape" ], - "s": 73757279, - "sha1_base64": "MmiiPFbNVcQ2FF8UR+wHclg473k=" + "s": 75080247, + "sha1_base64": "LlFf+MlJeJ2wjMgso/wwF2LqYOc=" }, { "id": "South Africa_Gauteng", @@ -12443,8 +12446,8 @@ "Gauteng", "South Africa" ], - "s": 49233522, - "sha1_base64": "1ruMeYX76ZYihjzap+QlIw2WPz4=" + "s": 49758898, + "sha1_base64": "QP3xmolhXtJbiug5dY6xHnG0fcI=" }, { "id": "South Africa_North West", @@ -12455,8 +12458,8 @@ "North West", "South Africa" ], - "s": 30475405, - "sha1_base64": "cSCxxgp36JYkZl1b08/es6yc628=" + "s": 30626829, + "sha1_base64": "XM0/QGk4kRIQfnTpa7cHGPQe8Xw=" }, { "id": "South Africa_Free State", @@ -12467,8 +12470,8 @@ "Free State", "South Africa" ], - "s": 33668086, - "sha1_base64": "YD/GWZpJUDVZ9XTZArK85HbRAis=" + "s": 34125710, + "sha1_base64": "/t26qBxKA9JAiuQuM8+DdYL9HYY=" }, { "id": "South Africa_Eastern Cape", @@ -12479,8 +12482,8 @@ "Eastern Cape", "South Africa" ], - "s": 51529809, - "sha1_base64": "cGWxgMluJKYyXRCyzt7DROwP3/c=" + "s": 52174466, + "sha1_base64": "LIBBdvrygA9BEgG3D5gfqxTmNoo=" }, { "id": "South Africa_Northern Cape", @@ -12491,8 +12494,8 @@ "Northern Cape", "South Africa" ], - "s": 33032301, - "sha1_base64": "hSqygOsaaRjMJzXSo2jetXrMwmo=" + "s": 33413101, + "sha1_base64": "DbINe3gXcsmqrg8rCQmAcYGuq8Q=" }, { "id": "South Africa_Mpumalanga", @@ -12503,8 +12506,8 @@ "Mpumalanga", "South Africa" ], - "s": 38346279, - "sha1_base64": "A5lLPqepYJ7PCXvA1qh1OQe9BwE=" + "s": 38439607, + "sha1_base64": "mJY36aHRjoGx0U1EjImaDF7CR4w=" }, { "id": "South Africa_Limpopo", @@ -12515,8 +12518,8 @@ "Limpopo", "South Africa" ], - "s": 34172135, - "sha1_base64": "JQ4yxLnje1yDgb5q9/tCscuddhw=" + "s": 34326503, + "sha1_base64": "EAL4PQ5JY6dBSdvNGauBSOH5u80=" }, { "id": "South Africa_KwaZulu-Natal", @@ -12527,8 +12530,8 @@ "KwaZulu-Natal", "South Africa" ], - "s": 128594910, - "sha1_base64": "t1H068cTCj9995L12Yps8pOgBrI=" + "s": 130893686, + "sha1_base64": "WG2wQJFng3lIXqvSbodYo1LmjGQ=" } ] }, @@ -12544,8 +12547,8 @@ "country_name_synonyms": [ "South Georgia and South Sandwich Islands" ], - "s": 12388290, - "sha1_base64": "pesr8k9jRb/IBdrsiwrl9EtfAJU=" + "s": 12551754, + "sha1_base64": "cGTEPEcD/3k9mJlTywv18fNMc38=" }, { "id": "South Ossetia", @@ -12557,8 +12560,8 @@ "Хуссар Ирыстон - Южная Осетия", "საქართველო" ], - "s": 12614849, - "sha1_base64": "tr8GJpcmsANnJ3T18IJD8v9jcRY=" + "s": 12655081, + "sha1_base64": "aYkyqZw8g6FEED2UTPTMKLe/VCI=" }, { "id": "South Sudan", @@ -12579,8 +12582,8 @@ "Western Equatoria", "واراب" ], - "s": 117354410, - "sha1_base64": "ITZUSwJgDQSIyVhOwTLDA5t1uQo=" + "s": 118152170, + "sha1_base64": "3d6yz12It3IGtMjgNDAXuv1jMuE=" }, { "id": "Spain", @@ -12595,8 +12598,8 @@ "España (mare territorial)", "España" ], - "s": 92736841, - "sha1_base64": "e9okE9ApDhpF0QTjcWwP8jCwXtw=" + "s": 94130817, + "sha1_base64": "n0XqgTnTKHNdSAdng5YSVtN91xM=" }, { "id": "Spain_Andalusia_Sevilla", @@ -12607,8 +12610,8 @@ "Andalucía", "España" ], - "s": 109054272, - "sha1_base64": "KKwbRfTETcfRLyakXR4ssbQe5+4=" + "s": 112146224, + "sha1_base64": "azPb7Je8rvuLnP+lClO+sCLbHz4=" }, { "id": "Spain_Aragon", @@ -12619,8 +12622,8 @@ "Aragón", "España" ], - "s": 113388403, - "sha1_base64": "EoiTZQr0jxqZB+YAzdBwc5c1+/U=" + "s": 114621467, + "sha1_base64": "plfNaJGLLfoYVZGzmrihuyjemik=" }, { "id": "Spain_Balearic Islands", @@ -12631,8 +12634,8 @@ "Illes Balears", "España" ], - "s": 49087289, - "sha1_base64": "2n55hBzJ4LiBhN9OVpX3tyhkxYY=" + "s": 49563474, + "sha1_base64": "dzdy/2eF8DvezwoAwVtw70/H3kw=" }, { "id": "Spain_Basque Country", @@ -12644,8 +12647,8 @@ "España", "Euskadi" ], - "s": 82440272, - "sha1_base64": "MnGbZJS/NTdaCQGk2S4ZXeRxHnM=" + "s": 85083184, + "sha1_base64": "3J3Kbqxx1xOgurd/tqZFNPaft+o=" }, { "id": "Spain_Canary Islands", @@ -12656,8 +12659,8 @@ "Canarias", "España" ], - "s": 65033652, - "sha1_base64": "p+JqCaOxnqvDt4RMKb3aMU016dE=" + "s": 66339260, + "sha1_base64": "M/0J0vxYLcSM8eTsOb4LAkDFm5w=" }, { "id": "Spain_Cantabria", @@ -12668,8 +12671,8 @@ "Cantabria", "España" ], - "s": 37743618, - "sha1_base64": "w484TfdL/FS4cemvRWnrFJUaGJo=" + "s": 39371850, + "sha1_base64": "wBSXAHxaDhfDyFVaFZOopxDPXws=" }, { "id": "Spain_Castile and Leon_West", @@ -12680,8 +12683,8 @@ "Castilla y León", "España" ], - "s": 107534683, - "sha1_base64": "aZI4VG9LEoc+qFqhpZew0p8vgdA=" + "s": 109504459, + "sha1_base64": "dQPSHwNePhokj0gpHSJZhOQgKEQ=" }, { "id": "Spain_Castile and Leon_East", @@ -12692,8 +12695,8 @@ "Castilla y León", "España" ], - "s": 94737682, - "sha1_base64": "oHh3HkA/umTXZPb2DQ9kBQCGpvs=" + "s": 96051730, + "sha1_base64": "FJk3WPaHm5HJL+VFlObuE03vz4Y=" }, { "id": "Spain_Castile-La Mancha", @@ -12704,8 +12707,8 @@ "Castilla-La Mancha", "España" ], - "s": 126598372, - "sha1_base64": "/8bTrsKlRrSm0sMf7AR7TxSaplA=" + "s": 127989708, + "sha1_base64": "kwOufbbT/ncuQ7zm5zHTaQecu4k=" }, { "id": "Spain_Catalonia_Provincia de Barcelona", @@ -12716,8 +12719,8 @@ "Catalunya", "España" ], - "s": 139529587, - "sha1_base64": "5rYlZLp0Myd1DKg/CZiSOZooiGU=" + "s": 142435404, + "sha1_base64": "q7rMKcY7qeSYPGr5Bm8dVCzrJOg=" }, { "id": "Spain_Catalonia_Provincia de Girona", @@ -12728,8 +12731,8 @@ "Catalunya", "España" ], - "s": 52223523, - "sha1_base64": "OmV2V6wX9XJqeROLrdNTRy7jF/E=" + "s": 53350787, + "sha1_base64": "nWu0Q3ttejVIwczJRkxX1+Gn/hI=" }, { "id": "Spain_Catalonia_Provincia de Lleida", @@ -12740,8 +12743,8 @@ "Catalunya", "España" ], - "s": 66472157, - "sha1_base64": "hOLCiPgRU6Tt7qRVEXUjAueJwY8=" + "s": 67119718, + "sha1_base64": "Fq6r5wmgAcS0hb6pd0i4Wrt6Pgw=" }, { "id": "Spain_Catalonia_Provincia de Tarragona", @@ -12752,8 +12755,8 @@ "Catalunya", "España" ], - "s": 48639825, - "sha1_base64": "QFSKDhNSBnSYQusDmpAfEC1NB44=" + "s": 50316273, + "sha1_base64": "yIGFJGwerr2QZIKghxuE/37/CBs=" }, { "id": "Spain_Ceuta", @@ -12765,8 +12768,8 @@ "España", "Maroc ⵍⵎⵖⵔⵉⴱ المغرب" ], - "s": 748013, - "sha1_base64": "IlVlW3U/aWI/1WYYsfGwQiAtW+M=" + "s": 757141, + "sha1_base64": "zJP+oakVTchl7wxGn73BQP1H4lM=" }, { "id": "Spain_Community of Madrid", @@ -12777,8 +12780,8 @@ "Comunidad de Madrid", "España" ], - "s": 89547352, - "sha1_base64": "suipB809rGIcvooDODlew6CMsB8=" + "s": 91660000, + "sha1_base64": "+HWQntZe1BVkFchMGHCnTPm954Y=" }, { "id": "Spain_Comunidad Foral de Navarra", @@ -12789,8 +12792,8 @@ "Comunidad Foral de Navarra", "España" ], - "s": 47282837, - "sha1_base64": "mLalPVUbpB1SLyZ5sw9NpuYaFtI=" + "s": 54091805, + "sha1_base64": "EShBApav1iXpaiTl4IeI/Dn80Ls=" }, { "id": "Spain_Extremadura", @@ -12801,8 +12804,8 @@ "España", "Extremadura" ], - "s": 49893978, - "sha1_base64": "3o3t5BVdusrJwZrEGl0BFNUyyCc=" + "s": 51142898, + "sha1_base64": "0Sv2yM0waJykTdjUcTdQV4SyY9A=" }, { "id": "Spain_Galicia_North", @@ -12813,8 +12816,8 @@ "España", "Galicia" ], - "s": 72136664, - "sha1_base64": "BFej+Bqnn3EXboYrb1s9uUw+TfM=" + "s": 73776472, + "sha1_base64": "hBZ5VQyjK+c2clXOxB+bdaHByfA=" }, { "id": "Spain_Galicia_South", @@ -12825,8 +12828,8 @@ "España", "Galicia" ], - "s": 51889277, - "sha1_base64": "FPdPif7QA1Y59ExeDdwih5ALGk0=" + "s": 52538749, + "sha1_base64": "HpYrs771BrSIrji5LsHNOuBGroE=" }, { "id": "Spain_La Rioja", @@ -12837,8 +12840,8 @@ "España", "La Rioja" ], - "s": 18775318, - "sha1_base64": "Sj9t+kkcGyVnJfeVJ310Nw3Zm8Q=" + "s": 18916326, + "sha1_base64": "8ILQKrfbbguxRlsMPX3yZbJPKAo=" }, { "id": "Spain_Melilla", @@ -12851,8 +12854,8 @@ "Maroc ⵍⵎⵖⵔⵉⴱ المغرب", "Melilla" ], - "s": 979461, - "sha1_base64": "kMewsts9X0/zZon0oYHyeEyrA7g=" + "s": 985637, + "sha1_base64": "8diCko3x3wIFiKhHSqH0IrSs1TQ=" }, { "id": "Spain_Principado de Asturias", @@ -12863,8 +12866,8 @@ "España", "Principado de Asturias" ], - "s": 40397075, - "sha1_base64": "9Fj5NWK1PIK645IROLapi9HxoO0=" + "s": 41363667, + "sha1_base64": "vaqNC4rkobsBQ852PWOga6tiI/4=" }, { "id": "Spain_Region de Murcia", @@ -12875,8 +12878,8 @@ "España", "Región de Murcia" ], - "s": 45539594, - "sha1_base64": "kr2vj+Mr+rjCfmWN9P3JldNMVn8=" + "s": 46446866, + "sha1_base64": "Kj/mEkL+tjp7k1RsKNpRs3lJqwc=" }, { "id": "Spain_Valencian Community", @@ -12887,8 +12890,8 @@ "Comunitat Valenciana", "España" ], - "s": 148012853, - "sha1_base64": "SO1htthqDO+S6B+ej6XgenkWcP0=" + "s": 151057309, + "sha1_base64": "fc461cpOXDYSGr2g7zd2eYUzKHs=" } ] }, @@ -12908,8 +12911,8 @@ "מחוז ירושלים", "מדינת ישראל" ], - "s": 10104945, - "sha1_base64": "gZMnoNrNQoduyk1Brx2rY0AW7hk=" + "s": 10235609, + "sha1_base64": "wAK/Du3WEId3sIdLjas6RZqMD6o=" }, { "id": "Palestine", @@ -12921,8 +12924,8 @@ "Area B", "Area C" ], - "s": 37733078, - "sha1_base64": "lRePNAOTMbMTLaDPpj1CviPtt7A=" + "s": 38191502, + "sha1_base64": "lHdSKktlgrYv8RbuDVrr3vGt7gw=" } ] }, @@ -12943,8 +12946,8 @@ "Western Province", "ශ්‍රී ලංකා" ], - "s": 139977188, - "sha1_base64": "LBOkXCrX3nQ2tAINezd8ywPsXS0=" + "s": 140050436, + "sha1_base64": "EIY/ZEPF9jKRcVryEMwVr0DYYEQ=" }, { "id": "Sudan", @@ -12967,8 +12970,8 @@ "an-Nil al-Azraq", "ash-Shamaliyah" ], - "s": 55060976, - "sha1_base64": "KJocML6y6o6OeJHhZ9cWLw0lMLY=" + "s": 55152872, + "sha1_base64": "8yQF8GwebomddKWWANJvZ/y6ve8=" }, { "id": "Sudan_West", @@ -12993,8 +12996,8 @@ "ash-Shamaliyah", "واراب" ], - "s": 150470012, - "sha1_base64": "BElIcV8PoFziAJ3jS5Z1t5tr++w=" + "s": 153400836, + "sha1_base64": "0demnBADe6NdeXTz6xuniYzMVdU=" } ] }, @@ -13016,8 +13019,8 @@ "Suriname", "Wanica" ], - "s": 32205892, - "sha1_base64": "U/18sM34L6hcwPMcVo49PNQF1CA=" + "s": 32470092, + "sha1_base64": "RSdDl/BUg7QzkTeRm7vQ0CzqNlU=" }, { "id": "Swaziland", @@ -13034,8 +13037,8 @@ "country_name_synonyms": [ "Eswatini" ], - "s": 28069112, - "sha1_base64": "aS2ut8tkPD36aUrFhFhpFcz54RI=" + "s": 28148928, + "sha1_base64": "lFUZgr7lhSWtSYVsC854sXkHHGY=" }, { "id": "Sweden", @@ -13051,8 +13054,8 @@ "Uppsala län", "Västmanlands län" ], - "s": 66492366, - "sha1_base64": "FQ5aVZhqQDuio8Pu23KtLZ9phGk=" + "s": 67538694, + "sha1_base64": "l6SWgQgE0/+82DqdDaZ0xl+4ZCY=" }, { "id": "Sweden_Stockholm", @@ -13063,8 +13066,8 @@ "Stockholms län", "Sverige" ], - "s": 67897669, - "sha1_base64": "AFV0IDrs8bAMRzCI58nisU3kGxU=" + "s": 69108685, + "sha1_base64": "L5WpAz9K8T2heO9HjMlQGARDPVU=" }, { "id": "Sweden_Ostra Gotaland", @@ -13081,8 +13084,8 @@ "Sverige", "Territorial waters of Gotland" ], - "s": 113385073, - "sha1_base64": "5GlWKpnrbI5aEUQc1YpLIsZTnIU=" + "s": 114286329, + "sha1_base64": "jJz6AJAlHaOry8oICuzRiJvCqHg=" }, { "id": "Sweden_Norra Sverige", @@ -13094,8 +13097,8 @@ "Sverige", "Västerbottens län" ], - "s": 111379529, - "sha1_base64": "qgV4eYjHhr0y8ZFs9ZvZsW3o/vI=" + "s": 112319481, + "sha1_base64": "LbHs8iHHNWD++hZ8zTRa4tS9e80=" }, { "id": "Sweden_Mellannorrland", @@ -13107,8 +13110,8 @@ "Sverige", "Västernorrlands län" ], - "s": 135605478, - "sha1_base64": "HR0zLUtEnao3ksjzm9cZxoj5oU0=" + "s": 136590918, + "sha1_base64": "IJ1pQ95ZbJSnFYw+54GishXBNN0=" }, { "id": "Sweden_Bergslagen", @@ -13122,8 +13125,8 @@ "Sverige", "Värmlands län" ], - "s": 164657377, - "sha1_base64": "6FjPUSO2EDj/CUwfw0cqU1Ljxp4=" + "s": 165310481, + "sha1_base64": "LTBMi3CVn1jRBIvFQSIobQd+NfI=" }, { "id": "Sweden_Vastra Gotaland", @@ -13136,8 +13139,8 @@ "Sverige", "Västra Götalands län" ], - "s": 134173650, - "sha1_base64": "4y5SDYsPWsm2NGRQxfhsgLdINQ8=" + "s": 139601714, + "sha1_base64": "Snr9wONlm9bSOG0Kp9/NjVkq00A=" }, { "id": "Sweden_Sodra Gotaland", @@ -13151,8 +13154,8 @@ "Sverige", "Territorial waters of Bornholm" ], - "s": 60731397, - "sha1_base64": "/haT7MNJeViVV+zaigoEJSY6U3A=" + "s": 61403381, + "sha1_base64": "JxAgewH6Zb+/KVJT0V7mNjWQSw4=" } ] }, @@ -13174,8 +13177,8 @@ "Schweiz, Suisse, Svizzera, Svizra", "Thurgau" ], - "s": 100375098, - "sha1_base64": "n3r3RL9OqN05bA0dTMGyfISJlSg=" + "s": 102410634, + "sha1_base64": "hLtEtwU74wTDyy2VKsUsIqaxdww=" }, { "id": "Switzerland_Central", @@ -13191,8 +13194,8 @@ "Uri", "Zug" ], - "s": 54396828, - "sha1_base64": "mIx4MFWuCToZi/BWLCxxhL/hSj8=" + "s": 55421549, + "sha1_base64": "DX7U+lewmEt9cNqko2zcmY7kIpo=" }, { "id": "Switzerland_Espace Mittelland_Bern", @@ -13209,8 +13212,8 @@ "Solothurn", "Vaud" ], - "s": 88543321, - "sha1_base64": "nYAsdqI2yZyLgVmaxXlhoinFVmA=" + "s": 90975569, + "sha1_base64": "bTq8Drg4Sbw7LwCyrFBwLZmx95c=" }, { "id": "Switzerland_Espace Mittelland_East", @@ -13221,8 +13224,8 @@ "Bern - Berne", "Schweiz, Suisse, Svizzera, Svizra" ], - "s": 50478587, - "sha1_base64": "0O6fibuWLNRyrCSascc4CN31xrs=" + "s": 51171139, + "sha1_base64": "1iUEUFpxa/GUgDo0s1FJYQ2s028=" }, { "id": "Switzerland_Ticino", @@ -13233,8 +13236,8 @@ "Schweiz, Suisse, Svizzera, Svizra", "Ticino" ], - "s": 32345025, - "sha1_base64": "PWw3MgSf3Nk6GKrA+DfwC8beI2c=" + "s": 32620210, + "sha1_base64": "CYiD6giN4008gn82NdqKeoACtXg=" }, { "id": "Switzerland_Northwestern", @@ -13247,8 +13250,8 @@ "Basel-Stadt", "Schweiz, Suisse, Svizzera, Svizra" ], - "s": 56048142, - "sha1_base64": "wsB68UkJ1VuAW0zeTOuEaoK2fs4=" + "s": 57029255, + "sha1_base64": "7ryn3jl00Vs94nuiqhW/d8p/HhY=" }, { "id": "Switzerland_Lake Geneva region", @@ -13262,8 +13265,8 @@ "Vaud", "Valais - Wallis" ], - "s": 107209500, - "sha1_base64": "eElsfJdDK3lPu/MPkY16mghL0ic=" + "s": 110807956, + "sha1_base64": "X3P4aWud/73lNopBUqkfvjoOymw=" }, { "id": "Switzerland_Zurich", @@ -13274,8 +13277,8 @@ "Schweiz, Suisse, Svizzera, Svizra", "Zürich" ], - "s": 63142655, - "sha1_base64": "l3P6kZtZqR0jpAqsnCHh6R1dX2s=" + "s": 68039455, + "sha1_base64": "aCxY4m1kmlAQzbSfzOwDR7+lch8=" } ] }, @@ -13301,8 +13304,8 @@ "UNDOF", "حمص" ], - "s": 101582533, - "sha1_base64": "t2inBaspLGiF5+isHnINkbjxaWo=" + "s": 102296381, + "sha1_base64": "oSyXmUukL/F4NJPvEsZzz7n2QkU=" }, { "id": "Sao Tome and Principe", @@ -13314,8 +13317,8 @@ "São Tomé Province", "São Tomé e Príncipe" ], - "s": 3020319, - "sha1_base64": "f1nCBS3q/lkxbcr3e7BnmRnRZO0=" + "s": 3126383, + "sha1_base64": "N3nXGm6e5mbs4KYlTp7VXeSqu1g=" }, { "id": "Tajikistan", @@ -13329,8 +13332,8 @@ "Ноҳияҳои тобеи ҷумҳурӣ", "Тоҷикистон" ], - "s": 81766657, - "sha1_base64": "dOJxCEp0NHEPeB76um+wHZbdEx8=" + "s": 81992305, + "sha1_base64": "7fznL1TIHd6WYBsn3LWrRondmZ8=" }, { "id": "Tanzania", @@ -13365,8 +13368,8 @@ "Unguja Kusini", "Unguja Mjini Magharibi" ], - "s": 607245204, - "sha1_base64": "qeV34CznZ0U9foNFCqb3Y3mmORg=" + "s": 609811244, + "sha1_base64": "7ooO2S3J63UFLKMeiO/stSebSj0=" }, { "id": "Thailand", @@ -13392,8 +13395,8 @@ "จังหวัดเชียงใหม่", "จังหวัดแม่ฮ่องสอน" ], - "s": 65939583, - "sha1_base64": "FHyhvAXwqA+llhk0veYhwx+erFw=" + "s": 66205751, + "sha1_base64": "PcxBaHEGsWh5dUXn9PP8iAQrS04=" }, { "id": "Thailand_Central", @@ -13439,8 +13442,8 @@ "จังหวัดอำนาจเจริญ", "จังหวัดพระนครศรีอยุธยา" ], - "s": 129866928, - "sha1_base64": "+7+7GN9fyRFDo8PeqNQTHQo88P4=" + "s": 130339528, + "sha1_base64": "+xH0TIoYw+qkxjY4Tvrma6s4S0U=" }, { "id": "Thailand_South", @@ -13482,8 +13485,8 @@ "จังหวัดนครศรีธรรมราช", "จังหวัดประจวบคีรีขันธ์" ], - "s": 169418545, - "sha1_base64": "ZIH90gpkn8mzK9IUV+Z+AOBbdco=" + "s": 170834369, + "sha1_base64": "MRCXya9O/0DmuVRRD8VEZO2feRA=" } ] }, @@ -13499,8 +13502,8 @@ "country_name_synonyms": [ "Bahamas" ], - "s": 14960144, - "sha1_base64": "3XxET3ZF0oPW42zhyeLaCQ+yRVw=" + "s": 15099456, + "sha1_base64": "mavHB3+DAhiJ/iU77ZweAi7tjOg=" }, { "id": "The Gambia", @@ -13519,8 +13522,8 @@ "Mansakonko", "Senegal" ], - "s": 16557033, - "sha1_base64": "IaYgb6qjZ6rmfE7kCcClklCVEIo=" + "s": 16626193, + "sha1_base64": "XcHBsN/EnsZ4pTgXwT9KLjmRCLw=" }, { "id": "Netherlands", @@ -13534,8 +13537,8 @@ "Drenthe", "Nederland" ], - "s": 45957217, - "sha1_base64": "kELsepSIn8N9kKijNM1TaWwt7LY=" + "s": 46813329, + "sha1_base64": "smC5GrPzVtnq5j1XMDYyo+wExpg=" }, { "id": "Netherlands_Flevoland", @@ -13546,8 +13549,8 @@ "Flevoland", "Nederland" ], - "s": 27382174, - "sha1_base64": "ZadwBsuimQNaWnf/pAeDnihZFpI=" + "s": 28021878, + "sha1_base64": "OHQxkfWxCzbN9O5T4LsK1BJBZ/c=" }, { "id": "Netherlands_Friesland", @@ -13558,8 +13561,8 @@ "Friesland", "Nederland" ], - "s": 69011651, - "sha1_base64": "Vq6jrOermiQ3FYX6abVZPQpsxjE=" + "s": 69671299, + "sha1_base64": "rB3D2aReXUFNBsRKNhj6FqTmmsI=" }, { "id": "Netherlands_Gelderland_Nijmegen", @@ -13570,8 +13573,8 @@ "Gelderland", "Nederland" ], - "s": 42402282, - "sha1_base64": "Pae9nIUhEgZGvRCemhsvtyz6R+4=" + "s": 42766154, + "sha1_base64": "j/sEVLhEGPf7uX7dtBGBnUXyp1A=" }, { "id": "Netherlands_Gelderland_North", @@ -13582,8 +13585,8 @@ "Gelderland", "Nederland" ], - "s": 70681180, - "sha1_base64": "R2/Jazz26MehIZI4OpKlDec59C8=" + "s": 71558388, + "sha1_base64": "sJ3B5SWVydUdp8iRNs3E+i3/ysQ=" }, { "id": "Netherlands_Gelderland_Zutphen", @@ -13594,8 +13597,8 @@ "Gelderland", "Nederland" ], - "s": 29090350, - "sha1_base64": "dnCAMdqSXbGVy21zjUqo5dFqcyI=" + "s": 29626838, + "sha1_base64": "Ay13emAIHPXKC0eRHNHHV5cL+2w=" }, { "id": "Netherlands_Groningen", @@ -13608,8 +13611,8 @@ "Nederland", "Niedersachsen" ], - "s": 43847347, - "sha1_base64": "bz4xZgVqthvem8mt0y3twiJiv+g=" + "s": 44094403, + "sha1_base64": "Q2mD1mBnEJ+0i0a8Dote2Bvkctk=" }, { "id": "Netherlands_Limburg", @@ -13620,8 +13623,8 @@ "Limburg", "Nederland" ], - "s": 80044596, - "sha1_base64": "XndlLec11e3NBalviHSgJzinaIk=" + "s": 80646708, + "sha1_base64": "/zCxzZWShzLsOZv6JbnlU5LS7wk=" }, { "id": "Netherlands_North Brabant_Eindhoven", @@ -13632,8 +13635,8 @@ "Nederland", "Noord-Brabant" ], - "s": 64322314, - "sha1_base64": "34J9Vh1wqG4u5bD6rkm7pFIVnSM=" + "s": 64943115, + "sha1_base64": "kaVMUKphwAfox9dAycUmim8H3Rg=" }, { "id": "Netherlands_North Brabant_Roosendaal", @@ -13644,8 +13647,8 @@ "Nederland", "Noord-Brabant" ], - "s": 21301917, - "sha1_base64": "gHqOK1obzRCDGqfkgu7cSPNomqY=" + "s": 21470237, + "sha1_base64": "yRcZyqgeNoIa3Zj6cAVK36+13N8=" }, { "id": "Netherlands_North Brabant_Tiburg", @@ -13657,8 +13660,8 @@ "Nederland - Belgique / België / Belgien", "Noord-Brabant" ], - "s": 50219113, - "sha1_base64": "FA+tx+mtla8zkODlvcAZ02PclOY=" + "s": 50619409, + "sha1_base64": "AKA3f3I1/DyJ3hV0tZnF4Q+UIgU=" }, { "id": "Netherlands_North Brabant_Uden", @@ -13669,8 +13672,8 @@ "Nederland", "Noord-Brabant" ], - "s": 23417893, - "sha1_base64": "tJKVLCgVeyRWKlYNP7RriMa6Iyk=" + "s": 23538301, + "sha1_base64": "BnPgpSo+Wxsf1Y3czKjcHxLQEJE=" }, { "id": "Netherlands_North Holland_Alkmaar", @@ -13681,8 +13684,8 @@ "Nederland", "Noord-Holland" ], - "s": 42078913, - "sha1_base64": "FqgxO2O01pDyl2UOQvnnbbjRwxA=" + "s": 42702681, + "sha1_base64": "IYjjlzBX5tjOLKPoObk55Vte1Mw=" }, { "id": "Netherlands_North Holland_Amsterdam", @@ -13693,8 +13696,8 @@ "Nederland", "Noord-Holland" ], - "s": 88542540, - "sha1_base64": "5wjYxsDJrAI0UQEK16PixVtIFQo=" + "s": 90054252, + "sha1_base64": "+dUV/w+OlBpZBG55oKZnMEdflGk=" }, { "id": "Netherlands_North Holland_Zaandam", @@ -13705,8 +13708,8 @@ "Nederland", "Noord-Holland" ], - "s": 30086205, - "sha1_base64": "3aJ9MwJApqMOW+U9754Vosr+wYE=" + "s": 30443365, + "sha1_base64": "KJXGG0fBjAbfw/XSNV/qglJynOU=" }, { "id": "Netherlands_Overijssel_Enschede", @@ -13717,8 +13720,8 @@ "Nederland", "Overijssel" ], - "s": 43528001, - "sha1_base64": "2TjRm5NMDGGk7ijJcluu8uzFp0c=" + "s": 44133161, + "sha1_base64": "pvwU9DRQ1QUm8qzM9VMpjuyrfX4=" }, { "id": "Netherlands_Overijssel_Zwolle", @@ -13729,8 +13732,8 @@ "Nederland", "Overijssel" ], - "s": 43126402, - "sha1_base64": "og6ZcKzNHyyJbsbZWtdSs41O6yY=" + "s": 44288809, + "sha1_base64": "bhI8imgi1cZaAKsICxaDZHuHTOg=" }, { "id": "Netherlands_South Holland_Brielle", @@ -13741,8 +13744,8 @@ "Nederland", "Zuid-Holland" ], - "s": 23094641, - "sha1_base64": "kXYvaslQ5QHJBk8j9KxE8ieV1L8=" + "s": 23393177, + "sha1_base64": "M4ZiwgIU2NncdQt2hoy3qtbd3aY=" }, { "id": "Netherlands_South Holland_Den Haag", @@ -13753,8 +13756,8 @@ "Nederland", "Zuid-Holland" ], - "s": 69231563, - "sha1_base64": "KT1Z+WesMPSZ3PWd6YeLBNrk1eo=" + "s": 70096435, + "sha1_base64": "ONFn0n+TbUIm0IP5f/81emi9Edc=" }, { "id": "Netherlands_South Holland_Leiden", @@ -13765,8 +13768,8 @@ "Nederland", "Zuid-Holland" ], - "s": 28793174, - "sha1_base64": "WVqDdzj+D4UmCBfzspj/AYRX8s4=" + "s": 29138750, + "sha1_base64": "ImvYlVglCukakNVsWFbwZ8P81S8=" }, { "id": "Netherlands_South Holland_Rotterdam", @@ -13777,8 +13780,8 @@ "Nederland", "Zuid-Holland" ], - "s": 67130711, - "sha1_base64": "+DWOLWyTtmUyMHa2RCGfNMB42WA=" + "s": 68247999, + "sha1_base64": "Hc7H43cnRQApAjmWXUY3YjwN7rU=" }, { "id": "Netherlands_Utrecht_Amersfoort", @@ -13789,8 +13792,8 @@ "Utrecht", "Nederland" ], - "s": 32791680, - "sha1_base64": "/V7u8R861RwbIVja0b5eQzUqy+w=" + "s": 33184376, + "sha1_base64": "FRGGWxpMq4Wr8icVDz2dYLf+m2w=" }, { "id": "Netherlands_Utrecht_Utrecht", @@ -13801,8 +13804,8 @@ "Utrecht", "Nederland" ], - "s": 40201730, - "sha1_base64": "0HPEE2M/6i2DWQJ9cFgKv+63PB8=" + "s": 40953234, + "sha1_base64": "jfPWoUoNOV0m7GdAMlgmQ6z6ubU=" }, { "id": "Netherlands_Zeeland", @@ -13813,8 +13816,8 @@ "Nederland", "Zeeland" ], - "s": 37377393, - "sha1_base64": "o2hYOcb/WPniSZosVTCr2n4UNUg=" + "s": 37924585, + "sha1_base64": "rX4QCcSJriW4uE/fpLLclEWgNKw=" } ] }, @@ -13831,8 +13834,8 @@ "Région des Savanes", "Togo" ], - "s": 59115454, - "sha1_base64": "cMYX7LkvszeEZ/MpA/tA8vhRJZo=" + "s": 59507294, + "sha1_base64": "B7dGPlICK9wypWekQ9o1Vvk5VO8=" }, { "id": "Tonga", @@ -13852,8 +13855,8 @@ "Vahe Vaini", "Vavaʻu" ], - "s": 4086162, - "sha1_base64": "C0vLU8FB7MVwgdIBMkNI211I+ho=" + "s": 4319956, + "sha1_base64": "qBHbCsI6yNXJptzVrYLQe6Dg7K4=" }, { "id": "Tunisia", @@ -13887,8 +13890,8 @@ "القيروان", "المنستير" ], - "s": 82584686, - "sha1_base64": "eJaPBfFtEhLaflLHi9xp+rBe1lc=" + "s": 83516710, + "sha1_base64": "8KDXJcYKvxBPh+1rQ5hLVOIkX88=" }, { "id": "Turkey", @@ -13909,8 +13912,8 @@ "Osmaniye", "Türkiye" ], - "s": 120893654, - "sha1_base64": "5tX5BlZlEzkzmzAgPNnIO69/IOk=" + "s": 121470678, + "sha1_base64": "QSOUfk5WT4V3rNjUHEVnPzGJ5WY=" }, { "id": "Turkey_Southeastern Anatolia Region", @@ -13930,8 +13933,8 @@ "Şanlıurfa", "Şırnak" ], - "s": 71717098, - "sha1_base64": "ImQw7HN8dZpd4qvjMoW5X+UiwSA=" + "s": 72146226, + "sha1_base64": "8HVo2Gmdv96cpCCA3exkrWibagc=" }, { "id": "Turkey_Marmara Region_Istanbul", @@ -13948,8 +13951,8 @@ "Çanakkale", "İstanbul" ], - "s": 98765488, - "sha1_base64": "qrlPRjyjtcj7MT+uyBnKwApQ5PM=" + "s": 99866416, + "sha1_base64": "dQ2gWR6TpuyuYR57MFh+Yqif8eM=" }, { "id": "Turkey_Marmara Region_Bursa", @@ -13969,8 +13972,8 @@ "Çanakkale", "İstanbul" ], - "s": 79893340, - "sha1_base64": "A8fzLH3UKRJCozF23vQdkREao1E=" + "s": 81281084, + "sha1_base64": "s7bWve0tcsxy4uDjvAijuTadzVI=" }, { "id": "Turkey_Eastern Anatolia Region", @@ -13994,8 +13997,8 @@ "Tunceli", "Türkiye" ], - "s": 62653675, - "sha1_base64": "so2uCW5CvK+V0JbaiyxDWvosTYQ=" + "s": 62954155, + "sha1_base64": "prmFgm/QKEvCjG1aFf+ijFUPNds=" }, { "id": "Turkey_Black Sea Region", @@ -14023,8 +14026,8 @@ "Zonguldak", "Çorum" ], - "s": 108060480, - "sha1_base64": "C/Cuv04x+10gsia6F2JqzhmJKQ4=" + "s": 108356592, + "sha1_base64": "irgcw36MHGQdJfwVB6dTfgFH9qE=" }, { "id": "Turkey_Central Anatolia Region_Ankara", @@ -14042,8 +14045,8 @@ "Türkiye", "Çankırı" ], - "s": 65259028, - "sha1_base64": "p+AbYuITSrZy20kpaOzad9Ffts0=" + "s": 65732971, + "sha1_base64": "CZJ68iJXZhQNK92YQoZ39Y4Q7PE=" }, { "id": "Turkey_Central Anatolia Region_Kayseri", @@ -14059,8 +14062,8 @@ "Türkiye", "Yozgat" ], - "s": 58850920, - "sha1_base64": "MJBFvntYa8H8SSJ6XTy9MyKRgps=" + "s": 59115832, + "sha1_base64": "keWCgM4cRn3Tv3QCFJuba4/BHcs=" }, { "id": "Turkey_Aegean Region", @@ -14078,8 +14081,8 @@ "Uşak", "İzmir" ], - "s": 107753863, - "sha1_base64": "yxHHJDDHA6shwzH3pAStRjqO9SQ=" + "s": 108920463, + "sha1_base64": "IkhEJ+XEi795AnVT/PbxHowt224=" } ] }, @@ -14096,8 +14099,8 @@ "Mary", "Türkmenistan" ], - "s": 39447601, - "sha1_base64": "qPL/sw/HgQZFiuf+9ds728xGAtg=" + "s": 42532793, + "sha1_base64": "IC0N03M6tOePL5waEH7atHkBmt0=" }, { "id": "Turks and Caicos Islands", @@ -14109,8 +14112,8 @@ "The Bahamas", "Turks and Caicos Islands" ], - "s": 1441798, - "sha1_base64": "mhUY5LdGQHrvIqS3bTKkiFfVE3g=" + "s": 1486382, + "sha1_base64": "qbrn08v2INTKZahPvFZZWAE9W5I=" }, { "id": "Tuvalu", @@ -14120,8 +14123,8 @@ "affiliations": [ "Tuvalu" ], - "s": 528157, - "sha1_base64": "R6Zt1DePnXihF3Wk4nZsbPlSzPA=" + "s": 538173, + "sha1_base64": "2JhBnLBAh0MIWZ9XryPRpLHBRjU=" }, { "id": "Uganda", @@ -14170,8 +14173,8 @@ "Uganda", "Western Region" ], - "s": 343172996, - "sha1_base64": "uC+uX0ADDPZ7gvPOTccqICmTSao=" + "s": 348703566, + "sha1_base64": "jl1IydF7WfwniGPwxNapvEzxuUQ=" }, { "id": "Ukraine", @@ -14185,8 +14188,8 @@ "Черкаська область", "Україна" ], - "s": 45522083, - "sha1_base64": "04YXiCMzHePN+7F7mciPLnAxkAQ=" + "s": 45687827, + "sha1_base64": "uLPBCU6g1eDeHkFlzRE10bwLE6I=" }, { "id": "Ukraine_Chernihiv Oblast", @@ -14197,8 +14200,8 @@ "Україна", "Чернігівська область" ], - "s": 36763777, - "sha1_base64": "R4zEBq+l/jD16a9TqiwgNbJpY1A=" + "s": 37372569, + "sha1_base64": "s5o9cwmOEHMd/6VKUyoiBvg7XMM=" }, { "id": "Ukraine_Chernivtsi Oblast", @@ -14209,8 +14212,8 @@ "Чернівецька область", "Україна" ], - "s": 30377029, - "sha1_base64": "4vpqb8a5S7SI3SG9FX4CLc0q5qk=" + "s": 30682045, + "sha1_base64": "VnZ8y/AXxT0FX2rZeqrHXLvX4g0=" }, { "id": "Ukraine_Dnipropetrovsk Oblast", @@ -14221,8 +14224,8 @@ "Україна", "Дніпропетровська область" ], - "s": 63706643, - "sha1_base64": "7+NfeIN+uLUjEWEnVYAYgxi63kI=" + "s": 64413147, + "sha1_base64": "K2yAIJ4Ky4gHh84/ICrVVMj1L7Y=" }, { "id": "Ukraine_Donetsk Oblast", @@ -14233,8 +14236,8 @@ "Україна", "Донецька область" ], - "s": 71078940, - "sha1_base64": "6+mwxmkygOwKIcq4hiNKPc3nnvs=" + "s": 72369540, + "sha1_base64": "Tz2dGBMmmBaLaB+fbRQdTMYSN54=" }, { "id": "Ukraine_Ivano-Frankivsk Oblast", @@ -14245,8 +14248,8 @@ "Івано-Франківська область", "Україна" ], - "s": 41992809, - "sha1_base64": "p48H996i1yZ/vV3Gcf5DkW15tuU=" + "s": 42346489, + "sha1_base64": "KahHkWdOpUsX3mpaGy9O/XECqRI=" }, { "id": "Ukraine_Kharkiv Oblast", @@ -14257,8 +14260,8 @@ "Харківська область", "Україна" ], - "s": 63837906, - "sha1_base64": "WEybzSVDRQwSG1XTa7nSsce+Tl0=" + "s": 64249386, + "sha1_base64": "1CWBqG5cZNno21cyGT9kQ6fxXxA=" }, { "id": "Ukraine_Kherson Oblast", @@ -14269,8 +14272,8 @@ "Херсонська область", "Україна" ], - "s": 23315381, - "sha1_base64": "3y+ifMAFBUzgEkyxacnRac/Z2rU=" + "s": 24150405, + "sha1_base64": "sFa8IjX6UuabcHmxY36trp7Nw3w=" }, { "id": "Ukraine_Khmelnytskyi Oblast", @@ -14281,8 +14284,8 @@ "Хмельницька область", "Україна" ], - "s": 39008662, - "sha1_base64": "w3A4V8ASzX212+T8f/nMuagoiNw=" + "s": 39220014, + "sha1_base64": "7T9J9yRuiw769JUtphkmwm4J+z8=" }, { "id": "Ukraine_Kirovohrad Oblast", @@ -14293,8 +14296,8 @@ "Україна", "Кіровоградська область" ], - "s": 38884814, - "sha1_base64": "EdUsHX1q0R/Twts7JBgR77FXEhY=" + "s": 39100598, + "sha1_base64": "U23QeC7q3yIb2xuiZ/mIESErY/I=" }, { "id": "Ukraine_Kyiv Oblast", @@ -14306,8 +14309,8 @@ "Україна", "Київська область" ], - "s": 86552822, - "sha1_base64": "kOnV3HVloMGLeGraDwd5el6WZco=" + "s": 87635230, + "sha1_base64": "VXOWpeic0VAehQpeScvAVCL09jg=" }, { "id": "Ukraine_Luhansk Oblast", @@ -14318,8 +14321,8 @@ "Україна", "Луганська область" ], - "s": 50974416, - "sha1_base64": "CLX5VS/SFZSQtTBHUMLvYJ9VB7w=" + "s": 51344440, + "sha1_base64": "I0lYzS+qC5C0jNZcBHNZ80kImbo=" }, { "id": "Ukraine_Lviv Oblast", @@ -14330,8 +14333,8 @@ "Львівська область", "Україна" ], - "s": 73047374, - "sha1_base64": "G9dDcs5r+Ww0IHJuPBB15bwJBug=" + "s": 73735014, + "sha1_base64": "lYjdVLDoC2uWuvQPgUqzzBEFQwc=" }, { "id": "Ukraine_Mykolaiv Oblast", @@ -14342,8 +14345,8 @@ "Україна", "Миколаївська область" ], - "s": 36486016, - "sha1_base64": "/hQIVfy44g3JA7g/TC3bG911GKE=" + "s": 37067728, + "sha1_base64": "yYPQtJKaJs6AcBuhBHXM1N3sKpc=" }, { "id": "Ukraine_Odessa Oblast", @@ -14354,8 +14357,8 @@ "Україна", "Одеська область" ], - "s": 45274579, - "sha1_base64": "Bw9OdOXhwyxPJljh8GIsHvCELhQ=" + "s": 45653651, + "sha1_base64": "qBZZFOECkKTqJ89f18JdNYZ511w=" }, { "id": "Ukraine_Poltava Oblast", @@ -14366,8 +14369,8 @@ "Полтавська область", "Україна" ], - "s": 38932122, - "sha1_base64": "31F0tMPZnDIMi81eTZP2qjpgDyI=" + "s": 39336442, + "sha1_base64": "vvDt+STYkrdijQUBe8m5ciIrED4=" }, { "id": "Ukraine_Rivne Oblast", @@ -14378,8 +14381,8 @@ "Рівненська область", "Україна" ], - "s": 31585918, - "sha1_base64": "m3fPTW4ieq8z89XhHa3S6MGJ8ZA=" + "s": 31693518, + "sha1_base64": "O+4P0HdFblfj4+9pHOc8bkWpEZk=" }, { "id": "Ukraine_Sumy Oblast", @@ -14390,8 +14393,8 @@ "Україна", "Сумська область" ], - "s": 34371383, - "sha1_base64": "iSuFWH08MDOPM4qx9UhIQCdwOMA=" + "s": 34835903, + "sha1_base64": "zBoKaTzOxGgPVCZvBRxFdJrfUPg=" }, { "id": "Ukraine_Ternopil Oblast", @@ -14402,8 +14405,8 @@ "Україна", "Тернопільська область" ], - "s": 34148366, - "sha1_base64": "TNNTSOh1Q99fXpr4g3rKABVJ0jc=" + "s": 34927110, + "sha1_base64": "CSaNvooCE5TZiPKO+P9FWy8L29I=" }, { "id": "Ukraine_Vinnytsia Oblast", @@ -14414,8 +14417,8 @@ "Україна", "Вінницька область" ], - "s": 46007400, - "sha1_base64": "DI+HxXo9XlMrLejfS8wZ7V5zY9s=" + "s": 46118312, + "sha1_base64": "u6QYJKePiPud6i5kV3IsBXyFiLE=" }, { "id": "Ukraine_Volyn Oblast", @@ -14426,8 +14429,8 @@ "Україна", "Волинська область" ], - "s": 31939710, - "sha1_base64": "PJ8D/ttfyBxlqXuC1my6xYrtQ4A=" + "s": 32192142, + "sha1_base64": "AGUHLS+YUuHT6MYZq9ZR5fKVH/8=" }, { "id": "Ukraine_Zakarpattia Oblast", @@ -14438,8 +14441,8 @@ "Україна", "Закарпатська область" ], - "s": 45511187, - "sha1_base64": "sQusJmBbcfRu5wTaAZMPF9ujovM=" + "s": 45894427, + "sha1_base64": "1JF1gmHH1l66OjNb7I5MtRShDkA=" }, { "id": "Ukraine_Zaporizhia Oblast", @@ -14450,8 +14453,8 @@ "Запорізька область", "Україна" ], - "s": 32759438, - "sha1_base64": "ejM7arrYN1cPO4mmJSPBR53FVPM=" + "s": 33014398, + "sha1_base64": "GgoCCJUux+pUxkGZj0XtF6DRKvQ=" }, { "id": "Ukraine_Zhytomyr Oblast", @@ -14462,8 +14465,8 @@ "Житомирська область", "Україна" ], - "s": 38116449, - "sha1_base64": "fd+xqJQGk6uIqMe72AIZ3xBECPM=" + "s": 38339801, + "sha1_base64": "iul0ABx/9FHrAJAV+kgx/xaJqVU=" }, { "id": "Crimea", @@ -14478,8 +14481,8 @@ "Україна", "Республика Крым" ], - "s": 55320691, - "sha1_base64": "FtLSbuVHHZ6AoD6UCTRE6S1zJRw=" + "s": 55728755, + "sha1_base64": "iRBodnM5K1ewzkybnXGIb1DL8nY=" } ] }, @@ -14499,8 +14502,8 @@ "الشارقة", "الإمارات العربيّة المتّحدة" ], - "s": 103969159, - "sha1_base64": "cbE+KeSB+twantDFOrL2BS+u2Us=" + "s": 107163231, + "sha1_base64": "t5Og75owKkPAV/GSCtCzeVHgGhY=" }, { "id": "Falkland Islands", @@ -14510,8 +14513,8 @@ "affiliations": [ "Falkland Islands" ], - "s": 11011623, - "sha1_base64": "YZ9hGE6KWrpRMX422WQCNp3gGZY=" + "s": 11050271, + "sha1_base64": "lfFe5PGb9rTwFybfnQC+Eph+3Y0=" }, { "id": "United Kingdom", @@ -14524,8 +14527,8 @@ "affiliations": [ "British Indian Ocean Territory" ], - "s": 600079, - "sha1_base64": "R261HGyZZsEcf8v3hinxmMgUfuQ=" + "s": 602047, + "sha1_base64": "xx9C1fg2zZQ73mkZaRtbvt/WMhA=" }, { "id": "UK_England_East Midlands", @@ -14536,8 +14539,8 @@ "England", "United Kingdom" ], - "s": 136832537, - "sha1_base64": "DwH6v4OU0aK2Llm/smdBIEM/mOI=" + "s": 140346105, + "sha1_base64": "s74fkOBRxzZCGmAqZYVohCPUy3c=" }, { "id": "UK_England_East of England_Essex", @@ -14548,8 +14551,8 @@ "England", "United Kingdom" ], - "s": 83394156, - "sha1_base64": "bLu4FaoBfehLHlg4d05I1RoLcEA=" + "s": 85428804, + "sha1_base64": "4txQrxnT4YSIPWsgqpwsD1auIIg=" }, { "id": "UK_England_East of England_Norfolk", @@ -14560,8 +14563,8 @@ "England", "United Kingdom" ], - "s": 96619686, - "sha1_base64": "iDZ8A680pw6B5BxkHRVtkl5KXsQ=" + "s": 97681246, + "sha1_base64": "upJGFcqvKpI9nodtFw4fdCucVn4=" }, { "id": "UK_England_Greater London", @@ -14572,8 +14575,8 @@ "England", "United Kingdom" ], - "s": 133851611, - "sha1_base64": "9bKrWRdHa1cPxpQxJaIhKqswED0=" + "s": 137862795, + "sha1_base64": "568X70qyMVSgdZAUTLmaoWcTymQ=" }, { "id": "UK_England_North East England", @@ -14584,8 +14587,8 @@ "England", "United Kingdom" ], - "s": 71183732, - "sha1_base64": "hD1g546suptcSe4+ACx31fDQzT4=" + "s": 72320564, + "sha1_base64": "Bgxh+2IRikNA3wLAk3tY3GrJzLk=" }, { "id": "UK_England_North West England_Manchester", @@ -14596,8 +14599,8 @@ "England", "United Kingdom" ], - "s": 132691856, - "sha1_base64": "HCpVVCv/OgzD/PWn0WVOK7WT/U0=" + "s": 133795648, + "sha1_base64": "BMZASjqlDTSAjkewWRFxfCPxUPU=" }, { "id": "UK_England_North West England_Lancaster", @@ -14608,8 +14611,8 @@ "England", "United Kingdom" ], - "s": 59466884, - "sha1_base64": "bPonik2XbCyrXpG/8aqWlOYxc/s=" + "s": 60750564, + "sha1_base64": "2w9r0KaDcGohRXr3mZxqgsqmlUE=" }, { "id": "UK_England_South East_Brighton", @@ -14620,8 +14623,8 @@ "England", "United Kingdom" ], - "s": 143995777, - "sha1_base64": "mF59BEkE13jvSFUhr0dLGvfmC3M=" + "s": 148125033, + "sha1_base64": "uGnbtDFOSOHTmxMVaYC/dWkywXU=" }, { "id": "UK_England_South East_Oxford", @@ -14632,8 +14635,8 @@ "England", "United Kingdom" ], - "s": 133490705, - "sha1_base64": "fX1wsP+Vr8GENVAzOZVJM77ZfsI=" + "s": 137243785, + "sha1_base64": "N6FsPyg3a65bn/jDZbnx5/g1yHo=" }, { "id": "UK_England_South West England_Bristol", @@ -14644,8 +14647,8 @@ "England", "United Kingdom" ], - "s": 151026442, - "sha1_base64": "xVfz5pYuM/poDBhPMNboXDj4BCk=" + "s": 153321778, + "sha1_base64": "IrHdg5fAADSg48Av2DDJnBBiaME=" }, { "id": "UK_England_South West England_Cornwall", @@ -14656,8 +14659,8 @@ "England", "United Kingdom" ], - "s": 86109253, - "sha1_base64": "lq6os1XlOCOUXQRyltNZ9lx30tk=" + "s": 87648197, + "sha1_base64": "VAg5p4dew6Uef7ojZkC3uuZxg5I=" }, { "id": "UK_England_West Midlands", @@ -14668,8 +14671,8 @@ "England", "United Kingdom" ], - "s": 155592027, - "sha1_base64": "BZjCH0FyO7WgJIbG7J89yF/ZEO0=" + "s": 159600475, + "sha1_base64": "NQBvYbD8bG3EQdUPjJDkvpGoU0k=" }, { "id": "UK_England_Yorkshire and the Humber", @@ -14680,8 +14683,8 @@ "England", "United Kingdom" ], - "s": 151521530, - "sha1_base64": "foeKi6sDL2/D6xe25SapHvHa7xw=" + "s": 154318370, + "sha1_base64": "QIuHHypQ7Ubge/dcMjDxn/0Pvf8=" }, { "id": "UK_Northern Ireland", @@ -14693,8 +14696,8 @@ "Scotland", "United Kingdom" ], - "s": 75517589, - "sha1_base64": "S6oxqsrEzUA1SxBCly51SetsWrE=" + "s": 76875573, + "sha1_base64": "j6rDF+yOGKHmHNlEs49GBNTYGfE=" }, { "id": "UK_Scotland_North", @@ -14705,8 +14708,8 @@ "Scotland", "United Kingdom" ], - "s": 182041178, - "sha1_base64": "gYLntgFq6Gu9gvcQW0fQr1V55t0=" + "s": 185083826, + "sha1_base64": "6R3N/C4z2UlgdaZHvWunU1z9YIM=" }, { "id": "UK_Scotland_South", @@ -14718,8 +14721,8 @@ "Scotland", "United Kingdom" ], - "s": 139737776, - "sha1_base64": "Q/VuooriBlELBx95ucFdnXI2yvE=" + "s": 144107360, + "sha1_base64": "HDNdlOb6D8Zwn1ux4WCEGCvS9FQ=" }, { "id": "UK_Wales", @@ -14730,8 +14733,8 @@ "United Kingdom", "Wales" ], - "s": 149475586, - "sha1_base64": "uLzse7dlXoqDhpWSzSVcsP7Le7s=" + "s": 152092362, + "sha1_base64": "BaNBA56xeN7FEQ8+sD9kw4I6HuM=" } ] }, @@ -14746,8 +14749,8 @@ "affiliations": [ "Ireland" ], - "s": 61020636, - "sha1_base64": "bx3C4aob3hS/ZxRsplMruxCEcf8=" + "s": 62482668, + "sha1_base64": "IY0dekzNcgMvFXylZUJSSc2RCNI=" }, { "id": "Ireland_Leinster", @@ -14757,8 +14760,8 @@ "affiliations": [ "Ireland" ], - "s": 124525553, - "sha1_base64": "Jm+a6myQEZhwhNdcwmfVAB3EGCU=" + "s": 133716081, + "sha1_base64": "20Bh/ZquExPnCgUym3xVt1sNcZM=" }, { "id": "Ireland_Munster", @@ -14768,8 +14771,8 @@ "affiliations": [ "Ireland" ], - "s": 83630542, - "sha1_base64": "ZA/I7Uq/j6oYmpFMItwtokQzyYw=" + "s": 87125142, + "sha1_base64": "zSQE3gC3zITgQnrY79/hSkgOxnA=" }, { "id": "Ireland_Northern Counties", @@ -14779,8 +14782,8 @@ "affiliations": [ "Ireland" ], - "s": 36165425, - "sha1_base64": "KJbAcsM1zTgDp7/cG8Ie+xX3lLM=" + "s": 37158201, + "sha1_base64": "K171qJQmuNIylOSp0ozeXufrqyo=" } ] }, @@ -14800,8 +14803,8 @@ "AL", "United States of America" ], - "s": 96501083, - "sha1_base64": "XETYZXTcT342EJauGzu2cAefPSw=" + "s": 97200043, + "sha1_base64": "VT4DH9NEL+6XjWizloTgUEN35F0=" }, { "id": "US_Alabama_Montgomery", @@ -14813,8 +14816,8 @@ "AL", "United States of America" ], - "s": 134584350, - "sha1_base64": "k4tNFuXNz7s3mEsMy018UHWL2Hk=" + "s": 135114382, + "sha1_base64": "AGGt92HjRQbuE+zg1+P2Q/F5Bs8=" } ] }, @@ -14828,8 +14831,8 @@ "AK", "United States of America" ], - "s": 345621052, - "sha1_base64": "hAs/bSA+cYocWEajiSBeivwXBYU=" + "s": 350126980, + "sha1_base64": "+xmp448d3tujpVLOXs3lqJYVnEI=" }, { "id": "Arizona", @@ -14844,8 +14847,8 @@ "AZ", "United States of America" ], - "s": 98479524, - "sha1_base64": "6+sGKWalJeYSNVTU81YO4ovNi1U=" + "s": 99259396, + "sha1_base64": "sYrkmWxCyb+PxTNvlDs4sjnYD+Q=" }, { "id": "US_Arizona_Phoenix", @@ -14857,8 +14860,8 @@ "AZ", "United States of America" ], - "s": 189266290, - "sha1_base64": "Vhvk0UzzBQjbhKfI8DJvQC5rscI=" + "s": 191490666, + "sha1_base64": "L6D6eICUmoIODuGKIxGAgMLnqtM=" }, { "id": "US_Arizona_Tucson", @@ -14870,8 +14873,8 @@ "AZ", "United States of America" ], - "s": 88047754, - "sha1_base64": "YUa5tN9uulowL6bDAe7+Koc674I=" + "s": 89314298, + "sha1_base64": "esUXgxHXWtYuDkAO3/P92skb38A=" } ] }, @@ -14888,8 +14891,8 @@ "AR", "United States of America" ], - "s": 97350347, - "sha1_base64": "HV0r2Cbi8tRF5SiKrLKAxAlhZ3E=" + "s": 97705315, + "sha1_base64": "Lor02hlCpcfTgxayJ6yZu9GNyag=" }, { "id": "US_Arkansas_South", @@ -14901,8 +14904,8 @@ "AR", "United States of America" ], - "s": 63596913, - "sha1_base64": "vn8qqB0nBofOxOdRVMYp4qKVNqU=" + "s": 63865505, + "sha1_base64": "Wltpxq075Fd8rEzo3VN/gsEG2UY=" } ] }, @@ -14919,8 +14922,8 @@ "CA", "United States of America" ], - "s": 59021305, - "sha1_base64": "gHDaN6TDZjwoC8R6b5O83sFD19k=" + "s": 59618617, + "sha1_base64": "kCIemJPxiKEXpWGoveJXWwT5Yc4=" }, { "id": "US_California_Bakersfield_Bakersfield", @@ -14932,8 +14935,8 @@ "CA", "United States of America" ], - "s": 58972032, - "sha1_base64": "qzE5ryGAfU1d3vhhIXXnO3+ntq0=" + "s": 60256416, + "sha1_base64": "SNTjP65OKHT2lFRZKc7sD9bPjXg=" }, { "id": "US_California_Bakersfield_Lancaster", @@ -14945,8 +14948,8 @@ "CA", "United States of America" ], - "s": 79855218, - "sha1_base64": "/7598UoF+QCONY/6GFheoGhyink=" + "s": 80993162, + "sha1_base64": "Uq7DAKqdwBs0Ja5etz4LdH31FZo=" }, { "id": "US_California_LA", @@ -14958,8 +14961,8 @@ "CA", "United States of America" ], - "s": 297671559, - "sha1_base64": "RnqgIsJk+tai8rXk+g//3HBFqXY=" + "s": 300014704, + "sha1_base64": "06THQhe1r//PBR7ODsfa815PI+A=" }, { "id": "US_California_LA North", @@ -14971,8 +14974,8 @@ "CA", "United States of America" ], - "s": 92046456, - "sha1_base64": "xM6/aDH7x8evh48dIO3lmq8TZ3U=" + "s": 92954840, + "sha1_base64": "KP3Cwu9J2Tcy0VcVzP0mPTi8Cns=" }, { "id": "US_California_Redding", @@ -14985,8 +14988,8 @@ "Hoopa Valley Tribe", "United States of America" ], - "s": 70965859, - "sha1_base64": "+25NI0DVchJ/6QZqZTPqUH3o7uk=" + "s": 71466075, + "sha1_base64": "ySINGomf5rdFPE0+k1l0QMytpp8=" }, { "id": "US_California_Sacramento_Sacramento", @@ -14998,8 +15001,8 @@ "CA", "United States of America" ], - "s": 77590794, - "sha1_base64": "LfX9iQoQxiUpL5MM0DBm8mRp78E=" + "s": 78673578, + "sha1_base64": "CEtInmTXyDkhClDLp22T5Mt12kM=" }, { "id": "US_California_Sacramento_Fresno", @@ -15011,8 +15014,8 @@ "CA", "United States of America" ], - "s": 67279456, - "sha1_base64": "aVVQ0IA7WglspHE3qf91q+3EKEg=" + "s": 68075328, + "sha1_base64": "v6diTFEwdXQFLKYfsmHSZYEk5zE=" }, { "id": "US_California_Sacramento_Stockton", @@ -15024,8 +15027,8 @@ "CA", "United States of America" ], - "s": 83348202, - "sha1_base64": "gdT+9Uy6pU6Guy2kbkd185SuiQ8=" + "s": 84442418, + "sha1_base64": "JapcINV8790q6PgPAS81H05ej/4=" }, { "id": "US_California_San Diego", @@ -15037,8 +15040,8 @@ "CA", "United States of America" ], - "s": 129580183, - "sha1_base64": "vNisouqdgwPcRyHoYUTuZPqBuNs=" + "s": 132070927, + "sha1_base64": "chowwBzw+pUwZKtV0CyRLXoFLpU=" }, { "id": "US_California_Santa_Clara_Santa Cruz", @@ -15050,8 +15053,8 @@ "CA", "United States of America" ], - "s": 43033904, - "sha1_base64": "7LXZePPhEC5J63LdZyrQiPXooBw=" + "s": 43492312, + "sha1_base64": "5+qKfl6kF9mfq8kS57GL+Y+a5nA=" }, { "id": "US_California_Santa_Clara_Palo Alto", @@ -15063,8 +15066,8 @@ "CA", "United States of America" ], - "s": 224390034, - "sha1_base64": "Kb+6I4YB/uZX6cPwPNla62njZls=" + "s": 227689026, + "sha1_base64": "FIuOqbdzqLHNsWM5S0h2tux6BUA=" } ] }, @@ -15081,8 +15084,8 @@ "CO", "United States of America" ], - "s": 108210060, - "sha1_base64": "cCZP7wF74HBwyPJO4szFjjkBO14=" + "s": 109092676, + "sha1_base64": "+QJZ4WfDazsom5zyiyWefBBb+VA=" }, { "id": "US_Colorado_Denver", @@ -15094,8 +15097,8 @@ "CO", "United States of America" ], - "s": 200882762, - "sha1_base64": "m7/yS9AHTngIq8vllxB2paRAU+Q=" + "s": 208294490, + "sha1_base64": "pJjD7avLypqMHcze/mYVC9WWDzQ=" }, { "id": "US_Colorado_South", @@ -15107,8 +15110,8 @@ "CO", "United States of America" ], - "s": 101572914, - "sha1_base64": "jqxbSd7IfphpM9iN0LuR6A05WXk=" + "s": 103138618, + "sha1_base64": "DTc8vXkcleDFSRnU7RD2v/26u1E=" } ] }, @@ -15122,8 +15125,8 @@ "CT", "United States of America" ], - "s": 181313263, - "sha1_base64": "ThbNYKewJX74N4FJyj6i6ZFEpdY=" + "s": 182592255, + "sha1_base64": "EQUgYlXECKfFM5M7uKmUR2pxtOk=" }, { "id": "US_Delaware", @@ -15135,8 +15138,8 @@ "DE", "United States of America" ], - "s": 30644718, - "sha1_base64": "vNZp81HTCrv71gtTdoJmdAn1jOw=" + "s": 30996166, + "sha1_base64": "vcF/lcZoMk1rtguYGUGEIjHDH0U=" }, { "id": "Florida", @@ -15151,8 +15154,8 @@ "FL", "United States of America" ], - "s": 220227717, - "sha1_base64": "Q1GWiigCFsdfkM2LakeCTsB/xYo=" + "s": 221426300, + "sha1_base64": "bDS4rDckIyTeoOIYo2qRgJYTCeE=" }, { "id": "US_Florida_Miami", @@ -15164,8 +15167,8 @@ "FL", "United States of America" ], - "s": 208261472, - "sha1_base64": "b2toLUB0+FlR4/j46yNyA6VdrsQ=" + "s": 210006184, + "sha1_base64": "94wHhRyhB3CqNpvhfgliaN6CZAI=" }, { "id": "US_Florida_Orlando", @@ -15177,8 +15180,8 @@ "FL", "United States of America" ], - "s": 97428970, - "sha1_base64": "EGs9VeVlEx0KrNMBQw2WfYpQfl8=" + "s": 99067594, + "sha1_base64": "Gu6zQ3gBwMOpd0czoKG4BJ9sJ0Q=" }, { "id": "US_Florida_Tampa", @@ -15190,8 +15193,8 @@ "FL", "United States of America" ], - "s": 202727338, - "sha1_base64": "CwY4QqAf7vakdcpuJaSOSB8GiHE=" + "s": 203832522, + "sha1_base64": "X6Z5sJhPbckPKmrP8hw/c0ik9iM=" }, { "id": "US_Florida_Gainesville", @@ -15203,8 +15206,8 @@ "FL", "United States of America" ], - "s": 153991614, - "sha1_base64": "0dtgbDZohjnEbYZgkLlOFgJz7nQ=" + "s": 154687598, + "sha1_base64": "MU6Jg/KQX9vBr9VIm3C8on/KeHM=" } ] }, @@ -15221,8 +15224,8 @@ "GA", "United States of America" ], - "s": 159497056, - "sha1_base64": "KOd/hntcqG23xNXwYDLw7L7Z6pg=" + "s": 160306248, + "sha1_base64": "9PYlxRFOe6NywjHQg8SB37ujToQ=" }, { "id": "US_Georgia_Macon", @@ -15234,8 +15237,8 @@ "GA", "United States of America" ], - "s": 86069836, - "sha1_base64": "D0FQhaWDiPPyvCulmSjqPJChcSs=" + "s": 86370164, + "sha1_base64": "XBiJsOC3VvYZjulPHcIJtglnHIw=" }, { "id": "US_Georgia_North", @@ -15247,8 +15250,8 @@ "GA", "United States of America" ], - "s": 66095770, - "sha1_base64": "he9LpxREsFiSBxje15bWs1PJioI=" + "s": 66519034, + "sha1_base64": "QZvfdnZkA8VlXcgxh+qtFo3/U+s=" }, { "id": "US_Georgia_South", @@ -15260,8 +15263,8 @@ "GA", "United States of America" ], - "s": 92308803, - "sha1_base64": "GzWcZajo25BbE6WZArHuY1Y1FUY=" + "s": 92538787, + "sha1_base64": "ty3PjQVzVOJ2S4J0RYSJQVLfgQk=" } ] }, @@ -15281,8 +15284,8 @@ "country_name_synonyms": [ "Guam" ], - "s": 5185116, - "sha1_base64": "EqMIEgUM5D28L+tKhy/pLqFn3Fg=" + "s": 5248396, + "sha1_base64": "1KB2HmCXNx5j/swRNHdR4UYWAzA=" }, { "id": "US_Hawaii", @@ -15294,8 +15297,8 @@ "HI", "United States of America" ], - "s": 31081883, - "sha1_base64": "+WqY00H4WUYRCbkAbZ4pS4DuEtA=" + "s": 32041739, + "sha1_base64": "Lr8smY5HXzt3HNjUpD9AxJdz1jg=" }, { "id": "US_Idaho", @@ -15310,8 +15313,8 @@ "ID", "United States of America" ], - "s": 72920882, - "sha1_base64": "asIg37ekqkFyLzzIyYB+UvdztHo=" + "s": 74518114, + "sha1_base64": "e6ekWMrHjfGlY2gSo3fMff/VEHI=" }, { "id": "US_Idaho_South", @@ -15323,8 +15326,8 @@ "ID", "United States of America" ], - "s": 81111259, - "sha1_base64": "R8zVt4AxpNg1RPhTBJid/5PakmA=" + "s": 82022755, + "sha1_base64": "Gk8bvKKL0InbbRHPzMPOjOO2ciw=" } ] }, @@ -15341,8 +15344,8 @@ "IL", "United States of America" ], - "s": 87749365, - "sha1_base64": "5lzmjITZguiqqZQWWhlZj9wrtDI=" + "s": 88855277, + "sha1_base64": "wGWsEFFguUsUA+BQh04CLIYkgFI=" }, { "id": "US_Illinois_Chickago", @@ -15354,8 +15357,8 @@ "IL", "United States of America" ], - "s": 121139719, - "sha1_base64": "RVct1fZI8cb220xkJejri6HMgV0=" + "s": 122349775, + "sha1_base64": "h5r4+J20EMfN5wL9Xxt1rqSM2G4=" }, { "id": "US_Illinois_Elgin", @@ -15367,8 +15370,8 @@ "IL", "United States of America" ], - "s": 81978300, - "sha1_base64": "InCEtK6f+a4qxwQceyFGPsJbLPs=" + "s": 83536604, + "sha1_base64": "N8gmonliDBeo2a9WFyqLTg/WOk4=" }, { "id": "US_Illinois_Rockford", @@ -15380,8 +15383,8 @@ "IL", "United States of America" ], - "s": 51712904, - "sha1_base64": "ECuHoWPtzEsGTvkHBU0K64jO2/8=" + "s": 52040400, + "sha1_base64": "VQGYUrWcL4Y1OhdIMxGSyvGKcHc=" }, { "id": "US_Illinois_Springfield", @@ -15393,8 +15396,8 @@ "IL", "United States of America" ], - "s": 104095501, - "sha1_base64": "Bet/i46BE0BYJkVBi+fKBzlE8vM=" + "s": 105634837, + "sha1_base64": "WX4fmG7qzycCQGKnKCQSBSp1jWc=" } ] }, @@ -15411,8 +15414,8 @@ "IN", "United States of America" ], - "s": 125740464, - "sha1_base64": "Vxi24xf9RiFKN0pI4IV9V4izcwA=" + "s": 127621248, + "sha1_base64": "0gmVWUaTwRVo4J9OfcciPrYOb+A=" }, { "id": "US_Indiana_Evansville", @@ -15424,8 +15427,8 @@ "IN", "United States of America" ], - "s": 62430857, - "sha1_base64": "RTgiv0VqRtd66Go1UoPDmimu7rs=" + "s": 62767137, + "sha1_base64": "gavP+bYOVkOtW9LMzHCd8cvsii0=" }, { "id": "US_Indiana_Indianapolis", @@ -15437,8 +15440,8 @@ "IN", "United States of America" ], - "s": 95409810, - "sha1_base64": "cm+UzNc1NrVByIjL0A8bFlbqFi4=" + "s": 96294554, + "sha1_base64": "9PWiQPz8zL+wwc+D0k0/vL40dZE=" } ] }, @@ -15455,8 +15458,8 @@ "IA", "United States of America" ], - "s": 71062666, - "sha1_base64": "vHXcrt3749TUAzoHY2lX/Py408o=" + "s": 71849994, + "sha1_base64": "80rpBCHd+BOI+0j7iSPmFQx85b8=" }, { "id": "US_Iowa_Waterloo", @@ -15468,8 +15471,8 @@ "IA", "United States of America" ], - "s": 69490538, - "sha1_base64": "aMWyBjrtl0hITI6Q7LW5byYj3Ug=" + "s": 69892538, + "sha1_base64": "GU1JcdV913h5fFgP0ADjLjaBLh0=" }, { "id": "US_Iowa_West", @@ -15481,8 +15484,8 @@ "IA", "United States of America" ], - "s": 70567753, - "sha1_base64": "L6A7WpgiSXIctWZ1+h+SpwbL9Js=" + "s": 70818113, + "sha1_base64": "2De6V9XDV/ITEmBpVfwvseIV8jA=" } ] }, @@ -15499,8 +15502,8 @@ "KS", "United States of America" ], - "s": 81081090, - "sha1_base64": "iEFaASmxqdeeFUYB7qry4YaMtJA=" + "s": 82556186, + "sha1_base64": "z+37/RDcxao0aZVa+83DISBcCPs=" }, { "id": "US_Kansas_West", @@ -15512,8 +15515,8 @@ "KS", "United States of America" ], - "s": 41483847, - "sha1_base64": "IgZXHXeMCP7CKgEbcGjRzJis2Q8=" + "s": 41822143, + "sha1_base64": "wNzPgNjq3Ljgrh5m79GY/srfaCQ=" }, { "id": "US_Kansas_Wichita", @@ -15525,8 +15528,8 @@ "KS", "United States of America" ], - "s": 63241545, - "sha1_base64": "w1OxE9JhZvUwxdhwlPMwQ0urvKk=" + "s": 63677665, + "sha1_base64": "UjDyTsnOoix++zEOT15w33KrthI=" } ] }, @@ -15543,8 +15546,8 @@ "KY", "United States of America" ], - "s": 88867235, - "sha1_base64": "NS05ZdVrpo2aUVGyekRR/cbxxus=" + "s": 90014107, + "sha1_base64": "H+gfP8c0m+vERACxqwQ4V5LzdSs=" }, { "id": "US_Kentucky_West", @@ -15556,8 +15559,8 @@ "KY", "United States of America" ], - "s": 66299489, - "sha1_base64": "GuazxRPuBBhQJy+D9Dn9a/w7q/s=" + "s": 66830529, + "sha1_base64": "xfnMdZC2g7YJ036u9Psl4bkviSU=" }, { "id": "US_Kentucky_Louisville", @@ -15569,8 +15572,8 @@ "KY", "United States of America" ], - "s": 49662672, - "sha1_base64": "bINRfWzJRNe1KCnwtp6QZoj/QRY=" + "s": 49854200, + "sha1_base64": "JCRgYEot/UdIFYTI1ayc0bxj/cI=" } ] }, @@ -15587,8 +15590,8 @@ "LA", "United States of America" ], - "s": 87766891, - "sha1_base64": "gRAMBb8Z2Fz1f2LAqCKfZi8OVRk=" + "s": 88211395, + "sha1_base64": "DZ+IuNFvOL3FcG1coWgzj0DBz/8=" }, { "id": "US_Louisiana_New Orleans", @@ -15600,8 +15603,8 @@ "LA", "United States of America" ], - "s": 100018396, - "sha1_base64": "8Fw2Sr1xGTUQxHmy00O/BeTLqZQ=" + "s": 100199180, + "sha1_base64": "+qpPyPVqM7ydDkVJNZnVThcdqCc=" } ] }, @@ -15615,8 +15618,8 @@ "ME", "United States of America" ], - "s": 119522471, - "sha1_base64": "pVg2EnuN8nCnELHGUegbjUUevl0=" + "s": 122517879, + "sha1_base64": "HT3mJ5CiMLGqHv4pPVmx1JVPoUs=" }, { "id": "Maryland", @@ -15631,8 +15634,8 @@ "MD", "United States of America" ], - "s": 136946576, - "sha1_base64": "7quttkUIpALsMcMf8pjEPtmMA5U=" + "s": 138605280, + "sha1_base64": "0EgAS15P+LONILVKT14nXZsJ/8U=" }, { "id": "US_Maryland_and_DC", @@ -15647,8 +15650,8 @@ "MD", "United States of America" ], - "s": 116622423, - "sha1_base64": "USBAuhdYq4Tf80K1Z+h57CSLnr0=" + "s": 117671248, + "sha1_base64": "7FN6s3Nivxb9zjb0iFEun4j1lqc=" } ] }, @@ -15665,8 +15668,8 @@ "MA", "United States of America" ], - "s": 91218499, - "sha1_base64": "MhSrm2S1h9ATo3dfiQz60S56HFY=" + "s": 94054571, + "sha1_base64": "B0HKNQm1tlkWGrhervHtfb2fpOo=" }, { "id": "US_Massachusetts_Central", @@ -15678,8 +15681,8 @@ "MA", "United States of America" ], - "s": 46404655, - "sha1_base64": "ctck8EvJzBNpmBD1tI1vrWAI2Bw=" + "s": 46772015, + "sha1_base64": "z/0HSltYSPogD0mCycCaw3lNO3Q=" }, { "id": "US_Massachusetts_Plymouth", @@ -15691,8 +15694,8 @@ "MA", "United States of America" ], - "s": 43933734, - "sha1_base64": "jE/ZTiRTKFVPPa8+6nFqN/IZF5I=" + "s": 45651166, + "sha1_base64": "qfULc9Ny8WcDii5tgLURluYKqQg=" }, { "id": "US_Massachusetts_Southeastern", @@ -15704,8 +15707,8 @@ "MA", "United States of America" ], - "s": 21556299, - "sha1_base64": "cqKKrWQC3lWFixwRx2b2bXZixy0=" + "s": 23537259, + "sha1_base64": "51kNwV/Cf+EMcWBfsjS+6rTlMug=" }, { "id": "US_Massachusetts_West", @@ -15717,8 +15720,8 @@ "MA", "United States of America" ], - "s": 42311743, - "sha1_base64": "gDgIH6ZF2tw0OPOJgrA1gLAk+Bg=" + "s": 42506591, + "sha1_base64": "3G5SdGC7lGes3R8kVmQfk/2GLHQ=" } ] }, @@ -15735,8 +15738,8 @@ "MI", "United States of America" ], - "s": 139083758, - "sha1_base64": "S19IOxUgFQm/m2NwKdJRsZQF/Do=" + "s": 140586894, + "sha1_base64": "ZjtizqUdOfXmgHZ3Z/0unXmjbaw=" }, { "id": "US_Michigan_North", @@ -15748,8 +15751,8 @@ "MI", "United States of America" ], - "s": 52367679, - "sha1_base64": "AZEw8ANrdcyXUvbMxyQZQaho5E0=" + "s": 52708199, + "sha1_base64": "476TTtkR34FZw6L+w75xm5VMF6M=" }, { "id": "US_Michigan_Grand Rapids", @@ -15767,8 +15770,8 @@ "MI", "United States of America" ], - "s": 111895380, - "sha1_base64": "2As5VZbIrmjypuh8EBUP8Pywjjs=" + "s": 112976941, + "sha1_base64": "ZbivEkX4O79NZpHACwXPfOX4QRs=" }, { "id": "US_Michigan_Lansing", @@ -15782,8 +15785,8 @@ "MI", "United States of America" ], - "s": 119140727, - "sha1_base64": "MXIpU1aqiNXE4C2NI9O9dF2qTNM=" + "s": 119917087, + "sha1_base64": "183IGsrwXXzW3dRmUoE9vg2JLEo=" } ] }, @@ -15800,8 +15803,8 @@ "MN", "United States of America" ], - "s": 76636618, - "sha1_base64": "G/+J4I3zqXrNWksmMccqlqdX6rk=" + "s": 77667538, + "sha1_base64": "hrLX/M9Gnf8PBnQ+oLnsOCKKMMs=" }, { "id": "US_Minnesota_Minneapolis", @@ -15813,8 +15816,8 @@ "MN", "United States of America" ], - "s": 102140379, - "sha1_base64": "dzH4I+7eC7HxZ6ovoMB7lEjRF7M=" + "s": 103468267, + "sha1_base64": "0DrOsMCMWtFFjiJyWpx0tP8U0Oc=" }, { "id": "US_Minnesota_North", @@ -15826,8 +15829,8 @@ "MN", "United States of America" ], - "s": 86309273, - "sha1_base64": "06jGkoe3XJZNWv9UrPVVqqTLzAA=" + "s": 86562233, + "sha1_base64": "VZuDsKew+KO3jS5b12ZxfWF7azg=" }, { "id": "US_Minnesota_Saint Cloud", @@ -15839,8 +15842,8 @@ "MN", "United States of America" ], - "s": 70200241, - "sha1_base64": "cdLSyOQhou7QQhTZm93VzCqjCyw=" + "s": 70673265, + "sha1_base64": "YWP7Ra6Btu8gCm2R6KllMDg25Z4=" } ] }, @@ -15857,8 +15860,8 @@ "MS", "United States of America" ], - "s": 36138485, - "sha1_base64": "Nse9apnfvAtUzHhvV3qtePOQtRo=" + "s": 36277781, + "sha1_base64": "0TGpyx1oWMfdhxO+MnKEYJU6RgI=" }, { "id": "US_Mississippi_North", @@ -15870,8 +15873,8 @@ "MS", "United States of America" ], - "s": 100997659, - "sha1_base64": "S+6z9DRkwis4XzoVtNpUK1SiuYQ=" + "s": 101795531, + "sha1_base64": "6pproWny88AQcIaePvjy9dQvnuk=" } ] }, @@ -15888,8 +15891,8 @@ "MO", "United States of America" ], - "s": 35862749, - "sha1_base64": "5+cHNK+Vyv8WwXqENKfL18m5Mz8=" + "s": 36028181, + "sha1_base64": "yahkZchtf37JO/4RP0h/ppuCGPs=" }, { "id": "US_Missouri_Springfield", @@ -15901,8 +15904,8 @@ "MO", "United States of America" ], - "s": 69402123, - "sha1_base64": "I9hO7PKW+Tb6Ea6A3MoARCD3DBY=" + "s": 69714059, + "sha1_base64": "6pHzrRXathhtwhT+hFLBbB2oE/A=" }, { "id": "US_Missouri_Kansas", @@ -15914,8 +15917,8 @@ "MO", "United States of America" ], - "s": 80464773, - "sha1_base64": "NKhXZMew6hIiKd/sgOE6g2Vc6rQ=" + "s": 82255605, + "sha1_base64": "iC6D2pdxvYeiqK3kuGFS6Vms6HQ=" }, { "id": "US_Missouri_St Louis", @@ -15927,8 +15930,8 @@ "MO", "United States of America" ], - "s": 102476713, - "sha1_base64": "NzvhwXmb3Pd08J70v4GXToFWqCM=" + "s": 104398209, + "sha1_base64": "Jd8Pw6NJvAp766fTmaqToC5UpSY=" } ] }, @@ -15945,8 +15948,8 @@ "MT", "United States of America" ], - "s": 70641290, - "sha1_base64": "Lt9oKjXS4dh1d4kdGL30xR6dnug=" + "s": 71254018, + "sha1_base64": "v0kEW/LQRobPG8xrqSzyeV9vD6I=" }, { "id": "US_Montana_West", @@ -15958,8 +15961,8 @@ "MT", "United States of America" ], - "s": 72952163, - "sha1_base64": "4DlKUnL/pB1czvssMPdlKY6Bv7E=" + "s": 74298683, + "sha1_base64": "/p1XX2ITLzFQ2TSIt5VfMmqqzFI=" } ] }, @@ -15976,8 +15979,8 @@ "NE", "United States of America" ], - "s": 70998707, - "sha1_base64": "UOMZqtFrFny+oP7tiPd8Jg+YAgE=" + "s": 71943411, + "sha1_base64": "Br1KUwRIQTc79KTvPLVXFQWcIrM=" }, { "id": "US_Nebraska_West", @@ -15989,8 +15992,8 @@ "NE", "United States of America" ], - "s": 64923402, - "sha1_base64": "u+7Vlxrt8bQ7c296IHMyN19zGS0=" + "s": 67278915, + "sha1_base64": "35aXx9dTdd4WJGNMkMejhEIWIpo=" } ] }, @@ -16004,8 +16007,8 @@ "NV", "United States of America" ], - "s": 157577567, - "sha1_base64": "tb105n1KSskffr98t8yZfhZq4dY=" + "s": 159270976, + "sha1_base64": "Hoo1+X3y0egJqCoCE0xRM4qH3Ec=" }, { "id": "US_New Hampshire", @@ -16017,8 +16020,8 @@ "NH", "United States of America" ], - "s": 79680182, - "sha1_base64": "+cy4NLuNY9MMyXB4+t/rYsBt1e0=" + "s": 82191958, + "sha1_base64": "wA1QOhfm0BkyAN1aTkmp5QnFfkA=" }, { "id": "New Jersey", @@ -16033,8 +16036,8 @@ "NJ", "United States of America" ], - "s": 98862038, - "sha1_base64": "K46Fma8Np7oOgmb9R6P5NfpDe0g=" + "s": 99630550, + "sha1_base64": "k+9tbuUjMcmUhTJxvUDH59qMOag=" }, { "id": "US_New Jersey_South", @@ -16046,8 +16049,8 @@ "NJ", "United States of America" ], - "s": 110500145, - "sha1_base64": "2UkmIHdX8DPytOt06L8yjaJYQYk=" + "s": 111626249, + "sha1_base64": "1izyaJOBk/EXKqfGEdVVTi6T0oU=" } ] }, @@ -16064,8 +16067,8 @@ "NM", "United States of America" ], - "s": 89544415, - "sha1_base64": "crsz8Oy4ElBorQBIMI6Rx6Q0tyI=" + "s": 90396095, + "sha1_base64": "KQLg2eYTvXMBmo9IbFSHO6YWQEM=" }, { "id": "US_New Mexico_Roswell", @@ -16077,8 +16080,8 @@ "NM", "United States of America" ], - "s": 75187962, - "sha1_base64": "313AXQZfibXImHVxdsvm96HubCo=" + "s": 76479834, + "sha1_base64": "0459+rC9uJHOZVO60O+zNyIMZ7A=" } ] }, @@ -16096,8 +16099,8 @@ "NY", "United States of America" ], - "s": 129571197, - "sha1_base64": "TsHX6khqYtvqpA8M9Wor0uoxJj8=" + "s": 130619365, + "sha1_base64": "VRym7xCV/GIB5qJhVmOvRKgfpzU=" }, { "id": "US_New York_New York", @@ -16111,8 +16114,8 @@ "NY", "United States of America" ], - "s": 113592975, - "sha1_base64": "mi08o0LbFZC3FpPrM+ZGDDtbx2M=" + "s": 114940151, + "sha1_base64": "Hw7+prFwLQiXwc+W17CCn3z3ajA=" }, { "id": "US_New York_North", @@ -16124,8 +16127,8 @@ "NY", "United States of America" ], - "s": 129783094, - "sha1_base64": "Zrfb7+2xlWyLKPsKMss5q6KmSgU=" + "s": 130374486, + "sha1_base64": "5UXYS4vq9yqNaYo5MkDCZJ8ooYY=" }, { "id": "US_New York_West", @@ -16137,8 +16140,8 @@ "NY", "United States of America" ], - "s": 211142280, - "sha1_base64": "/8h84g2vFhLBc6VmvWdy6IXFJKE=" + "s": 212533232, + "sha1_base64": "Q4B7WwwoBO1sepppoE+YhL+S2IM=" } ] }, @@ -16155,8 +16158,8 @@ "NC", "United States of America" ], - "s": 66416098, - "sha1_base64": "I3XjF/Xff7FthMN2OyoNzWZqguc=" + "s": 66652146, + "sha1_base64": "qE/Rd5UiYMCDbgkE6spHHqI86U0=" }, { "id": "US_North Carolina_Asheville", @@ -16168,8 +16171,8 @@ "NC", "United States of America" ], - "s": 75340803, - "sha1_base64": "ULnCoUUwKUVX/1tk7QufrESHjJo=" + "s": 76020403, + "sha1_base64": "iA33WDyC3SymP5dBGFL6MdKeawU=" }, { "id": "US_North Carolina_Charlotte", @@ -16181,8 +16184,8 @@ "NC", "United States of America" ], - "s": 114656122, - "sha1_base64": "kOTPYGRXYI34y7fHDDgjNyPwni4=" + "s": 115521995, + "sha1_base64": "rJvulqLndpW14ugjflfNDomYCGw=" }, { "id": "US_North Carolina_Greensboro", @@ -16194,8 +16197,8 @@ "NC", "United States of America" ], - "s": 91241186, - "sha1_base64": "mY6axXSjNUncqF0s9JWyXk2IU/I=" + "s": 91708866, + "sha1_base64": "lbosrxCLoCaLFsgolq6tW9i5Bms=" }, { "id": "US_North Carolina_Raleigh", @@ -16207,8 +16210,8 @@ "NC", "United States of America" ], - "s": 109474628, - "sha1_base64": "fLQ70uG/ew68I2Og7DbrCSBRwLE=" + "s": 110484109, + "sha1_base64": "/R1DZma2ZEI6kY7llkmsaaYH9rE=" }, { "id": "US_North Carolina_Wilmington", @@ -16220,8 +16223,8 @@ "NC", "United States of America" ], - "s": 67434402, - "sha1_base64": "c0L5+BqocRAaX24effBOvvWKyYw=" + "s": 67773010, + "sha1_base64": "yhx05+wTzZgJeBZJw1mFJKEy0+Q=" } ] }, @@ -16238,8 +16241,8 @@ "ND", "United States of America" ], - "s": 42124342, - "sha1_base64": "uIbJJlNOj7RlqrDlq3HhW3uaFgQ=" + "s": 42342998, + "sha1_base64": "EQeA9nXZZPr0tranWf7OhMPZBes=" }, { "id": "US_North Dakota_East", @@ -16251,8 +16254,8 @@ "ND", "United States of America" ], - "s": 55486024, - "sha1_base64": "zlK0sInyWnJoxT5zvYfvYaYamK8=" + "s": 55826816, + "sha1_base64": "eSVxxLasy7SvqbhP3i9kQZC56ss=" }, { "id": "US_North Dakota_Minot", @@ -16264,8 +16267,8 @@ "ND", "United States of America" ], - "s": 34855997, - "sha1_base64": "4wZPgohbpWBW0bqDg05HvglHx60=" + "s": 35510773, + "sha1_base64": "p2HBqUe8ubZxEcbIIAvbyFM4Yz4=" } ] }, @@ -16282,8 +16285,8 @@ "OH", "United States of America" ], - "s": 145404057, - "sha1_base64": "Lb9sPj+zzudqx+GPTkAWRRi9ORE=" + "s": 147150761, + "sha1_base64": "YDA4tDCNLeLHu9ME1mEiIK/wB1k=" }, { "id": "US_Ohio_Cincinnati", @@ -16295,8 +16298,8 @@ "OH", "United States of America" ], - "s": 124347518, - "sha1_base64": "+l0BsDq5XvNgPEnykxTyh1VsqJg=" + "s": 126030015, + "sha1_base64": "esNsVPFPfQJy/zwSftvy/StcONA=" }, { "id": "US_Ohio_Columbus", @@ -16308,8 +16311,8 @@ "OH", "United States of America" ], - "s": 95525662, - "sha1_base64": "aFexNHvFoyYDzZcXOz8DKxF8qj0=" + "s": 96744398, + "sha1_base64": "0AQFS32M5ST/80DzvqUqTauEojw=" }, { "id": "US_Ohio_Toledo", @@ -16321,8 +16324,8 @@ "OH", "United States of America" ], - "s": 65878889, - "sha1_base64": "137jJhmBZi3lIuipzlurVns5tVw=" + "s": 66308049, + "sha1_base64": "wwYNFuvnm+awjmhGEq7BrWCmvwA=" } ] }, @@ -16339,8 +16342,8 @@ "OK", "United States of America" ], - "s": 32371566, - "sha1_base64": "4ne+YdJF8167hC8xlLmjO9pzzuA=" + "s": 32689422, + "sha1_base64": "Ir0iZRruxdHZ6zYRUP0YRoCvVEo=" }, { "id": "US_Oklahoma_West", @@ -16352,8 +16355,8 @@ "OK", "United States of America" ], - "s": 32503565, - "sha1_base64": "dSfKoFxgBkmKetA+W7jntReTrAg=" + "s": 32543653, + "sha1_base64": "+dHpHIXCdJfFMVlV0wW/lw+iQuc=" }, { "id": "US_Oklahoma_Tulsa", @@ -16365,8 +16368,8 @@ "OK", "United States of America" ], - "s": 72898754, - "sha1_base64": "p3D7ecFvki55Ekg9Anw34ZUW1fI=" + "s": 73125242, + "sha1_base64": "6pWjGmDqX3tAyyS6Jpz5CnUOuvU=" }, { "id": "US_Oklahoma_Oklahoma", @@ -16378,8 +16381,8 @@ "OK", "United States of America" ], - "s": 67129043, - "sha1_base64": "8AutWE0Q272lYF+ujodmzdyg50w=" + "s": 67518443, + "sha1_base64": "eANytw5/5+hMcKU7TOr7522OCHw=" } ] }, @@ -16396,8 +16399,8 @@ "OR", "United States of America" ], - "s": 86260892, - "sha1_base64": "Yo9ijT0+ufsEG6D/yAIsFEEDOts=" + "s": 87171396, + "sha1_base64": "TTumPBvm0j7VXJQrBZQhLrjkfBc=" }, { "id": "US_Oregon_Portland", @@ -16409,8 +16412,8 @@ "OR", "United States of America" ], - "s": 121933389, - "sha1_base64": "DpBMDtQGatoH3MKi+f3RQ59Kcps=" + "s": 123431877, + "sha1_base64": "u2msTQ5tkCIhHIgF3CMLRHYhO1s=" }, { "id": "US_Oregon_West", @@ -16422,8 +16425,8 @@ "OR", "United States of America" ], - "s": 74472499, - "sha1_base64": "UvrBAIycv9JH959Qy5bJlPs0+Hs=" + "s": 75701403, + "sha1_base64": "+gk+2O291mwj4mNgXq1xOa596dI=" } ] }, @@ -16440,8 +16443,8 @@ "PA", "United States of America" ], - "s": 121266758, - "sha1_base64": "12+DD9gmnVG+83hx/Y8onAW5Vd4=" + "s": 122093550, + "sha1_base64": "nIPiE4vfJLkIL4GPsfbSvAjO9cg=" }, { "id": "US_Pennsylvania_Pittsburgh", @@ -16453,8 +16456,8 @@ "PA", "United States of America" ], - "s": 117137476, - "sha1_base64": "gGGnsl2/2BrJvHNL+jLSx4eFqmo=" + "s": 117878004, + "sha1_base64": "hg6Z4Gde+b/2bDNifWgUc+OPjRQ=" }, { "id": "US_Pennsylvania_Reading", @@ -16466,8 +16469,8 @@ "PA", "United States of America" ], - "s": 116391967, - "sha1_base64": "VX+lN5UIg4phJOvJnYYrfUV0Jnw=" + "s": 117257447, + "sha1_base64": "M0gC64/dF9o3VGB82/cst6mK+Q0=" }, { "id": "US_Pennsylvania_Scranton", @@ -16479,8 +16482,8 @@ "PA", "United States of America" ], - "s": 101219484, - "sha1_base64": "MWgsYLMVPIQ57TVV4ajiYAQI/HA=" + "s": 101930580, + "sha1_base64": "XaJJaJgH2lPApxESJSq4tEC60kY=" } ] }, @@ -16495,8 +16498,8 @@ "República Dominicana", "United States of America" ], - "s": 71755461, - "sha1_base64": "o/oOv5nErMIsjlqxqI419sVeDmU=" + "s": 72403029, + "sha1_base64": "ncexVLps7IlxyIbaPYJEf0vYHyk=" }, { "id": "US_Rhode Island", @@ -16509,8 +16512,8 @@ "RI", "United States of America" ], - "s": 44993311, - "sha1_base64": "wCq6FLOAQiA5kf0S+4fPT7Gs/+g=" + "s": 45652871, + "sha1_base64": "nWnZrLciapJTv/BuFyW0UQEy/nw=" }, { "id": "South Carolina", @@ -16525,8 +16528,8 @@ "SC", "United States of America" ], - "s": 57196639, - "sha1_base64": "pxvBuz0htXcW5AGih/m9E2T1MwY=" + "s": 57728608, + "sha1_base64": "wakqoAYrYYe2Lp++yylBJny9xrQ=" }, { "id": "US_South Carolina_Columbia", @@ -16538,8 +16541,8 @@ "SC", "United States of America" ], - "s": 106874947, - "sha1_base64": "jN4heDslsXQDTJEmpCunn37xb+g=" + "s": 107722923, + "sha1_base64": "kAqJrbfbo0lNir3iGqOeE2wJeFk=" }, { "id": "US_South Carolina_Florence", @@ -16551,8 +16554,8 @@ "SC", "United States of America" ], - "s": 66745648, - "sha1_base64": "RQGjw3Iuyiw62sV1yThBJxZCS5U=" + "s": 67060400, + "sha1_base64": "jrs0R4cOUfIxE5zQCrAuMCnikkM=" } ] }, @@ -16566,8 +16569,8 @@ "SD", "United States of America" ], - "s": 87821489, - "sha1_base64": "iANjIP2v2mg7SaSp/2eEEb52bpY=" + "s": 88785713, + "sha1_base64": "YDvuJ+fPoMg1FKRp7pTivN7kZj0=" }, { "id": "Tennessee", @@ -16582,8 +16585,8 @@ "TN", "United States of America" ], - "s": 146949656, - "sha1_base64": "DIpX2kcoakPBajTcksavobP++rc=" + "s": 148107640, + "sha1_base64": "sCA2wN9oa0OI28D/6HN59K5k8cU=" }, { "id": "US_Tennessee_West", @@ -16595,8 +16598,8 @@ "TN", "United States of America" ], - "s": 129714799, - "sha1_base64": "7yrmZku5Brf56TlWVq+E5umgOuk=" + "s": 132052263, + "sha1_base64": "0/Ka6DlxYZ18ZBsabzhv5dJVstc=" } ] }, @@ -16613,8 +16616,8 @@ "TX", "United States of America" ], - "s": 108806546, - "sha1_base64": "xGvHYuQvw6YP7eX2SKHiq+h/uh0=" + "s": 109414578, + "sha1_base64": "lmG4g8GKBq39LbaRwh/OtMTgNL4=" }, { "id": "US_Texas_Victoria", @@ -16626,8 +16629,8 @@ "TX", "United States of America" ], - "s": 36252525, - "sha1_base64": "XtAiCDXOVTtE81CmLkwb6y4GmnA=" + "s": 36543477, + "sha1_base64": "rCC25Qvlzt/mZXTLjQ8rRtwCGOo=" }, { "id": "US_Texas_Dallas", @@ -16639,8 +16642,8 @@ "TX", "United States of America" ], - "s": 200445609, - "sha1_base64": "BYp+b9VguOq4+ThVQe4GeRNL3Lk=" + "s": 201403873, + "sha1_base64": "T/xTZq/gJPBlIB65V6c4QtpCKRs=" }, { "id": "US_Texas_Houston", @@ -16652,8 +16655,8 @@ "TX", "United States of America" ], - "s": 148221592, - "sha1_base64": "vHMpqhKhLr706vtKl+mxCO6F8EU=" + "s": 149507120, + "sha1_base64": "Kksq/OK6kbvVbslL56/KVDl12+E=" }, { "id": "US_Texas_Amarillo", @@ -16665,8 +16668,8 @@ "TX", "United States of America" ], - "s": 41274974, - "sha1_base64": "iYLMBa2UdpDuBjTtt+h/1IZj/PQ=" + "s": 41372942, + "sha1_base64": "lPUgGBy0yFSxOZvyahznGbOV8yY=" }, { "id": "US_Texas_Lubbock", @@ -16678,8 +16681,8 @@ "TX", "United States of America" ], - "s": 43528584, - "sha1_base64": "Sz9mPQmml31NeelE7BraO7W+OgU=" + "s": 43683504, + "sha1_base64": "ivE1ufUX39aaQH+80dUIz1/9Ic0=" }, { "id": "US_Texas_San Antonio", @@ -16691,8 +16694,8 @@ "TX", "United States of America" ], - "s": 89922532, - "sha1_base64": "HmeoneNuYVmUdGuYxx32r+j0u6M=" + "s": 90534244, + "sha1_base64": "sI3NW0o7M0FPDQS5v8aw4w11yp4=" }, { "id": "US_Texas_Southwest", @@ -16704,8 +16707,8 @@ "TX", "United States of America" ], - "s": 45402557, - "sha1_base64": "0qetfqhVRNB9Q3LKOdiq11WH7lA=" + "s": 45639813, + "sha1_base64": "8vi1ZdWY/lzXSHFiMVnO61lFYlc=" }, { "id": "US_Texas_Tyler", @@ -16717,8 +16720,8 @@ "TX", "United States of America" ], - "s": 87353179, - "sha1_base64": "VE1c4WAoS+gOA/50VNKD7TUyNT8=" + "s": 87732347, + "sha1_base64": "RN1Fyc0R+iNXsNICMV7y61lzmVY=" }, { "id": "US_Texas_Wako", @@ -16730,8 +16733,8 @@ "TX", "United States of America" ], - "s": 55349481, - "sha1_base64": "+hkARHPm/+rFI/8gLLVgvh+Zn8M=" + "s": 55867921, + "sha1_base64": "47PkKHSTBiitPU8JHS0ylLfriAg=" }, { "id": "US_Texas_West", @@ -16743,8 +16746,8 @@ "TX", "United States of America" ], - "s": 70718674, - "sha1_base64": "9OsbBjzsZMua0BnOV+T8uAvQtJc=" + "s": 71220234, + "sha1_base64": "8Cte0Q8egVmib9uIWogunzCQUsU=" } ] }, @@ -16754,8 +16757,8 @@ "Navassa Island", "United States Minor Outlying Islands" ], - "s": 797568, - "sha1_base64": "2OVocj0RyItGK3oOUlSMRfYtQgo=" + "s": 854200, + "sha1_base64": "/9THN++DK+wRpHA+lLp1AX1ej64=" }, { "id": "US_Utah", @@ -16770,8 +16773,8 @@ "Utah", "UT" ], - "s": 65414337, - "sha1_base64": "FK5bpO7SkHst7WmmRu0XxDK315s=" + "s": 65803617, + "sha1_base64": "axMFEDgP1X4jPcm/ItGdjbOQNYw=" }, { "id": "US_Utah_North", @@ -16783,8 +16786,8 @@ "Utah", "UT" ], - "s": 133061893, - "sha1_base64": "CdJWr0CH61QTc63//pQfs5J+Zio=" + "s": 134838973, + "sha1_base64": "3JTORN7bRnvAjB5zEon82Rb3GFU=" } ] }, @@ -16798,8 +16801,8 @@ "Vermont", "VT" ], - "s": 59066177, - "sha1_base64": "LO3hvmVeMD/7uRI2VBHjkdinS/k=" + "s": 59325065, + "sha1_base64": "aPmKcVBWOYGs+/R+r765c9iw4JE=" }, { "id": "Virginia", @@ -16814,8 +16817,8 @@ "VA", "United States of America" ], - "s": 76799683, - "sha1_base64": "PHi8kfq1QyJCAOVYhg4oj+Au7NQ=" + "s": 77220243, + "sha1_base64": "ap8rfEgelDpKNJA0K7b2K3wkldo=" }, { "id": "US_Virginia_Norfolk", @@ -16827,8 +16830,8 @@ "VA", "United States of America" ], - "s": 97507680, - "sha1_base64": "33pd+cv+QiByDOiMLuP5NJMqBMA=" + "s": 98752496, + "sha1_base64": "N29d2VvD4XreJ0CQPMfMltnWaTA=" }, { "id": "US_Virginia_Lynchburg", @@ -16840,8 +16843,8 @@ "VA", "United States of America" ], - "s": 107848980, - "sha1_base64": "rVxDQtjFqFm+I24ZQQsMQG7UWAM=" + "s": 108733028, + "sha1_base64": "9EhwHM5llFORTDOxjkzTAOYVwcc=" }, { "id": "US_Virginia_Richmond", @@ -16853,8 +16856,8 @@ "VA", "United States of America" ], - "s": 73255201, - "sha1_base64": "+QlJBiLyo2RMpy0GWvXoI/f9TxM=" + "s": 73671073, + "sha1_base64": "DHFAPGDa+rev0L61D3WAOSlDpBo=" }, { "id": "US_Virginia_Alexandria", @@ -16866,8 +16869,8 @@ "VA", "United States of America" ], - "s": 104156200, - "sha1_base64": "UzKNy42btf64LdB9BHQ1y2iogsM=" + "s": 105179448, + "sha1_base64": "Vq2j18rp/NENPoQo3DIzMbM/z0w=" } ] }, @@ -16886,8 +16889,8 @@ "Washington", "WA" ], - "s": 191991427, - "sha1_base64": "4JqClmP1NS2cD7sZYWTe6xcNxpw=" + "s": 194183347, + "sha1_base64": "n8pjy8W8z+mvjyM1Fam51/xN1BY=" }, { "id": "US_Washington_Seattle", @@ -16899,8 +16902,8 @@ "Washington", "WA" ], - "s": 111926143, - "sha1_base64": "fX4eSy1KfPNa8h1CeEpT4AwXMoE=" + "s": 113613887, + "sha1_base64": "tzqvgvHz54vY8wxNaDnQ8WHgzMc=" }, { "id": "US_Washington_Yakima", @@ -16912,8 +16915,8 @@ "Washington", "WA" ], - "s": 117064759, - "sha1_base64": "2WTSrJrJ9zHC1K3SnlSZGYdABZI=" + "s": 118272311, + "sha1_base64": "7DVlYhEhuQst5l0WrH7k4hsqytU=" } ] }, @@ -16927,8 +16930,8 @@ "West Virginia", "WV" ], - "s": 154837217, - "sha1_base64": "CS40DEu9onITliHlOH27C+AA/S0=" + "s": 155281905, + "sha1_base64": "pN6GD9T8WbJWKet6TrJE+q3o/Io=" }, { "id": "Wisconsin", @@ -16943,8 +16946,8 @@ "Wisconsin", "WI" ], - "s": 140775214, - "sha1_base64": "PMuAdVIadQmS+3P+H6LvKOLmWgY=" + "s": 141957358, + "sha1_base64": "pcxn/JYUov3VVzWluJ8984oJFog=" }, { "id": "US_Wisconsin_North", @@ -16956,8 +16959,8 @@ "Wisconsin", "WI" ], - "s": 62433689, - "sha1_base64": "Hys9QiTO1ir4hZmNXYKoz2pDS5k=" + "s": 62870105, + "sha1_base64": "XTaO9tD9VqnrVJSv4+fKb2EWncI=" }, { "id": "US_Wisconsin_Madison", @@ -16969,8 +16972,8 @@ "Wisconsin", "WI" ], - "s": 70027921, - "sha1_base64": "gBIzNMgTK/Ux+KOtIMnyHNa7jc4=" + "s": 70479921, + "sha1_base64": "YUEnzT2VISlVAz+V42qhaYq4jKw=" }, { "id": "US_Wisconsin_Eau Claire", @@ -16982,8 +16985,8 @@ "Wisconsin", "WI" ], - "s": 62083353, - "sha1_base64": "6fzXnE1HuMVRXD7YN2dKDGzcc1w=" + "s": 62855809, + "sha1_base64": "z3DqefBzVSZDz84iIiD8ezKwz1E=" } ] }, @@ -16997,8 +17000,8 @@ "Wyoming", "WY" ], - "s": 110877869, - "sha1_base64": "lnqMgsXxb+0pCLPDgjmBK2CltWE=" + "s": 111849389, + "sha1_base64": "4P0P6ccBuUgWFN5dhI9embe3msc=" } ] }, @@ -17030,8 +17033,8 @@ "Treinta y Tres", "Uruguay" ], - "s": 70542400, - "sha1_base64": "KduXFC6RmAzO+f8ANb/cSqr6vC8=" + "s": 71015544, + "sha1_base64": "SuV3zxTXKig3WJ0lLNn5olLdoq0=" }, { "id": "Uzbekistan", @@ -17056,8 +17059,8 @@ "Toshkent", "Xorazm Viloyati" ], - "s": 184919507, - "sha1_base64": "MALx526xB6LCibg+YTyWhjl9daU=" + "s": 186217907, + "sha1_base64": "hd5xB1dpF8mqa95pyyLUzUVSCeY=" }, { "id": "Vanuatu", @@ -17073,8 +17076,8 @@ "Vanuatu", "Torba" ], - "s": 12359134, - "sha1_base64": "0wFyLD60HhZ78RwkwOtzSnoxrWE=" + "s": 12373662, + "sha1_base64": "MHDA7mYPmMzygj1fY80QfUJdw4I=" }, { "id": "Venezuela", @@ -17109,8 +17112,8 @@ "Yaracuy", "Zulia" ], - "s": 70539742, - "sha1_base64": "v2MAg/TwoOjQu+Aaninyy7/m1Xg=" + "s": 71676678, + "sha1_base64": "iozTxbGf3i7J09GfL22LdrTQv0s=" }, { "id": "Venezuela_South", @@ -17131,8 +17134,8 @@ "Venezuela", "Zulia" ], - "s": 78481164, - "sha1_base64": "TeLSAPbyp1noBoxP6is2E5lxKhY=" + "s": 80455988, + "sha1_base64": "ar1rJ+uAY7jViwUM2FDzTiUTPT8=" } ] }, @@ -17207,8 +17210,8 @@ "Tỉnh Hà Giang", "Việt Nam" ], - "s": 333618700, - "sha1_base64": "9k0pKyYIYM+pTxeJ1W9kweNYbc0=" + "s": 335941478, + "sha1_base64": "7UkOvQML1paQhFB1szOZGJCqvwY=" }, { "id": "Yemen", @@ -17239,8 +17242,8 @@ "Ḩaḑramawt", "اليمن" ], - "s": 94015415, - "sha1_base64": "6Db1/p1IxkPy+PDpA5UF5o9leFw=" + "s": 95397199, + "sha1_base64": "CEn+KvVZAHEqgsOr3yhHp/n5dZk=" }, { "id": "Zambia", @@ -17260,8 +17263,8 @@ "Western Province", "Zambia" ], - "s": 238799862, - "sha1_base64": "yBjguCrct6xuQZG1wOvsp+JBvxg=" + "s": 240064046, + "sha1_base64": "23eIB8UXcgEXtZ2FFzati1mB58M=" }, { "id": "Zimbabwe", @@ -17281,16 +17284,16 @@ "Midlands Province", "Zimbabwe" ], - "s": 151362772, - "sha1_base64": "E7cficiycn/4KznLkgYvHWzIBJs=" + "s": 151489780, + "sha1_base64": "3En7+VK0wdxnc/wKxodYlPLnrJ4=" }, { "id": "Antarctica", "affiliations": [ "South Georgia and South Sandwich Islands" ], - "s": 61882535, - "sha1_base64": "HFd+uXpt6J+KKr7nzG8lBjpI+44=" + "s": 62515327, + "sha1_base64": "Qq9AAb0ghkrbgtubSIcaR9j4Puk=" }, { "id": "New Zealand", @@ -17303,8 +17306,8 @@ "affiliations": [ "Tokelau" ], - "s": 439703, - "sha1_base64": "VjrJ8hqUzKFcq/UDBpTbOoR0KhA=" + "s": 463311, + "sha1_base64": "x7Nk94poXSZJS8q4MSWe3+N+nak=" }, { "id": "New Zealand North_Auckland", @@ -17318,8 +17321,8 @@ "Northland", "Waikato" ], - "s": 163227563, - "sha1_base64": "RDIatMr5aOAfc4/YWoTFq1GwuJI=" + "s": 168817491, + "sha1_base64": "/ANzh5+RSYweN+y9HEcZkBU36z0=" }, { "id": "New Zealand North_Wellington", @@ -17334,8 +17337,8 @@ "Taranaki", "Wellington" ], - "s": 115969272, - "sha1_base64": "D/qmpQzTubx3eFexWfrxTleMGUg=" + "s": 118468672, + "sha1_base64": "xC/lehlrEnzl1DIC35VblR6WElI=" }, { "id": "New Zealand South_Canterbury", @@ -17351,8 +17354,8 @@ "Tasman", "West Coast" ], - "s": 147096344, - "sha1_base64": "YfJoLfbgFJ/w0s+wT17gB7RxzsM=" + "s": 150963512, + "sha1_base64": "82GwoXwEpDJYRNLaq5E03rhFDjE=" }, { "id": "New Zealand South_Southland", @@ -17365,8 +17368,8 @@ "Southland", "West Coast" ], - "s": 92482199, - "sha1_base64": "QvbToJfnoiLHFZVmzd9/ON3I5sA=" + "s": 94214655, + "sha1_base64": "vjXp/pP5QM5RFGJM6v63KLtvYC0=" } ] }, @@ -17390,8 +17393,8 @@ "충청남도", "충청북도" ], - "s": 198146539, - "sha1_base64": "hoW5IwOq/3/QaICC8JtpqkeobOQ=" + "s": 199266091, + "sha1_base64": "mhjzNr8OuMU4Xw6EtaDFF8ea7S4=" }, { "id": "South Korea_South", @@ -17411,8 +17414,8 @@ "전라남도", "전라북도" ], - "s": 174634427, - "sha1_base64": "Yx9Qp9zJHLQbndk85d077YG2IuU=" + "s": 175860275, + "sha1_base64": "V0i1M5dYnn5Cfq8yZRhsFwddI0s=" } ] } diff --git a/data/countries_synonyms.csv b/data/countries_synonyms.csv index 009ca6775..e052e9565 100644 --- a/data/countries_synonyms.csv +++ b/data/countries_synonyms.csv @@ -24,3 +24,4 @@ China_Guangdong Hong Kong US_Guam Guam Macedonia North Macedonia Czech Republic Czechia +Myanmar Burma diff --git a/data/editor.config b/data/editor.config index 56c782b2b..c5df5679d 100644 --- a/data/editor.config +++ b/data/editor.config @@ -258,6 +258,10 @@ + + + + @@ -382,9 +386,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1058,6 +1095,9 @@ + + + @@ -1105,6 +1145,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1126,6 +1185,7 @@ + @@ -1134,6 +1194,14 @@ + + + + + + + + @@ -1187,6 +1255,15 @@ + + + + + + + + + @@ -1196,6 +1273,18 @@ + + + + + + + + + + + + @@ -1226,6 +1315,9 @@ + + + @@ -1288,6 +1380,9 @@ + + + @@ -1456,19 +1551,6 @@ - - - - - - - - - - - - - diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 254037401..cf61afd3a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -95,13 +95,13 @@ railway|rail;28; highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29; place|hamlet;30; moved:highway|road:05.2024;31;highway|road -deprecated:highway|track|grade2:04.2024;[highway=track][tracktype=grade2];x;name;int_name;32;highway|track +natural|tree;32; # ~1.5M usages w/o a more specific wetland=* natural|wetland;33; deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track # ~1M usages. power|minor_line;[power=minor_line][!location];;;;35; -amenity|school;36; +amenity|school;[amenity=school],[education=school];;name;int_name;36; # Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp). highway|cycleway;37; # ~16M usages. @@ -113,7 +113,7 @@ highway|service|driveway;[highway=service][service=driveway];;name;int_name;42; addr:interpolation|even;43; highway|motorway_link;44; waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45; -deprecated:highway|track|grade4:04.2024;[highway=track][tracktype=grade4];x;name;int_name;46;highway|track +natural|sand;46; natural|water|pond;[natural=water][water=pond];;name;int_name;47; landuse|farmland;48; barrier|fence;49; @@ -169,7 +169,7 @@ highway|residential|bridge;[highway=residential][bridge?];;name;int_name;81; # railway|rail|service|bridge;[railway=rail][service?][service!=spur][bridge?];... railway|rail|bridge;[railway=rail][bridge?][dont=match];;name;int_name;82; deprecated:boundary|administrative|10:04.2024;[boundary=administrative][admin_level=10];x;name;int_name;83; -deprecated:boundary|administrative|6:04.2024;[boundary=administrative][admin_level=6];x;name;int_name;84; +emergency|access_point;[emergency=access_point];;name;;84; highway|secondary|bridge;[highway=secondary][bridge?];;name;int_name;85; highway|tertiary|bridge;[highway=tertiary][bridge?];;name;int_name;86; barrier|bollard;87; @@ -225,7 +225,7 @@ place|suburb;128; landuse|allotments;129; landuse|forest|coniferous;[landuse=forest][wood=coniferous],[landuse=forest][leaf_type=coniferous],[natural=wood][wood=coniferous],[natural=wood][leaf_type=coniferous];;name;int_name;130; landuse|forest|mixed;[landuse=forest][wood=mixed],[landuse=forest][leaf_type=mixed],[landuse=forest][leaf_cycle=mixed],[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];;name;int_name;131; -deprecated:natural|wood|mixed:01.2020;[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];x;name;int_name;132;landuse|forest|mixed +emergency|life_ring;132; sport|tennis;133; # ~730k usages. landuse|vineyard;134; @@ -276,7 +276,7 @@ deprecated:natural|wood|coniferous:01.2020;[natural=wood][wood=coniferous],[natu landuse|recreation_ground;173; landuse|village_green;174; amenity|drinking_water;175; -amenity|university;176; +amenity|university;[amenity=university],[education=university];;name;int_name;176; highway|secondary_link;177; power|substation;178; railway|tram_stop;179; @@ -327,7 +327,7 @@ sport|swimming;220; leisure|track;221; sport|skateboard;222; barrier|retaining_wall;223; -amenity|college;224; +amenity|college;[amenity=college],[education=college];;name;int_name;224; sport|baseball;225; highway|service|area;[highway=service][area?];;name;int_name;226; highway|residential|area;[highway=residential][area?];;name;int_name;227; @@ -462,7 +462,7 @@ place|country;349; deprecated:highway|path|alpine_hiking:04.2024;[highway=path][sac_scale=alpine_hiking];x;name;int_name;350;highway|path|expert tourism|zoo|petting;[tourism=zoo][zoo=petting_zoo];;name;int_name;351; sport|scuba_diving;352; -deprecated:highway|cycleway|permissive:12.2023;[highway=cycleway][access=permissive];x;name;int_name;353;highway|cycleway +entrance|emergency;[entrance=emergency],[exit=emergency];;name;int_name;353; highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354; natural|volcano;355; amenity|parking|underground|fee;[amenity=parking][location=underground][fee],[amenity=parking][parking=underground][fee];;name;int_name;356; @@ -564,8 +564,8 @@ deprecated:railway|yard:06.2023;447;x natural|water|ditch;[natural=water][water=ditch];;name;int_name;448; natural|water|moat;[natural=water][water=moat];;name;int_name;449; natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450; -deprecated:railway|razed:06.2023;451;x -deprecated:highway|footway|demanding_mountain_hiking:04.2024;[highway=footway][sac_scale=demanding_mountain_hiking];x;name;int_name;452;highway|path|difficult +entrance|service;451; +entrance|entry;[entrance=entrance];;ref;addr:flats;452; amenity|shelter|basic_hut;[amenity=shelter][shelter_type=basic_hut];;name;int_name;453; amenity|shelter|lean_to;[amenity=shelter][shelter_type=lean_to];;name;int_name;454; landuse|orchard;455; @@ -578,7 +578,7 @@ boundary|administrative|4;[boundary=administrative][admin_level=4];;;;459; # ~100k usages. railway|station;460; sport|handball;461; -deprecated:boundary|administrative|city:04.2024;[boundary=administrative][border_type=city];x;name;int_name;462; +shop|beauty|nails;[shop=beauty][beauty=nails];;name;int_name;462; piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride],[piste:type=downhill][piste:grooming=backcountry][!piste:difficulty];;name;int_name;463; # _path_grade is a surrogate tag which combines sac_scale and trail_visibility, see osm2type.cpp highway|path|difficult;[highway=path][_path_grade=difficult];;name;int_name;464; @@ -618,31 +618,31 @@ amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int waterway|fish_pass;496; waterway|fish_pass|tunnel;[waterway=fish_pass][tunnel?];;name;int_name;497; natural|water|lock;[natural=water][water=lock];;name;int_name;498; -deprecated:waterway|lock:06.2022;499;waterway|canal +xmas|tree;[xmas:feature=tree];;name;int_name;499; fee|yes;[fee?];;name;int_name;500; fee|no;[fee=not],[fee=no];;name;int_name;501; toilets|yes;502; highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503; drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504; drinking_water|no;505; -deprecated|deprecated;506;x -deprecated|deprecated;507;x -deprecated|deprecated;508;x -deprecated:railway|spur|bridge:06.2023;509;x -deprecated|deprecated;510;x -deprecated|deprecated;511;x -deprecated|deprecated;512;x +amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506; +amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507; +amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508; +amenity|car_pooling;509; +social_facility|soup_kitchen;510; +social_facility|food_bank;511; +amenity|food_sharing;512; sport|curling;513; -deprecated|deprecated;514;x -deprecated|deprecated;515;x -deprecated|deprecated;516;x -deprecated|deprecated;517;x -deprecated|deprecated;518;x -deprecated|deprecated;519;x +amenity|give_box;514; +man_made|telescope;515; +man_made|telescope|optical;[man_made=telescope][telescope:type=optical];;name;int_name;516; +man_made|telescope|radio;[man_made=telescope][telescope:type=radio];;name;int_name;517; +man_made|telescope|gamma;[man_made=telescope][telescope:type=gamma];;name;int_name;518; +man_made|observatory;519; sport|diving;520; #~270k uses. man_made|utility_pole;521; -deprecated:boundary|administrative|suburb:04.2024;[boundary=administrative][border_type=suburb];x;name;int_name;522; +amenity|payment_centre;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; -deprecated:amenity|speed_trap:10.2021;542;highway|speed_camera +leisure|indoor_play;542; area:highway|track;543; area:highway|primary;544; deprecated|deprecated;545;x @@ -700,26 +700,26 @@ aerialway|rope_tow;575; natural|pond;576;natural|water|pond railway|station|funicular;[railway=station][station=funicular],[railway=halt][station=funicular];;name;int_name;577; highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578; -deprecated|deprecated;579;x -deprecated|deprecated;580;x -deprecated|deprecated;581;x -deprecated|deprecated;582;x -deprecated|deprecated;583;x -deprecated|deprecated;584;x -deprecated|deprecated;585;x -deprecated|deprecated;586;x +buoy|lateral|port;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port];;;;579; +buoy|lateral|starboard;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard];;;;580; +buoy|isolated_danger;[seamark:type=buoy_isolated_danger];;;;581; +buoy|cardinal|east;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east];;;;582; +buoy|cardinal|west;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west];;;;583; +buoy|cardinal|south;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south];;;;584; +buoy|cardinal|north;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north];;;;585; +buoy|special_purpose;[seamark:type=buoy_special_purpose];;;;586; aerialway|mixed_lift;587; -deprecated|deprecated;588;x -deprecated|deprecated;589;x -deprecated|deprecated;590;x +buoy|safe_water;[seamark:type=buoy_safe_water];;;;588; +beacon|lateral|port;[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;589; +beacon|lateral|starboard;[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;590; highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];x;name;int_name;591;highway|track -deprecated|deprecated;592;x -deprecated|deprecated;593;x -deprecated|deprecated;594;x -deprecated|deprecated;595;x -deprecated|deprecated;596;x -deprecated:boundary|administrative|region:04.2024;[boundary=administrative][border_type=region];x;name;int_name;597; -deprecated|deprecated;598;x +beacon|isolated_danger;[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=tower],[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=lattice],[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=pile],[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=buoyant];;;;592; +beacon|cardinal|east;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant];;;;593; +beacon|cardinal|west;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant];;;;594; +beacon|cardinal|south;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant];;;;595; +beacon|cardinal|north;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant];;;;596; +beacon|special_purpose;[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=tower],[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=lattice],[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=pile],[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=buoyant];;;;597; +beacon|safe_water;[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=tower],[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=lattice],[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=pile],[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=buoyant];;;;598; deprecated|deprecated;599;x deprecated|deprecated;600;x place|continent;601; @@ -738,23 +738,23 @@ piste:type|downhill|expert|area;[piste:type=downhill][piste:difficulty=expert][a piste:type|downhill|area;[piste:type=downhill][area?];;;;614; piste:type|sled|area;[piste:type=sled][area?];;;;615; piste:type|snow_park;616; -deprecated|deprecated;617;x -deprecated|deprecated;618;x +spherical_buoy|lateral|port;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port][seamark:buoy_lateral:shape=spherical];;;;617; +spherical_buoy|lateral|starboard;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard][seamark:buoy_lateral:shape=spherical];;;;618; aerialway|j-bar;619; -deprecated|deprecated;620;x -deprecated|deprecated;621;x -deprecated|deprecated;622;x -deprecated|deprecated;623;x -deprecated|deprecated;624;x -deprecated|deprecated;625;x -deprecated:railway|siding|bridge:06.2023;626;x -deprecated:highway|footway|difficult_alpine_hiking:04.2024;[highway=footway][sac_scale=difficult_alpine_hiking];x;name;int_name;627;highway|path|expert -deprecated|deprecated;628;x -deprecated|deprecated;629;x -deprecated|deprecated;630;x +spherical_buoy|isolated_danger;[seamark:type=buoy_isolated_danger][seamark:buoy_isolated_danger:shape=spherical];;;;620; +spherical_buoy|cardinal|east;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east][seamark:buoy_cardinal:shape=spherical];;;;621; +spherical_buoy|cardinal|west;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west][seamark:buoy_cardinal:shape=spherical];;;;622; +spherical_buoy|cardinal|south;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south][seamark:buoy_cardinal:shape=spherical];;;;623; +spherical_buoy|cardinal|north;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north][seamark:buoy_cardinal:shape=spherical];;;;624; +spherical_buoy|special_purpose;[seamark:type=buoy_special_purpose][seamark:buoy_special_purpose:shape=spherical];;;;625; +spherical_buoy|safe_water;[seamark:type=buoy_safe_water][seamark:buoy_safe_water:shape=spherical];;;;626; +cardinal|east;[seamark:buoy_cardinal:category=east],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant];;;;627; +cardinal|west;[seamark:buoy_cardinal:category=west],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant];;;;628; +cardinal|south;[seamark:buoy_cardinal:category=south],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant];;;;629; +cardinal|north;[seamark:buoy_cardinal:category=north],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant];;;;630; highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];x;name;int_name;631;highway|track -deprecated|deprecated;632;x -deprecated|deprecated;633;x +lateral|port;[seamark:buoy_lateral:category=port],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;632; +lateral|starboard;[seamark:buoy_lateral:category=starboard],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;633; highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634; deprecated|deprecated;635;x deprecated|deprecated;636;x @@ -857,7 +857,7 @@ sport|skiing;732; tourism|museum;733; tourism|guest_house;734; tourism|motel;735; -deprecated:boundary|administrative|4|state:01.2022;[boundary=administrative][admin_level=4][border_type=state];x;name;int_name;736;boundary|administrative|4 +shop|telecommunication;736; 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,16 +980,15 @@ 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; -# service=bus/busway is deprecated in OSM -deprecated:highway|service|busway:10.2023;[highway=service][service=busway];x;name;int_name;857;highway|busway +amenity|mobile_money_agent;857; 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; natural|salt_pond;861;landuse|salt_pond amenity|conference_centre;862; amenity|exhibition_centre;863; -deprecated:railway|siding|tunnel:06.2023;864;x -deprecated:railway|yard|tunnel:06.2023;865;x +shop|beauty|day_spa;[shop=beauty][beauty=spa];;name;int_name;864; +amenity|boat_rental;865; area:highway|footway;866; junction|circular;867; area:highway|residential;868; @@ -1118,8 +1117,8 @@ junction|roundabout;990; highway|speed_camera;991; shop|beauty;992; shop|sports;993; -deprecated:route|ferry|motor_vehicle:09.2021;[route=ferry][motor_vehicle];x;name;int_name;994;route|ferry -deprecated:railway|rail|motor_vehicle:06.2023;[railway=rail][motor_vehicle],[railway=rail][motorcar];x;name;int_name;995;railway|rail +entrance|house;[entrance=home],[entrance=staircase];;ref;addr:flats;994; +entrance|garage;[entrance=garage];;ref;addr:flats;995; hwtag|nofoot;996; place|city|capital|2;[place=city][capital=2],[place=city][capital?][admin_level=2];;name;int_name;997; place|city|capital|3;[place=city][capital=3],[place=city][capital?][admin_level=3];;name;int_name;998; @@ -1258,8 +1257,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130; amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131; leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132; -amenity|music_school;1133; -amenity|language_school;1134; +amenity|music_school;[amenity=music_school],[education=music_school];;name;int_name;1133; +amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134; historic|city_gate;1135; sport|padel;1136; sport|futsal;1137; @@ -1286,7 +1285,7 @@ shop|charity;1157; hwtag|toll;1158; amenity|arts_centre;1159; amenity|biergarten;1160; -amenity|driving_school;1161; +amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161; amenity|food_court;1162; amenity|ice_cream;1163; amenity|internet_cafe;1164; @@ -1349,7 +1348,7 @@ railway|subway_entrance|warszawa;[railway=subway_entrance][city=warszawa];;name; shop|bed;1221; shop|outpost;1222; shop|gas;1223; -natural|desert;[natural=desert],[natural=sand][desert=erg];;name;int_name;1224; +natural|desert;1224; natural|water|tunnel;[natural=water][tunnel?];;name;int_name;1225; place|square;1226; tourism|artwork|architecture;[tourism=artwork][artwork_type=architecture],[tourism=artwork][type=architecture];;name;int_name;1227; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index a34d37455..e9ec1379f 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -77,6 +77,8 @@ vending=water : vending=drinks vending=milk : vending=drinks vending=bread : vending=food +highway=emergency_access_point : emergency=access_point + building=entrance : entrance=yes ice_road=yes : highway=ice_road @@ -91,11 +93,6 @@ natural=forest : natural=wood natural=shrubbery : natural=scrub cliff=yes : natural=cliff -desert=sand : desert=erg -desert=yes : desert=erg -desert=semi_arid : desert=erg -desert=dune : desert=erg - office=notary : office=lawyer office=administrative : office=government diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 19750c545..088818f8b 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -51,6 +51,7 @@ @wetland_swamp: #3D5045; @wetland_mangrove: #3E5143; @beach: #322C20; +@sand: #312d24; @barerock: #2B2A26; @scree: #292825; @desert: #312E28; @@ -242,6 +243,7 @@ @neutral_label: #51585E; @healthcare_label: #983E44; @public_transport_label: #2F6499; +@emergency_label: #247F52; /* 6.4 Road labels */ diff --git a/data/styles/default/dark/symbols/access_point-m.svg b/data/styles/default/dark/symbols/access_point-m.svg new file mode 100644 index 000000000..a81bd0f8a --- /dev/null +++ b/data/styles/default/dark/symbols/access_point-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/assembly_point-m.svg b/data/styles/default/dark/symbols/assembly_point-m.svg index da02933fc..69c0cebf5 100644 --- a/data/styles/default/dark/symbols/assembly_point-m.svg +++ b/data/styles/default/dark/symbols/assembly_point-m.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-east-m.svg b/data/styles/default/dark/symbols/beacon-cardinal-east-m.svg new file mode 100644 index 000000000..f04c855eb --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-east-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-east-s.svg b/data/styles/default/dark/symbols/beacon-cardinal-east-s.svg new file mode 100644 index 000000000..e6f9def79 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-east-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-north-m.svg b/data/styles/default/dark/symbols/beacon-cardinal-north-m.svg new file mode 100644 index 000000000..d94eb571e --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-north-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-north-s.svg b/data/styles/default/dark/symbols/beacon-cardinal-north-s.svg new file mode 100644 index 000000000..45324d08a --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-north-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-south-m.svg b/data/styles/default/dark/symbols/beacon-cardinal-south-m.svg new file mode 100644 index 000000000..fe0a7c44b --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-south-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-south-s.svg b/data/styles/default/dark/symbols/beacon-cardinal-south-s.svg new file mode 100644 index 000000000..750d0d197 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-south-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-west-m.svg b/data/styles/default/dark/symbols/beacon-cardinal-west-m.svg new file mode 100644 index 000000000..531d4bcd6 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-west-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-cardinal-west-s.svg b/data/styles/default/dark/symbols/beacon-cardinal-west-s.svg new file mode 100644 index 000000000..122855b6f --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-cardinal-west-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-isolated_danger-m.svg b/data/styles/default/dark/symbols/beacon-isolated_danger-m.svg new file mode 100644 index 000000000..5ccab05b5 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-isolated_danger-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-isolated_danger-s.svg b/data/styles/default/dark/symbols/beacon-isolated_danger-s.svg new file mode 100644 index 000000000..be74cea68 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-isolated_danger-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-lateral-port-m.svg b/data/styles/default/dark/symbols/beacon-lateral-port-m.svg new file mode 100644 index 000000000..9eb1f9036 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-lateral-port-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-lateral-port-s.svg b/data/styles/default/dark/symbols/beacon-lateral-port-s.svg new file mode 100644 index 000000000..4d1aac329 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-lateral-port-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg b/data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg new file mode 100644 index 000000000..8f1e34501 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-lateral-starboard.svg b/data/styles/default/dark/symbols/beacon-lateral-starboard.svg new file mode 100644 index 000000000..cd67f765d --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-lateral-starboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-safe_water-m.svg b/data/styles/default/dark/symbols/beacon-safe_water-m.svg new file mode 100644 index 000000000..df1a637e2 --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-safe_water-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-safe_water-s.svg b/data/styles/default/dark/symbols/beacon-safe_water-s.svg new file mode 100644 index 000000000..fb1f2677a --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-safe_water-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-special_purpose-m.svg b/data/styles/default/dark/symbols/beacon-special_purpose-m.svg new file mode 100644 index 000000000..b4af71f9d --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-special_purpose-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/beacon-special_purpose-s.svg b/data/styles/default/dark/symbols/beacon-special_purpose-s.svg new file mode 100644 index 000000000..f064e5c3e --- /dev/null +++ b/data/styles/default/dark/symbols/beacon-special_purpose-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bicycle-rental-xm.svg b/data/styles/default/dark/symbols/bicycle-rental-xm.svg new file mode 100644 index 000000000..b325ed508 --- /dev/null +++ b/data/styles/default/dark/symbols/bicycle-rental-xm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bicycle-rental.svg b/data/styles/default/dark/symbols/bicycle-rental.svg deleted file mode 100644 index 68e8967be..000000000 --- a/data/styles/default/dark/symbols/bicycle-rental.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - bike-parking-m - - - - - - - diff --git a/data/styles/default/dark/symbols/boat_rental-m.svg b/data/styles/default/dark/symbols/boat_rental-m.svg new file mode 100644 index 000000000..d1d603eb8 --- /dev/null +++ b/data/styles/default/dark/symbols/boat_rental-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/boating_school-m.svg b/data/styles/default/dark/symbols/boating_school-m.svg new file mode 100644 index 000000000..068ceb68f --- /dev/null +++ b/data/styles/default/dark/symbols/boating_school-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-east-m.svg b/data/styles/default/dark/symbols/buoy-cardinal-east-m.svg new file mode 100644 index 000000000..28eb91cfe --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-east-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-east-s.svg b/data/styles/default/dark/symbols/buoy-cardinal-east-s.svg new file mode 100644 index 000000000..508346df9 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-east-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-north-m.svg b/data/styles/default/dark/symbols/buoy-cardinal-north-m.svg new file mode 100644 index 000000000..450da88a8 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-north-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-north-s.svg b/data/styles/default/dark/symbols/buoy-cardinal-north-s.svg new file mode 100644 index 000000000..0efdbc693 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-north-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-south-m.svg b/data/styles/default/dark/symbols/buoy-cardinal-south-m.svg new file mode 100644 index 000000000..f3cc4cf4d --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-south-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-south-s.svg b/data/styles/default/dark/symbols/buoy-cardinal-south-s.svg new file mode 100644 index 000000000..9c19fe365 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-south-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-west-m.svg b/data/styles/default/dark/symbols/buoy-cardinal-west-m.svg new file mode 100644 index 000000000..e532a8c38 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-west-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-cardinal-west-s.svg b/data/styles/default/dark/symbols/buoy-cardinal-west-s.svg new file mode 100644 index 000000000..a75b66e54 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-cardinal-west-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-isolated_danger-m.svg b/data/styles/default/dark/symbols/buoy-isolated_danger-m.svg new file mode 100644 index 000000000..4aacdb43b --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-isolated_danger-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-isolated_danger-s.svg b/data/styles/default/dark/symbols/buoy-isolated_danger-s.svg new file mode 100644 index 000000000..d58670742 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-isolated_danger-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-lateral-port-m.svg b/data/styles/default/dark/symbols/buoy-lateral-port-m.svg new file mode 100644 index 000000000..7ff7f4690 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-lateral-port-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-lateral-port-s.svg b/data/styles/default/dark/symbols/buoy-lateral-port-s.svg new file mode 100644 index 000000000..ad3c67452 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-lateral-port-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-lateral-starboard-m.svg b/data/styles/default/dark/symbols/buoy-lateral-starboard-m.svg new file mode 100644 index 000000000..06de49129 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-lateral-starboard-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-lateral-starboard-s.svg b/data/styles/default/dark/symbols/buoy-lateral-starboard-s.svg new file mode 100644 index 000000000..a1a736c24 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-lateral-starboard-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-safe_water-m.svg b/data/styles/default/dark/symbols/buoy-safe_water-m.svg new file mode 100644 index 000000000..9e2be60d8 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-safe_water-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-safe_water-s.svg b/data/styles/default/dark/symbols/buoy-safe_water-s.svg new file mode 100644 index 000000000..62168714e --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-safe_water-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-special_purpose-m.svg b/data/styles/default/dark/symbols/buoy-special_purpose-m.svg new file mode 100644 index 000000000..82d2064f6 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-special_purpose-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-special_purpose-s.svg b/data/styles/default/dark/symbols/buoy-special_purpose-s.svg new file mode 100644 index 000000000..caf5fa1fe --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-special_purpose-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-m.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-m.svg new file mode 100644 index 000000000..a2b4e4da8 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-s.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-s.svg new file mode 100644 index 000000000..16344080a --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-m.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-m.svg new file mode 100644 index 000000000..a401dc8f4 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-s.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-s.svg new file mode 100644 index 000000000..1d7a4b2e6 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-m.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-m.svg new file mode 100644 index 000000000..160370fef --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-s.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-s.svg new file mode 100644 index 000000000..d5a009212 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-m.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-m.svg new file mode 100644 index 000000000..c23575742 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-s.svg b/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-s.svg new file mode 100644 index 000000000..bf7bf4ca0 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-m.svg b/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-m.svg new file mode 100644 index 000000000..fc9368080 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-s.svg b/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-s.svg new file mode 100644 index 000000000..ec9c5c38b --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-port-m.svg b/data/styles/default/dark/symbols/buoy-spherical-lateral-port-m.svg new file mode 100644 index 000000000..5dc9dd3c8 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-lateral-port-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-port-s.svg b/data/styles/default/dark/symbols/buoy-spherical-lateral-port-s.svg new file mode 100644 index 000000000..7a057a325 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-lateral-port-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-m.svg b/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-m.svg new file mode 100644 index 000000000..f415b7a80 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-s.svg b/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-s.svg new file mode 100644 index 000000000..5772e70e9 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-safe_water-m.svg b/data/styles/default/dark/symbols/buoy-spherical-safe_water-m.svg new file mode 100644 index 000000000..744122c13 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-safe_water-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-safe_water-s.svg b/data/styles/default/dark/symbols/buoy-spherical-safe_water-s.svg new file mode 100644 index 000000000..bda4f988d --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-safe_water-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-special_purpose-m.svg b/data/styles/default/dark/symbols/buoy-spherical-special_purpose-m.svg new file mode 100644 index 000000000..41c6d1ea9 --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-special_purpose-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/buoy-spherical-special_purpose-s.svg b/data/styles/default/dark/symbols/buoy-spherical-special_purpose-s.svg new file mode 100644 index 000000000..27752537f --- /dev/null +++ b/data/styles/default/dark/symbols/buoy-spherical-special_purpose-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bus-m.svg b/data/styles/default/dark/symbols/bus-m.svg deleted file mode 100644 index 989d2b1bb..000000000 --- a/data/styles/default/dark/symbols/bus-m.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bus-s.svg b/data/styles/default/dark/symbols/bus-s.svg deleted file mode 100644 index 65525513a..000000000 --- a/data/styles/default/dark/symbols/bus-s.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bus-xm.svg b/data/styles/default/dark/symbols/bus-xm.svg new file mode 100644 index 000000000..8f02b371e --- /dev/null +++ b/data/styles/default/dark/symbols/bus-xm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bus-xs.svg b/data/styles/default/dark/symbols/bus-xs.svg new file mode 100644 index 000000000..2ccdf374c --- /dev/null +++ b/data/styles/default/dark/symbols/bus-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/bus-xvs.svg b/data/styles/default/dark/symbols/bus-xvs.svg new file mode 100644 index 000000000..855417f4d --- /dev/null +++ b/data/styles/default/dark/symbols/bus-xvs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/christmas-tree-m.svg b/data/styles/default/dark/symbols/christmas-tree-m.svg new file mode 100644 index 000000000..a34a4cf1a --- /dev/null +++ b/data/styles/default/dark/symbols/christmas-tree-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/day-spa-m.svg b/data/styles/default/dark/symbols/day-spa-m.svg new file mode 100644 index 000000000..1211a7f98 --- /dev/null +++ b/data/styles/default/dark/symbols/day-spa-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/driving_school-m.svg b/data/styles/default/dark/symbols/driving_school-m.svg index d26ab956a..68e70f768 100644 --- a/data/styles/default/dark/symbols/driving_school-m.svg +++ b/data/styles/default/dark/symbols/driving_school-m.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/emergency-exit-m.svg b/data/styles/default/dark/symbols/emergency-exit-m.svg new file mode 100644 index 000000000..553918f0d --- /dev/null +++ b/data/styles/default/dark/symbols/emergency-exit-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-barrier-m.svg b/data/styles/default/dark/symbols/entrance-barrier-m.svg new file mode 100644 index 000000000..7b475739c --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-barrier-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-barrier-s.svg b/data/styles/default/dark/symbols/entrance-barrier-s.svg deleted file mode 100644 index 1bede73f3..000000000 --- a/data/styles/default/dark/symbols/entrance-barrier-s.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/styles/default/dark/symbols/entrance-barrier-xs.svg b/data/styles/default/dark/symbols/entrance-barrier-xs.svg new file mode 100644 index 000000000..d9cf3e2ac --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-barrier-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-emergency-m.svg b/data/styles/default/dark/symbols/entrance-emergency-m.svg new file mode 100644 index 000000000..dccd04d76 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-emergency-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-emergency-s.svg b/data/styles/default/dark/symbols/entrance-emergency-s.svg deleted file mode 100644 index 72029679b..000000000 --- a/data/styles/default/dark/symbols/entrance-emergency-s.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/styles/default/dark/symbols/entrance-emergency-xs.svg b/data/styles/default/dark/symbols/entrance-emergency-xs.svg new file mode 100644 index 000000000..af4d8b36c --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-emergency-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-entry-m.svg b/data/styles/default/dark/symbols/entrance-entry-m.svg new file mode 100644 index 000000000..73495b2ef --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-entry-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-entry-xs.svg b/data/styles/default/dark/symbols/entrance-entry-xs.svg new file mode 100644 index 000000000..4f4f87b94 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-entry-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-exit-m.svg b/data/styles/default/dark/symbols/entrance-exit-m.svg new file mode 100644 index 000000000..e1b8aa976 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-exit-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-exit-s.svg b/data/styles/default/dark/symbols/entrance-exit-s.svg deleted file mode 100644 index eefebd408..000000000 --- a/data/styles/default/dark/symbols/entrance-exit-s.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/default/dark/symbols/entrance-exit-xs.svg b/data/styles/default/dark/symbols/entrance-exit-xs.svg new file mode 100644 index 000000000..1944faf30 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-exit-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-m.svg b/data/styles/default/dark/symbols/entrance-m.svg new file mode 100644 index 000000000..bfeafd0c5 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-main-m.svg b/data/styles/default/dark/symbols/entrance-main-m.svg new file mode 100644 index 000000000..5085ae457 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-main-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-main-s.svg b/data/styles/default/dark/symbols/entrance-main-s.svg deleted file mode 100644 index 4a3d4faec..000000000 --- a/data/styles/default/dark/symbols/entrance-main-s.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/styles/default/dark/symbols/entrance-main-xs.svg b/data/styles/default/dark/symbols/entrance-main-xs.svg new file mode 100644 index 000000000..cb6b813c6 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-main-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-s.svg b/data/styles/default/dark/symbols/entrance-s.svg deleted file mode 100644 index 8bfcb8933..000000000 --- a/data/styles/default/dark/symbols/entrance-s.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/default/dark/symbols/entrance-service-m.svg b/data/styles/default/dark/symbols/entrance-service-m.svg new file mode 100644 index 000000000..08efa0b8e --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-service-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-service-xs.svg b/data/styles/default/dark/symbols/entrance-service-xs.svg new file mode 100644 index 000000000..24c52aa65 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-service-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/entrance-xs.svg b/data/styles/default/dark/symbols/entrance-xs.svg new file mode 100644 index 000000000..7b785b066 --- /dev/null +++ b/data/styles/default/dark/symbols/entrance-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/flying_school-m.svg b/data/styles/default/dark/symbols/flying_school-m.svg new file mode 100644 index 000000000..2ab936ca2 --- /dev/null +++ b/data/styles/default/dark/symbols/flying_school-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/food_bank-m.svg b/data/styles/default/dark/symbols/food_bank-m.svg new file mode 100644 index 000000000..a10b350aa --- /dev/null +++ b/data/styles/default/dark/symbols/food_bank-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/food_sharing-m.svg b/data/styles/default/dark/symbols/food_sharing-m.svg new file mode 100644 index 000000000..754e9e53f --- /dev/null +++ b/data/styles/default/dark/symbols/food_sharing-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/give_box-m.svg b/data/styles/default/dark/symbols/give_box-m.svg new file mode 100644 index 000000000..d57ee4c67 --- /dev/null +++ b/data/styles/default/dark/symbols/give_box-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/indoor_play-m.svg b/data/styles/default/dark/symbols/indoor_play-m.svg new file mode 100644 index 000000000..669d376f9 --- /dev/null +++ b/data/styles/default/dark/symbols/indoor_play-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/language_school-m.svg b/data/styles/default/dark/symbols/language_school-m.svg index 81787b2db..4daf48011 100644 --- a/data/styles/default/dark/symbols/language_school-m.svg +++ b/data/styles/default/dark/symbols/language_school-m.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/lifebuoy-m.svg b/data/styles/default/dark/symbols/lifebuoy-m.svg new file mode 100644 index 000000000..1fd208aef --- /dev/null +++ b/data/styles/default/dark/symbols/lifebuoy-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/marina-m.svg b/data/styles/default/dark/symbols/marina-m.svg index a32e0ff4e..8f56cb5c8 100644 --- a/data/styles/default/dark/symbols/marina-m.svg +++ b/data/styles/default/dark/symbols/marina-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/music_school-m.svg b/data/styles/default/dark/symbols/music_school-m.svg index b2492818f..929fef511 100644 --- a/data/styles/default/dark/symbols/music_school-m.svg +++ b/data/styles/default/dark/symbols/music_school-m.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/nails-m.svg b/data/styles/default/dark/symbols/nails-m.svg new file mode 100644 index 000000000..9a2357d66 --- /dev/null +++ b/data/styles/default/dark/symbols/nails-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/observatory-m.svg b/data/styles/default/dark/symbols/observatory-m.svg new file mode 100644 index 000000000..bc147d4fe --- /dev/null +++ b/data/styles/default/dark/symbols/observatory-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/parking_pooling-m.svg b/data/styles/default/dark/symbols/parking_pooling-m.svg new file mode 100644 index 000000000..6e49e9aee --- /dev/null +++ b/data/styles/default/dark/symbols/parking_pooling-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/parking_pooling-s.svg b/data/styles/default/dark/symbols/parking_pooling-s.svg new file mode 100644 index 000000000..3ab9d7a54 --- /dev/null +++ b/data/styles/default/dark/symbols/parking_pooling-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/prep_school-m.svg b/data/styles/default/dark/symbols/prep_school-m.svg new file mode 100644 index 000000000..885f0b3f7 --- /dev/null +++ b/data/styles/default/dark/symbols/prep_school-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_blue-scaled.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_blue-scaled.svg new file mode 100644 index 000000000..3d7114958 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_blue-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_blue.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_blue.svg new file mode 100644 index 000000000..630b04bee --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_blue.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_green-scaled.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_green-scaled.svg new file mode 100644 index 000000000..c455ed3fc --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_green-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_green.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_green.svg new file mode 100644 index 000000000..132847f80 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_green.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_red-scaled.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_red-scaled.svg new file mode 100644 index 000000000..6c96dd652 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_red-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_red.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_red.svg new file mode 100644 index 000000000..3b582206f --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_red.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_turkey-scaled.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_turkey-scaled.svg new file mode 100644 index 000000000..bedba7849 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_turkey-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_turkey.svg b/data/styles/default/dark/symbols/shield-highway_hexagon_turkey.svg new file mode 100644 index 000000000..eafc784b0 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-highway_hexagon_turkey.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg b/data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg new file mode 100644 index 000000000..fe5350e44 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/dark/symbols/shield-hungary-blue.svg b/data/styles/default/dark/symbols/shield-hungary-blue.svg new file mode 100644 index 000000000..a47ba1bd9 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-hungary-blue.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/dark/symbols/shield-hungary-green-scaled.svg b/data/styles/default/dark/symbols/shield-hungary-green-scaled.svg new file mode 100644 index 000000000..29c613a74 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-hungary-green-scaled.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/dark/symbols/shield-hungary-green.svg b/data/styles/default/dark/symbols/shield-hungary-green.svg new file mode 100644 index 000000000..6ff9e9bb8 --- /dev/null +++ b/data/styles/default/dark/symbols/shield-hungary-green.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/dark/symbols/slipway-m.svg b/data/styles/default/dark/symbols/slipway-m.svg new file mode 100644 index 000000000..a0991f96a --- /dev/null +++ b/data/styles/default/dark/symbols/slipway-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/soup_kitchen-m.svg b/data/styles/default/dark/symbols/soup_kitchen-m.svg new file mode 100644 index 000000000..3e38aefd0 --- /dev/null +++ b/data/styles/default/dark/symbols/soup_kitchen-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/square-m.svg b/data/styles/default/dark/symbols/square-m.svg deleted file mode 100644 index be4d751da..000000000 --- a/data/styles/default/dark/symbols/square-m.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/styles/default/dark/symbols/taxi-m.svg b/data/styles/default/dark/symbols/taxi-m.svg deleted file mode 100644 index e57e00374..000000000 --- a/data/styles/default/dark/symbols/taxi-m.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/data/styles/default/dark/symbols/taxi-xm.svg b/data/styles/default/dark/symbols/taxi-xm.svg new file mode 100644 index 000000000..cd6eeab8f --- /dev/null +++ b/data/styles/default/dark/symbols/taxi-xm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-gamma-m.svg b/data/styles/default/dark/symbols/telescope-gamma-m.svg new file mode 100644 index 000000000..119beb8d6 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-gamma-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-m.svg b/data/styles/default/dark/symbols/telescope-m.svg new file mode 100644 index 000000000..54c1e4ce7 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-optical-m.svg b/data/styles/default/dark/symbols/telescope-optical-m.svg new file mode 100644 index 000000000..c6da5b2c7 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-optical-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/telescope-radio-m.svg b/data/styles/default/dark/symbols/telescope-radio-m.svg new file mode 100644 index 000000000..38db2ffc7 --- /dev/null +++ b/data/styles/default/dark/symbols/telescope-radio-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/train_building-m.svg b/data/styles/default/dark/symbols/train_building-m.svg new file mode 100644 index 000000000..d0204cbed --- /dev/null +++ b/data/styles/default/dark/symbols/train_building-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/tree-m.svg b/data/styles/default/dark/symbols/tree-m.svg new file mode 100644 index 000000000..ffd79452d --- /dev/null +++ b/data/styles/default/dark/symbols/tree-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 8a45a1c71..56b5a14e6 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -254,6 +254,7 @@ area|z11-[natural=bare_rock], /* 5.BEACH, GLACIER, DESERT, etc. */ area|z0-[natural=glacier], +area|z0-[natural=sand], area|z10-[natural=beach], area|z0-[natural=desert], area|z10-[leisure=beach_resort], @@ -266,7 +267,11 @@ area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;} +area|z10-[natural=sand], +{fill-color: @sand;} + area|z0-[natural=desert], +area|z0-9[natural=sand], {fill-color: @desert;} /* 6.WATER */ @@ -428,6 +433,7 @@ area|z14-[area:highway=living_street], area|z14-[amenity=grave_yard], area|z14-[landuse=cemetery], area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], area|z16-[public_transport=platform], area|z16-[railway=platform], {fill-opacity: 1;} @@ -590,6 +596,7 @@ area|z10-[landuse=farmyard], /* Parking */ area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], {fill-color: @parking;} area|z15-[amenity=parking][location=underground], diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index 5ebc25f4c..9745081a0 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -468,6 +468,7 @@ area|z17-[landuse=plant_nursery], /* 5.2 Beach, Glacier, Desert, etc. */ area|z14-[natural=desert], +area|z15-[natural=sand], node|z15-[natural=beach], {text: name;font-size: 10;text-color: @poi_label;} @@ -665,12 +666,17 @@ node|z16-[addr:housenumber][addr:street]::int_name, node|z18-[entrance=main], node|z18-[emergency=emergency_ward_entrance], -node|z19-[entrance], +node|z19-[entrance!=emergency], +node|z19-[entrance=entry], node|z19-[entrance=exit], +node|z19-[entrance=house], +node|z19-[entrance=service], node|z19-[amenity=loading_dock], +node|z20-[entrance=emergency], {text: name; text-color: @building_label;} node|z18-[entrance=main]::flats, -node|z19-[entrance]::flats, +node|z19-[entrance!=emergency]::flats, +node|z19-[entrance=entry]::flats, node|z19-[entrance=exit]::flats, {text: int_name; text-color: @building_label; font-size: 8; text-offset: 1;} @@ -705,21 +711,35 @@ node|z18-[addr:housenumber][addr:street], node|z16-[addr:housenumber][addr:street]::int_name, {font-size: 8;} -node|z17[entrance], -node|z18[amenity=loading_dock], -node|z16[entrance=main], -node|z16[emergency=emergency_ward_entrance], -{icon-image: square-m.svg;} +node|z17[entrance=entrance], +{icon-image: entrance-entry-xs.svg;} +node|z17[entrance=exit], +{icon-image: entrance-exit-xs.svg;} +node|z17-[entrance=main], +{icon-image: entrance-main-xs.svg;} +node|z16-[emergency=emergency_ward_entrance], +{icon-image: entrance-emergency-xs.svg;} node|z18-[entrance], -node|z19-[amenity=loading_dock], -{icon-image: entrance-s.svg; font-size: 10; text-offset: 1;} +{icon-image: entrance-m.svg; font-size: 10; text-offset: 1;} +node|z18-[entrance=entrance], +{icon-image: entrance-entry-m.svg; font-size: 10; text-offset: 1;} node|z18-[entrance=exit], -{icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;} -node|z17-[entrance=main], -{icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;} -node|z17-[emergency=emergency_ward_entrance], -{icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;} +{icon-image: entrance-exit-m.svg; font-size: 10; text-offset: 1;} +node|z18-[entrance=main], +{icon-image: entrance-main-m.svg; font-size: 10; text-offset: 1;} +node|z18-[emergency=emergency_ward_entrance], +{icon-image: entrance-emergency-m.svg; font-size: 10; text-offset: 1;} +node|z19-[entrance=service], +node|z19-[amenity=loading_dock], +{icon-image: entrance-service-m.svg; font-size: 10; text-offset: 1;} +node|z20-[entrance=emergency], +{icon-image: emergency-exit-m.svg; font-size: 10; text-offset: 1;} + +node|z18[entrance=garage], +node|z18[entrance=service], +node|z18-19[entrance=emergency], +{icon-image: none;} /* 8.3 Airports */ area|z14-[aeroway=terminal] diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 7b89afcc8..cfd326beb 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -5,7 +5,7 @@ 3.2 Road Icons 3.3 Tram Station 3.4 Bus Station - 3.5 Ferry terminal + 3.5 Ferry terminal & seamarks 3.6 Airport 3.7 Aerialway 4.TOURISM @@ -206,6 +206,12 @@ node|z19-[man_made=water_well][drinking_water=not], node|z19-[amenity=water_point][drinking_water=not], {icon-image: drinking-water-no-m.svg;} +node|z18-[natural=tree], +{icon-image: tree-m.svg;} + +node|z18-[xmas:feature=tree], +{icon-image: christmas-tree-m.svg;} + /* 3. TRANSPORT */ node|z12-[railway=station], @@ -323,14 +329,16 @@ node|z19-[amenity=bus_station], node|z19-[amenity=bus_station]::int_name, {text-offset: 1;font-size: 10;} +node|z15[highway=bus_stop], +{icon-image: bus-xvs.svg;icon-min-distance: 1;} node|z16[highway=bus_stop], -{icon-image: bus-m.svg;} +{icon-image: bus-xs.svg;icon-min-distance: 1;} node|z17-[highway=bus_stop], -{icon-image: bus-m.svg;text-offset: 1;font-size: 11;} +{icon-image: bus-xm.svg;text-offset: 1;font-size: 11;} node|z18-19[highway=bus_stop]::int_name, -{icon-image: bus-m.svg;text-offset: 1;font-size: 9;} +{icon-image: bus-xm.svg;text-offset: 1;font-size: 9;} -/* 3.5 Ferry terminal */ +/* 3.5 Ferry terminal & seamarks */ node|z11-12[amenity=ferry_terminal] {icon-image: ship-s.svg;icon-min-distance: 12;} @@ -343,6 +351,167 @@ node|z16[amenity=ferry_terminal] node|z17-[amenity=ferry_terminal] {icon-image: ship-m.svg;text-offset: 1;font-size: 12;} +node|z16[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port], +{icon-image: buoy-lateral-port-s.svg;} +node|z16[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard], +{icon-image: buoy-lateral-starboard-s.svg;} +node|z16[seamark:type=buoy_isolated_danger], +{icon-image: buoy-isolated_danger-s.svg;} +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east], +{icon-image: buoy-cardinal-east-s.svg;} +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west], +{icon-image: buoy-cardinal-west-s.svg;} +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south], +{icon-image: buoy-cardinal-south-s.svg;} +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north], +{icon-image: buoy-cardinal-north-s.svg;} +node|z16[seamark:type=buoy_special_purpose], +{icon-image: buoy-special_purpose-s.svg;} +node|z16[seamark:type=buoy_safe_water], +{icon-image: buoy-safe_water-s.svg;} + +node|z17-[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port], +{icon-image: buoy-lateral-port-m.svg;} +node|z17-[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard], +{icon-image: buoy-lateral-starboard-m.svg;} +node|z17-[seamark:type=buoy_isolated_danger], +{icon-image: buoy-isolated_danger-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east], +{icon-image: buoy-cardinal-east-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west], +{icon-image: buoy-cardinal-west-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south], +{icon-image: buoy-cardinal-south-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north], +{icon-image: buoy-cardinal-north-m.svg;} +node|z17-[seamark:type=buoy_special_purpose], +{icon-image: buoy-special_purpose-m.svg;} +node|z17-[seamark:type=buoy_safe_water], +{icon-image: buoy-safe_water-m.svg;} + +node|z16[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port][seamark:buoy_lateral:shape=spherical], +node|z16[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard][seamark:buoy_lateral:shape=spherical], +node|z16[seamark:type=buoy_isolated_danger][seamark:buoy_isolated_danger:shape=spherical], +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east][seamark:buoy_cardinal:shape=spherical], +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west][seamark:buoy_cardinal:shape=spherical], +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south][seamark:buoy_cardinal:shape=spherical], +node|z16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north][seamark:buoy_cardinal:shape=spherical], +node|z16[seamark:type=buoy_special_purpose][seamark:buoy_special_purpose:shape=spherical], +node|z16[seamark:type=buoy_safe_water][seamark:buoy_safe_water:shape=spherical], +{icon-image: none;} + +node|z17-[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port][seamark:buoy_lateral:shape=spherical], +{icon-image: buoy-spherical-lateral-port-m.svg;} +node|z17-[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard][seamark:buoy_lateral:shape=spherical], +{icon-image: buoy-spherical-lateral-starboard-m.svg;} +node|z17-[seamark:type=buoy_isolated_danger][seamark:buoy_isolated_danger:shape=spherical], +{icon-image: buoy-spherical-isolated_danger-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-east-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-west-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-south-m.svg;} +node|z17-[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-north-m.svg;} +node|z17-[seamark:type=buoy_special_purpose][seamark:buoy_special_purpose:shape=spherical], +{icon-image: buoy-spherical-special_purpose-m.svg;} +node|z17-[seamark:type=buoy_safe_water][seamark:buoy_safe_water:shape=spherical], +{icon-image: buoy-spherical-safe_water-m.svg;} + +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower], +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice], +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile], +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant], +{icon-image: beacon-lateral-port-s.svg;} +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower], +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice], +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile], +node|z16[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant], +{icon-image: beacon-lateral-starboard-s.svg;} +node|z16[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=tower], +node|z16[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=lattice], +node|z16[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=pile], +node|z16[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=buoyant], +{icon-image: beacon-isolated_danger-s.svg;} +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-east-s.svg;} +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-west-s.svg;} +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-south-s.svg;} +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile], +node|z16[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-north-s.svg;} +node|z16[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=tower], +node|z16[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=lattice], +node|z16[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=pile], +node|z16[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=buoyant], +{icon-image: beacon-special_purpose-s.svg;} +node|z16[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=tower], +node|z16[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=lattice], +node|z16[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=pile], +node|z16[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=buoyant], +{icon-image: beacon-safe_water-s.svg;} + +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower], +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice], +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile], +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant], +{icon-image: beacon-lateral-port-m.svg;} +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower], +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice], +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile], +node|z17-[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant], +{icon-image: beacon-lateral-starboard-m.svg;} +node|z17-[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=tower], +node|z17-[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=lattice], +node|z17-[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=pile], +node|z17-[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=buoyant], +{icon-image: beacon-isolated_danger-m.svg;} +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-east-m.svg;} +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-west-m.svg;} +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-south-m.svg;} +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile], +node|z17-[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-north-m.svg;} +node|z17-[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=tower], +node|z17-[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=lattice], +node|z17-[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=pile], +node|z17-[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=buoyant], +{icon-image: beacon-special_purpose-m.svg;} +node|z17-[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=tower], +node|z17-[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=lattice], +node|z17-[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=pile], +node|z17-[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=buoyant], +{icon-image: beacon-safe_water-m.svg;} + + /* 3.6 Airport */ node|z7-9[aeroway=aerodrome][aerodrome=international], @@ -788,7 +957,6 @@ node|z16-[amenity=biergarten], /* 5.AMENITY (infrastructure) */ node|z13-[leisure=stadium], -node|z14-[barrier=toll_booth], node|z14-[amenity=university], node|z14-[amenity=place_of_worship], node|z14-[man_made=lighthouse], @@ -812,6 +980,7 @@ node|z16-[barrier=kissing_gate], node|z16-[barrier=lift_gate], node|z16-[barrier=swing_gate], node|z16-[barrier=stile], +node|z16-[barrier=toll_booth], node|z16-[barrier=turnstile], node|z17-[barrier=wicket_gate], node|z16-[barrier=cycle_barrier], @@ -844,9 +1013,12 @@ 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], +node|z17-[social_facility=food_bank], +node|z17-[social_facility=soup_kitchen], node|z17-[amenity=animal_shelter], node|z17-[amenity=kindergarten], node|z17-[amenity=childcare], @@ -854,6 +1026,9 @@ node|z16-[amenity=school], node|z17-[amenity=driving_school], node|z17-[amenity=language_school], node|z17-[amenity=music_school], +node|z17-[amenity=sailing_school], +node|z17-[amenity=flight_school], +node|z17-[amenity=prep_school], node|z17-[amenity=cinema], node|z17-[amenity=ice_cream], node|z17-[leisure=bowling_alley], @@ -865,9 +1040,11 @@ 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], @@ -912,15 +1089,26 @@ node|z15-[leisure=sports_centre][sport=swimming], node|z17-[highway=ladder], node|z18-[amenity=dojo], node|z18-[amenity=vending_machine], +node|z18-[amenity=food_sharing], +node|z18-[amenity=give_box], +node|z18-[man_made=telescope], +node|z17-[man_made=telescope][telescope:type=optical], +node|z17-[man_made=telescope][telescope:type=radio], +node|z17-[man_made=telescope][telescope:type=gamma], +node|z16-[man_made=observatory], node|z17-[amenity=fire_station], node|z18-[amenity=internet_cafe], node|z18-[emergency=defibrillator], +node|z18-[emergency=access_point], node|z18-[emergency=assembly_point], +node|z19-[emergency=life_ring], node|z18-[emergency=lifeguard], 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], @@ -1073,6 +1261,12 @@ node|z17-[amenity=driving_school], {icon-image: driving_school-m.svg;} node|z17-[amenity=language_school], {icon-image: language_school-m.svg;} +node|z17-[amenity=sailing_school], +{icon-image: boating_school-m.svg;} +node|z17-[amenity=flight_school], +{icon-image: flying_school-m.svg;} +node|z17-[amenity=prep_school], +{icon-image: prep_school-m.svg;} node|z17-[leisure=hackerspace], {icon-image: hackerspace-m.svg;} node|z17-[leisure=escape_game] @@ -1327,9 +1521,7 @@ node|z13-14[man_made=lighthouse], node|z15-[man_made=lighthouse], {icon-image: lighthouse-m.svg;} -node|z12-14[barrier=toll_booth], -{icon-image: toll_booth-s.svg;} -node|z15-[barrier=toll_booth], +node|z16-[barrier=toll_booth], {icon-image: toll_booth-m.svg;} node|z14[barrier=border_control], @@ -1347,7 +1539,7 @@ node|z17-[barrier=wicket_gate], {icon-image: dot-m.svg;font-size: 11;} node|z16-[barrier=entrance], -{icon-image: entrance-barrier-s.svg; font-size: 11;} +{icon-image: entrance-barrier-xs.svg; font-size: 11;} node|z17-[highway=ladder], {icon-image: ladder-m.svg;font-size: 11;} @@ -1387,7 +1579,7 @@ node|z17-[man_made=petroleum_well], {icon-image: pole-m.svg;} node|z16-[amenity=taxi], -{icon-image: taxi-m.svg;icon-min-distance: 30;} +{icon-image: taxi-xm.svg;icon-min-distance: 30;} node|z17-[amenity=taxi], {icon-min-distance: 20;} @@ -1419,6 +1611,9 @@ 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;} @@ -1428,6 +1623,12 @@ node|z17-[amenity=nursing_home], node|z17-[amenity=social_facility], {icon-image: social_facility-m.svg;} +node|z17-[social_facility=soup_kitchen], +{icon-image: soup_kitchen-m.svg;} + +node|z17-[social_facility=food_bank], +{icon-image: food_bank-m.svg;} + node|z17-[amenity=cinema], {icon-image: cinema-m.svg;} node|z18-[amenity=cinema], @@ -1452,6 +1653,9 @@ 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], @@ -1470,8 +1674,13 @@ node|z17-[amenity=motorcycle_rental], node|z18-[amenity=motorcycle_rental], {font-size: 11;} +node|z17-[amenity=boat_rental], +{icon-image: boat_rental-m.svg;} +node|z18-[amenity=boat_rental], +{font-size: 11;} + node|z17-[amenity=bicycle_rental], -{icon-image: bicycle-rental.svg;} +{icon-image: bicycle-rental-xm.svg;} node|z18-[amenity=bicycle_rental], {font-size: 11;} @@ -1494,9 +1703,15 @@ node|z19-[emergency=fire_hydrant], node|z18-[emergency=defibrillator], {icon-image: defibrillator-m.svg;font-size: 11;} +node|z18-[emergency=access_point], +{icon-image: access_point-m.svg;font-size: 11;} + node|z18-[emergency=assembly_point], {icon-image: assembly_point-m.svg;font-size: 11;} +node|z19-[emergency=life_ring], +{icon-image: lifebuoy-m.svg; font-size: 11;} + node|z17-[emergency=lifeguard], {icon-image: lifeguard-m.svg; font-size: 11;} @@ -1511,16 +1726,15 @@ node|z17-[amenity=telephone] {icon-image: phone-m.svg;} node|z17-[emergency=phone] -{icon-image: emergency-phone-m.svg;} - - -node|z16-[amenity=recycling][recycling_type=centre], -{icon-image: recycling-centre-m.svg;} +{icon-image: emergency-phone-m.svg; text-offset: 1;} node|z17-[amenity=recycling], node|z17-[amenity=waste_transfer_station], {icon-image: recycling-m.svg;} +node|z16-[amenity=recycling][recycling_type=centre], +{icon-image: recycling-centre-m.svg;} + node|z17-[power=plant], /* Skip individual solar generators, because there are a lot of mapped panels */ node|z17-[power=generator][generator:source!=solar], @@ -1538,6 +1752,9 @@ 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;} @@ -1557,11 +1774,30 @@ node|z17-[amenity=parcel_locker], node|z18-[amenity=vending_machine][vending=fuel], {icon-image: fuel-dispenser-m.svg;} +node|z18-[amenity=food_sharing], +{icon-image: food_sharing-m.svg;} +node|z18-[amenity=give_box], +{icon-image: give_box-m.svg;} + +node|z18-[man_made=telescope], +{icon-image: telescope-m.svg;} +node|z17-[man_made=telescope][telescope:type=optical], +{icon-image: telescope-optical-m.svg;} +node|z17-[man_made=telescope][telescope:type=radio], +{icon-image: telescope-radio-m.svg;} +node|z17-[man_made=telescope][telescope:type=gamma], +{icon-image: telescope-gamma-m.svg;} + +node|z16-[man_made=observatory], +{icon-image: observatory-m.svg;} + node|z17-[aeroway=gate], {icon-image: airport_gate-m.svg;font-size: 11;} 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], @@ -1708,6 +1944,7 @@ 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], @@ -1874,6 +2111,7 @@ 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;} @@ -1921,6 +2159,8 @@ node|z17-[shop=pastry], {icon-image: bakery-m.svg;icon-min-distance: 24;} node|z17-[shop=beauty], {icon-image: beauty-m.svg;icon-min-distance: 24;} +node|z17-[shop=beauty][beauty=nails], +{icon-image: nails-m.svg;icon-min-distance: 24;} node|z17-[shop=cosmetics], {icon-image: beauty-m.svg;icon-min-distance: 24;} node|z17-[shop=beverages], @@ -2020,6 +2260,7 @@ 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;} @@ -2043,6 +2284,8 @@ node|z17-[shop=variety_store], {icon-image: shop-m.svg;} node|z17-[shop=massage], {icon-image: massage_salon-m.svg;icon-min-distance: 24;} +node|z17-[shop=beauty][beauty=spa], +{icon-image: day-spa-m.svg;icon-min-distance: 24;} node|z17-[shop=money_lender], {icon-image: bank-m.svg;icon-min-distance: 24;} node|z17-[shop=pawnbroker], @@ -2133,6 +2376,7 @@ node|z17-[amenity=bicycle_parking], node|z17-[amenity=motorcycle_parking], node|z17-[amenity=car_wash], node|z18-[amenity=parking], +node|z18-[amenity=car_pooling], node|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} @@ -2207,6 +2451,11 @@ node|z16-[amenity=parking], node|z17-[amenity=parking], {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10} +node|z16-[amenity=car_pooling], +{icon-image: parking-pooling-s.svg;icon-min-distance: 5;} +node|z17-[amenity=car_pooling], +{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10} + node|z16-[amenity=parking][location=underground], {icon-image:parking_underground-m.svg;} @@ -2269,4 +2518,4 @@ node|z18-[amenity=parking_space][parking_space=disabled], /* 8. Colored Labels */ -@import("../../default/include/Icons_Label_Colors.mapcss"); \ No newline at end of file +@import("../../default/include/Icons_Label_Colors.mapcss"); diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss index 83a17a8fd..85f7a642a 100644 --- a/data/styles/default/include/Icons_Label_Colors.mapcss +++ b/data/styles/default/include/Icons_Label_Colors.mapcss @@ -1,6 +1,7 @@ /* 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], @@ -33,6 +34,7 @@ node[shop=wholesale], node[craft=photographer], node[craft=tailor], +node[craft=winery], {text-color: @shop_label} node[amenity=bar], @@ -56,6 +58,7 @@ 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], @@ -71,6 +74,7 @@ node[amenity=place_of_worship] node[amenity=social_facility], node[historic=ship], node[leisure=hackerspace], +node[social_facility], node[tourism=attraction], node[tourism=gallery], node[tourism=museum], @@ -102,6 +106,7 @@ 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] @@ -115,20 +120,29 @@ node[amenity=college], node[amenity=courthouse], node[amenity=driving_school], node[amenity=fire_station], +node[amenity=flight_school], 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=prep_school], node[amenity=prison], +node[amenity=recycling][recycling_type=centre], +node[amenity=sailing_school], node[amenity=school], node[amenity=townhall], node[amenity=university][name], node[barrier=border_control], node[building=guardhouse], +node[man_made=communications_tower], +node[man_made=lighthouse], +node[man_made=observatory], node[office=diplomatic], node[office=security], node[shop=money_lender], @@ -148,3 +162,6 @@ node[healthcare], 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;} + +node[emergency=access_point], +{text-color: @emergency_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 01c45d2a4..c155f5d55 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -23,6 +23,8 @@ 7.2 Residential, Road, Street tunnel 16-22 ZOOM 7.3 Residential, Road, Street bridge 14-22 ZOOM 7.4 Service 15-22 ZOOM + 7.5 Service tunnel 16-22 ZOOM + 7.6 Service bridge 15-22 ZOOM 8.OTHERS ROADS 13-22 ZOOM 8.1 Pedestrian & ford 13-22 ZOOM 8.2 Pedestrian & ford tunnel 16-22 ZOOM @@ -678,6 +680,41 @@ line|z19-[highway=service][service=busway], line|z19-[highway=busway], {width: 4;} +/* 7.5 Service tunnel 16-22 ZOOM */ + +line|z15-[highway=service][tunnel?], +line|z15-[highway=service][service=busway][tunnel?], +line|z15-[highway=busway][tunnel?], +{opacity: 0.7; casing-width: 1; casing-dashes: 5,5; color: @residential_tunnel; casing-linecap: butt; casing-color: @residential_tunnel_casing; casing-opacity: 0.7;} + +/* 7.6 Service bridge 15-22 ZOOM */ + +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=service][service=busway][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite, +{casing-width-add: 0;} +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=service][service=busway][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite, +{casing-width-add: 0.8;} +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=service][service=busway][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite, +{casing-width-add: 1;} + +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=service][service=busway][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, +{casing-width-add: 0.4;} +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=service][service=busway][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, +{casing-width-add: 1.6;} +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=service][service=busway][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, +{casing-width-add: 2;} + /* 8.OTHERS ROADS 13-22 ZOOM */ line|z13-[highway=pedestrian], @@ -702,7 +739,8 @@ line|z15-[highway=track][bridge?]::bridgewhite, line|z15-[highway=bridleway][bridge?]::bridgewhite, line|z15-[highway=steps][bridge?]::bridgewhite, line|z16-[highway=road][bridge?]::bridgewhite, -line|z16-[highway=service][bridge?]::bridgewhite +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z13-[highway=pedestrian][bridge?]::bridgeblack, line|z17-[highway=footway][bridge?]::bridgeblack, @@ -712,7 +750,8 @@ line|z17-[highway=track][bridge?]::bridgeblack, line|z17-[highway=bridleway][bridge?]::bridgeblack, line|z17-[highway=steps][bridge?]::bridgeblack, line|z16-[highway=road][bridge?]::bridgeblack, -line|z16-[highway=service][bridge?]::bridgeblack +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} line|z15-[highway=track], {color: @track;opacity: 0.6;} @@ -1341,19 +1380,17 @@ line|z16-[railway=disused], /* 9.2 Rail tunnel 14-22 ZOOM */ line|z12[railway=rail][tunnel?], -{opacity:0.9} +{opacity:0.8} line|z13[railway=rail][tunnel?], -{opacity:0.7} +{opacity:0.6} line|z14-[railway=rail][tunnel?], -{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;casing-opacity: 0.5; opacity:0.6} +{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;casing-opacity: 0.3; opacity:0.4} line|z15[railway=rail][tunnel?], -{casing-opacity: 0.4; opacity:0.5} +{casing-opacity: 0.3; opacity:0.3} line|z16[railway=rail][tunnel?], -{casing-opacity: 0.3; opacity:0.4} +{casing-opacity: 0.1; opacity:0.2} line|z17-[railway=rail][tunnel?], -{casing-opacity: 0.2; opacity:0.3} -line|z16-[railway=rail][tunnel?]::dash, -{color:@background1} +{casing-opacity: 0.05; opacity:0.1} /* 9.3 Rail bridge 14-22 ZOOM */ @@ -1443,6 +1480,13 @@ line|z16[railway=tram] line|z17-[railway=tram] {width: 1; opacity: 1;} +line|z15[railway=tram][tunnel?], +{opacity:0.3} +line|z16[railway=tram][tunnel?], +{opacity:0.2} +line|z17-[railway=tram][tunnel?], +{opacity:0.1} + /* 9.6 Funicular 12-22 ZOOM */ line|z12[railway=funicular], diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 2f4d81604..611e3813c 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -140,6 +140,7 @@ railway-platform # area z16- (also has captio amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) @@ -241,6 +242,7 @@ natural-beach-gravel # area z10- (also has captio natural-beach-sand # area z10- (also has caption z15-) natural-desert # area z1- (also has caption z14-) natural-glacier # area z1- +natural-sand # area z1- (also has caption z15-) === 30 natural-land # area z1- diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 764899e9d..c9b4bab0c 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -196,17 +196,19 @@ highway-tertiary_link-tunnel # line z14- (also has line(c === 223 highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has pathtext z16-) -highway-busway-tunnel # line z15- (also has pathtext z16-) +highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) highway-service # line z15- (also has pathtext z16-) highway-service-area # line z15- (also has pathtext z16-) -highway-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) highway-service-driveway # line z16- (also has pathtext z16-) highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z15- (also has pathtext z16-) +highway-service-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) # highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) === 222 +# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail::dash # line::dash z16- (also has line z11-) @@ -327,6 +329,7 @@ highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (a === 153 highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) +highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) @@ -339,7 +342,7 @@ highway-residential-bridge::bridgewhite # line::bridgewhite z14- (al highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z15-, line::bridgeblack z16-, pathtext z16-) +highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) @@ -362,6 +365,7 @@ railway-subway-bridge::bridgewhite # line::bridgewhite z13- (al === 150 highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) +highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) @@ -374,7 +378,7 @@ highway-residential-bridge::bridgeblack # line::bridgeblack z14- (al highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) @@ -400,7 +404,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 caption z17-) +building-train_station # area z14- (also has icon z17-, caption(optional) z17-) === 130 piste:type-connection # line z15- diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 9f0d4b706..7c4768ba3 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -111,7 +111,7 @@ natural-water-lake # caption z10- (also has are natural-water-reservoir # caption z10- (also has area z1-) === 6650 -barrier-toll_booth # icon z12- (also has caption(optional) z14-) +barrier-toll_booth # icon z16- (also has caption(optional) z16-) === 6600 historic-ruins # icon z17- (also has caption(optional) z17-) @@ -550,7 +550,7 @@ railway-subway_entrance-yokohama # icon z16- (also has captio railway-tram_stop # icon z14- (also has caption(optional) z17-) === 3650 -highway-bus_stop # icon z16- (also has caption(optional) z17-) +highway-bus_stop # icon z15- (also has caption(optional) z17-) === 3600 amenity-drinking_water # icon z17- (also has caption(optional) z18-) @@ -574,6 +574,7 @@ natural-beach-gravel # caption z15- (also has are natural-beach-sand # caption z15- (also has area z10-) natural-cape # caption z14- natural-desert # caption z14- (also has area z1-) +natural-sand # caption z15- (also has area z1-) === 3250 shop-supermarket # icon z16- (also has caption(optional) z16-) @@ -736,10 +737,10 @@ highway-track-tunnel # pathtext z15- (also has li highway-service # pathtext z16- (also has line z15-) highway-service-area # pathtext z16- (also has line z15-) -highway-service-bridge # pathtext z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z16-) +highway-service-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-service-driveway # pathtext z16- (also has line z16-) highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line z15-) +highway-service-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) piste:type-downhill # pathtext z15- (also has line z14-) piste:type-downhill-advanced # pathtext z15- (also has line z14-) piste:type-downhill-easy # pathtext z15- (also has line z14-) @@ -773,6 +774,7 @@ 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 @@ -843,6 +845,8 @@ shop-antiques # icon z16- (also has captio shop-appliance # icon z18- (also has caption(optional) z18-) shop-baby_goods # icon z18- (also has caption(optional) z18-) shop-beauty # icon z16- (also has caption(optional) z16-) +shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +shop-beauty-nails # icon z16- (also has caption(optional) z16-) shop-beverages # icon z16- (also has caption(optional) z16-) shop-boutique # icon z18- (also has caption(optional) z18-) shop-car_repair # icon z16- (also has caption(optional) z16-) @@ -866,6 +870,7 @@ 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-) @@ -888,8 +893,8 @@ leisure-dog_park # icon z16- (also has captio === 2300 highway-busway # pathtext z16- (also has line z15-) -highway-busway-bridge # pathtext z16- (also has line z15-) -highway-busway-tunnel # pathtext z16- (also has line z15-) +highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) === 2250 amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) @@ -916,7 +921,7 @@ natural-wetland-tidalflat # caption z16- (also has are tourism-picnic_site # icon z16- (also has caption(optional) z16-) === 1800 -building-train_station # caption z17- (also has area z14-) +building-train_station # icon z17- (also has caption(optional) z17-, area z14-) railway-level_crossing # icon z17- === 1700 @@ -965,10 +970,15 @@ amenity-car_wash # icon z17- (also has captio amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) amenity-driving_school # icon z17- (also has caption(optional) z17-) +amenity-flight_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-prep_school # icon z17- (also has caption(optional) z17-) amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +amenity-sailing_school # icon z17- (also has caption(optional) z17-) amenity-veterinary # icon z16- (also has caption(optional) z16-) craft-electrician # icon z17- (also has caption(optional) z18-) craft-electronics_repair # icon z17- (also has caption(optional) z18-) @@ -985,6 +995,7 @@ leisure-escape_game # icon z17- (also has captio leisure-fitness_centre # icon z16- (also has caption(optional) z17-) leisure-hackerspace # icon z17- (also has caption(optional) z17-) leisure-sauna # icon z17- (also has caption(optional) z17-) +man_made-observatory # icon z16- (also has caption(optional) z16-) office-estate_agent # icon z18- (also has caption(optional) z18-) office-government # icon z18- (also has caption(optional) z18-) office-insurance # icon z18- (also has caption(optional) z18-) @@ -1130,6 +1141,8 @@ amenity-vending_machine-public_transport_tickets # icon z17- (also has captio amenity-water_point-drinking_water_no # icon z18- (also has caption(optional) z18-) highway-elevator # icon z17- leisure-picnic_table # icon z17- (also has caption(optional) z17-) +man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +man_made-telescope-radio # icon z17- (also has caption(optional) z17-) man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-) man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-) natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-) @@ -1139,6 +1152,10 @@ isoline-step_10 # pathtext z17- (also has li isoline-zero # pathtext z17- (also has line z15-) === 1000 +social_facility-food_bank # icon z17- (also has caption(optional) z17-) +social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +=== 851 + amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) amenity-nursing_home # icon z17- (also has caption(optional) z17-) @@ -1200,6 +1217,7 @@ 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-) @@ -1250,6 +1268,7 @@ power-portal # icon z19- power-tower # icon z19- === 450 +amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) @@ -1282,9 +1301,44 @@ power-plant-wind # icon z15- (also has captio === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) -entrance-main # icon z16- (also has caption(optional) z18-) +entrance-main # icon z17- (also has caption(optional) z18-) +=== 225 + +entrance # icon z18- (also has caption(optional) z19-) +entrance-entry # icon z17- (also has caption(optional) z19-) +entrance-exit # icon z17- (also has caption(optional) z19-) === 220 +spherical_buoy-cardinal-east # icon z17- +spherical_buoy-cardinal-north # icon z17- +spherical_buoy-cardinal-south # icon z17- +spherical_buoy-cardinal-west # icon z17- +spherical_buoy-isolated_danger # icon z17- +spherical_buoy-lateral-port # icon z17- +spherical_buoy-lateral-starboard # icon z17- +spherical_buoy-safe_water # icon z17- +spherical_buoy-special_purpose # icon z17- +=== 216 + +beacon-cardinal-east # icon z16- +beacon-cardinal-north # icon z16- +beacon-cardinal-south # icon z16- +beacon-cardinal-west # icon z16- +beacon-isolated_danger # icon z16- +beacon-lateral-port # icon z16- +beacon-lateral-starboard # icon z16- +beacon-safe_water # icon z16- +beacon-special_purpose # icon z16- +buoy-cardinal-east # icon z16- +buoy-cardinal-north # icon z16- +buoy-cardinal-south # icon z16- +buoy-cardinal-west # icon z16- +buoy-isolated_danger # icon z16- +buoy-lateral-port # icon z16- +buoy-lateral-starboard # icon z16- +buoy-safe_water # icon z16- +buoy-special_purpose # icon z16- +entrance-emergency # icon z20- (also has caption(optional) z20-) highway-traffic_signals # icon z19- === 215 @@ -1316,7 +1370,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 # caption z17- +leisure-slipway # icon z17- (also has caption(optional) 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-) @@ -1367,7 +1421,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-nature_reserve # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17) # === -3300 -# barrier-toll_booth # caption(optional) z14- (also has icon z12-) +# barrier-toll_booth # caption(optional) z16- (also has icon z16-) # === -3400 # historic-ruins # caption(optional) z17- (also has icon z17-) @@ -1762,7 +1816,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-tram_stop # caption(optional) z17- (also has icon z14-) # === -6350 -# highway-bus_stop # caption(optional) z17- (also has icon z16-) +# highway-bus_stop # caption(optional) z17- (also has icon z15-) # === -6400 # amenity-drinking_water # caption(optional) z18- (also has icon z17-) @@ -1810,6 +1864,7 @@ 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 @@ -1876,6 +1931,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-appliance # caption(optional) z18- (also has icon z18-) # shop-baby_goods # caption(optional) z18- (also has icon z18-) # shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) # shop-beverages # caption(optional) z16- (also has icon z16-) # shop-boutique # caption(optional) z18- (also has icon z18-) # shop-car_repair # caption(optional) z16- (also has icon z16-) @@ -1899,6 +1956,7 @@ 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-) @@ -1934,6 +1992,9 @@ 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 @@ -1976,10 +2037,15 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) # amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_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-prep_school # caption(optional) z17- (also has icon z17-) # amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) # amenity-veterinary # caption(optional) z16- (also has icon z16-) # craft-electrician # caption(optional) z18- (also has icon z17-) # craft-electronics_repair # caption(optional) z18- (also has icon z17-) @@ -1996,6 +2062,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-fitness_centre # caption(optional) z17- (also has icon z16-) # leisure-hackerspace # caption(optional) z17- (also has icon z17-) # leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z16-) # office-estate_agent # caption(optional) z18- (also has icon z18-) # office-government # caption(optional) z18- (also has icon z18-) # office-insurance # caption(optional) z18- (also has icon z18-) @@ -2136,11 +2203,17 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) # amenity-water_point-drinking_water_no # caption(optional) z18- (also has icon z18-) # leisure-picnic_table # caption(optional) z17- (also has icon z17-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) # man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-) # man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-) # natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) # === -8800 +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + # amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) # amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) # amenity-nursing_home # caption(optional) z17- (also has icon z17-) @@ -2188,6 +2261,7 @@ 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-) @@ -2223,6 +2297,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop # caption(optional) z18- (also has icon z18-) # === -9530 +xmas-tree # icon z18- +=== -9540 + # amenity-bbq # caption(optional) z18- (also has icon z18-) # amenity-luggage_locker # caption(optional) z19- (also has icon z17-) # amenity-public_bookcase # caption(optional) z18- (also has icon z18-) @@ -2233,6 +2310,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # man_made-water_tower # caption(optional) z18- (also has icon z16-) # === -9550 +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) @@ -2256,9 +2334,17 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9770 # barrier-entrance # caption(optional) z16- (also has icon z16-) -# entrance-main # caption(optional) z18- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) # === -9780 +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + # historic-anchor # caption(optional) z18- (also has icon z18-) # historic-cannon # caption(optional) z18- (also has icon z18-) # historic-memorial-plaque # caption(optional) z18- (also has icon z18-) @@ -2278,6 +2364,7 @@ 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 @@ -2299,13 +2386,18 @@ tourism-information # icon z16- (also has captio tourism-information-board # icon z16- (also has caption(optional) z16-) tourism-information-guidepost # icon z16- (also has caption(optional) z16-) tourism-information-map # icon z16- (also has caption(optional) z16-) -=== -9950 +=== -9940 amenity # caption z19- amenity-telephone # icon z17- (also has caption(optional) z19-) -entrance # icon z17- (also has caption(optional) z19-) +entrance-house # icon z18- (also has caption(optional) z19-) +=== -9950 + +entrance-garage # icon z19- (also has caption(optional) z19-) === -9960 +amenity-food_sharing # icon z18- (also has caption(optional) z18-) +amenity-give_box # icon z18- (also has caption(optional) z18-) amenity-parking_space # caption z19- amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) amenity-parking_space-permissive # caption z19- @@ -2321,26 +2413,35 @@ amenity-vending_machine-food # icon z18- (also has captio amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) building-address # caption z16- +man_made-telescope-optical # icon z17- (also has caption(optional) z17-) === -9970 amenity-bench # icon z18- (also has caption(optional) z19-) amenity-bench-backless # icon z18- (also has caption(optional) z19-) amenity-lounger # icon z18- (also has caption(optional) z19-) amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +emergency-access_point # icon z18- (also has caption(optional) z18-) emergency-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) -emergency-phone # icon z17- +emergency-phone # icon z17- (also has caption(optional) z19-) +man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 amenity-waste_basket # icon z18- (also has caption(optional) z19-) emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +emergency-life_ring # icon z19- (also has caption(optional) z19-) power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 +natural-tree # icon z18- +=== -9991 + # amenity-bench # caption(optional) z19- (also has icon z18-) # amenity-bench-backless # caption(optional) z19- (also has icon z18-) -amenity-loading_dock # icon z18- (also has caption(optional) z19-) -# amenity-loading_dock # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) # amenity-lounger # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) @@ -2355,14 +2456,20 @@ amenity-loading_dock # icon z18- (also has captio # amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) # amenity-waste_basket # caption(optional) z19- (also has icon z18-) # amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) # emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) -# entrance # caption(optional) z19- (also has icon z17-) -entrance-exit # icon z17- (also has caption(optional) z19-) -# entrance-exit # caption(optional) z19- (also has icon z17-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) # man_made-cairn # caption(optional) z19- (also has icon z19-) # man_made-survey_point # caption(optional) z18- (also has icon z18-) +# man_made-telescope # caption(optional) z18- (also has icon z18-) +# man_made-telescope-optical # caption(optional) z17- (also has icon z17-) # power-substation # caption(optional) z18- (also has icon z17-, area z13-) # tourism-information # caption(optional) z16- (also has icon z16-) # tourism-information-board # caption(optional) z16- (also has icon z16-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 51bfd0191..0755a0dec 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -51,6 +51,7 @@ @wetland_swamp: #A1D4B7; @wetland_mangrove: #A2D4B0; @beach: #FADDA0; +@sand: #F7E4C3; @barerock: #D9D2BF; @scree: #CCC7BA; @desert: #F4E5C8; @@ -240,6 +241,7 @@ @neutral_label: #494F54; @healthcare_label: #A6454B; @public_transport_label: #234B73; +@emergency_label: #247F52; /* 6.4 Road labels */ diff --git a/data/styles/default/light/symbols/access_point-m.svg b/data/styles/default/light/symbols/access_point-m.svg new file mode 100644 index 000000000..e04adca21 --- /dev/null +++ b/data/styles/default/light/symbols/access_point-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/assembly_point-m.svg b/data/styles/default/light/symbols/assembly_point-m.svg index c21a96e36..fe7bcab6f 100644 --- a/data/styles/default/light/symbols/assembly_point-m.svg +++ b/data/styles/default/light/symbols/assembly_point-m.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-east-m.svg b/data/styles/default/light/symbols/beacon-cardinal-east-m.svg new file mode 100644 index 000000000..391be5427 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-east-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-east-s.svg b/data/styles/default/light/symbols/beacon-cardinal-east-s.svg new file mode 100644 index 000000000..18990b053 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-east-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-north-m.svg b/data/styles/default/light/symbols/beacon-cardinal-north-m.svg new file mode 100644 index 000000000..d12dc9d59 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-north-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-north-s.svg b/data/styles/default/light/symbols/beacon-cardinal-north-s.svg new file mode 100644 index 000000000..a380d8442 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-north-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-south-m.svg b/data/styles/default/light/symbols/beacon-cardinal-south-m.svg new file mode 100644 index 000000000..6c3e5fcbc --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-south-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-south-s.svg b/data/styles/default/light/symbols/beacon-cardinal-south-s.svg new file mode 100644 index 000000000..9eb6bef0b --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-south-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-west-m.svg b/data/styles/default/light/symbols/beacon-cardinal-west-m.svg new file mode 100644 index 000000000..3af98e0c0 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-west-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-cardinal-west-s.svg b/data/styles/default/light/symbols/beacon-cardinal-west-s.svg new file mode 100644 index 000000000..7e1637a12 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-cardinal-west-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-isolated_danger-m.svg b/data/styles/default/light/symbols/beacon-isolated_danger-m.svg new file mode 100644 index 000000000..ae4e747a9 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-isolated_danger-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-isolated_danger-s.svg b/data/styles/default/light/symbols/beacon-isolated_danger-s.svg new file mode 100644 index 000000000..17594c831 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-isolated_danger-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-lateral-port-m.svg b/data/styles/default/light/symbols/beacon-lateral-port-m.svg new file mode 100644 index 000000000..482ddfdea --- /dev/null +++ b/data/styles/default/light/symbols/beacon-lateral-port-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-lateral-port-s.svg b/data/styles/default/light/symbols/beacon-lateral-port-s.svg new file mode 100644 index 000000000..c0efacd6e --- /dev/null +++ b/data/styles/default/light/symbols/beacon-lateral-port-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg b/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg new file mode 100644 index 000000000..e21878379 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-lateral-starboard-s.svg b/data/styles/default/light/symbols/beacon-lateral-starboard-s.svg new file mode 100644 index 000000000..d58a8739a --- /dev/null +++ b/data/styles/default/light/symbols/beacon-lateral-starboard-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-safe_water-m.svg b/data/styles/default/light/symbols/beacon-safe_water-m.svg new file mode 100644 index 000000000..935243f5c --- /dev/null +++ b/data/styles/default/light/symbols/beacon-safe_water-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-safe_water-s.svg b/data/styles/default/light/symbols/beacon-safe_water-s.svg new file mode 100644 index 000000000..329365691 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-safe_water-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-special_purpose-m.svg b/data/styles/default/light/symbols/beacon-special_purpose-m.svg new file mode 100644 index 000000000..52b2371b0 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-special_purpose-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/beacon-special_purpose-s.svg b/data/styles/default/light/symbols/beacon-special_purpose-s.svg new file mode 100644 index 000000000..254bac173 --- /dev/null +++ b/data/styles/default/light/symbols/beacon-special_purpose-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/bicycle-rental-xm.svg b/data/styles/default/light/symbols/bicycle-rental-xm.svg new file mode 100644 index 000000000..2599d7fd4 --- /dev/null +++ b/data/styles/default/light/symbols/bicycle-rental-xm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/bicycle-rental.svg b/data/styles/default/light/symbols/bicycle-rental.svg deleted file mode 100644 index 7773cfe17..000000000 --- a/data/styles/default/light/symbols/bicycle-rental.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - bike-parking-m - - - - - - - diff --git a/data/styles/default/light/symbols/boat_rental-m.svg b/data/styles/default/light/symbols/boat_rental-m.svg new file mode 100644 index 000000000..c1e64b03e --- /dev/null +++ b/data/styles/default/light/symbols/boat_rental-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/boating_school-m.svg b/data/styles/default/light/symbols/boating_school-m.svg new file mode 100644 index 000000000..4a6e2561a --- /dev/null +++ b/data/styles/default/light/symbols/boating_school-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-east-m.svg b/data/styles/default/light/symbols/buoy-cardinal-east-m.svg new file mode 100644 index 000000000..90c7f36e2 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-east-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-east-s.svg b/data/styles/default/light/symbols/buoy-cardinal-east-s.svg new file mode 100644 index 000000000..aed209ca2 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-east-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-north-m.svg b/data/styles/default/light/symbols/buoy-cardinal-north-m.svg new file mode 100644 index 000000000..d0762984c --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-north-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-north-s.svg b/data/styles/default/light/symbols/buoy-cardinal-north-s.svg new file mode 100644 index 000000000..a348fec82 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-north-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-south-m.svg b/data/styles/default/light/symbols/buoy-cardinal-south-m.svg new file mode 100644 index 000000000..ccdcd7a40 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-south-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-south-s.svg b/data/styles/default/light/symbols/buoy-cardinal-south-s.svg new file mode 100644 index 000000000..9b137c3d6 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-south-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-west-m.svg b/data/styles/default/light/symbols/buoy-cardinal-west-m.svg new file mode 100644 index 000000000..bdec72153 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-west-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-cardinal-west-s.svg b/data/styles/default/light/symbols/buoy-cardinal-west-s.svg new file mode 100644 index 000000000..60dfa8723 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-cardinal-west-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-isolated_danger-m.svg b/data/styles/default/light/symbols/buoy-isolated_danger-m.svg new file mode 100644 index 000000000..2d1281728 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-isolated_danger-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-isolated_danger-s.svg b/data/styles/default/light/symbols/buoy-isolated_danger-s.svg new file mode 100644 index 000000000..1adda3919 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-isolated_danger-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-lateral-port-m.svg b/data/styles/default/light/symbols/buoy-lateral-port-m.svg new file mode 100644 index 000000000..170624bc6 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-lateral-port-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-lateral-port-s.svg b/data/styles/default/light/symbols/buoy-lateral-port-s.svg new file mode 100644 index 000000000..5bdfc7037 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-lateral-port-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg b/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg new file mode 100644 index 000000000..2613ea5dc --- /dev/null +++ b/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-lateral-starboard-s.svg b/data/styles/default/light/symbols/buoy-lateral-starboard-s.svg new file mode 100644 index 000000000..eb2b5a2f5 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-lateral-starboard-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-safe_water-m.svg b/data/styles/default/light/symbols/buoy-safe_water-m.svg new file mode 100644 index 000000000..0a661cad9 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-safe_water-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-safe_water-s.svg b/data/styles/default/light/symbols/buoy-safe_water-s.svg new file mode 100644 index 000000000..e2b71692b --- /dev/null +++ b/data/styles/default/light/symbols/buoy-safe_water-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-special_purpose-m.svg b/data/styles/default/light/symbols/buoy-special_purpose-m.svg new file mode 100644 index 000000000..15856905d --- /dev/null +++ b/data/styles/default/light/symbols/buoy-special_purpose-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-special_purpose-s.svg b/data/styles/default/light/symbols/buoy-special_purpose-s.svg new file mode 100644 index 000000000..9084f9801 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-special_purpose-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg new file mode 100644 index 000000000..b8862e66d --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-east-s.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-east-s.svg new file mode 100644 index 000000000..04daab17b --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-east-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg new file mode 100644 index 000000000..cd31b8750 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-north-s.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-north-s.svg new file mode 100644 index 000000000..4af52f870 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-north-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg new file mode 100644 index 000000000..91902864f --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-south-s.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-south-s.svg new file mode 100644 index 000000000..444f3fe65 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-south-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg new file mode 100644 index 000000000..338dea289 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-west-s.svg b/data/styles/default/light/symbols/buoy-spherical-cardinal-west-s.svg new file mode 100644 index 000000000..28d651e1e --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-cardinal-west-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg b/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg new file mode 100644 index 000000000..baac72971 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-isolated_danger-s.svg b/data/styles/default/light/symbols/buoy-spherical-isolated_danger-s.svg new file mode 100644 index 000000000..9e226427b --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-isolated_danger-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg b/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg new file mode 100644 index 000000000..ab1fa931a --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-port-s.svg b/data/styles/default/light/symbols/buoy-spherical-lateral-port-s.svg new file mode 100644 index 000000000..9dd4641ca --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-lateral-port-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg b/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg new file mode 100644 index 000000000..374dcce39 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-s.svg b/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-s.svg new file mode 100644 index 000000000..d2ef2167c --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg b/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg new file mode 100644 index 000000000..396be7129 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-safe_water-s.svg b/data/styles/default/light/symbols/buoy-spherical-safe_water-s.svg new file mode 100644 index 000000000..94edd7066 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-safe_water-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg b/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg new file mode 100644 index 000000000..0a1ebb4a3 --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/buoy-spherical-special_purpose-s.svg b/data/styles/default/light/symbols/buoy-spherical-special_purpose-s.svg new file mode 100644 index 000000000..55d60b63d --- /dev/null +++ b/data/styles/default/light/symbols/buoy-spherical-special_purpose-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/bus-m.svg b/data/styles/default/light/symbols/bus-m.svg deleted file mode 100644 index 83a49048f..000000000 --- a/data/styles/default/light/symbols/bus-m.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/styles/default/light/symbols/bus-s.svg b/data/styles/default/light/symbols/bus-s.svg deleted file mode 100644 index 64fbec9aa..000000000 --- a/data/styles/default/light/symbols/bus-s.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/styles/default/light/symbols/bus-xm.svg b/data/styles/default/light/symbols/bus-xm.svg new file mode 100644 index 000000000..6c63f72a0 --- /dev/null +++ b/data/styles/default/light/symbols/bus-xm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/bus-xs.svg b/data/styles/default/light/symbols/bus-xs.svg new file mode 100644 index 000000000..17834be2d --- /dev/null +++ b/data/styles/default/light/symbols/bus-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/bus-xvs.svg b/data/styles/default/light/symbols/bus-xvs.svg new file mode 100644 index 000000000..ec1b79e57 --- /dev/null +++ b/data/styles/default/light/symbols/bus-xvs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/christmas-tree-m.svg b/data/styles/default/light/symbols/christmas-tree-m.svg new file mode 100644 index 000000000..45181a263 --- /dev/null +++ b/data/styles/default/light/symbols/christmas-tree-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/day-spa-m.svg b/data/styles/default/light/symbols/day-spa-m.svg new file mode 100644 index 000000000..68a0b3bb1 --- /dev/null +++ b/data/styles/default/light/symbols/day-spa-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/driving_school-m.svg b/data/styles/default/light/symbols/driving_school-m.svg index 228ea9350..f463e9abd 100644 --- a/data/styles/default/light/symbols/driving_school-m.svg +++ b/data/styles/default/light/symbols/driving_school-m.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/light/symbols/emergency-exit-m.svg b/data/styles/default/light/symbols/emergency-exit-m.svg new file mode 100644 index 000000000..6a4fa4224 --- /dev/null +++ b/data/styles/default/light/symbols/emergency-exit-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-barrier-m.svg b/data/styles/default/light/symbols/entrance-barrier-m.svg new file mode 100644 index 000000000..a9b4977d2 --- /dev/null +++ b/data/styles/default/light/symbols/entrance-barrier-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-barrier-s.svg b/data/styles/default/light/symbols/entrance-barrier-s.svg deleted file mode 100644 index 1e4b437ed..000000000 --- a/data/styles/default/light/symbols/entrance-barrier-s.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/styles/default/light/symbols/entrance-barrier-xs.svg b/data/styles/default/light/symbols/entrance-barrier-xs.svg new file mode 100644 index 000000000..4319c3a94 --- /dev/null +++ b/data/styles/default/light/symbols/entrance-barrier-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-emergency-m.svg b/data/styles/default/light/symbols/entrance-emergency-m.svg new file mode 100644 index 000000000..ef1dbcf5a --- /dev/null +++ b/data/styles/default/light/symbols/entrance-emergency-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-emergency-s.svg b/data/styles/default/light/symbols/entrance-emergency-s.svg deleted file mode 100644 index 3c42eafed..000000000 --- a/data/styles/default/light/symbols/entrance-emergency-s.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/styles/default/light/symbols/entrance-emergency-xs.svg b/data/styles/default/light/symbols/entrance-emergency-xs.svg new file mode 100644 index 000000000..6091aee35 --- /dev/null +++ b/data/styles/default/light/symbols/entrance-emergency-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-entry-m.svg b/data/styles/default/light/symbols/entrance-entry-m.svg new file mode 100644 index 000000000..9cde79c9c --- /dev/null +++ b/data/styles/default/light/symbols/entrance-entry-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-entry-xs.svg b/data/styles/default/light/symbols/entrance-entry-xs.svg new file mode 100644 index 000000000..e9f23e86d --- /dev/null +++ b/data/styles/default/light/symbols/entrance-entry-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-exit-m.svg b/data/styles/default/light/symbols/entrance-exit-m.svg new file mode 100644 index 000000000..cad2be484 --- /dev/null +++ b/data/styles/default/light/symbols/entrance-exit-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-exit-s.svg b/data/styles/default/light/symbols/entrance-exit-s.svg deleted file mode 100644 index c9b6c1a6b..000000000 --- a/data/styles/default/light/symbols/entrance-exit-s.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/default/light/symbols/entrance-exit-xs.svg b/data/styles/default/light/symbols/entrance-exit-xs.svg new file mode 100644 index 000000000..4f3c60f5a --- /dev/null +++ b/data/styles/default/light/symbols/entrance-exit-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-m.svg b/data/styles/default/light/symbols/entrance-m.svg new file mode 100644 index 000000000..9701d9d6a --- /dev/null +++ b/data/styles/default/light/symbols/entrance-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-main-m.svg b/data/styles/default/light/symbols/entrance-main-m.svg new file mode 100644 index 000000000..b476a24ca --- /dev/null +++ b/data/styles/default/light/symbols/entrance-main-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-main-s.svg b/data/styles/default/light/symbols/entrance-main-s.svg deleted file mode 100644 index 1ce9334c7..000000000 --- a/data/styles/default/light/symbols/entrance-main-s.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/styles/default/light/symbols/entrance-main-xs.svg b/data/styles/default/light/symbols/entrance-main-xs.svg new file mode 100644 index 000000000..f3cbfe19b --- /dev/null +++ b/data/styles/default/light/symbols/entrance-main-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-s.svg b/data/styles/default/light/symbols/entrance-s.svg deleted file mode 100644 index a9020b79a..000000000 --- a/data/styles/default/light/symbols/entrance-s.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/default/light/symbols/entrance-service-m.svg b/data/styles/default/light/symbols/entrance-service-m.svg new file mode 100644 index 000000000..0e4087572 --- /dev/null +++ b/data/styles/default/light/symbols/entrance-service-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-service-xs.svg b/data/styles/default/light/symbols/entrance-service-xs.svg new file mode 100644 index 000000000..fda59bc4e --- /dev/null +++ b/data/styles/default/light/symbols/entrance-service-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/entrance-xs.svg b/data/styles/default/light/symbols/entrance-xs.svg new file mode 100644 index 000000000..242c59888 --- /dev/null +++ b/data/styles/default/light/symbols/entrance-xs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/flying_school-m.svg b/data/styles/default/light/symbols/flying_school-m.svg new file mode 100644 index 000000000..4e39a99a4 --- /dev/null +++ b/data/styles/default/light/symbols/flying_school-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/food_bank-m.svg b/data/styles/default/light/symbols/food_bank-m.svg new file mode 100644 index 000000000..2935d83b1 --- /dev/null +++ b/data/styles/default/light/symbols/food_bank-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/food_sharing-m.svg b/data/styles/default/light/symbols/food_sharing-m.svg new file mode 100644 index 000000000..93bef8e37 --- /dev/null +++ b/data/styles/default/light/symbols/food_sharing-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/give_box-m.svg b/data/styles/default/light/symbols/give_box-m.svg new file mode 100644 index 000000000..cd3b2a392 --- /dev/null +++ b/data/styles/default/light/symbols/give_box-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/indoor_play-m.svg b/data/styles/default/light/symbols/indoor_play-m.svg new file mode 100644 index 000000000..616825c5f --- /dev/null +++ b/data/styles/default/light/symbols/indoor_play-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/language_school-m.svg b/data/styles/default/light/symbols/language_school-m.svg index 16fcbcf6d..87bf924ec 100644 --- a/data/styles/default/light/symbols/language_school-m.svg +++ b/data/styles/default/light/symbols/language_school-m.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/light/symbols/lifebuoy-m.svg b/data/styles/default/light/symbols/lifebuoy-m.svg new file mode 100644 index 000000000..f634a553f --- /dev/null +++ b/data/styles/default/light/symbols/lifebuoy-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/marina-m.svg b/data/styles/default/light/symbols/marina-m.svg index ed4323c67..43c280858 100644 --- a/data/styles/default/light/symbols/marina-m.svg +++ b/data/styles/default/light/symbols/marina-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/music_school-m.svg b/data/styles/default/light/symbols/music_school-m.svg index db159328b..8210070a2 100644 --- a/data/styles/default/light/symbols/music_school-m.svg +++ b/data/styles/default/light/symbols/music_school-m.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/light/symbols/nails-m.svg b/data/styles/default/light/symbols/nails-m.svg new file mode 100644 index 000000000..6d4781cc5 --- /dev/null +++ b/data/styles/default/light/symbols/nails-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/observatory-m.svg b/data/styles/default/light/symbols/observatory-m.svg new file mode 100644 index 000000000..b6dfbcfaf --- /dev/null +++ b/data/styles/default/light/symbols/observatory-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/parking_pooling-m.svg b/data/styles/default/light/symbols/parking_pooling-m.svg new file mode 100644 index 000000000..3042d2538 --- /dev/null +++ b/data/styles/default/light/symbols/parking_pooling-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/parking_pooling-s.svg b/data/styles/default/light/symbols/parking_pooling-s.svg new file mode 100644 index 000000000..8f210c3f9 --- /dev/null +++ b/data/styles/default/light/symbols/parking_pooling-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/prep_school-m.svg b/data/styles/default/light/symbols/prep_school-m.svg new file mode 100644 index 000000000..3dec7764d --- /dev/null +++ b/data/styles/default/light/symbols/prep_school-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_blue-scaled.svg b/data/styles/default/light/symbols/shield-highway_hexagon_blue-scaled.svg new file mode 100644 index 000000000..bf5c2da0d --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_blue-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_blue.svg b/data/styles/default/light/symbols/shield-highway_hexagon_blue.svg new file mode 100644 index 000000000..9f16aab38 --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_blue.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_green-scaled.svg b/data/styles/default/light/symbols/shield-highway_hexagon_green-scaled.svg new file mode 100644 index 000000000..9af7136cb --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_green-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_green.svg b/data/styles/default/light/symbols/shield-highway_hexagon_green.svg new file mode 100644 index 000000000..e3822683d --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_green.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_red-scaled.svg b/data/styles/default/light/symbols/shield-highway_hexagon_red-scaled.svg new file mode 100644 index 000000000..ebcfd8330 --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_red-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_red.svg b/data/styles/default/light/symbols/shield-highway_hexagon_red.svg new file mode 100644 index 000000000..4b7df5455 --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_red.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_turkey-scaled.svg b/data/styles/default/light/symbols/shield-highway_hexagon_turkey-scaled.svg new file mode 100644 index 000000000..1d741d638 --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_turkey-scaled.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_turkey.svg b/data/styles/default/light/symbols/shield-highway_hexagon_turkey.svg new file mode 100644 index 000000000..b71b08f57 --- /dev/null +++ b/data/styles/default/light/symbols/shield-highway_hexagon_turkey.svg @@ -0,0 +1,14 @@ + + + + diff --git a/data/styles/default/light/symbols/shield-hungary-blue-scaled.svg b/data/styles/default/light/symbols/shield-hungary-blue-scaled.svg new file mode 100644 index 000000000..9901641bf --- /dev/null +++ b/data/styles/default/light/symbols/shield-hungary-blue-scaled.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/light/symbols/shield-hungary-blue.svg b/data/styles/default/light/symbols/shield-hungary-blue.svg new file mode 100644 index 000000000..8075dc832 --- /dev/null +++ b/data/styles/default/light/symbols/shield-hungary-blue.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/light/symbols/shield-hungary-green-scaled.svg b/data/styles/default/light/symbols/shield-hungary-green-scaled.svg new file mode 100644 index 000000000..c12202566 --- /dev/null +++ b/data/styles/default/light/symbols/shield-hungary-green-scaled.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/light/symbols/shield-hungary-green.svg b/data/styles/default/light/symbols/shield-hungary-green.svg new file mode 100644 index 000000000..23b0bf35a --- /dev/null +++ b/data/styles/default/light/symbols/shield-hungary-green.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/data/styles/default/light/symbols/slipway-m.svg b/data/styles/default/light/symbols/slipway-m.svg new file mode 100644 index 000000000..2893bcd9b --- /dev/null +++ b/data/styles/default/light/symbols/slipway-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/soup_kitchen-m.svg b/data/styles/default/light/symbols/soup_kitchen-m.svg new file mode 100644 index 000000000..a0513fdb4 --- /dev/null +++ b/data/styles/default/light/symbols/soup_kitchen-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/square-m.svg b/data/styles/default/light/symbols/square-m.svg deleted file mode 100644 index 3aa3b21de..000000000 --- a/data/styles/default/light/symbols/square-m.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/styles/default/light/symbols/taxi-m.svg b/data/styles/default/light/symbols/taxi-m.svg deleted file mode 100644 index 3405253fb..000000000 --- a/data/styles/default/light/symbols/taxi-m.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/data/styles/default/light/symbols/taxi-xm.svg b/data/styles/default/light/symbols/taxi-xm.svg new file mode 100644 index 000000000..c6f831339 --- /dev/null +++ b/data/styles/default/light/symbols/taxi-xm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-gamma-m.svg b/data/styles/default/light/symbols/telescope-gamma-m.svg new file mode 100644 index 000000000..cf6949a0b --- /dev/null +++ b/data/styles/default/light/symbols/telescope-gamma-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-m.svg b/data/styles/default/light/symbols/telescope-m.svg new file mode 100644 index 000000000..747d7da42 --- /dev/null +++ b/data/styles/default/light/symbols/telescope-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-optical-m.svg b/data/styles/default/light/symbols/telescope-optical-m.svg new file mode 100644 index 000000000..4fd3b184e --- /dev/null +++ b/data/styles/default/light/symbols/telescope-optical-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/telescope-radio-m.svg b/data/styles/default/light/symbols/telescope-radio-m.svg new file mode 100644 index 000000000..e8b0fdb7a --- /dev/null +++ b/data/styles/default/light/symbols/telescope-radio-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/train_building-m.svg b/data/styles/default/light/symbols/train_building-m.svg new file mode 100644 index 000000000..d097ca4f5 --- /dev/null +++ b/data/styles/default/light/symbols/train_building-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/tree-m.svg b/data/styles/default/light/symbols/tree-m.svg new file mode 100644 index 000000000..7bcaa47c4 --- /dev/null +++ b/data/styles/default/light/symbols/tree-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 5e6532c57..fd90ca79d 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -148,6 +148,105 @@ node|z15-[man_made=water_well][drinking_water=not], node|z15-[amenity=water_point][drinking_water=not], {icon-image: drinking-water-no-m.svg;} + +/* 3.5 Ferry terminal & seamarks */ + +node|z13-15[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port], +{icon-image: buoy-lateral-port-s.svg;} +node|z13-15[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard], +{icon-image: buoy-lateral-starboard-s.svg;} +node|z13-15[seamark:type=buoy_isolated_danger], +{icon-image: buoy-isolated_danger-s.svg;} +node|z13-15[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east], +{icon-image: buoy-cardinal-east-s.svg;} +node|z13-15[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west], +{icon-image: buoy-cardinal-west-s.svg;} +node|z13-15[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south], +{icon-image: buoy-cardinal-south-s.svg;} +node|z13-15[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north], +{icon-image: buoy-cardinal-north-s.svg;} +node|z13-15[seamark:type=buoy_special_purpose], +{icon-image: buoy-special_purpose-s.svg;} +node|z13-15[seamark:type=buoy_safe_water], +{icon-image: buoy-safe_water-s.svg;} + +node|z13-14[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port][seamark:buoy_lateral:shape=spherical], +node|z13-14[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard][seamark:buoy_lateral:shape=spherical], +node|z13-14[seamark:type=buoy_isolated_danger][seamark:buoy_isolated_danger:shape=spherical], +node|z13-14[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east][seamark:buoy_cardinal:shape=spherical], +node|z13-14[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west][seamark:buoy_cardinal:shape=spherical], +node|z13-14[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south][seamark:buoy_cardinal:shape=spherical], +node|z13-14[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north][seamark:buoy_cardinal:shape=spherical], +node|z13-14[seamark:type=buoy_special_purpose][seamark:buoy_special_purpose:shape=spherical], +node|z13-14[seamark:type=buoy_safe_water][seamark:buoy_safe_water:shape=spherical], +{icon-image: none;} + +node|z15-16[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port][seamark:buoy_lateral:shape=spherical], +{icon-image: buoy-spherical-lateral-port-s.svg;} +node|z15-16[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard][seamark:buoy_lateral:shape=spherical], +{icon-image: buoy-spherical-lateral-starboard-s.svg;} +node|z15-16[seamark:type=buoy_isolated_danger][seamark:buoy_isolated_danger:shape=spherical], +{icon-image: buoy-spherical-isolated_danger-s.svg;} +node|z15-16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-east-s.svg;} +node|z15-16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-west-s.svg;} +node|z15-16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-south-s.svg;} +node|z15-16[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north][seamark:buoy_cardinal:shape=spherical], +{icon-image: buoy-spherical-cardinal-north-s.svg;} +node|z15-16[seamark:type=buoy_special_purpose][seamark:buoy_special_purpose:shape=spherical], +{icon-image: buoy-spherical-special_purpose-s.svg;} +node|z15-16[seamark:type=buoy_safe_water][seamark:buoy_safe_water:shape=spherical], +{icon-image: buoy-spherical-safe_water-s.svg;} + +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower], +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice], +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile], +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant], +{icon-image: beacon-lateral-port-s.svg;} +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower], +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice], +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile], +node|z13-15[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant], +{icon-image: beacon-lateral-starboard-s.svg;} +node|z13-15[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=tower], +node|z13-15[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=lattice], +node|z13-15[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=pile], +node|z13-15[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=buoyant], +{icon-image: beacon-isolated_danger-s.svg;} +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-east-s.svg;} +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower][seamark:beacon_cardinal:category=west], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-west-s.svg;} +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-south-s.svg;} +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile], +node|z13-15[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant], +{icon-image: beacon-cardinal-north-s.svg;} +node|z13-15[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=tower], +node|z13-15[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=lattice], +node|z13-15[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=pile], +node|z13-15[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=buoyant], +{icon-image: beacon-special_purpose-s.svg;} +node|z13-15[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=tower], +node|z13-15[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=lattice], +node|z13-15[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=pile], +node|z13-15[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=buoyant], +{icon-image: beacon-safe_water-s.svg;} + + /* 4.TOURISM */ /* 4.2 Apartament */ @@ -269,6 +368,9 @@ node|z16-[man_made=survey_point], area|z14-[highway=rest_area], {icon-image: picnic-m.svg;} +node|z15-[man_made=observatory], +{icon-image: observatory-m.svg;} + node|z15-[amenity=toilets], {icon-image: toilets-m.svg; font-size: 11;} diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index fefb45ae0..ba1f2af8f 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -570,6 +570,18 @@ line|z16-[railway=construction], line|z16-[railway=disused] {width: 1.7; dashes: 2.5,7;} +line|z12[railway=rail][tunnel?], +{opacity:0.8} +line|z13[railway=rail][tunnel?], +{opacity:0.6} +line|z14-[railway=rail][tunnel?], +{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;casing-opacity: 0.3; opacity:0.4} +line|z15[railway=rail][tunnel?], +{casing-opacity: 0.3; opacity:0.3} +line|z16[railway=rail][tunnel?], +{casing-opacity: 0.1; opacity:0.2} +line|z17-[railway=rail][tunnel?], +{casing-opacity: 0.05; opacity:0.1} /* Power lines are good for orienteering */ line|z13-[power=line], diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 8e1c646ed..9bbf1a277 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -140,6 +140,7 @@ railway-platform # area z16- (also has captio amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) @@ -241,6 +242,7 @@ natural-beach-gravel # area z10- (also has captio natural-beach-sand # area z10- (also has caption z14-) natural-desert # area z1- (also has caption z14-) natural-glacier # area z1- +natural-sand # area z1- (also has caption z15-) === 30 natural-land # area z1- diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 3250cfea6..60cdcb0bb 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -198,17 +198,19 @@ highway-tertiary_link-tunnel # line z14- (also has line(c === 223 highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has pathtext z16-) -highway-busway-tunnel # line z15- (also has pathtext z16-) +highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) highway-service # line z13- (also has pathtext z16-) highway-service-area # line z13- (also has pathtext z16-) -highway-service-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) highway-service-driveway # line z16- (also has pathtext z16-) highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z13- (also has pathtext z16-) +highway-service-tunnel # line z13- (also has line(casing) z15-, pathtext z16-) # highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) === 222 +# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z13-, pathtext z16-) railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail::dash # line::dash z15- (also has line z10-) @@ -329,6 +331,7 @@ highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (a === 153 highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) @@ -341,7 +344,7 @@ highway-residential-bridge::bridgewhite # line::bridgewhite z14- (al highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-, pathtext z16-) +highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) @@ -364,6 +367,7 @@ railway-subway-bridge::bridgewhite # line::bridgewhite z13- (al === 150 highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) @@ -376,7 +380,7 @@ highway-residential-bridge::bridgeblack # line::bridgeblack z14- (al highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) @@ -402,7 +406,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 caption z17-) +building-train_station # area z14- (also has icon z17-, caption(optional) z17-) === 130 piste:type-connection # line z15- diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 76fe8f9f1..0df6f546b 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -111,7 +111,7 @@ natural-water-lake # caption z10- (also has are natural-water-reservoir # caption z10- (also has area z1-) === 6650 -barrier-toll_booth # icon z12- (also has caption(optional) z14-) +barrier-toll_booth # icon z16- (also has caption(optional) z16-) === 6600 historic-ruins # icon z17- (also has caption(optional) z17-) @@ -550,7 +550,7 @@ railway-subway_entrance-yokohama # icon z16- (also has captio railway-tram_stop # icon z14- (also has caption(optional) z17-) === 3650 -highway-bus_stop # icon z16- (also has caption(optional) z17-) +highway-bus_stop # icon z15- (also has caption(optional) z17-) === 3600 amenity-drinking_water # icon z12- (also has caption(optional) z14-) @@ -574,6 +574,7 @@ natural-beach-gravel # caption z14- (also has are natural-beach-sand # caption z14- (also has area z10-) natural-cape # caption z14- natural-desert # caption z14- (also has area z1-) +natural-sand # caption z15- (also has area z1-) === 3250 shop-supermarket # icon z16- (also has caption(optional) z16-) @@ -736,10 +737,10 @@ highway-track-tunnel # pathtext z13- (also has li highway-service # pathtext z16- (also has line z13-) highway-service-area # pathtext z16- (also has line z13-) -highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z16-) +highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-) highway-service-driveway # pathtext z16- (also has line z16-) highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line z13-) +highway-service-tunnel # pathtext z16- (also has line z13-, line(casing) z15-) piste:type-downhill # pathtext z15- (also has line z12-) piste:type-downhill-advanced # pathtext z15- (also has line z12-) piste:type-downhill-easy # pathtext z15- (also has line z12-) @@ -773,6 +774,7 @@ 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 @@ -843,6 +845,8 @@ shop-antiques # icon z16- (also has captio shop-appliance # icon z18- (also has caption(optional) z18-) shop-baby_goods # icon z18- (also has caption(optional) z18-) shop-beauty # icon z16- (also has caption(optional) z16-) +shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +shop-beauty-nails # icon z16- (also has caption(optional) z16-) shop-beverages # icon z16- (also has caption(optional) z16-) shop-boutique # icon z18- (also has caption(optional) z18-) shop-car_repair # icon z16- (also has caption(optional) z16-) @@ -866,6 +870,7 @@ 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-) @@ -888,8 +893,8 @@ leisure-dog_park # icon z16- (also has captio === 2300 highway-busway # pathtext z16- (also has line z15-) -highway-busway-bridge # pathtext z16- (also has line z15-) -highway-busway-tunnel # pathtext z16- (also has line z15-) +highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) === 2250 amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) @@ -916,7 +921,7 @@ natural-wetland-tidalflat # caption z16- (also has are tourism-picnic_site # icon z14- (also has caption(optional) z14-) === 1800 -building-train_station # caption z17- (also has area z14-) +building-train_station # icon z17- (also has caption(optional) z17-, area z14-) railway-level_crossing # icon z17- === 1700 @@ -965,10 +970,15 @@ amenity-car_wash # icon z17- (also has captio amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) amenity-driving_school # icon z17- (also has caption(optional) z17-) +amenity-flight_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-prep_school # icon z17- (also has caption(optional) z17-) amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +amenity-sailing_school # icon z17- (also has caption(optional) z17-) amenity-veterinary # icon z16- (also has caption(optional) z16-) craft-electrician # icon z17- (also has caption(optional) z18-) craft-electronics_repair # icon z17- (also has caption(optional) z18-) @@ -985,6 +995,7 @@ leisure-escape_game # icon z17- (also has captio leisure-fitness_centre # icon z16- (also has caption(optional) z17-) leisure-hackerspace # icon z17- (also has caption(optional) z17-) leisure-sauna # icon z17- (also has caption(optional) z17-) +man_made-observatory # icon z15- (also has caption(optional) z16-) office-estate_agent # icon z18- (also has caption(optional) z18-) office-government # icon z18- (also has caption(optional) z18-) office-insurance # icon z18- (also has caption(optional) z18-) @@ -1130,6 +1141,8 @@ amenity-vending_machine-public_transport_tickets # icon z17- (also has captio amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) highway-elevator # icon z17- leisure-picnic_table # icon z15- (also has caption(optional) z16-) +man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +man_made-telescope-radio # icon z17- (also has caption(optional) z17-) man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) @@ -1140,6 +1153,10 @@ isoline-zero # pathtext z15- (also has li power-line # pathtext z15- (also has line z13-, line::dash z13-) === 1000 +social_facility-food_bank # icon z17- (also has caption(optional) z17-) +social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +=== 851 + amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) amenity-nursing_home # icon z17- (also has caption(optional) z17-) @@ -1201,6 +1218,7 @@ 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-) @@ -1251,6 +1269,7 @@ power-portal # icon z13- power-tower # icon z13- === 450 +amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) @@ -1285,9 +1304,44 @@ power-pole # icon z15- === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) -entrance-main # icon z16- (also has caption(optional) z18-) +entrance-main # icon z17- (also has caption(optional) z18-) +=== 225 + +entrance # icon z18- (also has caption(optional) z19-) +entrance-entry # icon z17- (also has caption(optional) z19-) +entrance-exit # icon z17- (also has caption(optional) z19-) === 220 +spherical_buoy-cardinal-east # icon z15- +spherical_buoy-cardinal-north # icon z15- +spherical_buoy-cardinal-south # icon z15- +spherical_buoy-cardinal-west # icon z15- +spherical_buoy-isolated_danger # icon z15- +spherical_buoy-lateral-port # icon z15- +spherical_buoy-lateral-starboard # icon z15- +spherical_buoy-safe_water # icon z15- +spherical_buoy-special_purpose # icon z15- +=== 216 + +beacon-cardinal-east # icon z13- +beacon-cardinal-north # icon z13- +beacon-cardinal-south # icon z13- +beacon-cardinal-west # icon z13- +beacon-isolated_danger # icon z13- +beacon-lateral-port # icon z13- +beacon-lateral-starboard # icon z13- +beacon-safe_water # icon z13- +beacon-special_purpose # icon z13- +buoy-cardinal-east # icon z13- +buoy-cardinal-north # icon z13- +buoy-cardinal-south # icon z13- +buoy-cardinal-west # icon z13- +buoy-isolated_danger # icon z13- +buoy-lateral-port # icon z13- +buoy-lateral-starboard # icon z13- +buoy-safe_water # icon z13- +buoy-special_purpose # icon z13- +entrance-emergency # icon z20- (also has caption(optional) z20-) highway-traffic_signals # icon z19- === 215 @@ -1319,7 +1373,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 # caption z17- +leisure-slipway # icon z17- (also has caption(optional) 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-) @@ -1370,7 +1424,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-nature_reserve # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17) # === -3300 -# barrier-toll_booth # caption(optional) z14- (also has icon z12-) +# barrier-toll_booth # caption(optional) z16- (also has icon z16-) # === -3400 # historic-ruins # caption(optional) z17- (also has icon z17-) @@ -1765,7 +1819,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-tram_stop # caption(optional) z17- (also has icon z14-) # === -6350 -# highway-bus_stop # caption(optional) z17- (also has icon z16-) +# highway-bus_stop # caption(optional) z17- (also has icon z15-) # === -6400 # amenity-drinking_water # caption(optional) z14- (also has icon z12-) @@ -1813,6 +1867,7 @@ 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 @@ -1879,6 +1934,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-appliance # caption(optional) z18- (also has icon z18-) # shop-baby_goods # caption(optional) z18- (also has icon z18-) # shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) # shop-beverages # caption(optional) z16- (also has icon z16-) # shop-boutique # caption(optional) z18- (also has icon z18-) # shop-car_repair # caption(optional) z16- (also has icon z16-) @@ -1902,6 +1959,7 @@ 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-) @@ -1937,6 +1995,9 @@ 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 @@ -1979,10 +2040,15 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) # amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_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-prep_school # caption(optional) z17- (also has icon z17-) # amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) # amenity-veterinary # caption(optional) z16- (also has icon z16-) # craft-electrician # caption(optional) z18- (also has icon z17-) # craft-electronics_repair # caption(optional) z18- (also has icon z17-) @@ -1999,6 +2065,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-fitness_centre # caption(optional) z17- (also has icon z16-) # leisure-hackerspace # caption(optional) z17- (also has icon z17-) # leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z15-) # office-estate_agent # caption(optional) z18- (also has icon z18-) # office-government # caption(optional) z18- (also has icon z18-) # office-insurance # caption(optional) z18- (also has icon z18-) @@ -2139,11 +2206,17 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) # amenity-water_point-drinking_water_no # caption(optional) z14- (also has icon z14-) # leisure-picnic_table # caption(optional) z16- (also has icon z15-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) # man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-) # man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-) # natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) # === -8800 +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + # amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) # amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) # amenity-nursing_home # caption(optional) z17- (also has icon z17-) @@ -2193,6 +2266,7 @@ 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-) @@ -2228,6 +2302,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop # caption(optional) z18- (also has icon z18-) # === -9530 +xmas-tree # icon z18- +=== -9540 + # amenity-bbq # caption(optional) z17- (also has icon z16-) # amenity-luggage_locker # caption(optional) z19- (also has icon z17-) # amenity-public_bookcase # caption(optional) z18- (also has icon z18-) @@ -2239,6 +2316,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # man_made-water_tower # caption(optional) z14- (also has icon z13-) # === -9550 +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) @@ -2262,9 +2340,17 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9770 # barrier-entrance # caption(optional) z16- (also has icon z16-) -# entrance-main # caption(optional) z18- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) # === -9780 +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + # historic-anchor # caption(optional) z18- (also has icon z18-) # historic-cannon # caption(optional) z18- (also has icon z18-) # historic-memorial-plaque # caption(optional) z18- (also has icon z18-) @@ -2284,6 +2370,7 @@ 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 @@ -2305,13 +2392,18 @@ tourism-information # icon z15- (also has captio tourism-information-board # icon z15- (also has caption(optional) z15-) tourism-information-guidepost # icon z15- (also has caption(optional) z15-) tourism-information-map # icon z15- (also has caption(optional) z15-) -=== -9950 +=== -9940 amenity # caption z19- amenity-telephone # icon z17- (also has caption(optional) z19-) -entrance # icon z17- (also has caption(optional) z19-) +entrance-house # icon z18- (also has caption(optional) z19-) +=== -9950 + +entrance-garage # icon z19- (also has caption(optional) z19-) === -9960 +amenity-food_sharing # icon z18- (also has caption(optional) z18-) +amenity-give_box # icon z18- (also has caption(optional) z18-) amenity-parking_space # caption z19- amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) amenity-parking_space-permissive # caption z19- @@ -2327,26 +2419,35 @@ amenity-vending_machine-food # icon z18- (also has captio amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) building-address # caption z16- +man_made-telescope-optical # icon z17- (also has caption(optional) z17-) === -9970 amenity-bench # icon z18- (also has caption(optional) z19-) amenity-bench-backless # icon z18- (also has caption(optional) z19-) amenity-lounger # icon z18- (also has caption(optional) z19-) amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +emergency-access_point # icon z18- (also has caption(optional) z18-) emergency-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) -emergency-phone # icon z17- +emergency-phone # icon z17- (also has caption(optional) z19-) +man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 amenity-waste_basket # icon z18- (also has caption(optional) z19-) emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +emergency-life_ring # icon z19- (also has caption(optional) z19-) power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 +natural-tree # icon z18- +=== -9991 + # amenity-bench # caption(optional) z19- (also has icon z18-) # amenity-bench-backless # caption(optional) z19- (also has icon z18-) -amenity-loading_dock # icon z18- (also has caption(optional) z19-) -# amenity-loading_dock # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) # amenity-lounger # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) @@ -2361,14 +2462,20 @@ amenity-loading_dock # icon z18- (also has captio # amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) # amenity-waste_basket # caption(optional) z19- (also has icon z18-) # amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) # emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) -# entrance # caption(optional) z19- (also has icon z17-) -entrance-exit # icon z17- (also has caption(optional) z19-) -# entrance-exit # caption(optional) z19- (also has icon z17-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) # man_made-cairn # caption(optional) z17- (also has icon z17-) # man_made-survey_point # caption(optional) z15- (also has icon z14-) +# man_made-telescope # caption(optional) z18- (also has icon z18-) +# man_made-telescope-optical # caption(optional) z17- (also has icon z17-) # power-substation # caption(optional) z18- (also has icon z17-, area z13-) # tourism-information # caption(optional) z15- (also has icon z15-) # tourism-information-board # caption(optional) z15- (also has icon z15-) diff --git a/data/styles/vehicle/dark/colors.mapcss b/data/styles/vehicle/dark/colors.mapcss index ce7ad377b..9f22d0d35 100644 --- a/data/styles/vehicle/dark/colors.mapcss +++ b/data/styles/vehicle/dark/colors.mapcss @@ -180,6 +180,7 @@ @neutral_label: #51585E; @healthcare_label: #983E44; @public_transport_label: #2F6499; +@emergency_label: #247F52; /* 6.4 Road labels */ diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 42dc2b0e7..7e6ba44cc 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -178,6 +178,7 @@ area|z12-[amenity=prison] /* 5.BEACH, GLACIER, DESERT, etc. */ area|z0-[natural=glacier], +area|z0-[natural=sand], area|z10-[natural=beach], area|z0-[natural=desert], area|z10-[leisure=beach_resort], @@ -191,6 +192,7 @@ area|z10-[leisure=beach_resort], {fill-color: @beach;fill-opacity: 0.35;} area|z0-[natural=desert], +area|z0-[natural=sand], {fill-color: @desert;} /* 6.WATER */ @@ -294,6 +296,7 @@ area|z14-[landuse=cemetery], area|z14-[amenity=university], area|z15-[leisure=stadium], area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], {fill-opacity: 1;} /* 7.1 Industrial */ @@ -385,8 +388,10 @@ area|z14-[landuse=farmyard], /* Parking */ area|z15-[amenity=parking], +area|z15-[amenity=car_pooling], {fill-color: @parking;fill-opacity: 1;} area|z17-[amenity=parking], +area|z17-[amenity=car_pooling], {fill-color: @parking_l;fill-opacity: 1;} area|z15-[amenity=parking][location=underground], diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 70b6c969a..3578ef6e7 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -363,6 +363,7 @@ area|z18-[leisure=park][!name] area|z14-[natural=desert], area|z15-[leisure=beach_resort], +area|z15-[natural=sand], area|z15-[natural=beach], node|z17-[leisure=beach_resort], node|z17-[natural=beach] @@ -530,13 +531,13 @@ node|z18-[addr:housenumber][addr:street]::int_name, node|z19-[entrance], node|z19-[amenity=loading_dock], -{icon-image: entrance-s.svg; font-size: 13; text-offset: 1;} +{icon-image: entrance-m.svg; font-size: 13; text-offset: 1;} node|z19-[entrance=exit], -{icon-image: entrance-exit-s.svg; font-size: 13; text-offset: 1;} +{icon-image: entrance-exit-m.svg; font-size: 13; text-offset: 1;} node|z18-[entrance=main], -{icon-image: entrance-main-s.svg; font-size: 13; text-offset: 1;} +{icon-image: entrance-main-m.svg; font-size: 13; text-offset: 1;} node|z18-[emergency=emergency_ward_entrance], -{icon-image: entrance-emergency-s.svg; font-size: 13; text-offset: 1;} +{icon-image: entrance-emergency-m.svg; font-size: 13; text-offset: 1;} /* 8.3 Airports */ area|z14-[aeroway=terminal] diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index f7b9e4cf5..864fb22c7 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -600,6 +600,7 @@ node|z14-[amenity=charging_station][motorcar?][capacity?], node|z15-[amenity=sanitary_dump_station], node|z16-[amenity=charging_station], node|z16-[amenity=parking], +node|z16-[amenity=car_pooling], area|z16-[landuse=garages], node|z16-[tourism=caravan_site], node|z17-[amenity=car_wash], @@ -732,9 +733,13 @@ node|z18-[amenity=water_point][drinking_water=not], node|z15-[amenity=parking], {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;} +node|z15-[amenity=car_pooling], +{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;} node|z17[amenity=parking], +node|z17[amenity=car_pooling], {icon-min-distance: 15;font-size: 13.75;} node|z18-[amenity=parking], +node|z18-[amenity=car_pooling], {font-size: 14.5;} node|z15-[amenity=parking][location=underground], diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 156c124e2..725d467a9 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -14,6 +14,7 @@ # - BG-top: water (linear and areal) # - BG-by-size: landcover areas sorted by their size +amenity-car_pooling # area z15- (also has icon z15-, caption(optional) z16-) amenity-motorcycle_parking # area z17- (also has icon z17-) amenity-parking # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-fee # area z15- (also has icon z15-, caption(optional) z16-) @@ -132,6 +133,7 @@ natural-beach-gravel # area z10- (also has captio natural-beach-sand # area z10- (also has caption z15-) natural-desert # area z1- (also has caption z14-) natural-glacier # area z1- +natural-sand # area z1- (also has caption z15-) === 30 natural-land # area z1- diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 424a61231..071efc7cc 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -234,6 +234,7 @@ amenity-sanitary_dump_station # icon z15- (also has captio shop-caravan # icon z17- === 2600 +amenity-car_pooling # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-fee # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-multi-storey # icon z15- (also has caption(optional) z16-, area z15-) @@ -472,6 +473,7 @@ shop-mall # icon z14- (also has captio === 1500 natural-desert # caption z14- (also has area z1-) +natural-sand # caption z15- (also has area z1-) === 1450 natural-bay # caption z14- @@ -755,11 +757,19 @@ building-has_parts # caption z18- (also has are building-garage # caption z18- (also has area z15-) building-guardhouse # icon z18- (also has area z15-) -=== 30 +=== 40 entrance-main # icon z18- (also has caption(optional) z18-) +=== 30 + +entrance # icon z19- (also has caption(optional) z19-) +entrance-entry # icon z19- (also has caption(optional) z19-) +entrance-exit # icon z19- (also has caption(optional) z19-) === 20 +entrance-emergency # icon z19- (also has caption(optional) z19-) +=== 10 + # # All automatic optional captions priorities are below 0. # They follow the order of their correspoding icons. @@ -819,6 +829,7 @@ entrance-main # icon z18- (also has captio # amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) # === -7400 +# amenity-car_pooling # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-fee # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-multi-storey # caption(optional) z16- (also has icon z15-, area z15-) @@ -1229,13 +1240,27 @@ entrance-main # icon z18- (also has captio # leisure-park-private # caption(optional) z14- (also has icon z14-, area z10-) # === -9900 +entrance-garage # icon z19- (also has caption(optional) z19-) +=== -9910 + +entrance-house # icon z19- (also has caption(optional) z19-) +=== -9920 + # entrance-main # caption(optional) z18- (also has icon z18-) +# === -9970 + +# entrance # caption(optional) z19- (also has icon z19-) +# entrance-entry # caption(optional) z19- (also has icon z19-) +# entrance-exit # caption(optional) z19- (also has icon z19-) # === -9980 +# entrance-emergency # caption(optional) z19- (also has icon z19-) +# === -9990 + amenity-loading_dock # icon z19- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z19-) -entrance # icon z19- (also has caption(optional) z19-) -# entrance # caption(optional) z19- (also has icon z19-) -entrance-exit # icon z19- (also has caption(optional) z19-) -# entrance-exit # caption(optional) z19- (also has icon z19-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z19-) +entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) === -10000 diff --git a/data/styles/vehicle/light/colors.mapcss b/data/styles/vehicle/light/colors.mapcss index b7e2a9a93..b950d858e 100644 --- a/data/styles/vehicle/light/colors.mapcss +++ b/data/styles/vehicle/light/colors.mapcss @@ -151,6 +151,7 @@ @neutral_label: #494F54; @healthcare_label: #A6454B; @public_transport_label: #234B73; +@emergency_label: #247F52; /* ROADS LABELS */ @shield_text: #000000; diff --git a/data/taginfo.json b/data/taginfo.json index 8a9b9cf5b..914282de4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1,7 +1,7 @@ { "data_format": 1, "data_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/taginfo.json", - "data_updated": "20251020T140841Z", + "data_updated": "20251117T175008Z", "project": { "name": "CoMaps", "description": "CoMaps is a community-focused privacy navigation iOS & Android app for travelers - drivers, hikers, and cyclists.", @@ -94,6 +94,18 @@ "value": "bench", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bench.svg" }, + { + "description": "amenity=bench + backrest=no", + "key": "amenity", + "value": "bench", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bench_backless.svg" + }, + { + "description": "amenity=bench + backrest=no", + "key": "backrest", + "value": "no", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bench_backless.svg" + }, { "description": "amenity=bicycle_parking", "key": "amenity", @@ -130,6 +142,12 @@ "value": "biergarten", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pub-m.svg" }, + { + "description": "amenity=boat_rental", + "key": "amenity", + "value": "boat_rental", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boat_rental-m.svg" + }, { "description": "amenity=brothel", "key": "amenity", @@ -154,6 +172,12 @@ "value": "cafe", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/cafe-m.svg" }, + { + "description": "amenity=car_pooling", + "key": "amenity", + "value": "car_pooling", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking-pooling-m.svg" + }, { "description": "amenity=car_rental", "key": "amenity", @@ -182,17 +206,67 @@ "description": "amenity=charging_station", "key": "amenity", "value": "charging_station", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" }, { "description": "amenity=charging_station + motorcar?=*", "key": "amenity", "value": "charging_station", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" }, { "description": "amenity=charging_station + motorcar?=*", "key": "motorcar?", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity=1", + "key": "amenity", + "value": "charging_station", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity=1", + "key": "capacity", + "value": "1", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity=1", + "key": "motorcar?", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity=2", + "key": "amenity", + "value": "charging_station", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity=2", + "key": "capacity", + "value": "2", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity=2", + "key": "motorcar?", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity?=*", + "key": "amenity", + "value": "charging_station", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity?=*", + "key": "capacity?", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg" + }, + { + "description": "amenity=charging_station + motorcar?=* + capacity?=*", + "key": "motorcar?", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg" }, { @@ -259,7 +333,7 @@ "description": "amenity=dojo", "key": "amenity", "value": "dojo", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/martial-arts-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/martial-arts-centre-m.svg" }, { "description": "amenity=drinking_water", @@ -277,7 +351,7 @@ "description": "amenity=events_venue", "key": "amenity", "value": "events_venue", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/community-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/events_venue-m.svg" }, { "description": "amenity=exhibition_centre", @@ -303,12 +377,24 @@ "value": "fire_station", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fire_station-m.svg" }, + { + "description": "amenity=flight_school", + "key": "amenity", + "value": "flight_school", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/flying_school-m.svg" + }, { "description": "amenity=food_court", "key": "amenity", "value": "food_court", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/restaurant-m.svg" }, + { + "description": "amenity=food_sharing", + "key": "amenity", + "value": "food_sharing", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/food_sharing-m.svg" + }, { "description": "amenity=fountain", "key": "amenity", @@ -327,6 +413,12 @@ "value": "gambling", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/gambling-m.svg" }, + { + "description": "amenity=give_box", + "key": "amenity", + "value": "give_box", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/give_box-m.svg" + }, { "description": "amenity=hospital", "key": "amenity", @@ -369,6 +461,12 @@ "value": "library", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/library-m.svg" }, + { + "description": "amenity=lounger", + "key": "amenity", + "value": "lounger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/lounger-m.svg" + }, { "description": "amenity=love_hotel", "key": "amenity", @@ -387,6 +485,12 @@ "value": "marketplace", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/marketplace-m.svg" }, + { + "description": "amenity=mobile_money_agent", + "key": "amenity", + "value": "mobile_money_agent", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/banknote-m.svg" + }, { "description": "amenity=money_transfer", "key": "amenity", @@ -641,6 +745,12 @@ "value": "disabled", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking-disabled-m.svg" }, + { + "description": "amenity=payment_centre", + "key": "amenity", + "value": "payment_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/banknote-m.svg" + }, { "description": "amenity=payment_terminal", "key": "amenity", @@ -797,6 +907,12 @@ "value": "post_office", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/mail-m.svg" }, + { + "description": "amenity=prep_school", + "key": "amenity", + "value": "prep_school", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/prep_school-m.svg" + }, { "description": "amenity=prison", "key": "amenity", @@ -833,12 +949,30 @@ "value": "recycling", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/recycling-m.svg" }, + { + "description": "amenity=recycling + recycling_type=centre", + "key": "amenity", + "value": "recycling", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/recycling-centre-m.svg" + }, + { + "description": "amenity=recycling + recycling_type=centre", + "key": "recycling_type", + "value": "centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/recycling-centre-m.svg" + }, { "description": "amenity=restaurant", "key": "amenity", "value": "restaurant", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/restaurant-m.svg" }, + { + "description": "amenity=sailing_school", + "key": "amenity", + "value": "sailing_school", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boating_school-m.svg" + }, { "description": "amenity=sanitary_dump_station", "key": "amenity", @@ -899,6 +1033,11 @@ "value": "shower", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shower-m.svg" }, + { + "description": "amenity=slipway", + "key": "amenity", + "value": "slipway" + }, { "description": "amenity=social_facility", "key": "amenity", @@ -945,7 +1084,7 @@ "description": "amenity=townhall", "key": "amenity", "value": "townhall", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/embassy-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/public-building-m.svg" }, { "description": "amenity=university", @@ -1147,7 +1286,7 @@ "description": "barrier=entrance", "key": "barrier", "value": "entrance", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/entrance-barrier-s.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/entrance-barrier-xs.svg" }, { "description": "barrier=gate", @@ -1230,6 +1369,12 @@ "value": "guardhouse", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/security-m.svg" }, + { + "description": "building=train_station", + "key": "building", + "value": "train_station", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/train_building-m.svg" + }, { "description": "craft=*", "key": "craft", @@ -1367,6 +1512,17 @@ "value": "winery", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/winery-m.svg" }, + { + "description": "disused:shop=*", + "key": "disused:shop", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/disusedbusiness-m.svg" + }, + { + "description": "emergency=access_point", + "key": "emergency", + "value": "access_point", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/access_point-m.svg" + }, { "description": "emergency=assembly_point", "key": "emergency", @@ -1385,6 +1541,12 @@ "value": "fire_hydrant", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/firehydrant-m.svg" }, + { + "description": "emergency=life_ring", + "key": "emergency", + "value": "life_ring", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/lifebuoy-m.svg" + }, { "description": "emergency=lifeguard", "key": "emergency", @@ -1403,10 +1565,6 @@ "value": "phone", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/emergency-phone-m.svg" }, - { - "description": "healthcare=*", - "key": "healthcare" - }, { "description": "healthcare=alternative", "key": "healthcare", @@ -1471,7 +1629,7 @@ "description": "highway=bus_stop", "key": "highway", "value": "bus_stop", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bus-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bus-xm.svg" }, { "description": "highway=elevator", @@ -1550,6 +1708,90 @@ "value": "castle", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" }, + { + "description": "historic=castle + castle_type=castrum", + "key": "castle_type", + "value": "castrum", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=castrum", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=defensive", + "key": "castle_type", + "value": "defensive", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=defensive", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=fortified_church", + "key": "castle_type", + "value": "fortified_church", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=fortified_church", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=fortress", + "key": "castle_type", + "value": "fortress", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=fortress", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=hillfort", + "key": "castle_type", + "value": "hillfort", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=hillfort", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=kremlin", + "key": "castle_type", + "value": "kremlin", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=kremlin", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=shiro", + "key": "castle_type", + "value": "shiro", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, + { + "description": "historic=castle + castle_type=shiro", + "key": "historic", + "value": "castle", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" + }, { "description": "historic=city_gate", "key": "historic", @@ -1565,7 +1807,7 @@ "description": "historic=fort", "key": "historic", "value": "fort", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg" }, { "description": "historic=gallows", @@ -1645,6 +1887,90 @@ "value": "ruins", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" }, + { + "description": "historic=ruins + castle_type=castrum", + "key": "castle_type", + "value": "castrum", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=castrum", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=defensive", + "key": "castle_type", + "value": "defensive", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=defensive", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=fortified_church", + "key": "castle_type", + "value": "fortified_church", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=fortified_church", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=fortress", + "key": "castle_type", + "value": "fortress", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=fortress", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=hillfort", + "key": "castle_type", + "value": "hillfort", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=hillfort", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=kremlin", + "key": "castle_type", + "value": "kremlin", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=kremlin", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=shiro", + "key": "castle_type", + "value": "shiro", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, + { + "description": "historic=ruins + castle_type=shiro", + "key": "historic", + "value": "ruins", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg" + }, { "description": "historic=ruins + name=*", "key": "historic", @@ -1766,6 +2092,12 @@ "value": "amusement_arcade", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/arcade-m.svg" }, + { + "description": "leisure=bandstand", + "key": "leisure", + "value": "bandstand", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bandstand-m.svg" + }, { "description": "leisure=beach_resort", "key": "leisure", @@ -1808,11 +2140,23 @@ "value": "fitness_centre", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fitness_centre-m.svg" }, + { + "description": "leisure=fitness_centre + sport=yoga", + "key": "leisure", + "value": "fitness_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg" + }, + { + "description": "leisure=fitness_centre + sport=yoga", + "key": "sport", + "value": "yoga", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg" + }, { "description": "leisure=fitness_station", "key": "leisure", "value": "fitness_station", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fitness_station-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fitness-m.svg" }, { "description": "leisure=golf_course", @@ -1832,6 +2176,12 @@ "value": "ice_rink", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg" }, + { + "description": "leisure=indoor_play", + "key": "leisure", + "value": "indoor_play", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/indoor_play-m.svg" + }, { "description": "leisure=marina", "key": "leisure", @@ -1842,7 +2192,7 @@ "description": "leisure=miniature_golf", "key": "leisure", "value": "miniature_golf", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-centre-m.svg" }, { "description": "leisure=nature_reserve", @@ -1884,7 +2234,13 @@ "description": "leisure=sauna", "key": "leisure", "value": "sauna", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/public_bath-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sauna-m.svg" + }, + { + "description": "leisure=slipway", + "key": "leisure", + "value": "slipway", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/slipway-m.svg" }, { "description": "leisure=sports_centre", @@ -1892,6 +2248,390 @@ "value": "sports_centre", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" }, + { + "description": "leisure=sports_centre + sport=american_football", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/america-football-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=american_football", + "key": "sport", + "value": "american_football", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/america-football-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=archery", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=archery", + "key": "sport", + "value": "archery", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=athletics", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=athletics", + "key": "sport", + "value": "athletics", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=australian_football", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/australian-football-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=australian_football", + "key": "sport", + "value": "australian_football", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/australian-football-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=badminton", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/badminton-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=badminton", + "key": "sport", + "value": "badminton", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/badminton-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=baseball", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/baseball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=baseball", + "key": "sport", + "value": "baseball", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/baseball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=basketball", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/basketball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=basketball", + "key": "sport", + "value": "basketball", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/basketball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=beachvolleyball", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=beachvolleyball", + "key": "sport", + "value": "beachvolleyball", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=bowls", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=bowls", + "key": "sport", + "value": "bowls", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=climbing", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/climbing-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=climbing", + "key": "sport", + "value": "climbing", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/climbing-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=cricket", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/cricket-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=cricket", + "key": "sport", + "value": "cricket", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/cricket-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=curling", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/curling-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=curling", + "key": "sport", + "value": "curling", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/curling-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=equestrian", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/equestrian-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=equestrian", + "key": "sport", + "value": "equestrian", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/equestrian-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=field_hockey", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=field_hockey", + "key": "sport", + "value": "field_hockey", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=futsal", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=futsal", + "key": "sport", + "value": "futsal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=golf", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=golf", + "key": "sport", + "value": "golf", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=gymnastics", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=gymnastics", + "key": "sport", + "value": "gymnastics", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=handball", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/handball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=handball", + "key": "sport", + "value": "handball", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/handball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=ice_hockey", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=ice_hockey", + "key": "sport", + "value": "ice_hockey", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=multi", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=multi", + "key": "sport", + "value": "multi", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=padel", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/padel-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=padel", + "key": "sport", + "value": "padel", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/padel-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=pelota", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pelota-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=pelota", + "key": "sport", + "value": "pelota", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pelota-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=scuba_diving", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/diving-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=scuba_diving", + "key": "sport", + "value": "scuba_diving", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/diving-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=shooting", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=shooting", + "key": "sport", + "value": "shooting", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=skateboard", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skateboard-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=skateboard", + "key": "sport", + "value": "skateboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skateboard-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=skiing", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skiing-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=skiing", + "key": "sport", + "value": "skiing", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skiing-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=soccer", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=soccer", + "key": "sport", + "value": "soccer", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=swimming", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=swimming", + "key": "sport", + "value": "swimming", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=table_tennis", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/table-tennis-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=table_tennis", + "key": "sport", + "value": "table_tennis", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/table-tennis-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=tennis", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tennis-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=tennis", + "key": "sport", + "value": "tennis", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tennis-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=volleyball", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=volleyball", + "key": "sport", + "value": "volleyball", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=yoga", + "key": "leisure", + "value": "sports_centre", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg" + }, + { + "description": "leisure=sports_centre + sport=yoga", + "key": "sport", + "value": "yoga", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg" + }, { "description": "leisure=sports_hall", "key": "leisure", @@ -1924,7 +2664,7 @@ "description": "leisure=water_park", "key": "leisure", "value": "water_park", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-centre-m.svg" }, { "description": "man_made=cairn", @@ -1980,6 +2720,12 @@ "value": "mast", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/dot-m.svg" }, + { + "description": "man_made=observatory", + "key": "man_made", + "value": "observatory", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/observatory-m.svg" + }, { "description": "man_made=petroleum_well", "key": "man_made", @@ -2004,6 +2750,48 @@ "value": "survey_point", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/survey_point-m.svg" }, + { + "description": "man_made=telescope", + "key": "man_made", + "value": "telescope", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-m.svg" + }, + { + "description": "man_made=telescope + telescope:type=gamma", + "key": "man_made", + "value": "telescope", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-gamma-m.svg" + }, + { + "description": "man_made=telescope + telescope:type=gamma", + "key": "telescope:type", + "value": "gamma", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-gamma-m.svg" + }, + { + "description": "man_made=telescope + telescope:type=optical", + "key": "man_made", + "value": "telescope", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-optical-m.svg" + }, + { + "description": "man_made=telescope + telescope:type=optical", + "key": "telescope:type", + "value": "optical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-optical-m.svg" + }, + { + "description": "man_made=telescope + telescope:type=radio", + "key": "man_made", + "value": "telescope", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-radio-m.svg" + }, + { + "description": "man_made=telescope + telescope:type=radio", + "key": "telescope:type", + "value": "radio", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-radio-m.svg" + }, { "description": "man_made=tower", "key": "man_made", @@ -2156,6 +2944,12 @@ "value": "spring", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/drinking-water-no-m.svg" }, + { + "description": "natural=tree", + "key": "natural", + "value": "tree", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tree-m.svg" + }, { "description": "natural=volcano", "key": "natural", @@ -2281,17 +3075,854 @@ "value": "funicular", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/funicular-m.svg" }, + { + "description": "railway=station + station=light_rail", + "key": "railway", + "value": "station", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/train_light-m.svg" + }, + { + "description": "railway=station + station=light_rail", + "key": "station", + "value": "light_rail", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/train_light-m.svg" + }, { "description": "railway=tram_stop", "key": "railway", "value": "tram_stop", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tram-m.svg" }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:category", + "value": "east", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:category", + "value": "east", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:category", + "value": "east", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:category", + "value": "east", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:category", + "value": "north", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:category", + "value": "north", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:category", + "value": "north", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:category", + "value": "north", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:category", + "value": "south", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:category", + "value": "south", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:category", + "value": "south", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:category", + "value": "south", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:category", + "value": "west", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:beacon_cardinal:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:category", + "value": "west", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:beacon_cardinal:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:category", + "value": "west", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile", + "key": "seamark:beacon_cardinal:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:category", + "value": "west", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower", + "key": "seamark:beacon_cardinal:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower", + "key": "seamark:type", + "value": "beacon_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=buoyant", + "key": "seamark:beacon_isolated_danger:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=buoyant", + "key": "seamark:type", + "value": "beacon_isolated_danger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=lattice", + "key": "seamark:beacon_isolated_danger:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=lattice", + "key": "seamark:type", + "value": "beacon_isolated_danger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=pile", + "key": "seamark:beacon_isolated_danger:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=pile", + "key": "seamark:type", + "value": "beacon_isolated_danger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=tower", + "key": "seamark:beacon_isolated_danger:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=tower", + "key": "seamark:type", + "value": "beacon_isolated_danger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant", + "key": "seamark:beacon_lateral:category", + "value": "port", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant", + "key": "seamark:beacon_lateral:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice", + "key": "seamark:beacon_lateral:category", + "value": "port", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice", + "key": "seamark:beacon_lateral:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile", + "key": "seamark:beacon_lateral:category", + "value": "port", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile", + "key": "seamark:beacon_lateral:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower", + "key": "seamark:beacon_lateral:category", + "value": "port", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower", + "key": "seamark:beacon_lateral:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant", + "key": "seamark:beacon_lateral:category", + "value": "starboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant", + "key": "seamark:beacon_lateral:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice", + "key": "seamark:beacon_lateral:category", + "value": "starboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice", + "key": "seamark:beacon_lateral:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile", + "key": "seamark:beacon_lateral:category", + "value": "starboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile", + "key": "seamark:beacon_lateral:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower", + "key": "seamark:beacon_lateral:category", + "value": "starboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower", + "key": "seamark:beacon_lateral:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower", + "key": "seamark:type", + "value": "beacon_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=buoyant", + "key": "seamark:beacon_safe_water:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=buoyant", + "key": "seamark:type", + "value": "beacon_safe_water", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=lattice", + "key": "seamark:beacon_safe_water:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=lattice", + "key": "seamark:type", + "value": "beacon_safe_water", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=pile", + "key": "seamark:beacon_safe_water:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=pile", + "key": "seamark:type", + "value": "beacon_safe_water", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=tower", + "key": "seamark:beacon_safe_water:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=tower", + "key": "seamark:type", + "value": "beacon_safe_water", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=buoyant", + "key": "seamark:beacon_special_purpose:shape", + "value": "buoyant", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=buoyant", + "key": "seamark:type", + "value": "beacon_special_purpose", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=lattice", + "key": "seamark:beacon_special_purpose:shape", + "value": "lattice", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=lattice", + "key": "seamark:type", + "value": "beacon_special_purpose", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=pile", + "key": "seamark:beacon_special_purpose:shape", + "value": "pile", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=pile", + "key": "seamark:type", + "value": "beacon_special_purpose", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=tower", + "key": "seamark:beacon_special_purpose:shape", + "value": "tower", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=tower", + "key": "seamark:type", + "value": "beacon_special_purpose", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east", + "key": "seamark:buoy_cardinal:category", + "value": "east", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-east-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-east-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:category", + "value": "east", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north", + "key": "seamark:buoy_cardinal:category", + "value": "north", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-north-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-north-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:category", + "value": "north", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south", + "key": "seamark:buoy_cardinal:category", + "value": "south", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-south-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-south-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:category", + "value": "south" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:shape", + "value": "spherical" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:type", + "value": "buoy_cardinal" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:category", + "value": "south[seamark:buoy_cardinal:shape=spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west", + "key": "seamark:buoy_cardinal:category", + "value": "west", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-west-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-west-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:category", + "value": "west", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:buoy_cardinal:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg" + }, + { + "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical", + "key": "seamark:type", + "value": "buoy_cardinal", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg" + }, + { + "description": "seamark:type=buoy_isolated_danger", + "key": "seamark:type", + "value": "buoy_isolated_danger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-isolated_danger-m.svg" + }, + { + "description": "seamark:type=buoy_isolated_danger + seamark:buoy_isolated_danger:shape=spherical", + "key": "seamark:buoy_isolated_danger:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg" + }, + { + "description": "seamark:type=buoy_isolated_danger + seamark:buoy_isolated_danger:shape=spherical", + "key": "seamark:type", + "value": "buoy_isolated_danger", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port", + "key": "seamark:buoy_lateral:category", + "value": "port", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-port-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port", + "key": "seamark:type", + "value": "buoy_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-port-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical", + "key": "seamark:buoy_lateral:category", + "value": "port", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical", + "key": "seamark:buoy_lateral:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical", + "key": "seamark:type", + "value": "buoy_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard", + "key": "seamark:buoy_lateral:category", + "value": "starboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard", + "key": "seamark:type", + "value": "buoy_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical", + "key": "seamark:buoy_lateral:category", + "value": "starboard", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical", + "key": "seamark:buoy_lateral:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical", + "key": "seamark:type", + "value": "buoy_lateral", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg" + }, + { + "description": "seamark:type=buoy_safe_water", + "key": "seamark:type", + "value": "buoy_safe_water", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-safe_water-m.svg" + }, + { + "description": "seamark:type=buoy_safe_water + seamark:buoy_safe_water:shape=spherical", + "key": "seamark:buoy_safe_water:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg" + }, + { + "description": "seamark:type=buoy_safe_water + seamark:buoy_safe_water:shape=spherical", + "key": "seamark:type", + "value": "buoy_safe_water", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg" + }, + { + "description": "seamark:type=buoy_special_purpose", + "key": "seamark:type", + "value": "buoy_special_purpose", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-special_purpose-m.svg" + }, + { + "description": "seamark:type=buoy_special_purpose + seamark:buoy_special_purpose:shape=spherical", + "key": "seamark:buoy_special_purpose:shape", + "value": "spherical", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg" + }, + { + "description": "seamark:type=buoy_special_purpose + seamark:buoy_special_purpose:shape=spherical", + "key": "seamark:type", + "value": "buoy_special_purpose", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg" + }, { "description": "shop=*", "key": "shop", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-m.svg" }, + { + "description": "shop=agrarian", + "key": "shop", + "value": "agrarian", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-industry-m.svg" + }, { "description": "shop=alcohol", "key": "shop", @@ -2328,6 +3959,18 @@ "value": "beauty", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beauty-m.svg" }, + { + "description": "shop=beauty + beauty=spa", + "key": "beauty", + "value": "spa", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/day-spa-m.svg" + }, + { + "description": "shop=beauty + beauty=spa", + "key": "shop", + "value": "beauty", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/day-spa-m.svg" + }, { "description": "shop=beverages", "key": "shop", @@ -2490,11 +4133,6 @@ "value": "dry_cleaning", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/dry_cleaning-m.svg" }, - { - "description": "shop=electrical", - "key": "shop", - "value": "electrical" - }, { "description": "shop=electronics", "key": "shop", @@ -2543,6 +4181,12 @@ "value": "garden_centre", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/garden_center-m.svg" }, + { + "description": "shop=gas", + "key": "shop", + "value": "gas", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-industry-m.svg" + }, { "description": "shop=gift", "key": "shop", @@ -2643,7 +4287,7 @@ "description": "shop=massage", "key": "shop", "value": "massage", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/public_bath-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/massage_salon-m.svg" }, { "description": "shop=mobile_phone", @@ -2715,7 +4359,7 @@ "description": "shop=pawnbroker", "key": "shop", "value": "pawnbroker", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bookmaker-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-m.svg" }, { "description": "shop=pet", @@ -2795,6 +4439,12 @@ "value": "tattoo", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/craft-m.svg" }, + { + "description": "shop=telecommunication", + "key": "shop", + "value": "telecommunication", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/mobile_phone-m.svg" + }, { "description": "shop=ticket", "key": "shop", @@ -2813,6 +4463,12 @@ "value": "toys", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/toys-m.svg" }, + { + "description": "shop=trade", + "key": "shop", + "value": "trade", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-industry-m.svg" + }, { "description": "shop=tyres", "key": "shop", @@ -2849,6 +4505,18 @@ "value": "wine", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/alcohol-m.svg" }, + { + "description": "social_facility=food_bank", + "key": "social_facility", + "value": "food_bank", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/food_bank-m.svg" + }, + { + "description": "social_facility=soup_kitchen", + "key": "social_facility", + "value": "soup_kitchen", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soup_kitchen-m.svg" + }, { "description": "sport=*", "key": "sport", @@ -2878,6 +4546,12 @@ "value": "archery", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-m.svg" }, + { + "description": "sport=athletics", + "key": "sport", + "value": "athletics", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg" + }, { "description": "sport=australian_football", "key": "sport", @@ -2908,6 +4582,12 @@ "value": "beachvolleyball", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-m.svg" }, + { + "description": "sport=bowls", + "key": "sport", + "value": "bowls", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg" + }, { "description": "sport=chess", "key": "sport", @@ -2956,6 +4636,12 @@ "value": "golf", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-m.svg" }, + { + "description": "sport=gymnastics", + "key": "sport", + "value": "gymnastics", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg" + }, { "description": "sport=handball", "key": "sport", @@ -2968,6 +4654,12 @@ "value": "ice_hockey", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-m.svg" }, + { + "description": "sport=multi", + "key": "sport", + "value": "multi", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg" + }, { "description": "sport=padel", "key": "sport", @@ -3114,7 +4806,7 @@ "description": "tourism=guest_house", "key": "tourism", "value": "guest_house", - "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/apartment-m.svg" + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/guest_house-m.svg" }, { "description": "tourism=hostel", @@ -3253,6 +4945,12 @@ "key": "waterway", "value": "waterfall", "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/waterfall-m.svg" + }, + { + "description": "xmas:feature=tree", + "key": "xmas:feature", + "value": "tree", + "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/christmas-tree-m.svg" } ] } \ No newline at end of file diff --git a/docs/CPP_STYLE.md b/docs/CPP_STYLE.md index 736093a4f..e3e9148a9 100644 --- a/docs/CPP_STYLE.md +++ b/docs/CPP_STYLE.md @@ -16,7 +16,7 @@ Below are our specific (but not all!) exceptions to the Google's coding standard - Includes are sorted and grouped by directory, there should be newlines between different directories. - Order of directories in includes: "current_dir/current_file.hpp", includes from other dirs sorted by dependencies (e.g. indexer, then coding, then base), "defines.hpp", C++ standard library headers, boost headers, 3party. - We ARE using C++ exceptions. -- We are using all features of C++17 and C++23 except std::filesystem, std::to_chars & std::from_chars which are not fully supported on all platforms. +- We are using all features of C++17 and C++23 except `std::filesystem`, `std::to_chars`, `std::from_chars` and `std::format` which are not fully supported on all platforms. - We try to limit the usage of boost libraries which require linking (and prefer C++23 types over their boost counterparts). Naming and formatting diff --git a/docs/DEBUG_COMMANDS.md b/docs/DEBUG_COMMANDS.md index 3bc37f14d..31cff56e7 100644 --- a/docs/DEBUG_COMMANDS.md +++ b/docs/DEBUG_COMMANDS.md @@ -70,3 +70,7 @@ All the following commands require an app restart: - `?all-types`: Shows all internal types in place page - `?no-all-types`: Disables showing all internal types in place page + +## Search + +- `?wiki`: Search results for all elements with Wikipedia links \ No newline at end of file diff --git a/generator/complex_generator/complex_generator.cpp b/generator/complex_generator/complex_generator.cpp index 0c4723a8d..9a9c22a66 100644 --- a/generator/complex_generator/complex_generator.cpp +++ b/generator/complex_generator/complex_generator.cpp @@ -41,6 +41,8 @@ #include #include +#include + #include "defines.hpp" #include @@ -112,7 +114,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv) // Find directory with *.mwm. Directory FLAGS_maps_build_path must contain directory with *.mwm, // whose name must consist of six digits. Platform::FilesList files; - pl.GetFilesByRegExp(FLAGS_maps_build_path, "[0-9]{6}", files); + static boost::regex const regexp("[0-9]{6}"); + pl.GetFilesByRegExp(FLAGS_maps_build_path, regexp, files); CHECK_EQUAL(files.size(), 1, ()); auto const mwmPath = base::JoinPath(FLAGS_maps_build_path, files[0]); finalProcessor->UseCentersEnricher(mwmPath, osm2FtPath); diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index 8e4a8713c..54705edb7 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -225,6 +225,11 @@ bool FeatureBuilder::PreSerialize() }); m_params.name = std::move(nameWithRef); } + else if (ftypes::IsEmergencyAccessPointChecker::Instance()(types)) + { + m_params.name.Clear(); + m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref); + } m_params.ref.clear(); } diff --git a/generator/feature_processing_layers.cpp b/generator/feature_processing_layers.cpp index 6bf0aa13b..febf200e6 100644 --- a/generator/feature_processing_layers.cpp +++ b/generator/feature_processing_layers.cpp @@ -124,17 +124,8 @@ void RepresentationLayer::Handle(FeatureBuilder & fb) void RepresentationLayer::HandleArea(FeatureBuilder & fb, FeatureBuilderParams const & params) { - if (CanBeArea(params)) - { - LayerBase::Handle(fb); - fb.SetParams(params); - } - else if (CanBePoint(params)) - { - // CanBePoint ignores exceptional types from TypeAlwaysExists / IsUsefulNondrawableType. - auto featurePoint = MakePoint(fb); - LayerBase::Handle(featurePoint); - } + LayerBase::Handle(fb); + fb.SetParams(params); } // static diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp index eba47aac4..10fe3d9af 100644 --- a/generator/search_index_builder.cpp +++ b/generator/search_index_builder.cpp @@ -495,7 +495,7 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD if (!street.empty()) { - auto const streets = search::ReverseGeocoder::GetNearbyStreets(*contexts[threadIdx], center, kStreetRadiusM); + auto const streets = search::ReverseGeocoder::GetNearbyStreets(*contexts[threadIdx], center, kStreetRadiusM, true); streetId = MatchObjectByName(street, streets, [](std::string_view name) { return search::GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */); }); @@ -508,7 +508,7 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD if (!place.empty()) { - auto const places = search::ReverseGeocoder::GetNearbyPlaces(*contexts[threadIdx], center, kPlaceRadiusM); + auto const places = search::ReverseGeocoder::GetNearbyPlaces(*contexts[threadIdx], center, kPlaceRadiusM, true); placeId = MatchObjectByName(place, places, [](std::string_view name) { return strings::MakeUniString(name); }); } diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift index 8fbfcdc9c..f9cf3694f 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift @@ -125,27 +125,35 @@ final class MapTemplateBuilder { } private class func setupMuteAndRedirectButtons(template: CPMapTemplate) { - let muteButton = buildBarButton(type: .mute) { _ in - MWMTextToSpeech.setTTSEnabled(false) - setupUnmuteAndRedirectButtons(template: template) - } let redirectButton = buildBarButton(type: .redirectRoute) { _ in let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history) CarPlayService.shared.pushTemplate(listTemplate, animated: true) } - template.leadingNavigationBarButtons = [muteButton, redirectButton] + if MWMTextToSpeech.isTTSEnabled() { + let muteButton = buildBarButton(type: .mute) { _ in + MWMTextToSpeech.tts().active = false + setupUnmuteAndRedirectButtons(template: template) + } + template.leadingNavigationBarButtons = [muteButton, redirectButton] + } else { + template.leadingNavigationBarButtons = [redirectButton] + } } private class func setupUnmuteAndRedirectButtons(template: CPMapTemplate) { - let unmuteButton = buildBarButton(type: .unmute) { _ in - MWMTextToSpeech.setTTSEnabled(true) - setupMuteAndRedirectButtons(template: template) - } let redirectButton = buildBarButton(type: .redirectRoute) { _ in let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history) CarPlayService.shared.pushTemplate(listTemplate, animated: true) } - template.leadingNavigationBarButtons = [unmuteButton, redirectButton] + if MWMTextToSpeech.isTTSEnabled() { + let unmuteButton = buildBarButton(type: .unmute) { _ in + MWMTextToSpeech.tts().active = true + setupMuteAndRedirectButtons(template: template) + } + template.leadingNavigationBarButtons = [unmuteButton, redirectButton] + } else { + template.leadingNavigationBarButtons = [redirectButton] + } } // MARK: - CPMapButton builder @@ -159,6 +167,17 @@ final class MapTemplateBuilder { case .zoomOut: button.image = UIImage(systemName: "minus") } + // Remove code below once Apple has fixed its issue with the button background + if #unavailable(iOS 26) { + switch type { + case .startPanning: + button.focusedImage = UIImage(systemName: "smallcircle.filled.circle.fill") + case .zoomIn: + button.focusedImage = UIImage(systemName: "plus.circle.fill") + case .zoomOut: + button.focusedImage = UIImage(systemName: "minus.circle.fill") + } + } return button } diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift index 6b6f73589..e0f994eb6 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift @@ -12,8 +12,10 @@ final class SettingsTemplateBuilder { private class func buildGridButtons() -> [CPGridButton] { let options = RoutingOptions() - return [createUnpavedButton(options: options), - createTollButton(options: options), + return [createTollButton(options: options), + createUnpavedButton(options: options), + createPavedButton(options: options), + createMotorwayButton(options: options), createFerryButton(options: options), createStepsButton(options: options), createSpeedcamButton()] @@ -21,7 +23,7 @@ final class SettingsTemplateBuilder { // MARK: - CPGridButton builders private class func createTollButton(options: RoutingOptions) -> CPGridButton { - var tollIconName = "options.tolls" + var tollIconName = "tolls.circle" if options.avoidToll { tollIconName += ".slash" } let configuration = UIImage.SymbolConfiguration(textStyle: .title1) var image = UIImage(named: tollIconName, in: nil, with: configuration)! @@ -39,8 +41,8 @@ final class SettingsTemplateBuilder { } private class func createUnpavedButton(options: RoutingOptions) -> CPGridButton { - var unpavedIconName = "options.unpaved" - if options.avoidDirty { unpavedIconName += ".slash" } + var unpavedIconName = "unpaved.circle" + if options.avoidDirty && !options.avoidPaved { unpavedIconName += ".slash" } let configuration = UIImage.SymbolConfiguration(textStyle: .title1) var image = UIImage(named: unpavedIconName, in: nil, with: configuration)! if #unavailable(iOS 26) { @@ -49,15 +51,59 @@ final class SettingsTemplateBuilder { } let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")], image: image) { _ in options.avoidDirty = !options.avoidDirty + if options.avoidDirty { + options.avoidPaved = false + } options.save() CarPlayService.shared.updateRouteAfterChangingSettings() CarPlayService.shared.popTemplate(animated: true) } + unpavedButton.isEnabled = !options.avoidPaved return unpavedButton } + + private class func createPavedButton(options: RoutingOptions) -> CPGridButton { + var pavedIconName = "paved.circle" + if options.avoidPaved && !options.avoidDirty { pavedIconName += ".slash" } + let configuration = UIImage.SymbolConfiguration(textStyle: .title1) + var image = UIImage(named: pavedIconName, in: nil, with: configuration)! + if #unavailable(iOS 26) { + image = image.withTintColor(.white, renderingMode: .alwaysTemplate) + image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate) + } + let pavedButton = CPGridButton(titleVariants: [L("avoid_paved")], image: image) { _ in + options.avoidPaved = !options.avoidPaved + if options.avoidPaved { + options.avoidDirty = false + } + options.save() + CarPlayService.shared.updateRouteAfterChangingSettings() + CarPlayService.shared.popTemplate(animated: true) + } + pavedButton.isEnabled = !options.avoidDirty + return pavedButton + } + + private class func createMotorwayButton(options: RoutingOptions) -> CPGridButton { + var motorwayIconName = "motorways.circle" + if options.avoidMotorway { motorwayIconName += ".slash" } + let configuration = UIImage.SymbolConfiguration(textStyle: .title1) + var image = UIImage(named: motorwayIconName, in: nil, with: configuration)! + if #unavailable(iOS 26) { + image = image.withTintColor(.white, renderingMode: .alwaysTemplate) + image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate) + } + let motorwayButton = CPGridButton(titleVariants: [L("avoid_motorways")], image: image) { _ in + options.avoidMotorway = !options.avoidMotorway + options.save() + CarPlayService.shared.updateRouteAfterChangingSettings() + CarPlayService.shared.popTemplate(animated: true) + } + return motorwayButton + } private class func createFerryButton(options: RoutingOptions) -> CPGridButton { - var ferryIconName = "options.ferries" + var ferryIconName = "ferries.circle" if options.avoidFerry { ferryIconName += ".slash" } let configuration = UIImage.SymbolConfiguration(textStyle: .title1) var image = UIImage(named: ferryIconName, in: nil, with: configuration)! @@ -75,7 +121,7 @@ final class SettingsTemplateBuilder { } private class func createStepsButton(options: RoutingOptions) -> CPGridButton { - var stepsIconName = "options.steps" + var stepsIconName = "steps.circle" if options.avoidSteps { stepsIconName += ".slash" } let configuration = UIImage.SymbolConfiguration(textStyle: .title1) var image = UIImage(named: stepsIconName, in: nil, with: configuration)! @@ -93,7 +139,7 @@ final class SettingsTemplateBuilder { } private class func createSpeedcamButton() -> CPGridButton { - var speedcamIconName = "options.speedcamera" + var speedcamIconName = "speedcamera" let isSpeedCamActivated = CarPlayService.shared.isSpeedCamActivated if !isSpeedCamActivated { speedcamIconName += ".slash" } let configuration = UIImage.SymbolConfiguration(textStyle: .title1) diff --git a/iphone/Maps/Core/Routing/MWMRouter.h b/iphone/Maps/Core/Routing/MWMRouter.h index 86d8f5798..2901437b6 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.h +++ b/iphone/Maps/Core/Routing/MWMRouter.h @@ -6,7 +6,8 @@ typedef NS_ENUM(NSInteger, MWMRoadType) { MWMRoadTypeDirty, MWMRoadTypeFerry, MWMRoadTypeMotorway, - MWMRoadTypeSteps + MWMRoadTypeSteps, + MWMRoadTypePaved }; typedef void (^MWMImageHeightBlock)(UIImage *, NSString *, NSString *); diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 9d2bdaceb..82385be43 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -592,6 +592,9 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm case MWMRoadTypeDirty: options.avoidDirty = YES; break; + case MWMRoadTypePaved: + options.avoidPaved = YES; + break; case MWMRoadTypeFerry: options.avoidFerry = YES; break; diff --git a/iphone/Maps/Core/Settings/MWMRoutingOptions.h b/iphone/Maps/Core/Settings/MWMRoutingOptions.h index b45daf049..6d96e973d 100644 --- a/iphone/Maps/Core/Settings/MWMRoutingOptions.h +++ b/iphone/Maps/Core/Settings/MWMRoutingOptions.h @@ -7,6 +7,7 @@ NS_SWIFT_NAME(RoutingOptions) @property(nonatomic) BOOL avoidToll; @property(nonatomic) BOOL avoidDirty; +@property(nonatomic) BOOL avoidPaved; @property(nonatomic) BOOL avoidFerry; @property(nonatomic) BOOL avoidMotorway; @property(nonatomic) BOOL avoidSteps; diff --git a/iphone/Maps/Core/Settings/MWMRoutingOptions.mm b/iphone/Maps/Core/Settings/MWMRoutingOptions.mm index c05892a7f..d6b80a8c8 100644 --- a/iphone/Maps/Core/Settings/MWMRoutingOptions.mm +++ b/iphone/Maps/Core/Settings/MWMRoutingOptions.mm @@ -35,6 +35,14 @@ [self setOption:(routing::RoutingOptions::Road::Dirty) enabled:avoid]; } +- (BOOL)avoidPaved { + return _options.Has(routing::RoutingOptions::Road::Paved); +} + +- (void)setAvoidPaved:(BOOL)avoid { + [self setOption:(routing::RoutingOptions::Road::Paved) enabled:avoid]; +} + - (BOOL)avoidFerry { return _options.Has(routing::RoutingOptions::Road::Ferry); } @@ -60,7 +68,7 @@ } - (BOOL)hasOptions { - return self.avoidToll || self.avoidDirty || self.avoidFerry || self.avoidMotorway || self.avoidSteps; + return self.avoidToll || self.avoidDirty || self.avoidPaved|| self.avoidFerry || self.avoidMotorway || self.avoidSteps; } - (void)save { @@ -80,8 +88,7 @@ return NO; } MWMRoutingOptions *another = (MWMRoutingOptions *)object; - return another.avoidToll == self.avoidToll && another.avoidDirty == self.avoidDirty && - another.avoidFerry == self.avoidFerry && another.avoidMotorway == self.avoidMotorway && another.avoidSteps == self.avoidSteps; + return another.avoidToll == self.avoidToll && another.avoidDirty == self.avoidDirty && another.avoidPaved == self.avoidPaved && another.avoidFerry == self.avoidFerry && another.avoidMotorway == self.avoidMotorway && another.avoidSteps == self.avoidSteps; } @end diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg index 8e4b6d369..8d76fc1f7 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg @@ -2,6 +2,6 @@ atm_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg index 04c350256..4df5b065f 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg @@ -2,6 +2,6 @@ bank_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg index a5a3f702d..22fd7aaab 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg @@ -2,6 +2,6 @@ children_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg index a71a3e8a5..8e537e673 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg @@ -2,6 +2,6 @@ children_light - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg index c057afe9d..1d4baa95b 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg @@ -2,6 +2,6 @@ eat_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg index 49fdd1323..ca8515ba3 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg @@ -2,6 +2,6 @@ entertainment_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg index d9f0dc083..d0ecdfc0c 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg @@ -2,6 +2,6 @@ entertainment_light - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg index 017d1e4e4..cd1212c07 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg @@ -2,6 +2,6 @@ food_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg index a37a0645b..fdd7e92fa 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg @@ -2,6 +2,6 @@ fuel_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg index 046f0b26d..75ac7e524 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg @@ -2,6 +2,6 @@ fuel_light - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg index 88e7cad19..c689e4fd2 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg @@ -2,6 +2,6 @@ hospital_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg index e1f00a681..b09c33672 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg @@ -2,6 +2,6 @@ hotel_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg index c8df9702c..6e2449660 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg @@ -2,6 +2,6 @@ nightlife_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg index bf4010aa9..1afaa559f 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg @@ -2,6 +2,6 @@ parking_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg index e044f6792..5498e494b 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg @@ -2,6 +2,6 @@ pharmacy_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg index 2af5b1575..39641e18b 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg @@ -2,6 +2,6 @@ police_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg index 5a83f73ea..7da2702f1 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg @@ -2,6 +2,6 @@ post_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg index 018625c75..6d63697da 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg @@ -2,6 +2,6 @@ recycling_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg index eeb7da0ea..fc8ede4ea 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg @@ -2,6 +2,6 @@ rv_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg index 509e1d257..5275480ba 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg @@ -2,6 +2,6 @@ secondhand_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg index 16fdec841..a8a70e679 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg @@ -2,6 +2,6 @@ shopping_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg index f1bb0f5df..dca12c546 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg @@ -2,6 +2,6 @@ toilet_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg index 11967cd11..1673ffa55 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_light.svg @@ -2,6 +2,6 @@ toilet_light - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg index 709e82885..14bf56e79 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/tourism.imageset/tourism_dark.svg @@ -2,6 +2,6 @@ tourism_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg b/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg index a236e6240..dbe959881 100644 --- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg +++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/wifi.imageset/wifi_dark.svg @@ -2,6 +2,6 @@ wifi_dark - + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/Contents.json similarity index 72% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/Contents.json index 9053da09a..665958db4 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "options.steps.slash.svg", + "filename" : "ferries.circle.slash.svg", "idiom" : "universal" } ] diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/ferries.circle.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/ferries.circle.slash.svg new file mode 100644 index 000000000..f9a291841 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/ferries.circle.slash.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/Contents.json similarity index 74% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/Contents.json index 7089b43ea..b1ac2ec98 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "options.ferries.svg", + "filename" : "ferries.circle.svg", "idiom" : "universal" } ] diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/ferries.circle.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/ferries.circle.svg new file mode 100644 index 000000000..c3e581e5e --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/ferries.circle.svg @@ -0,0 +1,109 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from circle + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/Contents.json similarity index 75% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/Contents.json index 50bd67954..dad39a10e 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "options.steps.svg", + "filename" : "ferries.slash.svg", "idiom" : "universal" } ] diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/ferries.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/ferries.slash.svg new file mode 100644 index 000000000..bf8fe6a16 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/ferries.slash.svg @@ -0,0 +1,115 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/Contents.json similarity index 75% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/Contents.json index 96e38a308..e5cbc420c 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "options.tolls.svg", + "filename" : "ferries.svg", "idiom" : "universal" } ] diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/ferries.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/ferries.svg new file mode 100644 index 000000000..89e988aa6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/ferries.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from ferries + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/Contents.json similarity index 71% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/Contents.json index 1e1b4289e..712a5af04 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "options.ferries.slash.svg", + "filename" : "motorways.circle.slash.svg", "idiom" : "universal" } ] diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/options.unpaved.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/motorways.circle.slash.svg similarity index 57% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/options.unpaved.slash.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/motorways.circle.slash.svg index 05766c3ca..b009bc5f1 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/options.unpaved.slash.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/motorways.circle.slash.svg @@ -4,21 +4,23 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/Contents.json new file mode 100644 index 000000000..d32813535 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "motorways.circle.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/options.steps.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/motorways.circle.svg similarity index 65% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/options.steps.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/motorways.circle.svg index 23f474dcd..9f72ae1e5 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/options.steps.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/motorways.circle.svg @@ -5,16 +5,16 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/Contents.json similarity index 74% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/Contents.json index 5db8d3d41..f59d7b28d 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "options.unpaved.svg", + "filename" : "motorways.slash.svg", "idiom" : "universal" } ] diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/motorways.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/motorways.slash.svg new file mode 100644 index 000000000..4967532ed --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/motorways.slash.svg @@ -0,0 +1,115 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.symbolset/Contents.json new file mode 100644 index 000000000..bb9ced009 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "motorways.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/options.unpaved.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.symbolset/motorways.svg similarity index 51% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/options.unpaved.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/motorways.symbolset/motorways.svg index 1bd826730..8434c6bf6 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/options.unpaved.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.symbolset/motorways.svg @@ -4,15 +4,14 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/Contents.json deleted file mode 100644 index b127896c6..000000000 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "symbols" : [ - { - "filename" : "options.speedcamera.slash.svg", - "idiom" : "universal" - } - ] -} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/Contents.json deleted file mode 100644 index da4fc8459..000000000 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "symbols" : [ - { - "filename" : "options.tolls.slash.svg", - "idiom" : "universal" - } - ] -} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/options.tolls.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/options.tolls.slash.svg deleted file mode 100644 index 341a100d6..000000000 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/options.tolls.slash.svg +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - Weight/Scale Variations - Ultralight - Thin - Light - Regular - Medium - Semibold - Bold - Heavy - Black - - - - - - - - - - - Design Variations - Symbols are supported in up to nine weights and three scales. - For optimal layout with text and other symbols, vertically align - symbols with the adjacent text. - - - - - - Margins - Leading and trailing margins on the left and right side of each symbol - can be adjusted by modifying the x-location of the margin guidelines. - Modifications are automatically applied proportionally to all - scales and weights. - - - - Exporting - Symbols should be outlined when exporting to ensure the - design is preserved when submitting to Xcode. - Template v.6.0 - Requires Xcode 16 or greater - Generated from - Typeset at 100.0 points - Small - Medium - Large - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/Contents.json deleted file mode 100644 index 7d635434e..000000000 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "symbols" : [ - { - "filename" : "options.unpaved.slash.svg", - "idiom" : "universal" - } - ] -} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.slash.symbolset/Contents.json new file mode 100644 index 000000000..b35c43635 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.slash.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "paved.circle.slash.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/options.steps.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.slash.symbolset/paved.circle.slash.svg similarity index 62% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/options.steps.slash.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.slash.symbolset/paved.circle.slash.svg index bfebf73e2..be047ccb7 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/options.steps.slash.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.slash.symbolset/paved.circle.slash.svg @@ -7,20 +7,20 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" @@ -100,22 +100,22 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.symbolset/Contents.json new file mode 100644 index 000000000..40e239c42 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "paved.circle.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/options.tolls.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.symbolset/paved.circle.svg similarity index 59% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/options.tolls.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.symbolset/paved.circle.svg index 76e907664..2bb9905db 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/options.tolls.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.circle.symbolset/paved.circle.svg @@ -4,15 +4,17 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/paved.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.slash.symbolset/Contents.json new file mode 100644 index 000000000..a3f253667 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.slash.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "paved.slash.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/paved.slash.symbolset/paved.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.slash.symbolset/paved.slash.svg new file mode 100644 index 000000000..3a749a1b2 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.slash.symbolset/paved.slash.svg @@ -0,0 +1,115 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/paved.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.symbolset/Contents.json new file mode 100644 index 000000000..c9664ee5e --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "paved.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/paved.symbolset/paved.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.symbolset/paved.svg new file mode 100644 index 000000000..6d73a2c53 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/paved.symbolset/paved.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from paved + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.slash.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.slash.symbolset/Contents.json new file mode 100644 index 000000000..1ad8ef15b --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.slash.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "speedcamera.circle.slash.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/options.speedcamera.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.slash.symbolset/speedcamera.circle.slash.svg similarity index 74% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/options.speedcamera.slash.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.slash.symbolset/speedcamera.circle.slash.svg index 9b9f07a31..c573096b2 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/options.speedcamera.slash.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.slash.symbolset/speedcamera.circle.slash.svg @@ -4,21 +4,23 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.symbolset/Contents.json new file mode 100644 index 000000000..c76fb99ac --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "speedcamera.circle.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/options.speedcamera.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.symbolset/speedcamera.circle.svg similarity index 75% rename from iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/options.speedcamera.svg rename to iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.symbolset/speedcamera.circle.svg index 906b1e7e1..f116812df 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/options.speedcamera.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.circle.symbolset/speedcamera.circle.svg @@ -4,15 +4,17 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - + + + + CoMaps CDN + + + +

    This is a CDN for CoMaps

    + +

    Resources:

    +
      +
    1. CoMaps subway validator
      2. +
    2. CoMaps News
      3. +
    3. Donate
      4. +
    + + +``` diff --git a/tools/python/maps_generator/FRENCH_LIBRARY_INSTRUCTIONS.md b/tools/python/maps_generator/FRENCH_LIBRARY_INSTRUCTIONS.md new file mode 100644 index 000000000..446db3b87 --- /dev/null +++ b/tools/python/maps_generator/FRENCH_LIBRARY_INSTRUCTIONS.md @@ -0,0 +1,20 @@ +# French National Library Archiving + +The library has taken an interest in archiving CoMaps and its data as a snapshot +of our world and the way people interact with maps, in a way that doesn't rely on +maintaining servers etc. (With an APK and MWM files and some copy-paste, you can +reproduce our app on an emulator etc.) + +## Instructions + +Every 6 months or so, @jeanbaptisteC may ask to upload the most recent map version +and a custom APK with bundled World map (googleRelease) with production keys (like web release). + +Credentials for `frlibrary` are in the mapgen rclone, or in zyphlar/pastk's password managers. + +To upload (modify dates accordingly): + +``` +rclone copy CoMaps-25110702-google-release.apk frlibrary:/apk/ +rclone copy 251104 frlibrary:/maps/251104 +``` \ No newline at end of file diff --git a/tools/python/maps_generator/generator/exceptions.py b/tools/python/maps_generator/generator/exceptions.py index 3f8c94f2e..dec292b9b 100644 --- a/tools/python/maps_generator/generator/exceptions.py +++ b/tools/python/maps_generator/generator/exceptions.py @@ -1,5 +1,5 @@ import os - +import subprocess class MapsGeneratorError(Exception): pass @@ -35,9 +35,24 @@ class FailedTest(MapsGeneratorError): def wait_and_raise_if_fail(p): if p.wait() != os.EX_OK: - args = p.args - logs = p.output.name - if p.error.name != logs: - logs += " and " + p.error.name - msg = f"The launch of {args.pop(0)} failed.\nArguments used: {' '.join(args)}\nSee details in {logs}" - raise BadExitStatusError(msg) + if type(p) is subprocess.Popen: + args = p.args + stdout = p.stdout + stderr = p.stderr + logs = None + errors = None + if type(stdout) is not type(None): + logs = stdout.read(256).decode() + if type(stderr) is not type(None): + errors = stderr.read(256).decode() + if errors != logs: + logs += " and " + errors + msg = f"The launch of {args.pop(0)} failed.\nArguments used: {' '.join(args)}\nSee details in {logs}" + raise BadExitStatusError(msg) + else: + args = p.args + logs = p.output.name + if p.error.name != logs: + logs += " and " + p.error.name + msg = f"The launch of {args.pop(0)} failed.\nArguments used: {' '.join(args)}\nSee details in {logs}" + raise BadExitStatusError(msg) diff --git a/tools/python/maps_generator/generator/stages_declaration.py b/tools/python/maps_generator/generator/stages_declaration.py index d57e67016..06756a3d7 100644 --- a/tools/python/maps_generator/generator/stages_declaration.py +++ b/tools/python/maps_generator/generator/stages_declaration.py @@ -11,6 +11,7 @@ import multiprocessing import os import shutil import tarfile +import errno from collections import defaultdict from concurrent.futures import ThreadPoolExecutor, as_completed from typing import AnyStr @@ -168,8 +169,18 @@ class StageDownloadDescriptions(Stage): ) """ - src = "/home/planet/descriptions" + # The src folder is hardcoded here and must be implemented on the map building machine + src = "/home/planet/wikipedia/descriptions" + # The dest folder will generally become build/*/intermediate_data/descriptions dest = env.paths.descriptions_path + # An empty source folder is a big problem + try: + if os.path.isdir(src): + print("Found %s" % (src)) + else: + raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), src) + except OSError as e: + print("rmtree error: %s - %s" % (e.filename, e.strerror)) # Empty folder "descriptions" can be already created. try: if os.path.isdir(dest): diff --git a/tools/python/maps_generator/generator/stages_tests.py b/tools/python/maps_generator/generator/stages_tests.py index 821ec2add..b49f335b6 100644 --- a/tools/python/maps_generator/generator/stages_tests.py +++ b/tools/python/maps_generator/generator/stages_tests.py @@ -9,6 +9,8 @@ from maps_generator.utils.file import download_file def make_test_booking_data(max_days): def test_booking_data(env: Env, logger, *args, **kwargs): + if not settings.HOTELS_URL: + return None base_url, _ = settings.HOTELS_URL.rsplit("/", maxsplit=1) url = f"{base_url}/meta.json" meta_path = os.path.join(env.paths.tmp_dir(), "hotels-meta.json") diff --git a/tools/python/maps_generator/generator/steps.py b/tools/python/maps_generator/generator/steps.py index ac868ce3d..a98f5d089 100644 --- a/tools/python/maps_generator/generator/steps.py +++ b/tools/python/maps_generator/generator/steps.py @@ -36,8 +36,11 @@ def multithread_run_if_one_country(func): def wrap(env, country, **kwargs): if len(env.countries) == 1: kwargs.update({"threads_count": settings.THREADS_COUNT}) + # Otherwise index stage of Taiwan_* mwms continues to run after all other mwms have finished: elif country == 'Taiwan_North': - kwargs.update({"threads_count": 4}) + kwargs.update({"threads_count": 6}) + elif country == 'Taiwan_South': + kwargs.update({"threads_count": 2}) func(env, country, **kwargs) return wrap diff --git a/tools/python/maps_generator/var/etc/map_generator.ini.prod b/tools/python/maps_generator/var/etc/map_generator.ini.prod new file mode 100644 index 000000000..036893991 --- /dev/null +++ b/tools/python/maps_generator/var/etc/map_generator.ini.prod @@ -0,0 +1,107 @@ +[Developer] +# Path to the `comaps` source code repository: +OMIM_PATH: ~/comaps +# A path with the generator_tool binary: +BUILD_PATH: ~/omim-build-relwithdebinfo + + +[Main] +# A special small planet file will be downloaded if DEBUG is set to 1. +DEBUG: 0 +# A main working directory. There is a subdirectory created for each generator run +# which contains the planet and other downloads, temporary build files, logs and completed MWMs. +MAIN_OUT_PATH: /mnt/4tbexternal/osm-maps +# Path for storing caches for nodes, ways, relations. +# If it's not set then caches are stored inside the directory of the current build. +# CACHE_PATH: ${Main:MAIN_OUT_PATH}/cache + + +[Generator tool] +# Path to the data/ folder in the repository: +USER_RESOURCE_PATH: ${Developer:OMIM_PATH}/data +# Features stage only parallelism level. Set to 0 for auto detection. +THREADS_COUNT_FEATURES_STAGE: 0 +# Do not change it. This is determined automatically. +NODE_STORAGE: mem + + +[Osm tools] +# Path to osmctools binaries: +OSM_TOOLS_PATH: /usr/bin/ +# If the binaries are not found neither in the configured path nor system-wide, +# then the tools are built from the sources: +OSM_TOOLS_SRC_PATH: ${Developer:OMIM_PATH}/tools/osmctools + +[Logging] +# maps_generator's general (python output only) log file path and name. +# More detailed logs that include output of the `generator_tool` binary +# are located in the `logs/` subdir of a particular build directory, +# e.g. `maps_build/2023_06_04__20_05_07/logs/`. +LOG_FILE_PATH: ${Main:MAIN_OUT_PATH}/generation.log + + +[External] +# Planet file location. It should be a dump of OSM data in osm.pbf format. +# By default its an entire planet from "planet.openstreetmap.org". +# Or set it to a particular country/region extract from e.g. [Geofabrik](http://download.geofabrik.de/index.html). +# Note that an entire planet generation takes 40+ hours on a 256GB RAM server (and 1TB+ disk space). +# Stick to smaller extracts unless you have a machine this large. +# Here and further, its possible to specify either an URL (to be downloaded automatically) +# or a local file path like file:///path/to/file. +# A sample URL to download a latest OSM dump for North Macedonia: +PLANET_URL: file:///home/planet/planet/planet.o5m +# Location of the md5 checksum of the planet file: +PLANET_MD5_URL: ${External:PLANET_URL}.md5 +# A base url to the latest_coasts.geom and latest_coasts.rawgeom files. +# For example, if PLANET_COASTS_URL = https://somesite.com/download/ +# then the https://somesite.com/download/latest_coasts.geom url will be used to download latest_coasts.geom and +# the https://somesite.com/download/latest_coasts.rawgeom url will be used to download latest_coasts.rawgeom. +# Comment to skip getting the coastlines files. +PLANET_COASTS_URL: file:///home/planet/ +# Should be 'true' for an entire planet build to make a special routing section in World.mwm +# for alerting about absent regions without which the route can't be built. +# NEED_BUILD_WORLD_ROADS: true +# Subway file location, see docs/SUBWAY_GENERATION.md if you want to generate your own file. +# Comment to disable subway layer generation. + +SUBWAY_URL: file:///home/planet/subway/subways.transit.json + +# Location of the EXPERIMENTAL GTFS-extracted public transport transit files: +# TRANSIT_URL: + +# Urls for production maps generation. +# UGC_URL: +# HOTELS_URL: +# PROMO_CATALOG_CITIES: +# POPULARITY_URL: +# FOOD_URL: +# FOOD_TRANSLATIONS_URL: + +SRTM_PATH: /home/planet/SRTM-patched-europe/ +ISOLINES_PATH: /home/planet/isolines/ +ADDRESSES_PATH: /home/planet/tiger/ + +# Local path (not url!) to .csv files. +UK_POSTCODES_URL: /home/planet/postcodes/gb-postcode-data/gb_postcodes.csv +US_POSTCODES_URL: /home/planet/postcodes/us-postcodes/uszips.csv + + +[Stages] +# Set to 1 to update the entire OSM planet file (as taken from "planet.openstreetmap.org") +# via an osmupdate tool before the generation. Not for use with partial planet extracts. +NEED_PLANET_UPDATE: 0 +# If you want to calculate diffs you need to specify where the old maps are, +# e.g. ${Main:MAIN_OUT_PATH}/2021_03_16__09_00_00/ +DATA_ARCHIVE_DIR: ${Generator tool:USER_RESOURCE_PATH} +# How many versions in the archive to use for diff calculation: +DIFF_VERSION_DEPTH: 2 + + +[Common] +# Default parallelism level for the most of jobs. Set to 0 for auto detection. +THREADS_COUNT: 0 + + +[Stats] +# Path to rules for calculating statistics by type: +STATS_TYPES_CONFIG: ${Developer:OMIM_PATH}/tools/python/maps_generator/var/etc/stats_types_config.txt diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh index cd18798f2..c4d1e8721 100755 --- a/tools/unix/build_omim.sh +++ b/tools/unix/build_omim.sh @@ -6,6 +6,8 @@ SKIP_MAP_DOWNLOAD="${SKIP_MAP_DOWNLOAD:-}" SKIP_GENERATE_SYMBOLS="${SKIP_GENERATE_SYMBOLS:-}" SKIP_GENERATE_DRULES="${SKIP_GENERATE_DRULES:-}" +CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI -U GENERATOR_TOOL -U USE_PCH -U CMAKE_EXPORT_COMPILE_COMMANDS -U NJOBS -U SKIP_TESTS" + OPT_DEBUG= OPT_RELEASE= OPT_RELEASEDEBUGINFO= @@ -63,7 +65,6 @@ done OPT_TARGET=${@:$OPTIND} -CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI -U GENERATOR_TOOL" if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE"]; then CMAKE_CONFIG="${CMAKE_CONFIG:-} -DSKIP_QT_GUI=ON" fi diff --git a/tools/unix/generate_drules.sh b/tools/unix/generate_drules.sh index 7ef893fc4..6f7709c2b 100755 --- a/tools/unix/generate_drules.sh +++ b/tools/unix/generate_drules.sh @@ -1,9 +1,6 @@ #!/usr/bin/env bash set -e -u -# Prevent python from generating compiled *.pyc files -export PYTHONDONTWRITEBYTECODE=1 - OMIM_PATH="${OMIM_PATH:-$(dirname "$0")/../..}" DATA_PATH="${DATA_PATH:-$OMIM_PATH/data}" @@ -22,14 +19,18 @@ function BuildDrawingRules() { -o "$DATA_PATH/drules_proto$suffix" \ -p "$DATA_PATH/styles/$styleType/include/" # Output diff and store to a file - diff -u "$DATA_PATH"/drules_proto$suffix.txt{.prev,} | tee "$DATA_PATH"/drules_proto$suffix.txt.diff + if [ -f "$DATA_PATH/drules_proto$suffix.txt.prev" ]; then + diff -u "$DATA_PATH/drules_proto$suffix.txt.prev" "$DATA_PATH/drules_proto$suffix.txt" > "$DATA_PATH/drules_proto$suffix.txt.diff" || true + fi } outputs=(classificator.txt types.txt visibility.txt colors.txt patterns.txt drules_proto.txt) # Store old versions for diffs for item in ${outputs[*]} do - mv $DATA_PATH/$item{,.prev} || true + if [ -f "$DATA_PATH/$item" ]; then + mv -f "$DATA_PATH/$item" "$DATA_PATH/$item.prev" + fi done # Building drawing rules @@ -63,7 +64,11 @@ python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \ # Output diffs and store to files for item in ${outputs[*]} do - diff -u "$DATA_PATH"/$item{.prev,} | tee "$DATA_PATH"/$item.diff + if [ -f "$DATA_PATH/$item.prev" ] && [ -f "$DATA_PATH/$item" ]; then + diff -u "$DATA_PATH/$item.prev" "$DATA_PATH/$item" > "$DATA_PATH/$item.diff" || true + else + echo "Skipping diff for $item (first run or file missing)" + fi done -echo "Diffs for all changes are stored in $DATA_PATH/*.txt.diff" \ No newline at end of file +echo "Diffs for all changes are stored in $DATA_PATH/*.txt.diff" diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index 68f247dd8..c9494f679 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -14,9 +14,6 @@ then exit fi -# Prevent python from generating compiled *.pyc files -export PYTHONDONTWRITEBYTECODE=1 - # Add env var to disable renderer on a display (renderer not working into a Github container) export QT_QPA_PLATFORM=offscreen diff --git a/tools/unix/generate_vulkan_shaders.sh b/tools/unix/generate_vulkan_shaders.sh index 5976fd030..8c23f4023 100755 --- a/tools/unix/generate_vulkan_shaders.sh +++ b/tools/unix/generate_vulkan_shaders.sh @@ -1,9 +1,6 @@ #!/usr/bin/env bash set -e -u -# Prevent python from generating compiled *.pyc files -export PYTHONDONTWRITEBYTECODE=1 - DEBUG="${1:-empty}" MY_PATH="`dirname \"$0\"`" # relative diff --git a/tools/unix/maps/Dockerfile b/tools/unix/maps/Dockerfile new file mode 100644 index 000000000..b9f732408 --- /dev/null +++ b/tools/unix/maps/Dockerfile @@ -0,0 +1,68 @@ +# See run-docker.sh for cloning, building, and running the maps generator Docker routine +FROM debian:latest + +ARG DEBIAN_FRONTEND=noninteractive +ENV TZ=Etc/UTC + +RUN apt-get update -qq \ + && apt-get install -y --no-install-recommends \ + build-essential \ + ca-certificates \ + cargo \ + clang \ + cmake \ + curl \ + git \ + jq \ + libc++-dev \ + libfreetype-dev \ + libgeos-dev \ + libgl1-mesa-dev \ + libglvnd-dev \ + libharfbuzz-dev \ + libicu-dev \ + libqt6positioning6 \ + libqt6positioning6-plugins \ + libqt6svg6-dev \ + libsqlite3-dev \ + libxcursor-dev \ + libxi-dev \ + libxinerama-dev \ + libxrandr-dev \ + ninja-build \ + nodejs \ + openssh-client \ + osmctools \ + osmium-tool \ + pyosmium \ + python3 \ + python3-pip \ + python3-venv \ + python-is-python3 \ + python3-dev \ + qt6-base-dev \ + qt6-positioning-dev \ + rclone \ + rustc \ + sshpass \ + vim-tiny \ + wget \ + wget2 \ + zlib1g-dev \ + && rm -rf /var/cache/apt/* /var/lib/apt/lists/*; + +# Allow pip to install system-wide in the container +RUN pip3 install "protobuf<4" --break-system-packages + +# Mount a volume to store the large input, output, and temp files here +RUN mkdir /mnt/4tbexternal +# And a volume to store >10gb files for the planet output here +RUN mkdir /home/planet + +WORKDIR ~ + +# The actual map generation process will run something like this, +# but ~/comaps isn't mounted nor provided in the docker image. +#CMD ~/comaps/tools/unix/maps/docker_maps_generator.sh + +CMD /bin/bash \ No newline at end of file diff --git a/tools/unix/maps/docker_maps_generator.sh b/tools/unix/maps/docker_maps_generator.sh new file mode 100644 index 000000000..d0abc0b74 --- /dev/null +++ b/tools/unix/maps/docker_maps_generator.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash + +set -e + +echo "<$(date +%T)> Starting..." + +# Prepare paths +# Most other paths in /mnt/4tbexternal or /home/planet are already created by Dockerfile or CI/CD. +# +mkdir -p /root/.config/CoMaps # Odd mkdir permission errors in generator_tool in Docker without these +chmod -R 777 /root/.config +mkdir -p /home/planet/postcodes/gb-postcode-data/ +mkdir -p /home/planet/postcodes/us-postcodes/ +mkdir -p /home/planet/SRTM-patched-europe/ +mkdir -p /home/planet/subway + +echo "<$(date +%T)> Running ./configure.sh ..." +cd ~/comaps +export SKIP_MAP_DOWNLOAD=1 SKIP_GENERATE_SYMBOLS=1 +./configure.sh + +echo "<$(date +%T)> Compiling tools..." +cd ~/comaps +./tools/unix/build_omim.sh -p ~ -R generator_tool +./tools/unix/build_omim.sh -p ~ -R world_roads_builder_tool +./tools/unix/build_omim.sh -p ~ -R mwm_diff_tool +cd tools/python/maps_generator +python3 -m venv /tmp/venv +/tmp/venv/bin/pip3 install -r requirements_dev.txt + +echo "<$(date +%T)> Copying map generator INI..." +cp var/etc/map_generator.ini.prod var/etc/map_generator.ini + + +cd ~/comaps/tools/python +if [ $MWMCONTINUE -gt 0 ]; then + +echo "<$(date +%T)> Continuing from preexisting generator run..." +/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs" --continue + +else + +if [[ -n $MWMCOUNTRIES ]]; then + +echo "<$(date +%T)> Generating only specific maps [$MWMCOUNTRIES]..." +/tmp/venv/bin/python -m maps_generator --countries=$MWMCOUNTRIES --skip="MwmDiffs" + +else + +echo "<$(date +%T)> Generating maps..." +/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs" + +fi +fi + +echo "<$(date +%T)> DONE" diff --git a/tools/unix/maps/generate_subways.sh b/tools/unix/maps/generate_subways.sh index 867210368..467cb38cf 100755 --- a/tools/unix/maps/generate_subways.sh +++ b/tools/unix/maps/generate_subways.sh @@ -20,9 +20,9 @@ export SKIP_PLANET_UPDATE="1" # If unavailable then replace with a local file. # TODO: keep the downloaded csv file from the latest run. #export CITIES_INFO_URL="" -export TMPDIR="$BUILD_PATH/subways" +export TMPDIR="$BUILD_PATH/subway" # The output file, which needs post-processing by transit_graph_generator.py -export MAPSME="$SUBWAYS_PATH/subways.json" +export MAPSME="$SUBWAYS_PATH/subway.json" # Produce additional files needed for https://cdn.organicmaps.app/subway/ export HTML_DIR="$SUBWAYS_VALIDATOR_PATH" @@ -30,7 +30,12 @@ export DUMP="$SUBWAYS_VALIDATOR_PATH" export GEOJSON="$SUBWAYS_VALIDATOR_PATH" export DUMP_CITY_LIST="$SUBWAYS_VALIDATOR_PATH/cities.txt" -"$SUBWAYS_REPO_PATH/scripts/process_subways.sh" 2>&1 | tee "$SUBWAYS_LOG" +# cd to subways repo so relative paths work in the script +PREVDIR=$(pwd) +cd "$SUBWAYS_REPO_PATH" +echo "Running process_subways.sh:" +./scripts/process_subways.sh 2>&1 | tee "$SUBWAYS_LOG" +cd "$PREVDIR" # Make render.html available for map visualization on the web cp -r "$SUBWAYS_REPO_PATH"/render/* "$SUBWAYS_VALIDATOR_PATH/" diff --git a/tools/unix/maps/run-docker.sh b/tools/unix/maps/run-docker.sh new file mode 100644 index 000000000..a156b3533 --- /dev/null +++ b/tools/unix/maps/run-docker.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# Run the maps generator via Docker manually without CI +# See .forgejo/workflows/map-generator.yml for steps to run before the main mapgen process, +# e.g. clone the repos, get/update planet file, generate isolines etc. + +# To build the docker container: +# cd /mnt/4tbexternal/comaps/tools/unix/maps +# docker build . -t maps_generator +# +# To push for ci/cd, tag for codeberg: +# docker login codeberg.org +# docker tag maps_generator codeberg.org/comaps/maps_generator:latest +# docker push codeberg.org/comaps/maps_generator:latest +# You can also tag and push the image Id for posterity: codeberg.org/comaps/maps_generator:1234abcd +# If you get a Dockerfile not found error especially on an XFS partition, try copying Dockerfile to an ext4 partition first. +# Or use docker via apt instead of snap. + +# We assume that the following will be cloned into the container itself at runtime: +# ~/comaps (comaps main app repo) +# ~/subways (repo for processing OSM subway/transit info) +# ~/wikiparser (repo for processing Wikipedia data) + +# We also assume a number of files/folders/repos are pre-set-up before mounting via volumes below: +# /mnt/4tbexternal (base folder for directory traversal) +# /mnt/4tbexternal/osm-maps (folder for holding generated map data output) +# /home/planet (folder for holding required input dumps) + +docker run \ + --ulimit nofile=262144:262144 \ + -v /mnt/4tbexternal/:/mnt/4tbexternal/ \ + -v /mnt/4tbexternal/osm-planet:/home/planet \ + -it codeberg.org/comaps/maps_generator:latest \ + ~/comaps/tools/unix/maps/docker_maps_generator.sh diff --git a/tools/unix/maps/settings.sh.prod b/tools/unix/maps/settings.sh.prod new file mode 100644 index 000000000..2389be8c2 --- /dev/null +++ b/tools/unix/maps/settings.sh.prod @@ -0,0 +1,26 @@ +## NOTE: edit the settings.sh file to customize/override the defaults. + +# Absolutize & normalize paths. +REPO_PATH="${REPO_PATH:-$(cd "$(dirname "$0")/../../.."; pwd -P)}" + +#TODO: is base path used? +BASE_PATH="${BASE_PATH:-$REPO_PATH/..}" +# Source map data and processed outputs e.g. wiki articles +DATA_PATH="${DATA_PATH:-/home/planet}" +# Temporary files +BUILD_PATH="${BUILD_PATH:-$DATA_PATH/build}" +# Other code repositories, e.g. subways, wikiparser.. +CODE_PATH="${CODE_PATH:-~}" + +# OSM planet source files + +PLANET_PATH="${PLANET_PATH:-$DATA_PATH/planet}" +PLANET_PBF="${PLANET_PBF:-$PLANET_PATH/planet-latest.osm.pbf}" +PLANET_O5M="${PLANET_O5M:-$PLANET_PATH/planet-latest.o5m}" + +# Subways + +SUBWAYS_REPO_PATH="${SUBWAYS_REPO_PATH:-/root/subways}" +SUBWAYS_PATH="${SUBWAYS_PATH:-$DATA_PATH/subway}" +SUBWAYS_LOG="${SUBWAYS_LOG:-$SUBWAYS_PATH/subway.log}" +SUBWAYS_VALIDATOR_PATH="${SUBWAYS_VALIDATOR_PATH:-$SUBWAYS_PATH/validator}" diff --git a/tools/unix/maps/settings_default.sh b/tools/unix/maps/settings_default.sh index 95cf37974..60594c66a 100644 --- a/tools/unix/maps/settings_default.sh +++ b/tools/unix/maps/settings_default.sh @@ -20,6 +20,6 @@ PLANET_O5M="${PLANET_O5M:-$PLANET_PATH/planet-latest.o5m}" # Subways SUBWAYS_REPO_PATH="${SUBWAYS_REPO_PATH:-$CODE_PATH/subways}" -SUBWAYS_PATH="${SUBWAYS_PATH:-$DATA_PATH/subways}" -SUBWAYS_LOG="${SUBWAYS_LOG:-$SUBWAYS_PATH/subways.log}" -SUBWAYS_VALIDATOR_PATH="${SUBWAYS_VALIDATOR_PATH:-$SUBWAYS_PATH/validator}" +SUBWAYS_PATH="${SUBWAYS_PATH:-$DATA_PATH/subway}" +SUBWAYS_LOG="${SUBWAYS_LOG:-$SUBWAYS_PATH/subway.log}" +SUBWAYS_VALIDATOR_PATH="${SUBWAYS_VALIDATOR_PATH:-$SUBWAYS_PATH/validator}" \ No newline at end of file diff --git a/tools/unix/maps/upload_to_cdn.sh b/tools/unix/maps/upload_to_cdn.sh index f3462fc66..ab0af4e98 100755 --- a/tools/unix/maps/upload_to_cdn.sh +++ b/tools/unix/maps/upload_to_cdn.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Upload new maps version to all CDN nodes (in parallel). +# Upload new maps version to all CDN nodes (in parallel) and remove old versions. # Use following commands for deleting older maps: # @@ -8,15 +8,15 @@ # First list all maps versions on the server # sudo rclone lsd ru1:comaps-maps/maps # Delete the old version -# sudo rclone purge -v ru1:comaps-maps/maps/250713 +# sudo rclone purge -v ru1:comaps-maps/maps/250713/ # # fi1 - max 3 versions # sudo rclone lsd fi1:/var/www/html/maps -# sudo rclone purge -v fi1:/var/www/html/maps/250713 +# sudo rclone purge -v fi1:/var/www/html/maps/250713/ # # de1 - max 6 versions # sudo rclone lsd de1:/var/www/html/comaps-cdn/maps -# sudo rclone purge -v de1:/var/www/html/comaps-cdn/maps/250713 +# sudo rclone purge -v de1:/var/www/html/comaps-cdn/maps/250713/ # # us2 - all versions, don't delete # sudo rclone lsd us2:comaps-map-files/maps @@ -39,6 +39,54 @@ DIR=$(dirname $1)/$MAPS echo "Uploading maps folder $DIR to $MAPS" +# Remove old versions before uploading new ones +echo "Checking for old versions to remove..." + +# ru1 - keep max 3 versions +echo "Cleaning ru1 (keeping 3 newest versions)..." +OLD_VERSIONS_RU1=$(rclone lsd ru1:comaps-maps/maps --max-depth 1 | awk '{print $5}' | sort -r | tail -n +4) +for version in $OLD_VERSIONS_RU1; do + if [ $version -gt 250101 ]; then + echo " Deleting ru1:comaps-maps/maps/$version/" + rclone purge -v ru1:comaps-maps/maps/$version/ + fi +done + +# fi1 - keep max 3 versions +echo "Cleaning fi1 (keeping 3 newest versions)..." +OLD_VERSIONS_FI1=$(rclone lsd fi1:/var/www/html/maps --max-depth 1 | awk '{print $5}' | sort -r | tail -n +4) +for version in $OLD_VERSIONS_FI1; do + if [ $version -gt 250101 ]; then + echo " Deleting fi1:/var/www/html/maps/$version/" + rclone purge -v fi1:/var/www/html/maps/$version/ + fi +done + +# de1 - keep max 6 versions +echo "Cleaning de1 (keeping 6 newest versions)..." +OLD_VERSIONS_DE1=$(rclone lsd de1:/var/www/html/comaps-cdn/maps --max-depth 1 | awk '{print $5}' | sort -r | tail -n +7) +for version in $OLD_VERSIONS_DE1; do + if [ $version -gt 250101 ]; then + echo " Deleting de1:/var/www/html/comaps-cdn/maps/$version/" + rclone purge -v de1:/var/www/html/comaps-cdn/maps/$version/ + fi +done + +# fr1 - keep max 6 versions +echo "Cleaning fr1 (keeping 6 newest versions)..." +OLD_VERSIONS_FR1=$(rclone lsd fr1:/data/maps --max-depth 1 | awk '{print $5}' | sort -r | tail -n +7) +for version in $OLD_VERSIONS_FR1; do + if [ $version -gt 250101 ]; then + echo " Deleting fr1:/data/maps/$version/" + rclone purge -v fr1:/data/maps/$version/ + fi +done + +# us2 - keep all versions (no cleanup) +echo "Skipping us2 cleanup (keeping all versions)" + +echo "Old version cleanup complete" + echo "Uploading to us2" # An explicit mwm/txt filter is used to skip temp files when run for an unfinished generation rclone copy -v --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS & @@ -52,9 +100,29 @@ rclone copy -v --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS & echo "Uploading to de1" rclone copy -v --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS & +echo "Uploading to fr1" +rclone copy -v --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS & + # us1 is not used for maps atm # rclone lsd us1:/home/dh_zzxxrk/cdn-us-1.comaps.app/maps wait +echo "Running once more without parallelization to output status:" + +echo "us2 status:" +rclone copy -v --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS + +echo "ru1 status:" +rclone copy -v --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS + +echo "fi1 status:" +rclone copy -v --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS + +echo "de1 status:" +rclone copy -v --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS + +echo "fr1 status:" +rclone copy -v --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS + echo "Upload complete" diff --git a/tools/unix/minimise_symbol_svg.sh b/tools/unix/minimise_symbol_svg.sh index 13f33a535..fabb63c03 100755 --- a/tools/unix/minimise_symbol_svg.sh +++ b/tools/unix/minimise_symbol_svg.sh @@ -13,9 +13,6 @@ if ! command -v scour &> /dev/null; then exit fi -# Prevent python from generating compiled *.pyc files -export PYTHONDONTWRITEBYTECODE=1 - OMIM_PATH="${OMIM_PATH:-$(cd "$(dirname "$0")/../.."; pwd)}" echo "Started processing" diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index e43c070a2..f9fc2ecce 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 271DC2172EC60C0C00442D94 /* keys_to_remove.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 271DC2162EC60C0C00442D94 /* keys_to_remove.hpp */; }; 340C20DE1C3E4DFD00111D22 /* osm_auth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */; }; 340C20DF1C3E4DFD00111D22 /* osm_auth.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */; }; 340DC8291C4E71E500EAA2CC /* changeset_wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DC8271C4E71E500EAA2CC /* changeset_wrapper.cpp */; }; @@ -75,6 +76,7 @@ /* Begin PBXFileReference section */ 270C9C212E16AABF00ABA688 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = ../../libs/editor/module.modulemap; sourceTree = SOURCE_ROOT; }; + 271DC2162EC60C0C00442D94 /* keys_to_remove.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = keys_to_remove.hpp; sourceTree = ""; }; 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_auth.cpp; sourceTree = ""; }; 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_auth.hpp; sourceTree = ""; }; 340DC8271C4E71E500EAA2CC /* changeset_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changeset_wrapper.cpp; sourceTree = ""; }; @@ -240,6 +242,7 @@ 6715560420BEC331002BA3B4 /* edits_migration.hpp */, 3D052486200F62ED00F24998 /* feature_matcher.cpp */, 3D052485200F62ED00F24998 /* feature_matcher.hpp */, + 271DC2162EC60C0C00442D94 /* keys_to_remove.hpp */, 6715565220BF0F86002BA3B4 /* new_feature_categories.cpp */, 6715565320BF0F87002BA3B4 /* new_feature_categories.hpp */, 341138741C15AE42002E3B3E /* opening_hours_ui.cpp */, @@ -337,6 +340,7 @@ 6715565520BF0F87002BA3B4 /* new_feature_categories.hpp in Headers */, 6715560820BEC332002BA3B4 /* edits_migration.hpp in Headers */, 3D052487200F62EE00F24998 /* feature_matcher.hpp in Headers */, + 271DC2172EC60C0C00442D94 /* keys_to_remove.hpp in Headers */, 3411387B1C15AE42002E3B3E /* ui2oh.hpp in Headers */, 341138791C15AE42002E3B3E /* opening_hours_ui.hpp in Headers */, );