diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000000..2fd1f57f90 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,96 @@ +android/res/values-ar/ @organicmaps/translations-ar +android/res/values-be/ @organicmaps/translations-be +android/res/values-bg/ @organicmaps/translations-bg +android/res/values-cs/ @organicmaps/translations-cs +android/res/values-da/ @organicmaps/translations-da +android/res/values-de/ @organicmaps/translations-de +android/res/values-el/ @organicmaps/translations-el +android/res/values-es/ @organicmaps/translations-es +android/res/values-eu/ @organicmaps/translations-eu +android/res/values-fa/ @organicmaps/translations-fa +android/res/values-fi/ @organicmaps/translations-fi +android/res/values-fr/ @organicmaps/translations-fr +android/res/values-fr-rCA/ @organicmaps/translations-fr +android/res/values-he/ @organicmaps/translations-he +android/res/values-hu/ @organicmaps/translations-hu +android/res/values-in/ @organicmaps/translations-id +android/res/values-it/ @organicmaps/translations-it +android/res/values-ja/ @organicmaps/translations-ja +android/res/values-ko/ @organicmaps/translations-ko +android/res/values-nl/ @organicmaps/translations-nl +android/res/values-nb/ @organicmaps/translations-nb +android/res/values-pl/ @organicmaps/translations-pl +android/res/values-pt/ @organicmaps/translations-pt +android/res/values-pt-rBR/ @organicmaps/translations-pt +android/res/values-ro/ @organicmaps/translations-ro +android/res/values-ru/ @organicmaps/translations-ru +android/res/values-sk/ @organicmaps/translations-sk +android/res/values-sv/ @organicmaps/translations-sv +android/res/values-sw/ @organicmaps/translations-sw +android/res/values-th/ @organicmaps/translations-th +android/res/values-tr/ @organicmaps/translations-tr +android/res/values-uk/ @organicmaps/translations-uk +android/res/values-vi/ @organicmaps/translations-vi +android/res/values-zh/ @organicmaps/translations-zh-Hans +android/res/values-zh-rHK/ @organicmaps/translations-zh-Hant +android/res/values-zh-rMO/ @organicmaps/translations-zh-Hant +android/res/values-zh-rTW/ @organicmaps/translations-zh-Hant +iphone/Maps/LocalizedStrings/ar.lproj/ @organicmaps/translations-ar +iphone/Maps/LocalizedStrings/be.lproj/ @organicmaps/translations-be +iphone/Maps/LocalizedStrings/bg.lproj/ @organicmaps/translations-bg +iphone/Maps/LocalizedStrings/cs.lproj/ @organicmaps/translations-cs +iphone/Maps/LocalizedStrings/da.lproj/ @organicmaps/translations-da +iphone/Maps/LocalizedStrings/de.lproj/ @organicmaps/translations-de +iphone/Maps/LocalizedStrings/el.lproj/ @organicmaps/translations-el +iphone/Maps/LocalizedStrings/es.lproj/ @organicmaps/translations-es +iphone/Maps/LocalizedStrings/es-MX.lproj/ @organicmaps/translations-es +iphone/Maps/LocalizedStrings/eu.lproj/ @organicmaps/translations-eu +iphone/Maps/LocalizedStrings/fa.lproj/ @organicmaps/translations-fa +iphone/Maps/LocalizedStrings/fi.lproj/ @organicmaps/translations-fi +iphone/Maps/LocalizedStrings/fr.lproj/ @organicmaps/translations-fr +iphone/Maps/LocalizedStrings/he.lproj/ @organicmaps/translations-he +iphone/Maps/LocalizedStrings/hu.lproj/ @organicmaps/translations-hu +iphone/Maps/LocalizedStrings/id.lproj/ @organicmaps/translations-id +iphone/Maps/LocalizedStrings/it.lproj/ @organicmaps/translations-it +iphone/Maps/LocalizedStrings/ja.lproj/ @organicmaps/translations-ja +iphone/Maps/LocalizedStrings/ko.lproj/ @organicmaps/translations-ko +iphone/Maps/LocalizedStrings/nl.lproj/ @organicmaps/translations-nl +iphone/Maps/LocalizedStrings/nb.lproj/ @organicmaps/translations-nb +iphone/Maps/LocalizedStrings/pl.lproj/ @organicmaps/translations-pl +iphone/Maps/LocalizedStrings/pt.lproj/ @organicmaps/translations-pt +iphone/Maps/LocalizedStrings/pt-BR.lproj/ @organicmaps/translations-pt +iphone/Maps/LocalizedStrings/ro.lproj/ @organicmaps/translations-ro +iphone/Maps/LocalizedStrings/ru.lproj/ @organicmaps/translations-ru +iphone/Maps/LocalizedStrings/sk.lproj/ @organicmaps/translations-sk +iphone/Maps/LocalizedStrings/sv.lproj/ @organicmaps/translations-sv +iphone/Maps/LocalizedStrings/sw.lproj/ @organicmaps/translations-sw +iphone/Maps/LocalizedStrings/th.lproj/ @organicmaps/translations-th +iphone/Maps/LocalizedStrings/tr.lproj/ @organicmaps/translations-tr +iphone/Maps/LocalizedStrings/uk.lproj/ @organicmaps/translations-uk +iphone/Maps/LocalizedStrings/vi.lproj/ @organicmaps/translations-vi +iphone/Maps/LocalizedStrings/zh-Hans.lproj/ @organicmaps/translations-zh-Hans +iphone/Maps/LocalizedStrings/zh-Hant.lproj/ @organicmaps/translations-zh-Hant +android/src/fdroid/play/listings/ar/ @organicmaps/translations-ar +android/src/fdroid/play/listings/be/ @organicmaps/translations-be +android/src/fdroid/play/listings/ca/ @organicmaps/translations-ca +android/src/fdroid/play/listings/cs-CZ/ @organicmaps/translations-cs +android/src/fdroid/play/listings/eu-ES/ @organicmaps/translations-eu +android/src/fdroid/play/listings/fr-FR/ @organicmaps/translations-fr +android/src/fdroid/play/listings/it-IT/ @organicmaps/translations-it +android/src/fdroid/play/listings/mr-IN/ @organicmaps/translations-mr +android/src/fdroid/play/listings/pt-BR/ @organicmaps/translations-pt +android/src/fdroid/play/listings/ru-RU/ @organicmaps/translations-ru +android/src/fdroid/play/listings/tr-TR/ @organicmaps/translations-tr +android/src/fdroid/play/listings/zh-CN/ @organicmaps/translations-zh-Hans +android/src/fdroid/play/listings/zh-HK/ @organicmaps/translations-zh-Hant +android/src/fdroid/play/listings/zh-TW/ @organicmaps/translations-zh-Hant +iphone/metadata/ca/ @organicmaps/translations-ca +iphone/metadata/cs/ @organicmaps/translations-cs +iphone/metadata/es-ES/ @organicmaps/translations-es +iphone/metadata/es-MX/ @organicmaps/translations-es +iphone/metadata/id/ @organicmaps/translations-id +iphone/metadata/it/ @organicmaps/translations-it +iphone/metadata/pt-BR/ @organicmaps/translations-pt +iphone/metadata/tr/ @organicmaps/translations-tr +iphone/metadata/zh-Hans/ @organicmaps/translations-zh-Hans +iphone/metadata/zh-Hant/ @organicmaps/translations-zh-Hant diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 6f132ccea1..0000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: Bug Report -about: Describe your issue in details to help us improve Organic Maps -title: '' -labels: '' -assignees: '' - ---- - -**Describe the issue** -Please write here a clear and concise description of what the bug/issue is about. - -**Steps to reproduce** -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots or screen recordings to help explain your problem. - -**System information:** - - Operating system and its version: [iOS 12, Android 10, Ubuntu 22, MacOS Big Sur, etc.] - - Organic Maps version: [you can find it by clicking the "?" button] - - Device Model: [e.g. iPhone6, Samsung S22] - -**Additional context** -Please add any other context and important details/notes/comments about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index ad4b943f95..0000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,11 +0,0 @@ -blank_issues_enabled: true -contact_links: - - name: Discussions - url: https://github.com/organicmaps/organicmaps/discussions - about: Discuss the usage of OrganicMaps, ask questions, or talk about ideas that are not yet actionable. - - name: Translations - url: https://github.com/organicmaps/organicmaps/blob/master/docs/TRANSLATIONS.md - about: Translate Organic Maps into your language - - name: News - url: https://organicmaps.app/news/ - about: Check the latest project news \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 72f3f207bc..0000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for OrganicMaps -title: '' -labels: [Enhancement] -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. For example: -I'm always frustrated when [...] - -**Describe the solution you would like** -A clear and concise description of what you want to see in Organic Maps. - -**Describe alternatives you have considered** -- How do you solve this issue now with Organic Maps or other apps? -- Attach any examples, screenshots, or screen recordings from other apps that help us to better understand the idea. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/android-beta.yaml b/.github/workflows/android-beta.yaml index 2f70d6437c..2b32f91a86 100644 --- a/.github/workflows/android-beta.yaml +++ b/.github/workflows/android-beta.yaml @@ -67,7 +67,7 @@ jobs: run: | cmake --version ninja --version - gradle -x lint -x lintVitalGoogleBeta assembleGoogleBeta uploadCrashlyticsSymbolFileGoogleBeta uploadCrashlyticsMappingFileGoogleBeta + gradle -x lint -x lintVitalGoogleBeta assembleGoogleBeta uploadCrashlyticsMappingFileGoogleRelease - name: Upload beta apk to App Distribution shell: bash diff --git a/.github/workflows/android-monkey.yaml b/.github/workflows/android-monkey.yaml index ef313cfb36..79b22a331d 100644 --- a/.github/workflows/android-monkey.yaml +++ b/.github/workflows/android-monkey.yaml @@ -21,9 +21,9 @@ jobs: DIRS="android base drape drape_frontend editor ge0 map platform routing search shaders storage traffic transit" if [ '${{ github.event_name }}' != 'schedule' ] || [ $(git rev-list --count --since="24 hours" HEAD $DIRS) -gt 0 ]; then - echo "updated=true" >> $GITHUB_OUTPUT + echo "::set-output name=updated::true" else - echo "updated=" >> $GITHUB_OUTPUT + echo "::set-output name=updated::" fi outputs: updated: ${{ steps.check.outputs.updated }} @@ -73,26 +73,16 @@ jobs: run: | cmake --version ninja --version - gradle -Pfirebase assembleGoogleDebug uploadCrashlyticsSymbolFileGoogleDebug + gradle -Parm64 -Parm32 -Pfirebase assembleGoogleDebug - name: Run monkey run: | gcloud auth activate-service-account --key-file android/firebase-test-lab.json gcloud config set project omapsapp gcloud firebase test android run --app ./android/build/outputs/apk/google/debug/OrganicMaps-*-google-debug.apk \ - --device model=panther,version=33 \ - --device model=bluejay,version=32 \ - --device model=b2q,version=31 \ - --device model=f2q,version=30 \ + --device model=redfin,version=30 \ --device model=a10,version=29 \ - --device model=Pixel2.arm,version=30 \ - --device model=MediumPhone.arm,version=29 \ - --device model=MediumPhone.arm,version=28 \ - --device model=MediumPhone.arm,version=27 \ - --device model=Pixel2.arm,version=26,orientation=landscape \ - --device model=Nexus6,version=25 \ - --device model=NexusLowRes,version=24 \ - --device model=NexusLowRes,version=23,orientation=landscape \ - --device model=Nexus6,version=22 \ - --device model=Nexus7,version=21 \ + --device model=dipper,version=28 \ + --device model=OnePlus3T,version=26 \ + --device model=flo,version=21,orientation=landscape \ --timeout 15m diff --git a/.github/workflows/android-release-metadata.yaml b/.github/workflows/android-release-metadata.yaml index 0505a997ea..d72a010921 100644 --- a/.github/workflows/android-release-metadata.yaml +++ b/.github/workflows/android-release-metadata.yaml @@ -23,6 +23,15 @@ jobs: ref: master path: screenshots + # This symlink is not stored in the repo because Linter checks fail for the FDroid build. + # Linter complains about an invalid symlink (we don't check out screenshots for FDroid). + - name: Create symlink for GP screenshots + shell: bash + run: | + for locale in en-US tr-TR; do + ln -sf ../../../../../../screenshots/android/${locale}/graphics android/src/google/play/listings/${locale}/graphics + done + - name: Checkout private keys uses: actions/checkout@v3 with: @@ -39,6 +48,6 @@ jobs: - name: Upload shell: bash - run: ./gradlew prepareGoogleReleaseListing publishGoogleReleaseListing + run: ./gradlew publishGoogleReleaseListing working-directory: android timeout-minutes: 5 diff --git a/.github/workflows/appstream-check.yaml b/.github/workflows/appstream-check.yaml deleted file mode 100644 index 8e80ebbbc6..0000000000 --- a/.github/workflows/appstream-check.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Validate appstream metadata xml -on: - workflow_dispatch: # Manual trigger - pull_request: - paths: - - packaging/app.organicmaps.desktop.metainfo.xml - - .github/workflows/appstream-check.yaml # Run check on self change - -jobs: - validate-appstream: - name: Validate appstream metadata xml - runs-on: ubuntu-22.04 - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Install appstream validator - shell: bash - run: | - sudo apt update -y - sudo apt install -y \ - flatpak - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # We get it from flathub to ensure we have a recent version - sudo flatpak install -y org.freedesktop.appstream-glib - - - name: Validate appstream data - shell: bash - run: flatpak run org.freedesktop.appstream-glib validate --nonet packaging/app.organicmaps.desktop.metainfo.xml diff --git a/.github/workflows/ios-check-metadata.yaml b/.github/workflows/ios-check-metadata.yaml index e5922c070a..da80708d30 100644 --- a/.github/workflows/ios-check-metadata.yaml +++ b/.github/workflows/ios-check-metadata.yaml @@ -1,4 +1,4 @@ -name: iOS Check metadata +name: iOS Check on: workflow_dispatch: # Manual trigger pull_request: diff --git a/.github/workflows/ios-release.yaml b/.github/workflows/ios-release.yaml index 55c8af2e98..3db7b0252f 100644 --- a/.github/workflows/ios-release.yaml +++ b/.github/workflows/ios-release.yaml @@ -38,18 +38,6 @@ jobs: ref: master path: screenshots - - name: Checkout keywords - uses: actions/checkout@v3 - with: - repository: ${{ secrets.KEYWORDS_REPO }} - ssh-key: ${{ secrets.KEYWORDS_SSH_KEY }} - ref: master - path: keywords - - - name: Update metadata - shell: bash - run: ./tools/python/check_store_metadata.py ios - # NOTE: a new iOS draft must be created before this step - name: Upload metadata shell: bash diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml index e9dea31be2..bf725a3c59 100644 --- a/.github/workflows/linux-check.yaml +++ b/.github/workflows/linux-check.yaml @@ -125,7 +125,7 @@ jobs: - name: Checkout world_feed_integration_tests_data uses: actions/checkout@v3 with: - repository: organicmaps/world_feed_integration_tests_data + repository: omapsapp/world_feed_integration_tests_data path: data/world_feed_integration_tests_data - name: Tests @@ -155,3 +155,26 @@ jobs: -e routing_consistency_tests \ -e opening_hours_supported_features_tests \ -e storage_integration_tests \ + + linux-appstream: + name: Linux validate appstream data + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Install appstream validator + shell: bash + run: | + sudo apt update -y + sudo apt install -y \ + flatpak + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + # We get it from flathub to ensure we have a recent version + sudo flatpak install -y org.freedesktop.appstream-glib + + - name: Validate appstream data + shell: bash + run: flatpak run org.freedesktop.appstream-glib validate --nonet qt/res/app.organicmaps.desktop.metainfo.xml diff --git a/.github/workflows/macos-check.yaml b/.github/workflows/macos-check.yaml deleted file mode 100644 index 3bd9c93236..0000000000 --- a/.github/workflows/macos-check.yaml +++ /dev/null @@ -1,97 +0,0 @@ -name: macOS Check -on: - workflow_dispatch: # Manual trigger - pull_request: - paths-ignore: - - .gitignore - - .github/** - - '!.github/workflows/macos-check.yaml' # Run check on self change - - CONTRIBUTORS - - LICENSE - - NOTICE - - README.md - - android/** - - iphone/** - - data/strings/** - - docs/** - - packaging/** - - pyhelpers/** - - tools/** - - '!tools/python/run_desktop_tests.py' - - '!tools/python/testserver.py' - - '!tools/python/SiblingKiller.py' - - xcode/** - -jobs: - macos-matrix: - name: macOS builds and tests - runs-on: macos-12 - env: - HOMEBREW_NO_ANALYTICS: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - strategy: - fail-fast: false - matrix: - CMAKE_BUILD_TYPE: [Debug, RelWithDebInfo] - - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Parallel submodules checkout - shell: bash - run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20)) - - - name: Install build tools and dependencies - shell: bash - run: | - brew install ninja qt@5 - - - name: Configure - shell: bash - run: ./configure.sh - - - name: CMake - shell: bash - run: | - echo "Building ${{ matrix.CMAKE_BUILD_TYPE }}" - cmake . -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} -DCMAKE_C_FLAGS=-g1 -DCMAKE_CXX_FLAGS=-g1 - - - name: Compile - shell: bash - working-directory: build - run: ninja - - - name: Checkout world_feed_integration_tests_data - uses: actions/checkout@v3 - with: - repository: organicmaps/world_feed_integration_tests_data - path: data/world_feed_integration_tests_data - - - name: Tests - shell: bash - # generator_integration_tests - https://github.com/organicmaps/organicmaps/issues/225 -# # routing_integration_tests - https://github.com/organicmaps/organicmaps/issues/221 - # routing_quality_tests - https://github.com/organicmaps/organicmaps/issues/215 - # drape_tests - requires X Window - - # Separate run of OH boost-based test - run: | - ./build/opening_hours_tests | - ./tools/python/run_desktop_tests.py \ - -f ./build \ - -u ./data \ - -d ./data \ - -e generator_integration_tests \ - -e routing_integration_tests \ - -e routing_quality_tests \ - -e search_quality_tests \ - -e world_feed_integration_tests \ - -e drape_tests \ - -e shaders_tests \ - \ - -e opening_hours_tests \ - -e opening_hours_integration_tests \ - -e routing_consistency_tests \ - -e opening_hours_supported_features_tests \ - -e storage_integration_tests diff --git a/.gitignore b/.gitignore index 3ed246c9e0..17f0fd2d32 100644 --- a/.gitignore +++ b/.gitignore @@ -176,8 +176,6 @@ tools/python/routing/etc/*.ini # VS Code .vscode -# AppStore metadata -screenshots/ -android/src/google/play/listings/ -keywords/ -iphone/metadata/**/keywords.txt +# Screenshots +screenshots +android/src/google/play/listings/??-??/graphics diff --git a/.gitmodules b/.gitmodules index 113383eba8..3f6c0a063c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/aurelien-rainone/macdeployqtfix.git [submodule "3party/protobuf/protobuf"] path = 3party/protobuf/protobuf - url = https://github.com/organicmaps/protobuf.git + url = https://github.com/protocolbuffers/protobuf.git [submodule "tools/twine"] path = tools/twine url = https://github.com/organicmaps/twine.git diff --git a/3party/fast_double_parser b/3party/fast_double_parser index efec03532e..111ad80417 160000 --- a/3party/fast_double_parser +++ b/3party/fast_double_parser @@ -1 +1 @@ -Subproject commit efec03532ef65984786e5e32dbc81f6e6a55a115 +Subproject commit 111ad8041765d1623195bd6eb8b6bc7d97c44507 diff --git a/3party/jansson/CMakeLists.txt b/3party/jansson/CMakeLists.txt new file mode 100644 index 0000000000..c5fb507275 --- /dev/null +++ b/3party/jansson/CMakeLists.txt @@ -0,0 +1,17 @@ +set(JANSSON_EXAMPLES OFF) +set(JANSSON_BUILD_DOCS OFF) +set(JANSSON_WITHOUT_TESTS OFF) +set(JANSSON_INSTALL OFF) + +add_subdirectory(jansson) + +target_sources(jansson + PRIVATE + jansson_handle.cpp + myjansson.cpp + PUBLIC + jansson_handle.hpp + myjansson.hpp +) + +target_include_directories(jansson PUBLIC jansson/src .) diff --git a/cppjansson/jansson_handle.cpp b/3party/jansson/jansson_handle.cpp similarity index 100% rename from cppjansson/jansson_handle.cpp rename to 3party/jansson/jansson_handle.cpp diff --git a/cppjansson/jansson_handle.hpp b/3party/jansson/jansson_handle.hpp similarity index 100% rename from cppjansson/jansson_handle.hpp rename to 3party/jansson/jansson_handle.hpp diff --git a/cppjansson/cppjansson.cpp b/3party/jansson/myjansson.cpp similarity index 98% rename from cppjansson/cppjansson.cpp rename to 3party/jansson/myjansson.cpp index bf61be32cc..5798ee7bd0 100644 --- a/cppjansson/cppjansson.cpp +++ b/3party/jansson/myjansson.cpp @@ -1,4 +1,4 @@ -#include "cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include diff --git a/cppjansson/cppjansson.hpp b/3party/jansson/myjansson.hpp similarity index 100% rename from cppjansson/cppjansson.hpp rename to 3party/jansson/myjansson.hpp diff --git a/3party/protobuf/CMakeLists.txt b/3party/protobuf/CMakeLists.txt deleted file mode 100644 index 58e6a1d0bb..0000000000 --- a/3party/protobuf/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -project(protobuf) - -set(SRC - config.h - protobuf/src/google/protobuf/arena.cc - protobuf/src/google/protobuf/extension_set.cc - protobuf/src/google/protobuf/generated_message_util.cc - protobuf/src/google/protobuf/io/coded_stream.cc - protobuf/src/google/protobuf/io/zero_copy_stream.cc - protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc - protobuf/src/google/protobuf/message_lite.cc - protobuf/src/google/protobuf/repeated_field.cc - protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc - protobuf/src/google/protobuf/stubs/bytestream.cc - protobuf/src/google/protobuf/stubs/common.cc - protobuf/src/google/protobuf/stubs/int128.cc - protobuf/src/google/protobuf/stubs/once.cc - protobuf/src/google/protobuf/stubs/status.cc - protobuf/src/google/protobuf/stubs/statusor.cc - protobuf/src/google/protobuf/stubs/stringpiece.cc - protobuf/src/google/protobuf/stubs/stringprintf.cc - protobuf/src/google/protobuf/stubs/structurally_valid.cc - protobuf/src/google/protobuf/stubs/strutil.cc - protobuf/src/google/protobuf/stubs/time.cc - protobuf/src/google/protobuf/wire_format_lite.cc -) - -add_library(${PROJECT_NAME} ${SRC}) - -target_include_directories(${PROJECT_NAME} - PRIVATE . ../../ - PUBLIC protobuf/src -) - -if(NOT PLATFORM_WIN) - target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_PTHREAD) -endif () - -target_compile_options(${PROJECT_NAME} PRIVATE - $<$:-Wno-shorten-64-to-32> - $<$:-Wno-deprecated-declarations> - $<$>:-Wno-sign-compare> -) diff --git a/3party/protobuf/config.h b/3party/protobuf/config.h deleted file mode 100644 index cd97e35a3b..0000000000 --- a/3party/protobuf/config.h +++ /dev/null @@ -1,152 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* the name of */ -#define HASH_MAP_CLASS unordered_map - -/* the location of or */ -#define HASH_MAP_H - -/* the namespace of hash_map/hash_set */ -#define HASH_NAMESPACE std - -/* the name of */ -#define HASH_SET_CLASS unordered_set - -/* the location of or */ -#define HASH_SET_H - -/* define if the compiler supports basic C++11 syntax */ -#define HAVE_CXX11 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `ftruncate' function. */ -#define HAVE_FTRUNCATE 1 - -/* define if the compiler has hash_map */ -#define HAVE_HASH_MAP 1 - -/* define if the compiler has hash_set */ -#define HAVE_HASH_SET 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 - -/* Define if you have POSIX threads libraries and header files. */ -#define HAVE_PTHREAD 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strtol' function. */ -#define HAVE_STRTOL 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Enable classes using zlib compression. */ -#define HAVE_ZLIB 1 - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "protobuf" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "protobuf@googlegroups.com" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "Protocol Buffers" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Protocol Buffers 3.3.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "protobuf" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "3.3.0" - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Version number of package */ -#define VERSION "3.3.0" - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ diff --git a/3party/protobuf/protobuf b/3party/protobuf/protobuf index a6189acd18..90b73ac3f0 160000 --- a/3party/protobuf/protobuf +++ b/3party/protobuf/protobuf @@ -1 +1 @@ -Subproject commit a6189acd18b00611c1dc7042299ad75486f08a1a +Subproject commit 90b73ac3f0b10320315c2ca0d03a5a9b095d2f66 diff --git a/3party/pugixml/CMakeLists.txt b/3party/pugixml/CMakeLists.txt index 6284a90516..d49d17cb44 100644 --- a/3party/pugixml/CMakeLists.txt +++ b/3party/pugixml/CMakeLists.txt @@ -4,8 +4,7 @@ set(SRC pugixml/src/pugiconfig.hpp pugixml/src/pugixml.cpp pugixml/src/pugixml.hpp + utils.hpp ) add_library(${PROJECT_NAME} ${SRC}) - -target_include_directories(${PROJECT_NAME} PUBLIC pugixml/src) diff --git a/3party/pugixml/utils.hpp b/3party/pugixml/utils.hpp new file mode 100644 index 0000000000..7d53b88a22 --- /dev/null +++ b/3party/pugixml/utils.hpp @@ -0,0 +1,28 @@ +#pragma once + +#include "pugixml/src/pugixml.hpp" + +#include +#include +#include + +namespace pugi +{ +template +inline std::string XMLToString(pugi::xml_node const & n, Args &&... args) +{ + std::ostringstream sstr; + n.print(sstr, std::forward(args)...); + return sstr.str(); +} + +inline std::string DebugPrint(pugi::xml_node const & n) +{ + return XMLToString(n); +} + +inline std::string DebugPrint(pugi::xml_document const & n) +{ + return DebugPrint(dynamic_cast(n)); +} +} // namespace pugi diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fc9a7f12a..116cc3b4ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ if (NOT DEFINED ENV{COLORS_DISABLE} AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang add_link_options($<$:-fdiagnostics-color=always> $<$:-fcolor-diagnostics>) endif() -option(WITH_SYSTEM_PROVIDED_3PARTY "Enable compilation with system provided dependencies" OFF) set(OMIM_ROOT ${CMAKE_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OMIM_ROOT}/cmake") @@ -240,13 +239,8 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) if (NOT SKIP_DESKTOP) list(APPEND qt_components Gui Xml Svg) endif() - if (DEFINED ENV{HOMEBREW_PREFIX}) - set(HOMEBREW_PREFIX $ENV{HOMEBREW_PREFIX}) - else() - set(HOMEBREW_PREFIX /opt/homebrew) - endif() # PATHS are hard-coded hints where to look for qt5 in addition to other places. - find_package(Qt5 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} ${HOMEBREW_PREFIX}/opt/qt@5 /usr/local/opt/qt@5 /usr/lib/x86_64-linux-gnu/qt5) + find_package(Qt5 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@5 /usr/local/opt/qt@5 /usr/lib/x86_64-linux-gnu/qt5) if (Qt5_VERSION VERSION_LESS 5.5.0) message(FATAL_ERROR "Minimum supported Qt5 version is 5.5") endif() @@ -292,36 +286,18 @@ if (USE_PCH) endif() # Include 3party dependencies. -if (NOT WITH_SYSTEM_PROVIDED_3PARTY) - # Configure expat library. - # Suppress "Policy CMP0077 is not set: option() honors normal variables" - # for the expat options below. - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - set(EXPAT_BUILD_TOOLS OFF) - set(EXPAT_BUILD_EXAMPLES OFF) - set(EXPAT_BUILD_TESTS OFF) - set(EXPAT_BUILD_DOCS OFF) - set(EXPAT_BUILD_PKGCONFIG OFF) - set(EXPAT_ENABLE_INSTALL OFF) - set(EXPAT_SHARED_LIBS OFF) - add_subdirectory(3party/expat/expat) - - # Configure Jansson library. - set(JANSSON_BUILD_DOCS OFF) - set(JANSSON_BUILD_MAN OFF) - set(JANSSON_EXAMPLES OFF) - set(JANSSON_INSTALL OFF) - set(JANSSON_WITHOUT_TESTS ON) - add_subdirectory(3party/jansson/jansson/) - target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include") - - # Add pugixml library. - add_subdirectory(3party/pugixml) - - # Add protobuf library. - add_subdirectory(${OMIM_ROOT}/3party/protobuf) -endif() - +# Configure expat library. +# Suppress "Policy CMP0077 is not set: option() honors normal variables" +# for the expat options below. +set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +set(EXPAT_BUILD_TOOLS OFF) +set(EXPAT_BUILD_EXAMPLES OFF) +set(EXPAT_BUILD_TESTS OFF) +set(EXPAT_BUILD_DOCS OFF) +set(EXPAT_BUILD_PKGCONFIG OFF) +set(EXPAT_ENABLE_INSTALL OFF) +set(EXPAT_SHARED_LIBS OFF) +add_subdirectory(3party/expat/expat) add_subdirectory(3party/agg) add_subdirectory(3party/bsdiff-courgette) @@ -340,10 +316,11 @@ else() add_subdirectory(3party/freetype) add_subdirectory(3party/icu) endif() - +add_subdirectory(3party/jansson) add_subdirectory(3party/liboauthcpp) add_subdirectory(3party/minizip) add_subdirectory(3party/opening_hours) +add_subdirectory(3party/pugixml) add_subdirectory(3party/sdf_image) add_subdirectory(3party/stb_image) add_subdirectory(3party/succinct) @@ -373,7 +350,6 @@ add_subdirectory(geometry) add_subdirectory(indexer) add_subdirectory(kml) add_subdirectory(map) -add_subdirectory(cppjansson) add_subdirectory(platform) add_subdirectory(routing) add_subdirectory(routing_common) diff --git a/README.md b/README.md index 3bd2cbe752..7daa193995 100644 --- a/README.md +++ b/README.md @@ -139,10 +139,7 @@ and [Google Play](https://play.google.com/store/apps/details?id=app.organicmaps) - Присоединяйтесь к нашей [русскоязычной группе в Telegram](https://t.me/OrganicMapsRu) для обратной связи и помощи. - Diğer kullanıcılarla tartışmak için [Telegram Grubumuza](https://t.me/OrganicMapsTR) katılın. - Contact us by [email](mailto:hello@organicmaps.app). -- Follow our updates in -[Mastodon](https://fosstodon.org/@organicmaps), -[Facebook](https://facebook.com/OrganicMaps), -[Twitter](https://twitter.com/OrganicMapsApp), +- Follow our updates in [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp), [Instagram](https://instagram.com/organicmaps.app/). - Güncellemelerimizi [Instagram](https://instagram.com/organicmapstr/) üzerinden takip edin. diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 1463b1d67d..9167327a9c 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -551,6 +551,7 @@ + @@ -597,22 +598,25 @@ - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + + diff --git a/android/build.gradle b/android/build.gradle index 9aab4e47f5..66d2d68364 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -44,7 +44,7 @@ buildscript { } classpath("com.github.triplet.gradle:play-publisher:3.7.0") - classpath("ru.cian:huawei-publish-gradle-plugin:1.3.5") + classpath("ru.cian:huawei-publish-gradle-plugin:1.3.3") } } @@ -69,7 +69,7 @@ apply plugin: 'ru.cian.huawei-publish-gradle-plugin' dependencies { // Google Mobile Services if (googleMobileServicesEnabled) { - implementation 'com.google.android.gms:play-services-location:21.0.1' + implementation 'com.google.android.gms:play-services-location:20.0.0' } // Google Firebase Services @@ -116,8 +116,6 @@ def run(cmd) { return stdout.toString() } - -import com.github.triplet.gradle.androidpublisher.ReleaseStatus import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform def getVersion() { @@ -160,10 +158,8 @@ android { targetSdkVersion propTargetSdkVersion.toInteger() applicationId project.ext.appId buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"' - // Should be customized in flavors. - buildConfigField 'String', 'REVIEW_URL', '""' - - resConfigs project.ext.supportedLocalizations + buildConfigField 'String', 'REVIEW_URL', '"https://organicmaps.app/donate/"' + buildConfigField 'int', 'RATING_THRESHOLD', '5' multiDexEnabled true multiDexKeepFile file('multidex-config.txt') @@ -342,8 +338,6 @@ android { ndk.debugSymbolLevel = 'none' if (googleFirebaseServicesEnabled) { - // Keep debug symbols for test lab. - ndk.debugSymbolLevel = 'symbol_table' firebaseCrashlytics { nativeSymbolUploadEnabled true } @@ -444,32 +438,7 @@ android.buildTypes.all { buildType -> manifestPlaceholders += [FILE_PROVIDER_PLACEHOLDER : authorityValue] } -task prepareGoogleReleaseListing { - // Prepares Google Play metainfo from F-Droid metainfo. - final sourceFlavor = 'fdroid' - final targetFlavor = 'google' - doLast { - final sourceDir = new File("${projectDir}/src/$sourceFlavor/play/listings") - final targetDir = new File("${projectDir}/src/$targetFlavor/play/listings") - final sourceFiles = fileTree(dir: sourceDir, - include: "**/*.txt", exclude: "**/*-${targetFlavor}.txt") - sourceFiles.each { File sourceFile -> - final path = sourceFile.getPath() - final locale = sourceFile.parentFile.getName() - final targetLocaleDir = new File(targetDir, locale) - if (!targetLocaleDir.isDirectory()) - targetLocaleDir.mkdirs() - final targetFile = new File(targetLocaleDir, sourceFile.getName()) - // Override Google-specific values by using ${name}-google.txt files. - final overrideFile = new File(sourceFile.getPath().replace(".txt", "-${targetFlavor}.txt")) - targetFile.text = overrideFile.exists() ? overrideFile.text : sourceFile.text - } - copy { - from "${projectDir}/../screenshots/android" - into targetDir - } - } -} +import com.github.triplet.gradle.androidpublisher.ReleaseStatus play { enabled.set(false) @@ -484,28 +453,9 @@ huaweiPublish { instances { huaweiRelease { credentialsPath = "$rootDir/huawei-appgallery.json" - buildFormat = 'aab' - deployType = 'draft' // confirm manually - releaseNotes = [] - def localeOverride = [ - 'am' : 'am-ET', - 'gu': 'gu_IN', - 'iw-IL': 'he_IL', - 'kn-IN': 'kn_IN', - 'ml-IN': 'ml_IN', - 'mn-MN': 'mn_MN', - 'mr-IN': 'mr_IN', - 'ta-IN': 'ta_IN', - 'te-IN': 'te_IN', - ] - def files = fileTree(dir: "$projectDir/src/fdroid/play/listings", - include: '**/release-notes.txt') - files.each { File file -> - def path = file.getPath() - def locale = file.parentFile.getName() - locale = localeOverride.get(locale, locale) - releaseNotes.add(new ru.cian.huawei.publish.ReleaseNote(locale, path)) - } + buildFormat = "aab" + // https://github.com/cianru/huawei-publish-gradle-plugin/issues/32 + deployType = 'draft' } } } diff --git a/android/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java b/android/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java index d4256276c1..491035536f 100644 --- a/android/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java +++ b/android/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java @@ -1,8 +1,5 @@ package app.organicmaps.location; -import static app.organicmaps.util.concurrency.UiThread.runLater; - -import android.app.PendingIntent; import android.content.Context; import android.location.Location; import android.os.Looper; @@ -12,7 +9,6 @@ import androidx.annotation.NonNull; import com.google.android.gms.common.api.ApiException; import com.google.android.gms.common.api.ResolvableApiException; import com.google.android.gms.location.FusedLocationProviderClient; -import com.google.android.gms.location.Granularity; import com.google.android.gms.location.LocationAvailability; import com.google.android.gms.location.LocationCallback; import com.google.android.gms.location.LocationRequest; @@ -20,10 +16,7 @@ import com.google.android.gms.location.LocationResult; import com.google.android.gms.location.LocationServices; import com.google.android.gms.location.LocationSettingsRequest; import com.google.android.gms.location.LocationSettingsStatusCodes; -import com.google.android.gms.location.Priority; import com.google.android.gms.location.SettingsClient; - -import app.organicmaps.util.LocationUtils; import app.organicmaps.util.log.Logger; class GoogleFusedLocationProvider extends BaseLocationProvider @@ -33,8 +26,6 @@ class GoogleFusedLocationProvider extends BaseLocationProvider private final FusedLocationProviderClient mFusedLocationClient; @NonNull private final SettingsClient mSettingsClient; - @NonNull - private final Context mContext; private class GoogleLocationCallback extends LocationCallback { @@ -42,6 +33,9 @@ class GoogleFusedLocationProvider extends BaseLocationProvider public void onLocationResult(@NonNull LocationResult result) { final Location location = result.getLastLocation(); + // Documentation is inconsistent with the code: "returns null if no locations are available". + // https://developers.google.com/android/reference/com/google/android/gms/location/LocationResult#getLastLocation() + //noinspection ConstantConditions if (location != null) mListener.onLocationChanged(location); } @@ -57,12 +51,13 @@ class GoogleFusedLocationProvider extends BaseLocationProvider private final GoogleLocationCallback mCallback = new GoogleLocationCallback(); + private boolean mActive = false; + GoogleFusedLocationProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener) { super(listener); mFusedLocationClient = LocationServices.getFusedLocationProviderClient(context); mSettingsClient = LocationServices.getSettingsClient(context); - mContext = context; } @SuppressWarnings("MissingPermission") @@ -71,23 +66,20 @@ class GoogleFusedLocationProvider extends BaseLocationProvider public void start(long interval) { Logger.d(TAG); + mActive = true; - final LocationRequest locationRequest = new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, interval) - // Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the device immediately. - // https://github.com/organicmaps/organicmaps/issues/2149 - .setWaitForAccurateLocation(true) - // The desired location granularity should correspond to the client permission level. The client will be - // delivered fine locations while it has the Manifest.permission.ACCESS_FINE_LOCATION permission, coarse - // locations while it has only the Manifest.permission.ACCESS_COARSE_LOCATION permission, and no location - // if it lacks either. - .setGranularity(Granularity.GRANULARITY_PERMISSION_LEVEL) - // Sets the maximum age of an initial historical location delivered for this request. - .setMaxUpdateAgeMillis(60 * 60 * 1000L) // 1 hour - .build(); + final LocationRequest locationRequest = LocationRequest.create(); + locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY); + locationRequest.setInterval(interval); + // Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the device immediately. + // https://github.com/organicmaps/organicmaps/issues/2149 + locationRequest.setWaitForAccurateLocation(true); + Logger.d(TAG, "Request Google fused provider to provide locations at this interval = " + + interval + " ms"); + locationRequest.setFastestInterval(interval / 2); LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder(); builder.addLocationRequest(locationRequest); - builder.setAlwaysShow(true); // improves the wording/appearance of the dialog final LocationSettingsRequest locationSettingsRequest = builder.build(); mSettingsClient.checkLocationSettings(locationSettingsRequest).addOnSuccessListener(locationSettingsResponse -> { @@ -99,29 +91,11 @@ class GoogleFusedLocationProvider extends BaseLocationProvider int statusCode = ((ApiException) e).getStatusCode(); if (statusCode == LocationSettingsStatusCodes.RESOLUTION_REQUIRED) { - // This case happens if at least one of the following system settings is off: - // 1. Location Services a.k.a GPS; - // 2. Google Location Accuracy a.k.a High Accuracy; - // 3. Both Wi-Fi && Mobile Data together (needed for 2). - // - // PendingIntent below will show a special Google "For better experience... enable (1) and/or (2) and/or (3)" - // dialog. This system dialog can change system settings if "Yes" is pressed. We can't do it from our app. - // However, we don't want to annoy a user who disabled (2) or (3) intentionally. GPS (1) is mandatory to - // continue, while (2) and (3) are not dealbreakers here. - // - // See https://github.com/organicmaps/organicmaps/issues/3846 - // - if (LocationUtils.areLocationServicesTurnedOn(mContext)) - { - Logger.d(TAG, "Don't show 'location resolution' dialog because location services are already on"); - mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper()); - return; - } - Logger.d(TAG, "Requesting 'location resolution' dialog"); - final ResolvableApiException resolvable = (ResolvableApiException) e; - final PendingIntent pendingIntent = resolvable.getResolution(); - // Call this callback in the next event loop to allow LocationHelper::start() to finish. - runLater(() -> mListener.onLocationResolutionRequired(pendingIntent)); + // Location settings are not satisfied, but this can + // be fixed by showing the user a dialog + Logger.w(TAG, "Resolution is required"); + ResolvableApiException resolvable = (ResolvableApiException) e; + mListener.onLocationResolutionRequired(resolvable.getResolution()); return; } } @@ -131,11 +105,16 @@ class GoogleFusedLocationProvider extends BaseLocationProvider // https://developers.google.com/android/reference/com/google/android/gms/location/SettingsClient Logger.e(TAG, "An error that should be impossible: " + ex); } - // Location settings are not satisfied. However, we have no way to fix the - // settings so we won't show the dialog. Logger.e(TAG, "Service is not available: " + e); - // Call this callback in the next event loop to allow LocationHelper::start() to finish. - runLater(mListener::onFusedLocationUnsupported); + mListener.onLocationDisabled(); + }); + + // onLocationResult() may not always be called regularly, however the device location is known. + mFusedLocationClient.getLastLocation().addOnSuccessListener(location -> { + Logger.d(TAG, "onLastLocation, location = " + location); + if (location == null) + return; + mListener.onLocationChanged(location); }); } @@ -144,5 +123,9 @@ class GoogleFusedLocationProvider extends BaseLocationProvider { Logger.d(TAG); mFusedLocationClient.removeLocationUpdates(mCallback); + mActive = false; } + + @Override + protected boolean trustFusedLocations() { return true; } } diff --git a/android/gradle.properties b/android/gradle.properties index c9cf2e5f8f..874ad2663f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -8,5 +8,3 @@ org.gradle.jvmargs=-Xmx1024m -Xms256m android.useAndroidX=true android.enableJetifier=true android.native.buildOutput=verbose -# Autogenerated by tools/unix/generate_localizations.sh -supportedLocalizations=ar,be,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,eu,fa,fi,fr,fr_CA,he,hi,hu,id,in,it,ja,ko,mr,nb,ne,nl,pl,pt,pt_BR,ro,ru,sk,sv,sw,th,tr,uk,vi,zh_Hans,zh_Hant diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index c4cc9d4799..0f63b4a5d4 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -103,7 +103,7 @@ target_link_libraries(${PROJECT_NAME} # expat # freetype # minizip - # cppjansson + # jansson # protobuf # succinct # stb_image diff --git a/android/jni/app/organicmaps/editor/Editor.cpp b/android/jni/app/organicmaps/editor/Editor.cpp index cbe58bb013..792d1b9e8e 100644 --- a/android/jni/app/organicmaps/editor/Editor.cpp +++ b/android/jni/app/organicmaps/editor/Editor.cpp @@ -125,12 +125,6 @@ Java_app_organicmaps_editor_Editor_nativeGetStars(JNIEnv * env, jclass) return g_editableMapObject.GetStars(); } -JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass) -{ - return osm::EditableMapObject::kMaximumLevelsEditableByUsers; -} - JNIEXPORT jboolean JNICALL Java_app_organicmaps_editor_Editor_nativeHasWifi(JNIEnv *, jclass) { diff --git a/android/res/drawable/ic_christmas_tree.xml b/android/res/drawable/ic_christmas_tree.xml deleted file mode 100644 index bdcb7c5abc..0000000000 --- a/android/res/drawable/ic_christmas_tree.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/android/res/drawable/ic_follow.xml b/android/res/drawable/ic_follow.xml index 8f455f91df..f51e842fca 100644 --- a/android/res/drawable/ic_follow.xml +++ b/android/res/drawable/ic_follow.xml @@ -1,5 +1,5 @@ - + diff --git a/android/res/drawable/ic_mastodon.xml b/android/res/drawable/ic_mastodon.xml deleted file mode 100644 index ad988c9949..0000000000 --- a/android/res/drawable/ic_mastodon.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index 22acda61e1..1e9b51586d 100644 --- a/android/res/layout/about.xml +++ b/android/res/layout/about.xml @@ -15,13 +15,14 @@ @@ -44,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textAppearance="@style/MwmTextAppearance.Body3" + android:textAppearance="@style/MwmTextAppearance.Body2" android:textIsSelectable="true" android:selectAllOnFocus="true" tools:text="OpenStreetMap Data: 3 January 2022" /> @@ -54,10 +55,11 @@ - - - - + + - \ No newline at end of file + diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml index 88998c9767..fae716242f 100644 --- a/android/res/layout/place_page_preview.xml +++ b/android/res/layout/place_page_preview.xml @@ -87,22 +87,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/margin_base" - android:paddingEnd="@dimen/margin_quarter" - android:paddingStart="@dimen/margin_quarter" android:layout_alignParentEnd="true" android:layout_alignWithParentIfMissing="true" android:layout_alignBottom="@id/title_container" android:background="?selectableItemBackground" android:layout_below="@id/pull_icon_container" - android:gravity="center" - android:orientation="vertical" + android:gravity="bottom" + android:orientation="horizontal" tools:background="#111111F0"> @@ -111,7 +109,6 @@ android:id="@+id/tv__straight_distance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent" android:textSize="@dimen/text_size_body_3" tools:text="2000 km"/> diff --git a/android/res/values-ar-rSY/colors.xml b/android/res/values-ar-rSY/colors.xml deleted file mode 120000 index c5ceba9ced..0000000000 --- a/android/res/values-ar-rSY/colors.xml +++ /dev/null @@ -1 +0,0 @@ -../values-tr/colors.xml \ No newline at end of file diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index c10350fa57..0c5946194c 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ موقعي ًلاحقا - + البحث ابحث في الخريطة @@ -63,7 +63,7 @@ لون الإشارة المرجعية اسم قائمة الإشارات المرجعية - + الإشارات المرجعية أماكني @@ -458,8 +458,8 @@ قد يكون هذا مكلفاً جداً في بعض الاحيان أو عند التجوال. أدخل رقم بناء صحيح عدد الطوابق (بحد أقصى %d) - - يجب ألا يتجاوز عدد طوابق المبنى %d + + يجب ألا يتجاوز عدد طوابق المبنى 25 الرمز البريدي أدخل الرمز البريدي صالح @@ -738,10 +738,8 @@ مغسلة سيارات كازينو محطة شحن - محطة شحن حضانة سينما - ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ عيادة كلية مركز اجتماعي @@ -780,9 +778,9 @@ ﺹﺎﺧ ﻒﻗﻮﻣ موقف سيارات ﺽﺭﻻﺍ ﺖﺤﺗ ﻒﻗﻮﻣ - ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ + ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ مكان لوقوف السيارات مكان لوقوف السيارات مكان لوقوف السيارات @@ -962,20 +960,9 @@ مزيل الرجفان صنبور الإطفاء هاتف الطوارئ - مدخل - - ﻲﺴﻴﺋﺮﻟﺍ ﻞﺧﺪﻤﻟﺍ مختبر طبي اخصائي علاج طبيعي - الطب البديل - السمع - مركز التبرع بالدم - قياس البصر - علاج الأرجل - العلاج النفسي - أخذ العينات - علاج النطق طريق السريع @@ -983,7 +970,6 @@ جسر نفق - ﺺﺼﺨﻣ ﺕﻼﻓﺎﺣ ﻖﻳﺮﻃ موقف حافلة طريق تحت الإنشاء مسار للدراجات diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 9a6701565c..69496badce 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ Маё месцазнаходжанне Потым - + Шукаць Шукаць на мапе @@ -63,7 +63,7 @@ Колер закладкі Назва спісу закладак - + Закладкі Мае месцы @@ -235,7 +235,7 @@ Пытанні і адказы - Падтрымаць грашыма + Ахвяраваць Як нас падтрымаць? @@ -453,8 +453,8 @@ Гэта можа быць даволі дорага з некаторымі тарыфнымі планамі альбо ў роўмінгу. Увядзіце нумар дома правільна Колькасць паверхаў (максімум %d) - - Колькасць паверхаў павінна быць не больш за %d + + Колькасць паверхаў павінна быць не больш за 25 Паштовы індэкс Увядзіце паштовы індэкс правільна @@ -704,14 +704,11 @@ Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы дадатку. Дадзеныя карты з OpenStreetMap - + https://t.me/OrganicMapsRu - - https://organicmaps.app/ru/ Велапаркоўка - Боўлінг Аўташкола Музычная школа Моўная школа @@ -729,9 +726,9 @@ Прыватная паркоўка Прыватная паркоўка Падземны паркінг - Уваход на паркоўку Уваход на паркоўку Уваход на паркоўку + Уваход на паркоўку Паркоўка для інвалідаў Паштовая скрыня @@ -798,25 +795,14 @@ Дэлікатэсы Дэфібрылятар Пажарны гідрант - - Галоўны ўваход Медыцынская лабараторыя Фізіятэрапеўт - Альтэрнатыўная медыцына - Аўдыялогія - Цэнтр донарства крыві - Оптаметрыя - Подологія - Псіхатэрапія - Збор аналізаў - лагапедыя Мост Тунэль - Выдзеленая аўтобусная дарога Мост diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index c83f195236..39e6d44291 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ Мое местоположение По-късно - + Търсене Търсене в карта @@ -63,7 +63,7 @@ Цвят на отметка Име на група - + Отметки Мои места @@ -422,8 +422,8 @@ Това може да бъде значително скъпо при някои планове или при роуминг. Въведете валиден номер на сграда Брой етажи (максимум %d) - - Броят на етажите не трябва да надвишава %d + + Броят на етажите не трябва да надвишава 25 Пощенски код Въведете валиден пощенски код @@ -642,7 +642,6 @@ Картографски данни от OpenStreetMap - Боулинг писта Автошкола Музикално училище Езиково училище @@ -653,9 +652,9 @@ Частен паркинг Частен паркинг Подземен паркинг - Вход за паркинг Вход за паркинг Вход за паркинг + Вход за паркинг Паркомясто за инвалиди @@ -684,25 +683,14 @@ Винарна Шивач Деликатеси - - Главния вход Медицинска лаборатория Физиотерапевт - Алтернативна медицина - Аудиология - Център за кръводаряване - Оптометрия - Подиология - Психотерапия - Вземане на проби - Логопедия Мост Тунел - Обособен автобусен път Мост diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml index c3dc6e8744..57493ea0ff 100644 --- a/android/res/values-ca/strings.xml +++ b/android/res/values-ca/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ La meva posició Més tard - + Cerca Cerca en el mapa @@ -60,7 +60,7 @@ Color del marcador Nom de la llista de marcadors - + Marcadors Els meus llocs @@ -454,8 +454,8 @@ Això podria ser força car amb algunes tarifes d\'itinerància de dades. Introduïu un número d\'edifici vàlid Nombre de plantes (màxim %d) - - El nombre de plantes no pot excedir de %d + + El nombre de plantes no pot excedir de 25 Codi postal Introduïu un codi postal vàlid @@ -714,14 +714,4 @@ Si està activa, no cal desblocar l\'aparell cada vegada mentre l\'aplicació està funcionant. Dades del mapa de l\'OpenStreetMap - - - Bolera - - - - Entrada principal - - - Carretera dedicada a l\'autobús diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 76c4d24007..80a9b5a142 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Moje poloha Později - + Hledat Prohledat mapu @@ -60,7 +60,7 @@ Barva záložky Název záložky - + Záložky Moje místa @@ -151,7 +151,7 @@ Právě probíhá stahování země. - Ahoj, zkoukni mojí lokaci v Organic Maps! %1$s nebo %2$s Nemáš offline mapy? Stáhni tady: https://omaps.app/get + Koukni kde jsem. Otevři odkaz: %1$s nebo %2$s Koukni na moji značku na mapě v Organic Maps @@ -175,10 +175,6 @@ Délka Sdílet mé umístění - - Obecná nastavení - - Informace Navigace Tlačítka přiblížení/oddálení Zobrazit na obrazovce @@ -211,7 +207,7 @@ Webové stránky - Novinky + Zprávy Zpětná vazba @@ -341,7 +337,7 @@ Příjezd: %s Kategorie Historie - Omlouváme se, nic nebylo nalezeno. + Omlouvám se, nic nenalezeno. Zkuste zadat jiný hledaný výraz. Prohledat historii Získejte rychlý přístup k hledaným výrazům. @@ -432,11 +428,11 @@ %1$d z %2$d Stáhnout pomocí připojení přes mobilní síť? - Toto by mohlo být s některými tarify nebo roamingem výrazně dražší. + Toto by mohli být s některými tarify nebo roamingem výrazně dražší. Zadejte správné číslo domu Počet poschodí (max. %d) - - Opravte počet poschodí, max. %d + + Opravte počet poschodí, max. 25 PSČ Zadejte správné PSČ @@ -484,7 +480,7 @@ Ujistěte se, že jste nezadali žádná osobní data. Redaktoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy. - Organic Maps je bezplatná offline mapová aplikace s otevřeným zdrojovým kódem. Žádné reklamy. Žádné sledování. Pokud na mapě uvidíte chybu, opravte ji v OpenStreetMap. Projekt vytvářejí nadšenci v našem volném čase, takže potřebujeme vaši zpětnou vazbu a podporu. + Organic Maps jsou bezplatná offline mapová aplikace s otevřeným zdrojovým kódem. Žádné reklamy. Žádné sledování. Pokud na mapě vidíte chybu, opravte ji v OpenStreetMap. Projekt vytvářejí nadšenci v našem volném čase, takže potřebujeme vaši zpětnou vazbu a podporu. Přijmout @@ -495,7 +491,7 @@ Nepoužívat dnes Mobilní data - K zobrazení podrobných informací o místech, jako jsou fotografie, ceny a recenze je třeba mobilní internet. + Ke zobrazení podrobných informací o místech, jako jsou fotografie, ceny a recenze, je třeba mobilní internet. Nikdy nepoužívat Vždy se zeptat Ke zobrazení údajů o provozu musí být aktualizovány mapy. @@ -509,7 +505,7 @@ Zapnout Vypnout Pro hlasové pokyny používáme systém TTS. Mnoho zařízení se systémem Android používá Google TTS, můžete si ho stáhnout nebo aktualizovat na Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) - U některých jazyků je třeba nainstalovat jiný hlasový syntetizátor nebo další jazykové sady z obchodu s aplikacemi (Google Play, Galaxy Store, App Gallery, FDroid).\nOtevřete nastavení vašeho zařízení → Jazyky a zadávání → Hlasové zadávání → Převod textu na řeč. \nZde můžete spravovat nastavení pro syntézu řeči (například stáhnout jazykový balíček pro použití offline) a vybrat jiný modul převodu textu na řeč. + U některých jazyků je třeba nainstalovat jiný hlasový syntetizátor nebo další jazykové sady z obchodu s aplikacemi (Google Play, Galaxy Store, App Gallery, FDroid).\nOtevřete zařízení → Nastavení jazyka a zadávání → Hlasitost → Převod textu na řeč. \nZde můžete spravovat nastavení pro syntézu řeči (například stáhnout jazykový balíček pro použití offline) a vybrat jiný modul převodu textu na řeč. Více informací najdete v tomto návodu. Přepis do latinky Zjistit více @@ -530,8 +526,6 @@ Skrýt vše Zobrazit vše Vytvořte nový seznam - - Importovat záložky Nelze sdílet kvůli chybě aplikace Chyba sdílení Nelze sdílet s prázdným seznamem @@ -562,7 +556,7 @@ Natavení doprovodu Zprávy o chybách Můžeme používat vaše údaje pro vývoj a zlepšení Organic Maps. Změny se projeví po restartování aplikace. - Zásady ochrany osobních údajů + Politika důvěrnosti Podmínky užívání Zácpy Metro @@ -572,7 +566,7 @@ Pro přidání nové značky klikněte na symbol hvězdičky na obrázku objektu …ještě Exportovat soubor - Nastavení seznamu + Nástroje seznamu Smazat seznam Veřejně přístupné Soukromé @@ -585,14 +579,14 @@ Popis místa Nahrávání map - Režim spořič baterie - Pokud je zapnut automatický režim spořiče baterie, aplikace začne vypínat funkce vybíjející baterii, v závislosti na její momentální úrovni nabití. - Nikdy nepoužívat - Automatický - Maximální šetření baterií - Možnost zapne odesílání dat za diagnostickými účely. To nám pomáhá při řešení problémů s aplikací. Dočasně povolte pro nahrávání a odesílání logů našemu týmu o vašem problému. + Nízkoenergetický režim + Pokud je nízkoenergetický režim zapojen, příloha bude vypínat funkce, které mrhají energii v závislosti na nynější nabíjení telefonu + Nikdy + Auto + Maximální šetření energií + Daná možnost se zapojuje pro protokolování činností za účelem diagnostiky. To pomáhá týmu odhalit problémy s přílohou. Zapojujte možnost jenom na požádání podržení Organic Maps. Upravujte on-line - Možnosti trasy + Možnosti řízení Vyhněte se na každé trase Silnice s mýtným Nezpevněná silnice @@ -601,7 +595,7 @@ Nelze vypočítat trasu Bohužel jsme nemohli nalézt trasu pravděpodobně kvůli vámi definovaným možnostem. Změňte prosím nastavení a zkuste to znovu Definovat silnice, kterým se vyhnout - Možnosti trasy aktivní + Možnosti směrování byly povoleny Silnice s mýtným Nezpevněná silnice Přejezd trajektů @@ -670,15 +664,9 @@ Přiblížit pro prozkoumání izolinií Nechte obrazovku spát - Je-li tato možnost povolena, bude obrazovce po určité době nečinnosti umožněno usnout. - - Zobrazit na uzamčené obrazovce - - Pokud je funkce povolena, nemusíte pokaždé odemykat zařízení při spuštěné aplikaci. + Je-li tato možnost povolena, bude obrazovka po určité době nečinnosti umožněna usnout. Mapová data z OpenStreetMap - - https://organicmaps.app/cs/ Stanice lanové dráhy @@ -702,10 +690,8 @@ Sdílení aut Myčka aut Nabíjecí stanice - Nabíjecí stanice Jesle Kino - Bowlingová dráha Klinika Vysoká škola Kulturní centrum @@ -744,9 +730,9 @@ Soukromé parkoviště Parkoviště Podzemní parkoviště - Vjezd na parkoviště Vjezd na parkoviště Vjezd na parkoviště + Vjezd na parkoviště Prostor pro parkování Prostor pro parkování Prostor pro parkování @@ -924,27 +910,15 @@ Defibrilátor Požární hydrant Tísňového volání - Vchod - - Hlavní vchod Lékařská laboratoř Fyzioterapeut - Alternativní medicína - Audiologie - Centrum dárcovství krve - Optometrie - Podiatrie - Psychoterapie - Odběr vzorků - Logopedie Most Tunel - Vyhrazená autobusová silnice Autobusová zastávka Silnice v rekonstrukci diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 865f2d7eb5..112a13cbd5 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Min position Senere - + Søg Søg kort @@ -60,7 +60,7 @@ Bogmærke Farve Indstil bogmærkenavn - + Bogmærker Mine Steder @@ -431,8 +431,8 @@ Dette kan blive dyrt med nogle abonnementer eller hvis du er i roamingtilstand. Skriv det rigtige husnummer Antal etager (maks %d) - - Rediger bygningen med maksimum %d etager + + Rediger bygningen med maksimum 25 etager Postnummer Indtast det korrekte postnummer @@ -689,10 +689,8 @@ Bilvask Kasino Ladestation - Ladestation Vuggestue Biograf - Bowling bane Klinik Universitet Medborgerhus @@ -730,9 +728,9 @@ Privat parkering Parkering Underjordisk parkering - Parkeringsindgang Parkeringsindgang Parkeringsindgang + Parkeringsindgang Parkeringsplads Parkeringsplads Parkeringsplads @@ -906,27 +904,15 @@ Hjertestarter Brandhane Nødtelefon - Indgang - - Hovedindgang Medicinsk laboratorium Fysioterapeut - Alternativ medicin - Audiologi - Center for bloddonation - Optometri - Fodterapi - Psykoterapi - Prøvetagning - Tale terapi Bro Tunnel - Dedikeret busvej Busstoppested Vej under opbygning diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index fa8a4f4ded..5ddcee6873 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Mein Standort Später - + Suche Auf der Karte suchen @@ -60,7 +60,7 @@ Lesezeichenfarbe Name des Lesezeichens - + Lesezeichen Meine Orte @@ -451,8 +451,8 @@ Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden. Richtige Hausnummer eingeben Anzahl der Etagen (maximal %d) - - Das Gebäude kann nicht mehr als %d Etagen haben + + Das Gebäude kann nicht mehr als 25 Etagen haben Postleitzahl Geben Sie die korrekte Postleitzahl ein @@ -731,7 +731,7 @@ Infrastrukturobjekte Kunststätte Geldautomat - Grillplatz + Picknickplatz Parkbank Fahrradständer Fahrradverleih @@ -745,10 +745,8 @@ Autowäsche Kasino Ladestation - Ladestation Kindertagesstätte Kino - Bowlingbahn Klinik Hochschule Bürgerhaus @@ -786,9 +784,9 @@ Privatparkplatz P+R-Parkplatz Tiefgarage - Parkplatzeinfahrt Parkplatzeinfahrt Parkplatzeinfahrt + Parkplatzeinfahrt Parkplatz Parkplatz Parkplatz @@ -896,7 +894,7 @@ Schmied Brauerei Zimmermann - Süßwarenladen + Konditor Elektriker Elektrogerätereparatur Landschaftsgärtner @@ -963,7 +961,7 @@ Koreanisch Laotisch Libanesisch - Lokale Küche + Regional Madegassisch Malaysisch Mediterran @@ -979,7 +977,7 @@ Polnisch Portugiesisch Ramen - Regionale Küche + Regional Russisch Sandwich Wurst @@ -1000,20 +998,9 @@ Defibrillator Hydrant Notruftelefon - Eingang - - Haupteingang Medizinisches Labor Physiotherapeut - Alternative Medizin - Audiologie - Blutspendezentrum - Optometrie - Podologie - Psychotherapie - Probenahme - Logopedie Straße @@ -1023,7 +1010,6 @@ Reitweg Tunnel - Eigene Busstraße Bushaltestelle Straße im Bau Radweg @@ -1287,7 +1273,6 @@ Schwimmbecken Schwimmbecken Laufbahn - Laufbahn Aquapark künstliche Anlage Wellenbrecher @@ -1356,7 +1341,7 @@ Immobilienmakler Regierungsstelle Versicherungsbüro - Anwaltskanzlei + Anwaltsbüro Nichtregierungsorganisation Mobilfunkbetreiber Bio @@ -1676,45 +1661,44 @@ Spirituosengeschäft Bäckerei Schönheitssalon - Getränkemarkt + Getränke Fahrradladen Wettbüro - Buchhandlung + Büchergeschäft Metzgerei Autohaus Autoteile Autowerkstatt Reifenservice - Wohnmobilhändler Drogerie Schokoladengeschäft Bekleidungsgeschäft Kaffeegeschäft - Computerfachgeschäft + Computergeschäft Süßwarengeschäft Gemischtwarenladen Kopierladen Kosmetikgeschäft - Feinkostladen + Feinkostgeschäft Kaufhaus Baumarkt Chemische Reinigung - Elektrofachgeschäft + Elektronik Erotikladen Textilgeschäft - Hofladen + Hoflebensmittelladen Florist Bestattungsinstitut - Möbelhaus + Möbelgeschäft Gärtnerei - Geschenkeladen + Geschenkladen Gemüseladen Lebensmittelgeschäft Friseur Baumarkt Reformhaus Haushaltswarengeschäft - Juwelier + Juweliergeschäft Küchengeschäft Wäscherei Einkaufszentrum @@ -1727,7 +1711,7 @@ Zeitungsstand Optiker Outdoor-Ausrüstung - Konditorei + Gebäck Pfandleihe Tierhandlung Fotofachgeschäft @@ -1746,7 +1730,7 @@ Billigladen Videothek Gameshop - Weinhandlung + Wein- und Spirituosengeschäft Antiquitäten Kunstgeschäft Babybedarf @@ -1758,7 +1742,7 @@ Milchprodukte Elektrogeschäft Angelgeschäft - Einrichtungsgeschäft + Innendekorationen Lotteriescheine Medizinische Versorgung Nahrungsergänzungsmittel diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index 064ab9ee81..8fcda0ed33 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -1,6 +1,6 @@ - + @@ -24,7 +24,7 @@ Η θέση μου Αργότερα - + Αναζήτηση Αναζήτηση χάρτη @@ -61,7 +61,7 @@ Χρώμα αγαπημένου Όνομα συνόλου αγαπημένων - + Αγαπημένα Οι τοποθεσίες μου @@ -433,8 +433,8 @@ Αυτό μπορεί να είναι σημαντικά πιο ακριβό για μερικά πακέτα ή στην περίπτωση περιαγωγής Εισαγάγετε έναν έγκυρο αριθμό κτιρίου Αριθμός ορόφων (μέγιστο %d) - - Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d + + Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους 25 Ταχυδρομικός κώδικας Πληκτρολογήστε έναν έγκυρο ταχυδρομικό κώδικα @@ -688,10 +688,8 @@ Καθαρισμός αυτοκινήτων Καζίνο Σταθμός φόρτισης - Σταθμός φόρτισης Βρεφικός σταθμός Κινηματογράφος - Αίθουσα σφαιρίσεως Κλινική Κολέγιο Κέντρο κοινότητας @@ -730,9 +728,9 @@ Ιδιωτικός χώρος στάθμευσης Χώρος στάθμευσης Υπόγειος χώρος στάθμευσης - Είσοδος στάθμευσης Είσοδος στάθμευσης Είσοδος στάθμευσης + Είσοδος στάθμευσης Χώρος στάθμευσης Χώρος στάθμευσης Χώρος στάθμευσης @@ -911,27 +909,15 @@ Πρώτες βοήθειες Πυροσβεστικός κρουνός Τηλέφωνο έκτακτης ανάγκης - Είσοδος - - Κύρια είσοδος Ιατρικό Εργαστήριο Φυσικοθεραπευτής - Εναλλακτική ιατρική - Ακοολογία - Κέντρο αιμοδοσίας - Οπτομετρία - Ποδιατρική - Ψυχοθεραπεία - Δειγματοληψία - Λογοθεραπεία Γέφυρα Σήραγγα - Αφιερωμένος δρόμος λεωφορείων Στάση λεωφορείου Οδός υπό κατασκευή diff --git a/android/res/values-en-rGB/strings.xml b/android/res/values-en-rGB/strings.xml index d3f891bc18..8a9d549dc9 100644 --- a/android/res/values-en-rGB/strings.xml +++ b/android/res/values-en-rGB/strings.xml @@ -1,6 +1,6 @@ - + diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml index ba1ad4e643..0f65525200 100644 --- a/android/res/values-es-rMX/strings.xml +++ b/android/res/values-es-rMX/strings.xml @@ -1,6 +1,6 @@ - + @@ -195,6 +195,9 @@ Aparcamiento privado Aparcamiento privado Aparcamiento privado + Entrada al aparcamiento + Entrada al aparcamiento + Entrada al aparcamiento Plaza de aparcamiento Plaza de aparcamiento Plaza de aparcamiento diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index ef1b584716..05e3a61b66 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -1,6 +1,6 @@ - + @@ -12,23 +12,23 @@ Eliminar Descargar mapas - Error durante la descarga. Pulse para intentarlo de nuevo. + Error durante la descarga, iniciar otra vez Descargando… Kilómetros - Millas + Milla Mi posición Luego - + Buscar Buscar en el mapa - No se puede acceder a los servicios de localización en este dispositivo o aplicación. Por favor, actívelos en los ajustes. + No se puede acceder a los servicios de localización. Por favor, activelo en los ajustes. Mostrar en el mapa @@ -40,14 +40,14 @@ La aplicación requiere OpenGL acelerado por hardware. Lamentablemente, su dispositivo no es compatible. Descargar - Por favor, desconecte el cable USB o inserte una memoria SD para usar Organic Maps + Por favor desconectar el cable USB o insertar la memoria SD para usar Organic Maps - Por favor, libere primero espacio en la memoria SD/almacenamiento USB para usar la aplicación - Antes de comenzar, permita que descarguemos en tu dispositivo un mapamundi general.\nSe requieren %s de almacenamiento. + Por favor liberar espacio en la memoria SD/almacenamiento USB para usar la aplicación + Antes de comenzar, permite que descarguemos en tu dispositivo un mapamundi general.\nSe requieren %s de datos. Ir al mapa Descargando %s. Puede ahora\nproceder al mapa - ¿Descargar %s? - ¿Actualizar %s? + Descargar %s? + Actualizar %s? Pausar @@ -60,7 +60,7 @@ Color del marcador Nombre del grupo de marcadores - + Marcadores Mis lugares @@ -71,27 +71,15 @@ Lista - Ajustes + Configuración Guardar mapas en Seleccione el lugar donde deben descargarse los mapas - Mapas descargados - - Almacenamiento interno privado - - Almacenamiento interno compartido - - Tarjeta SD - - Almacenamiento externo compartido - - %1$s libres de %2$s + Mapas ¿Mover mapas? - - Error al mover los archivos de mapas Esto podría tardar varios minutos.\nPor favor, espere… @@ -147,28 +135,28 @@ Notas - Marcadores de Organic Maps compartidos con usted - Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz\n¡Disfrute viajando con Organic Maps! + Marcapáginas de Organic Maps compartidos contigo + Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábrelos si tienes instalado Organic Maps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este link: https://omaps.app/get?kmz\n¡Disfruta viajando con Organic Maps! - Cargando marcadores + Cargando favoritos - ¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores. + ¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestión de favoritos. - La carga de marcadores ha fallado. El archivo puede estar corrupto o ser defectuoso. + La carga de favoritos ha fallado. El archivo puede estar corrupto o ser defectuoso. Editar - Su ubicación aún no ha sido determinada + Tu ubicación aún no ha sido determinada Lo sentimos, la configuración del almacenamiento de mapas está desactivada. La descarga del mapa está en curso ahora. - ¡Mira mi ubicación actual en Organic Maps!. %1$s o %2$s ¿No tienes mapas offline? Descarga aquí: https://omaps.app/get + Mira mi ubicación actual en Organic Maps!. %1$s o %2$s ¿No tienes mapas offline? Descarga aquí: https://omaps.app/get - ¡Mira mi marcador en el mapa de Organic Maps! + Mira mi marcador en el mapa de Organic Maps! - ¡Mira mi ubicación actual en el mapa en Organic Maps! + Mira mi ubicación actual en el mapa en Organic Maps! Hola:\n\nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o esta %3$s para verlo en el mapa.\n\nGracias. @@ -221,8 +209,6 @@ 12 horas 1 día Ver en el mapa - - Menú Sitio web @@ -242,7 +228,7 @@ Derechos de autor - Informar de un fallo + Hay un error Actualizar todos @@ -257,7 +243,7 @@ Descargar todos Descargando: - Para eliminar el mapa, por favor, detenga la navegación. + Para eliminar el mapa, por favor, detén la navegación. Sólo se pueden crear rutas que estén totalmente contenidas en un mapa de una sola región. @@ -271,17 +257,17 @@ Servicios de Google Play - Usar los servicios de Google Play para obtener su ubicación actual + Usar los servicios de Google Play para obtener tu ubicación actual Descargue todos los mapas de su ruta - Para crear una ruta es necesario descargar y actualizar todos los mapas desde su ubicación a su destino. + Para crear una ruta es necesario descargar y actualizar todos los mapas de la ubicación de destino. No hay suficiente espacio Por favor, active los servicios de localización Guardar - Sus descripciones (texto o html) + Tus descripciones (texto o html) crear Rojo @@ -325,7 +311,7 @@ ¡Manténgase alerta y seguro en las rutas! Verificar la señal del GPS No se puede crear la ruta. No se pudieron identificar las coordenadas actuales del GPS. - Verifique la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación. + Verifique la señal del GPS. Activar Wi-Fi mejorará la precisión de su ubicación. Activar servicios de ubicación No se pueden encontrar las coordenadas del GPS. Active los servicios de ubicación para calcular la ruta. Imposible de encontrar una ruta @@ -346,8 +332,8 @@ Descargue mapas adicionales para crear una ruta mejor que cruce los límites de este mapa. - Para empezar a buscar y crear rutas, descargue el mapa. Después de eso, ya no necesitará una conexión a Internet. - Seleccionar mapa + Para empezar a buscar y crear rutas, descargue el mapa. Después de eso ya no necesitarás una conexión a Internet. + Seleccionar el mapa Mostrar @@ -356,19 +342,19 @@ Llegada: %s Categorías Historial - Lo siento, no se han encontrado resultados. - Por favor, pruebe con otra consulta. + Lo siento, no he encontrado nada. + Por favor, prueba con otra consulta. Historial de búsquedas Ver búsquedas recientes. Eliminar el historial de búsqueda Wikipedia - Su ubicación + Tu ubicación Empezar - Ruta desde + Desde Ruta hacia - La navegación solo está disponible desde su ubicación actual. - ¿Quiere que planeemos un ruta desde su ubicación actual? + La navegación solo está disponible desde tu ubicación actual. + ¿Quieres que planeemos un ruta desde tu ubicación actual? Siguiente Añadir horario @@ -385,8 +371,8 @@ Valores de ejemplo Corregir error Ubicación - Por favor, describa el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error. - O hágalo usted mismo en https://www.openstreetmap.org/ + Por favor, describe el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error. + O hazlo tú mismo en https://www.openstreetmap.org/ Enviar Problema El lugar no existe @@ -396,19 +382,19 @@ Diario 24/7 - Cerrado hoy - Cerrado + Día libre hoy + Día libre Hoy Abre en %s Cierra en %s Cerrado Editar los horarios de apertura - ¿No tiene cuenta en OpenStreetMap? + ¿No tienes cuenta en OpenStreetMap? Registrarse en OpenStreetMap Iniciar sesión Iniciar sesión en OpenStreetMap Contraseña - ¿Ha olvidado su contraseña? + ¿Has olvidado tu contraseña? Cerrar sesión Editar el lugar Añadir un idioma @@ -421,24 +407,23 @@ Ingrese un nombre de calle Elegir un idioma - Elija una calle + Elegir una calle Código postal Cocina Seleccionar cocina Email ó usuario - Añadir teléfono Piso Todos los cambios en los mapas se borrarán junto con el mapa. Autodescarga de mapas Para crear una ruta, es necesario actualizar todos los mapas y volver a planificar la ruta. Buscar en el mapa - Por favor, verifique los ajustes y asegúrese de que su dispositivo esté conectado a Internet. - No hay suficiente espacio - Por favor, elimine los datos innecesarios + Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet. + Sin espacio suficiente + Por favor, elimina los datos innecesarios Error de inicio de sesión. Cambios verificados - Arrastre el mapa para seleccionar la ubicación correcta del objeto. + Arrastra el mapa para seleccionar la ubicación correcta del objeto. Editar Añadir Nombre del lugar @@ -448,15 +433,15 @@ Añadir organización No se puede ubicar ningún objeto aquí Todos los datos del mapa provienen del proyecto OpenStreetMap. Es como Wikipedia para mapas donde puedes agregar o editar lugares, y están disponibles para millones de usuarios en todo el mundo. - Inicie sesión en OpenStreetMap.org para que otros usuarios puedan ver los cambios que haya efectuado. + Inicia sesión para que otros usuarios puedan ver los cambios que has efectuado. %1$d de %2$d ¿Descargar con conexión de red móvil? Podría ser muy caro con ciertos planes o con itinerancia de datos. Introducir el número de domicilio correcto Número de plantas (máx. %d) - - El número de plantas no debe superar %d + + El número de plantas no debe superar 25 Código postal Introduzca el código postal correcto @@ -493,20 +478,17 @@ ¿Eliminar el lugar añadido? Eliminar El lugar no existe - - Indique por favor la razón para eliminar el lugar - Introduzca un número de teléfono correcto - Introduzca una dirección web válida - Introduzca un email válido - Introduzca una dirección web, una cuenta o un nombre de página de Facebook válidos - Introduzca una dirección web o un nombre de cuenta de Instagram válidos + Introduce un número de teléfono correcto + Introduce una dirección web válida + Introduce un email válido + Introduce una dirección web, una cuenta o un nombre de página de Facebook válidos + Introduce una dirección web o un nombre de cuenta de Instagram válidos Introduzca una dirección web o un nombre de usuario válido de Twitter - Introduzca una dirección web o un nombre de cuenta de VK válidos - Introduzca una dirección web o ID de LINE válidos + Introduce una dirección web o un nombre de cuenta de VK válidos Añadir un lugar al mapa - ¿Quiere enviarlo a todos los usuarios? + ¿Quieres enviarlo a todos los usuarios? Asegúrate de que no has introducido ningún dato personal. Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta. @@ -566,18 +548,18 @@ Por favor ingrese el nombre de la lista Lista nueva Este nombre ya ha sido tomado - Por favor elija otro nombre - Por favor, espere… + Por favor elige otro nombre + Por favor espera… Número de teléfono Perfil de OpenStreetMap - Se encontró %d archivo. Lo verá después de la conversión. - Se han encontrado %d archivos. Los verá después de la conversión. + Se encontró %d archivo. Lo verás después de la conversión. + Se han encontrado %d archivos. Los verás después de la conversión. Sin conexión a Internet - %d objeto - %d objetos + %d objecto + %d objectos %d lugar @@ -590,21 +572,21 @@ Configuraciones de seguimiento Informe de incidentes - Puede que utilicemos sus datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después dw que reinicie la aplicación. - Política de privacidad + Puede que utilicemos vuestros datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después que reinicie la aplicación. + Política de Privacidad Condiciones de uso Tráfico Metro Capas del mapa El mapa del metro no está disponible Esta lista está vacía - Para agregar un marcador, toque un lugar en el mapa y después toque el icono de la estrella + Para agregar un marcador, toque un lugar en el mapa y después toque el ícono de estrella …más - Exportar archivo - Ajustes de la lista + Exportar como archivo + Configurar lista Eliminar lista Acceso público - Acceso limitado + Acceso privado Agregue una descripción (texto o html) Privado Cámaras de velocidad @@ -620,17 +602,17 @@ Automático Ahorro de energía máximo Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de Organic Maps. - Edición en línea - Opciones de enrutamiento + Se edita en línea + Configuración de desvío Evitar en todas las rutas Carreteras de pago Caminos sin pavimento Cruces de ferri Autopistas - No se puede calcular la ruta - Desafortunadamente, no pudimos encontrar una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo - Defina las carreteras a evitar - Opciones de enrutamiento habilitadas + No se puede construir una ruta + Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambia la configuración y vuelve a intentarlo + Personaliza la ruta de desvío + Configuración de desvío activada Carretera con pago de peaje Camino sin pavimento Cruce de ferri @@ -642,9 +624,9 @@ No - sí + Sí - no + No Ok Ordenar… @@ -678,41 +660,33 @@ Dinero Tiendas Estacionamiento - Gasolineras + Gasolinera Medicina Buscar en la lista Lugares sagrados Seleccionar lista Navegación en Metro aún no disponible en esta región Ruta de metro no encontrada - Elija por favor el punto de inicio o fin de ruta más cercano a una estación de metro + Elige el punto de inicio o fin de ruta más cercano al metro Alturas - Para usar la altitud de relieve, actualice o descargue el mapa del área deseada + Para usar la altitud de relieve, actualiza o descarga el mapa del área deseada La altitud de relieve aún no está disponible en esta región Ascenso Descenso Altura mínima Altura máxima Dificultad - Dist.: - Tiempo: - Amplíe el mapa para ver las isolíneas - Descarga el mapa mundial + Distancia: + Lapso: + Amplía el mapa para ver las isolíneas + Descarga mapa mundial - No se ha podido crear la carpeta y mover los ficheros en la memoria interna del dispositivo o en la tarjeta SD - - Error de disco - - Fallo de conexión + Problema de conexión Desconecte el cable USB Permitir que la pantalla duerma Cuando está habilitado, la pantalla podrá dormir después de un período de inactividad. - - Mostrar en la pantalla de bloqueo - - Cuando está habilitado, no tiene que desbloquear su dispositivo mientras la aplicación se está ejecutando. Datos de mapas de OpenStreetMap @@ -726,7 +700,7 @@ Estación de teleférico Infraestructura aérea Aeropuerto - Aeropuerto internacional + Aeropuerto Plataforma Puerta de embarque Helipuerto @@ -735,12 +709,12 @@ Terminal Infraestructura Centro de arte - Cajero automático + Cajero Banco Bar Picnic Banco - Aparcamiento de bicicletas + Aparcamiento de bicis Alquiler de bicicletas Estación de reparación de bicicletas Biergarten @@ -753,10 +727,8 @@ Lavado de coches Casino Estación de carga - Estación de carga Guardería Cine - Bolera Clínica Colegio Centro comunitario @@ -777,15 +749,15 @@ Cementerio - Cementerio cristiano + Cementerio Hospital - Puesto de caza + Galería de caza Heladería Cibercafé Guardería Biblioteca Mercado - Aparcamiento de motocicletas + Aparcamiento de motos Discoteca Residencia de ancianos Aparcamiento @@ -796,9 +768,9 @@ Aparcamiento privado Aparcamiento Aparcamiento subterráneo - Entrada al aparcamiento Entrada al aparcamiento Entrada al aparcamiento + Entrada al aparcamiento Plaza de aparcamiento Plaza de aparcamiento Plaza de aparcamiento @@ -815,7 +787,7 @@ Ermita Templo Policía - Buzón de correos + Buzón Oficina de correos Prisión Pub @@ -866,7 +838,7 @@ Papelera Basura Estación de transferencia de residuos - Fuente de agua para caravanas + Fuente de agua Barrera Bloque Bolardo @@ -884,7 +856,7 @@ Muro de contención Escalón Barrera - Cabina de peaje + Peaje Muro Frontera Frontera administrativa @@ -925,7 +897,7 @@ Paisajista Artesanía - Calefacción, ventilación y aire acondicionado + Aire acondicionado Trabajador del metal Pintor Fotógrafo @@ -1020,34 +992,18 @@ Cocina vegana Cocina vegetariana Cocina vietnamita - Emergencia Desfibrilador Boca de incendio - Teléfono de emergencias - + Teléfono de emergencia Entrada - - Entrada principal Laboratorio médico Fisioterapeuta - Medicina alternativa - Audiología - Centro de donación de sangre - Optometría - Podología - Psicoterapia - Muestreo - Logopedia - Carretera - Camino de caballos Puente - Camino de caballos Túnel - Carretera exclusiva para autobuses Parada de autobús Carretera en construcción Ciclovía @@ -1058,18 +1014,18 @@ Túnel Ascensor Camino - Senderismo alpino - Zona peatonal + Camino + Camino - Puente peatonal + Puente Camino Camino Camino - Sendero + Camino Camino Camino - Túnel peatonal + Túnel Vado (de lugar) Calle @@ -1101,12 +1057,12 @@ Camino Túnel - Calle peatonal - Zona peatonal + Calle + Calle - Puente peatonal + Puente - Túnel peatonal + Túnel Calle Puente @@ -1148,9 +1104,8 @@ Calle Túnel - Área de servicio Radar de velocidad - Escaleras + Camino Puente @@ -1165,17 +1120,17 @@ Puente Túnel - Pista - Pista + Calle + Calle Puente - Pista - Pista - Pista - Pista - Pista - Pista - Pista + Calle + Calle + Calle + Calle + Calle + Calle + Calle Túnel Semáforos @@ -1200,14 +1155,14 @@ Calle Calle Camino - Calle peatonal + Calle Calle Calle Calle Calle Calle - Escaleras - Pista + Camino + Calle Calle Calle @@ -1241,60 +1196,35 @@ Monumento Picota Ruinas - Barco + Turismo Tumba Cruz de término Peto de ánimas - Internet - Internet Rotonda - Uso del suelo Cuenca Cementerio - Cementerio cristiano + Cementerio Camposanto - Zona comercial - Construcción Instalaciones educativas - Granja Tierras agrícolas - Granja - Campo Bosque - Bosque de coníferas - Bosque caducifolio - Bosque mixto - Garajes + Bosque + Bosque + Bosque Césped - Invernadero - Invernadero - Zona industrial Vertedero - Pradera - Área militar - Huerto - Cantera Instalaciones ferroviarias - Área recreativa Cuenca - Zona residencial - Zona comercial - Estanque - Viñedo - Ocio Parque para perros Centro de fitness Gimnasio Salón de baile Jardín - Jardín residencial + Jardín Campo de golf - Pisa de patinaje - Reserva natural - Marina - Reserva natural + Territorio reservado Parque Parque Parque @@ -1302,40 +1232,23 @@ Mesa de picnic Complejo deportivo Patio de recreo - Zona recreativa Sauna Polideportivo Centro de escalada Centro de yoga Estadio Piscina - Piscina privada - Pista deportiva - Pista deportiva + Piscina Parque acuático - Resort de playa - Rompeolas Chimenea de fábrica - Punto geodésico - Mástil de bandera Faro - Mástil - Muelle - Tubería - Tubería aérea - Silo - Cisterna Cámara de vigilancia Torre - Planta de tratamiento de aguas residuales Toma de agua Depósito de agua Pozo Molino - Fábrica - Militar Búnker - Puerto de montaña Naturaleza Roca desnuda Bahía @@ -1418,28 +1331,13 @@ Barrio Pueblo Pueblo - Energía - Generador - Línea eléctrica - Línea eléctrica subterránea - Línea eléctrica de baja tensión Poste eléctrico - Estación eléctrica - Subestación eléctrica + Subestación Poste eléctrico Transporte público - Plataforma - Vía férrea - Vía férrea abandonada - Vía férrea en construcción - Paso a nivel - Vía férrea en desuso - Funicular - Punto de parada + Estación de tren Cruce de ferrocarril Tren de monorraíl - Vía férrea de ancho estrecho - Plataforma de vía férrea Ferrocarril Estación de tren Estación de tren @@ -1553,7 +1451,6 @@ Metro Metro Metro - Línea de metro Entrada al metro Entrada al metro Entrada al metro @@ -1663,10 +1560,7 @@ Entrada al metro Entrada al metro Entrada al metro - Línea de tranvía Parada de tranvía - Ruta - Ruta de ferry Tienda Licorería Panadería @@ -1676,15 +1570,14 @@ Casa de apuestas Librería Carnicería - Concesionario de coches + Venta de coches Piezas de automóvil Taller Reparación de neumáticos - Concesionario de caravanas Droguería - Chocolatería + Tienda Tienda de ropa - Tienda de café + Tienda Tienda de informática Confitería Tienda de barrio @@ -1696,7 +1589,7 @@ Tintorería Electrónica Sex Shop - Tienda de telas + Tienda Tienda de alimentos de granja Floristería Funeraria @@ -1716,13 +1609,13 @@ Centro comercial Salón de masajes Móviles - Prestamista + Tienda Tienda de motos - Tienda de discos - Instrumentos musicales + Disquería + Tienda Puesto de venta de periódicos Óptica - Equipamiento de ocio al aire libre + Equipamiento Pastelería Casa de empeños Tienda de mascotas @@ -1734,17 +1627,17 @@ Papelería Supermercado Tatuajes - Tienda de té + Tienda Venta de entradas Tienda de juguetes Agencia de viajes Tienda de neumáticos - Tienda de variedades + Tienda de Variedades Tienda de vídeo Tienda de videojuegos Tienda de vinos Antigüedades - Tienda de arte + Tienda de artes Tienda de niños Tienda de bolsos Boutique @@ -1754,10 +1647,10 @@ Productos lácteos Tienda de electricidad Tienda de pesca - Decoración de interiores + Decoraciones interiores Boletos de lotería Suministros médicos - Suplementos nutricionales + Suplementos Nutricionales Pinturas Perfumería Materiales de costura @@ -1785,7 +1678,7 @@ Varios deportes Submarinismo - Tiro deportivo + Tiroteo Monopatinaje Esquí Fútbol @@ -1796,13 +1689,13 @@ Bowling Bowling Pádel - Fútbol sala + Futsal Hockey sobre hielo Hockey sobre césped Bádminton Pelota vasca Turismo - Refugio de montaña + Cabaña Apartamentos Obras de arte Obras de arte @@ -1812,67 +1705,35 @@ Atracción turística Atracción turística Atracción turística - Camping + Campamento Zona de caravanas Chalé - Galería + Turismo Casa de huéspedes Albergue juvenil - Hotel - Información turística + Información Tablón de información Poste indicador Mapa turístico Oficina de turismo - Motel Museo - Zona de picnic - Resort + Picnic Parque de atracciones Vista panorámica Cabaña - Zoo - Reducción de velocidad - Banda reductora - Resalte - Curso de agua - Canal - Canal - Presa - Zanja - Zanja - Muelle - Desagüe - Desagüe Compuerta Río Río Río - Arroyo - Arroyo efímero - Arroyo intermitente - Arroyo + Río + Río + Río + Río Cascada - Presa Silla de ruedas Parcialmente equipado para discapacitados No equipado para discapacitados Equipado para discapacitados - Telesilla barra en J - Alfombra mágica - Telesilla de disco - Telesilla de cuerda - Telesilla barra en T - Tipo de pista - Pista de esquí alpino - Pista de esquí alpino - Pista de esquí alpino - Pista de esquí alpino - Pista de esquí alpino - Pista de esquí alpino - Pista de esquí alpino - Pista de esquí nórdico - Pista para trineos Edificio - Lugar para eventos + Lugar de los eventos diff --git a/android/res/values-et/strings.xml b/android/res/values-et/strings.xml index 03d7c24e50..09cbf9f409 100644 --- a/android/res/values-et/strings.xml +++ b/android/res/values-et/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Minu asukoht Hiljem - + Otsi Otsi kaardilt @@ -60,7 +60,7 @@ Järjehoidja värv Järjehoidjate loetelu nimi - + Järjehoidjad Minu kohad @@ -453,8 +453,8 @@ See võib mõningate lepingute või roamingu korral olla märgatavalt kallim. Sisesta kehtiv majanumber Korruste arv (maks. %d) - - Korruste arv ei või olla üle %d + + Korruste arv ei või olla üle 25 Postiindeks Sisesta korrektne postiindeks @@ -534,7 +534,7 @@ Sees Väljas Hääljuhiste jaoks kasutame TTS süsteemi. Paljud Android-seadmed kasutavad Google\'i TTS-i, saate selle alla laadida või värskendada teenusest Google Play (https:play.google.comstoreappsdetails?id=com.google.android.tts) - Mõne keele puhul peate paigaldama kõnesüntesaatori või täiendava keelepaketi rakenduste poest (Google Play, Galaxy Store, App Gallery, FDroid).\nAvage oma seadme seaded → Keel ja sisend → Kõne → Tekst kõneks väljund.\nSiin saate hallata kõnesünteesi seadeid (näiteks alla laadida keelepaketti võrguühenduseta kasutamiseks) ja valida mõne muu teksti kõneks muutmise mootori. + Mõne keele puhul peate paigaldama kõnesüntesaatori või täiendava keelepaketi rakenduste poest (Google Play, Galaxy Store, App Gallery, FDroid).\nAvage oma seadme seaded → Keel ja sisend → Kõne → Tekst kõneks väljund .\nSiin saate hallata kõnesünteesi seadeid (näiteks alla laadida keelepaketti võrguühenduseta kasutamiseks) ja valida mõne muu teksti kõneks muutmise mootori. Lisainfo saamiseks palun vaadake seda juhist. Transliteratsioon ladina keelde Lisateave @@ -750,10 +750,8 @@ Autopesula Kasiino Laadimisjaam - Laadimisjaam Lasteaed Kino - Bowlingusaal Kliinik Kolledž Kogukonnakeskus @@ -793,9 +791,9 @@ Privaatne parkimine Parkimine Maa-alune parkimine - Parkla sissepääs Parkla sissepääs Parkla sissepääs + Parkla sissepääs Parkimiskoht Parkimiskoht Parkimiskoht @@ -1021,20 +1019,9 @@ Defibrillaator Tuletõrjehüdrant Hädaabi telefon - Sissepääs - - Peasissekäik Meditsiinilabor Füsioterapeut - Alternatiivne meditsiin - Audioloogia - Vereloovutuskeskus - Optomeetria - Jalaravi - Psühhoteraapia - Proovivõtmine - Logopeedia Maantee @@ -1044,7 +1031,6 @@ Valjarada Tunnel - Spetsiaalne bussitee Bussipeatus Ehitusjärgus tee Jalgrattatee @@ -1314,7 +1300,6 @@ Ujumisbassein Privaatne bassein Jooksurada - Jooksurada Veepark Rannakuurort Inimese loodud diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml index b4ceedc211..1206828ee2 100644 --- a/android/res/values-eu/strings.xml +++ b/android/res/values-eu/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Nire posizioa Geroago - + Bilatu Bilatu mapan @@ -60,7 +60,7 @@ Markatzailearen kolorea Markatzaile taldearen izena - + Markagailuak Nire tokiak @@ -436,8 +436,8 @@ Oso garestia izan daiteke plan batzuekin edo datu-ibiltaritzarekin. Sartu etxe-zenbaki zuzena Solairu kopurua (gehienez %d) - - Landare kopurua ez da %detik gorakoa izan behar + + Landare kopurua ez da 25etik gorakoa izan behar Posta kodea Mesedez, idatzi posta-kode zuzena @@ -705,10 +705,8 @@ Kotxe garbiketa Kasinoa Kargatzeko geltokia - Kargatzeko geltokia Haurtzaindegia Filmak - Bolatokia Klinika Unibertsitatea Komunitate Zentroa @@ -748,9 +746,9 @@ Aparkaleku pribatua Aparkalekua Lurpeko Aparkalekua - Aparkalekuaren sarrera Aparkalekuaren sarrera Aparkalekuaren sarrera + Aparkalekuaren sarrera Aparkaleku Aparkaleku Aparkaleku @@ -972,27 +970,15 @@ Desfibriladorea Suteen hidrantea Larrialdi zenbakia - Sarrera - - Sarrera Nagusia Medikuntza laborategia Fisioterapeuta - Medikuntza alternatiboa - Audiologia - Odol Emate Zentroa - Optometria - Podologia - Psikoterapia - Laginketa - Logopedia Zubia Tunel - Autobus errepidea Autobus geltokia Eraikitzen ari diren errepidea Bizikletabidea diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index 034b2ebb33..bfefd88ac7 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -1,6 +1,6 @@ - + @@ -10,9 +10,9 @@ لغو حذف - دانلود نقشه‌ها + دانلود نقشه ها - دانلود ناموفق بود. برای تلاش مجدد لمس کنید + دانلود ناموفق بود . برای تلاش مجدد لمس کنید درحال دانلود @@ -26,12 +26,12 @@ مکان من بعداً - + جست‌وجو جست‌وجوی نقشه - سرویس موقعیت مکانی شما غیر فعال است .لطفا جهت کارکرد صحیح نرم افزار آن را فعال کنید. + سرویس موقعیت مکانی شما غیر فعال است .لطفا جهت کارکرد صحیح نرم افزار ان را فعال کنید. بر روی نقشه نمایش بده @@ -40,15 +40,15 @@ تلاش مجدد تنظیمات اتصال بستن - نیازمند است. متاسفانه دستگاه شما از آن پشتیبانی نمی‌کندOpenGLبرنامه برای اجرا به + نیازمند است. متاسفانه دستگاه شما از ان پشتیبانی نمی کندOpenGLبرنامه برای اجرا به دانلود - لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید + لطفا مقداری از فضای ذخیره سازی را آزاد نمایید قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم.\nمقدار %s از حافظه شما اشغال می شود. برو به نقشه درحال دانلود %s. شما اکنون می توانید\nبه نقشه بروید. دانلود %s? - آپدیت %s? + اپدیت %s? مکث @@ -59,30 +59,30 @@ اضافه کردن مجموعه جدید رنگ نشانه - - نشانه‌ها + + نشانه ها مکان من نام - آدرس + ادرس لیست تنظیمات - ذخیره نقشه‌ها در + ذخیره نقشه ها در - مسیری را که نقشه‌ها باید در آن دانلود شود را انتخاب کنید + مسیری را که نقشه ها باید در ان دانلود شود را انتخاب کنید - نقشه‌ها + نقشه ها - آیا نقشه‌ها جابه‌جا شود؟ + ایا نقشه ها جابه جا شود؟ ممکن است چند دقیقه طول بکشد.\nلطفا صبر کنید… - واحد اندازه‌گیری + واحد اندازه گیری بین مایل و کیلومتر انتخاب کنید @@ -106,7 +106,7 @@ سرگرمی - خود‌پرداز + خود پرداز تفریحات شبانه @@ -128,17 +128,17 @@ بازیافت - آب + اب - RV برای + RV ﯼﺍﺮﺑ - یادداشت‌ها + یادداشت ها - در حال بارگیری نشانه‌ها + در حال بارگیری نشانه ها - نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید + نشانه ها با موفقیت بارگذاری شد!شما می توانید ان ها را در نقشه یا بخش مدیریت نشانه ها بیابید - بارگذاری نشانه‌ها با شکست مواجه شد.ممکن است فایل آسیب دیده یا معیوب باشد + بارگذاری نشانه ها با شکست مواجح شد.ممکن است فایل اسیب دیده یا معیوب باشد ویرایش @@ -152,11 +152,11 @@ ایمیل - کپی در کلیپ‌برد: %1$s + کپی در کلیپ برد :%1$s انجام شد - OpenStreetMap: %s داده‌های + OpenStreetMap: %s ﯼﺎﻫ ﻩﺩﺍﺩ برای ادامه کار مطمئن اید؟ @@ -169,7 +169,7 @@ اطلاعات مسیریابی - دکمه‌های بزرگنمایی + دکمه های درشت نمایی نمایش بر روی نقشه حالت شب @@ -182,14 +182,14 @@ نمای چشم انداز - ساختمان‌های سه بعدی + ساختمان های سه بعدی دستور العمل صوتی زبان صوت موجود نیست - بزرگنمایی خودکار + بزرگ نمایی خودکار خاموش 1 ساعت 2 ساعت @@ -200,7 +200,7 @@ وب سایت - اخبار + ﺭﺎﺒﺧﺍ بازخورد @@ -208,9 +208,9 @@ کمک - پرسش‌های زیاد پرسیده شده + ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ - حمایت مالی + ﺪﯿﻨﮐ ﺍﺪﻫﺍ چگونه از ما حمایت کنیم؟ @@ -218,7 +218,7 @@ گزارش خطا - آپدیت همه + اپدیت همه لغو همه @@ -227,13 +227,13 @@ صف نزدیک من - نقشه‌ها + نقشه ها دانلود همه درحال دانلود: - برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید + برای حذف نقشه لطفا مسیر یابی را متوقف کنید - تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند. + تنها مسیر هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند. دانلود نقشه @@ -241,15 +241,15 @@ حذف نقشه - بروزرسانی نقشه + به روز رسانی نقشه خدمات Google Play استفاده از Google Play Services برای تعیین موقعیت کنونی شما - دانلود تمامی نقشه‌ها در طول مسیر‌تان + دانلود تمامی نقشه ها در طول مسیر تان - به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه‌های شما از مبدا تا مقصد را بروزرسانی کنیم. + به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه های شما از مبدا تا مقصد را به روز رسانی کنیم. فضای کافی موجود نیست @@ -262,7 +262,7 @@ زرد - آبی + ابی سبز @@ -278,11 +278,11 @@ آبی کمرنگ - فیروزه‌ای + فیروزه ای آبی سیر - زرد لیمویی + زرد لیویی نارنجی سیر @@ -295,11 +295,11 @@ —شرایط جاده قوانین راهنمایی و رانندگی و علائم جاده همیشه بر نکات مسیریابی اولویت دارند; —نقشه ممکن است اشتباه باشد و مسیر پیشنهادی همیشه بهترین مسیر برای رسید به مقصد شما نباشد; —مسیر پیشنهادی باید فقط به عنوان یک توصیه دانست - —در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر‌هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز‌های کشور‌ها را رد کند که این در بعضی مناطق غیر مجاز است. + —در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز های کشور ها را رد کند که این در بعضی مناطق غیر مجاز است. لطفا هوشیار و ایمن در جاده بمانید! سیگنال GPS را چک کنید ناتوان از ایجاد مسیر.موقعیت مکانی شما شناسایی نشد - لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت‌یابی فعال کنید. + لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت یابی فعال کنید. فعال کردن سرویس موقعیت مکانی (GPS) ناتوان از مشخص کردن موقعیت مکانی شما.لطفا سرویس موقعیت مکانی خود را فعال کنید. ناتوان در تعیین مسیر @@ -307,20 +307,20 @@ لطفا مبدا یا مقصد خود را تنظیم کنید. مبدا خود را تنظیم کنید مسیر ایجاد نشد.ناتوان در تعیین نقطه شروع - لطفا نقطه شروع را نزدیک‌تر به جاده انتخاب کنید. + لطفا نقطه شروع رانزدیک تر به جاده انتخاب کنید. تنظیم مقصد مسیر ایجاد نشد.ناتوان در تعیین مقصد. - لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید. + لطفا مقصد تعیین شده را نزدیک تر به جاده انتخاب نمایید. ناتوان در تعیین نقطه میانی. لطفا نقطه میانی را تنظیم کنید. خطای سیستم ناتوان در ایجاد مسیر به علت خطای برنامه. لطفا دوباره تلاش کنید - ایا مایل به دانلود نقشه و ایجاد مسیر‌های بهینه بیشتری که نقشه‌های بیشتری را پوشش میدهد هستید؟ - دانلود نقشه‌های اضافی برای ایجاد مسیری بهتر که حاشیه‌های این نقشه را رد می کند. + ایا مایل به دانلود نقشه و ایجاد مسیر های بهینه بیشتری که نقشه های بیشتری را پوشش میدهد هستید؟ + دانلود نقشه های اضافی برای ایجاد مسیری بهتر که حاشیه های این نقشه را رد می کند. - برای شروع جستجو و مسیر‌یابی لطفا نقشه رادانلود کنید بعد از آن دیگر نیازی به اتصال به اینترنت ندارید و برنامه کاملا آفلاین اجرا می شود. + برای شروع جستوجو و مسیر یابی لطفا نقشه رادانلود کنید بعد از ان دیگر نیازی به اتصال به اینترنت ندارید و برنامه کاملا افلاین اجرا می شود. انتخاب نقشه نمایش @@ -328,21 +328,21 @@ مخفی کردن ورود به: %s - دسته‌بندی‌ها + دسته بندی ها تاریخچه متاسفانه چیزی پیدا نشد - با تغییر در معیار‌های جستجو دوباره امتحان کنید - سوابق جستجو - مشاهده جستجو‌های اخیر - پاک کردن سابقه جستجوها + با تغییر در معیار های جست و جو دوباره امتحان کنید + سوابق جست وجو + مشاهده جست وجو های اخیر + پاک کردن سابقه جست وجو ها ویکی پدیا موقعیت شما شروع مسیر از مسیر به - مسیر‌یابی فقط از موقعیت کنونی شما قابل انجام است. - آیا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟ + مسیر یابی فقط از موقعیت کنونی شما قابل انجام است. + ایا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟ بعدی اضافه کردن برنامه ریزی @@ -359,12 +359,12 @@ مقادیر پیش فرض تصحیح خطا موقعیت - لطفا مشکلتان را با جزئیات توضیح دهید بطوری که انجمن OSM بتوانند آن را برطرف کنند. - یا خودتان آن را انجام دهید در وبسایت https://www.openstreetmap.org/ + لطفا مشکلتان را با جزئیات توضیح دهید بطوری که انجمن OSM بتوانند ان را برطرف کنند. + یا خودتان ان را انجام دهید در وبسایت https://www.openstreetmap.org/ ارسال مشکل مکان وجود ندارد - به علت تعمیرات بسته است + به علت تعمییرات بسته است مکان تکراری دانلود خودکار @@ -375,10 +375,10 @@ امروز تعطیل ویرایش ساعت کاری - آیا حساب OpenStreetMap ندارید؟ + ایا حساب OpenStreetMap ندارید؟ ثبت نام در OpenStreetMap ورود - شوید OpenStreetMap وارد + ﺪﯾﻮﺷ OpenStreetMap ﺩﺭﺍﻭ رمز عبور رمز عبور خود را فراموش کردید؟ خروج از حساب @@ -391,22 +391,22 @@ اضافه کردن خیابان - نام خیابان را وارد کنید + ﺪﯿﻨﮐ ﺩﺭﺍﻭ ﺍﺭ ﻥﺎﺑﺎﯿﺧ ﻡﺎﻧ انتخاب یک زبان انتخاب یک خیابان کد پستی - غذا‌خوری + غذا خوری انتخاب غذاخوری ایمیل یا نام کاربری طبقه - تمام ویرایش‌های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد. - بروزرسانی نقشه‌ها - برای ایجاد مسیر شما نیازمند بروزرسانی تمامی نقشه‌ها هستید سپس می توانید دوباره مسیرتان را برنامه ریزی کنید + تمام ویرایش های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد. + بروزرسانی نقشه ها + برای ایجاد مسیر شما نیازمند بروزرسانی تمامی نقشه ها هستید سپس می توانید دوباره مسیرتان را برنامه ریزی کنید یافتن نقشه لطفا تنظیمات خود را بازبینی کنید و مطمئن شوید که ابزار شما به اینترنت متصل است. فظای کافی موجود نیست - لطفا داده‌های غیر ضروری را از دستگاه خود حذف کنید + لطفا داده های غیر ضروری را از دستگاه خود حذف کنید خطای ورود تغییرات تایید شد برای انتخاب مکان صحیح شئی نقشه را بکشید. @@ -418,29 +418,29 @@ مشکلی دیگر اضافه کردن یک تجارت نمی توان شی ای در این مکان باشد - تمام داده‌های نقشه از پروژه OpenStreetMap می‌آید. این مثل ویکی‌پدیا برای نقشه‌هاست که شما می‌توانید مکان را اضافه یا ویرایش کنید ﻭ ﺁنها ﺑﺮﺍﯼ ﻣﯿﻠﯿﻮن‌ها ﮐﺎﺭﺑﺮ ﺩﺭ ﺳﺮﺍﺳﺮ ﺟﻬﺎﻥ ﺩﺭ ﺩﺳﺘﺮﺱ ﻗﺮﺍﺭ ﻣﯽﮔﯿﺮﻧﺪ. + .ﺪﻧﺮﯿﮔu200cﯽﻣ ﺭﺍﺮﻗ ﺱﺮﺘﺳﺩ ﺭﺩ ﻥﺎﻬﺟ ﺮﺳﺍﺮﺳ ﺭﺩ ﺮﺑﺭﺎﮐ ﺎﻫu200cﻥﻮﯿﻠﯿﻣ ﯼﺍﺮﺑ ﺎﻫu200cﻥﺁ ﻭ وارد شوید تا دیگر کاربران نیز بتوانند تغییرات ایجاد شده توسط شما را ببینند %1$d از %2$d دانلود بر روی یک شبکه دیتای موبایل؟ - این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد. + این کار می تواند برای شما در بعضی طرح ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد. وارد کردن شماره ساختمان معتبر تعداد طبقات ( حداکثر %d ) - - تعداد طبقات نباید بیش از %d باشد + + تعداد طبقات نباید بیش از 25 باشد کدپستی - یک کد‌ پستی معتبر وارد کنید + یک کد پستی معتبر وارد کنید مکان ناشناس - ارسال یادداشت به ویرایش‌کنندگان OSM - اظهار نظر بیشتر + ارسال یادداشت به ویرایشکنندگان OSM + اظهارنظر بیشتر شما یک سری تغییرات در نقشه را برای انجمن OpenStreetMap ارسال کردید.جزئیات اضافی را که نتوانستید در Organic Maps ویرایش کنید را برایشان بنویسید. در مورد OpenStreetMap بیشتر بدانید مالک شما هیچ نقشه دانلود شده ای ندارید - برای جست وجو یک مکان و استفاده از قابلیت ناوبری، نقشه‌ها را دانلود کنید. + برای جست وجو یک مکان و استفاده از قابلیت ناوبری, نقشه ها را دانلود کنید. - آیا یافتن مکان‌تان را ادامه می دهید؟ + ایا یافتن مکان تان را ادامه می دهید؟ مکان شما ناشناس مانده است.ممکن است شما داخل یک ساختمان یا تونل باشید. ادامه @@ -457,11 +457,11 @@ توضیحات بیشتر تماس - ویرایش نشانه‌ها + ویرایش نشانه ها اظهار نظر - آیا تغییرات محلی را نادیده می گیرید؟ + ایا تغییرات محلی را نادیده می گیرید؟ نادیده گرفتن - آیا مکان ثبت شده حذف شود؟ + ایا مکان ثبت شده حذف شود؟ حذف مکان وجود ندارد @@ -470,10 +470,10 @@ ایمیل معتبری وارد نمایید اضافه کردن یک مکان به نقشه - آیا می خواهید آن را برای دیگر کاربران ارسال کنید؟ + ایا می خواهید ان را برای دیگر کاربران ارسال کنید؟ مطمئن شوید که هیچ اطلاعات شخصی وارد نکرده باشد. - ویرایشگران OpenStreetMap ﺗﻐﯿﯿﺮﺍﺕ ﺭﺍ ﺑﺮﺭﺳﯽ ﮐﺮﺩﻩ ﻭ ﺩﺭ ﺻﻮﺭﺕ ﺩﺍﺷﺘﻦ ﻫﺮﮔﻮﻧﻪ ﺳﻮﺍﻝ ﺑﺎ ﺷﻤﺎ ﺗﻤﺎﺱ ﺧﻮﺍﻫﻨﺪ ﮔﺮﻓﺖ. + .ﺖﻓﺮﮔ ﺪﻨﻫﺍﻮﺧ ﺱﺎﻤﺗ ﺎﻤﺷ ﺎﺑ ﻝﺍﻮﺳ ﻪﻧﻮﮔﺮﻫ ﻦﺘﺷﺍﺩ ﺕﺭﻮﺻ ﺭﺩ ﻭ ﻩﺩﺮﮐ ﯽﺳﺭﺮﺑ ﺍﺭ ﺕﺍﺮﯿﯿﻐﺗ Ope Organic Maps یک برنامه نقشه آفلاین رایگان و منبع باز است. بدون تبلیغات بدون ردیابی اگر خطایی روی نقشه مشاهده کردید، لطفاً آن را در OpenStreetMap برطرف کنید. این پروژه توسط علاقه مندان در اوقات فراغت ما ایجاد می شود، بنابراین ما به بازخورد و پشتیبانی شما نیاز داریم. @@ -486,10 +486,10 @@ امروز نه دیتای موبایل - برای نمایش جزئیات مکان مانند تصاویر قیمت‌ها و بازخورد‌ها به اینترنت همراه نیاز است + برای نمایش جزئیات مکان مانند تصاویر قیمت ها و بازخورد ها به اینترنت همراه نیاز است هرگز همیشه بپرس - برای نمایش ترافیک، نقشه می بایستی بروزرسانی شود. + برای نمایش ترافیک,نقشه می بایستی بروزرسانی شود. افزایش اندازه متن بر روی نقشه لطفا Organic Maps را بروزرسانی کنید @@ -499,8 +499,8 @@ \"تنظیمات: دکمه \"ارسال بازخورد کلی روشن خاموش - ما از TTS سیستم برای دستورالعمل‌های صوتی استفاده می کنیم. بسیاری از دستگاه‌های Android از Google TTS استفاده می کنند، شما می توانید آن را از Google Play دانلود کنید (https://play.google.com/store/apps/details؟id=com.google.android.tts) - برای بعضی از زبان‌ها، شما باید speech synthesizer یا یک بسته زبان دیگر را از فروشگاه برنامه (بازار Google Play، Galaxy Store) نصب کنید. \n تنظیمات دستگاه خود را باز کنید. → زبان و ورودی → گفتار → خروجی متن به گفتار. می توانید تنظیمات برای ترکیب گفتار (به عنوان مثال، بسته‌های زبان را برای استفاده آفلاین دانلود کنید) را مدیریت کنید و یک موتور دیگر متن به گفتار را انتخاب کنید. + ما از TTS سیستم برای دستورالعمل های صوتی استفاده می کنیم. بسیاری از دستگاه های Android از Google TTS استفاده می کنند، شما می توانید آن را از Google Play دانلود کنید (https://play.google.com/store/apps/details؟id=com.google.android.tts) + برای بعضی از زبان ها، شما باید speech synthesizer یا یک بسته زبان دیگر را از فروشگاه برنامه (بازار Google Play، Galaxy Store) نصب کنید. \n تنظیمات دستگاه خود را باز کنید. → زبان و ورودی → گفتار → خروجی متن به گفتار. می توانید تنظیمات برای ترکیب گفتار (به عنوان مثال، بسته های زبان را برای استفاده آفلاین دانلود کنید) را مدیریت کنید و یک موتور دیگر متن به گفتار را انتخاب کنید. برای اطلاعات بیشتر لطفا این راهنما را بررسی کنید. ترجمه به لاتین بیشتر بدانید @@ -511,12 +511,12 @@ خروج حذف اضافه کردن توقف - مشکل دسترسی به ذخیره‌سازی + مشکل دسترسی به ذخیره سازی ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support\@organicmaps.app تماس بگیرید شبیه سازی ذخیره سازی بد ورودی لطفا نام صحیح را وارد کنید - لیست‌ها + لیست ها پنهان کردن همه نمایش همه @@ -524,7 +524,7 @@ با توجه به خطای برنامه، امکان اشتراک گذاری وجود ندارد خطای اشتراک یک لیست خالی را نمی توان به اشتراک گذاشت - نام نمی‌تواند خالی باشد + نام نمیتواند خالی باشد لطفا نام لیست را وارد کنید لیست جدید این اسم قبلا انتخاب شده است @@ -557,7 +557,7 @@ شرایط استفاده ترافیک مترو - لایه‌های نقشه + لایه های نقشه نقشه مترو موجود نیست این لیست خالی است برای افزودن یک نشانه، روی یک مکان روی نقشه ضربه بزنید و سپس روی نماد ستاره ضربه بزنید @@ -569,7 +569,7 @@ دسترسی محدود یک توضیح (متن یا html) تایپ نمایید خصوصی - دوربین‌های سرعت + دوربین های سرعت خودکار همیشه هرگز @@ -583,22 +583,22 @@ حداکثر ذخیره انرژی این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی Organic Maps فعال کنید. ویرایش آنلاین - گزینه‌های رانندگی + گزینه های رانندگی اجتناب از تمامی مسیرها - جاده‌های دارای عوارض - جاده‌های آسفالت نشده - گذرگاه‌های جاده‌ای - بزرگراه‌ها + جاده های دارای عوارض + جاده های آسفالت نشده + گذرگاه های جاده ای + بزرگراه ها امکان محاسبه مسیر نیست - متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید - جاده‌های لغو شده را تعریف نمایید - گزینه‌های مسیریابی فعال شد + متأسفانه، احتمالاً به دلیل گزینه های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید + جاده های لغو شده را تعریف نمایید + گزینه های مسیریابی فعال شد جاده دارای عوارض جاده آسفالت نشده - گذرگاه جاده‌ای - اجتناب از جاده‌های دارای عوارض - اجتناب از جاده‌های آسفالت نشده - اجتناب از گذرگاه‌های کشتی + گذرگاه جاده ای + اجتناب از جاده های دارای عوارض + اجتناب از جاده های آسفالت نشده + اجتناب از گذرگاه های کشتی بله @@ -611,7 +611,7 @@ مرتب سازی… - مرتب سازی نشانه‌ها + مرتب سازی نشانهها به صورت پیش فرض @@ -630,7 +630,7 @@ غذا مناظر - موزه‌ها + موزهها پارکها شنا کوهها @@ -663,8 +663,8 @@ درصورت فعال بودن ، بعد از یک دوره عدم فعالیت به صفحه اجازه خواب داده می شود. - OpenStreetMap داده‌های نقشه از - + OpenStreetMap ﺯﺍ ﻪﺸﻘﻧ ﯼﺎﻫ ﻩﺩﺍﺩ + https://t.me/OrganicMapsIR @@ -690,10 +690,8 @@ کارواش قمارخانه ایستگاه شارژ - ایستگاه شارژ شیرخوارگاه سرگرمی - ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ کلینیک دانشگاه مرکزاجتماعی @@ -732,9 +730,9 @@ ﯽﺻﺎﺼﺘﺧﺍ ﮓﻨﯿﮐﺭﺎﭘ پارکینگ ﯽﻨﯿﻣﺯ ﺮﯾﺯ ﮓﻨﯿﮐﺭﺎﭘ - ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ + ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ جای پارک جای پارک جای پارک @@ -827,27 +825,15 @@ دستگاه شوک شیر آتش‌نشانی تلفن اضطراری - ورودی - - ﯽﻠﺻﺍ ﯼﺩﻭﺭﻭ ﯽﮑﺷﺰﭘ ﻩﺎﮕﺸﯾﺎﻣﺯﺁ فیزیوتراپیست - طب جایگزین - شنوایی شناسی - مرکز اهدای خون - بینایی سنجی - پزشکی پا - روان درمانی - نمونه برداری - گفتار درمانی پل تونل - ﺱﻮﺑﻮﺗﺍ ﯽﺻﺎﺼﺘﺧﺍ ﻩﺩﺎﺟ حمل و نقل جاده در دست ساخت است diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 7447f86943..b541673a73 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -1,6 +1,6 @@ - + @@ -25,7 +25,7 @@ Sijaintini Myöhemmin - + Haku Hae kartalta @@ -62,7 +62,7 @@ Kirjanmerkin väri Kirjanmerkkivalikoiman nimi - + Kirjanmerkit Paikkani @@ -435,8 +435,8 @@ Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä. Syötä oikea talon numero Kerrosten määrä (maks. %d) - - Muokkaa kerroksia, enintään %d kerrosta + + Muokkaa kerroksia, enintään 25 kerrosta Postinumero Anna kelvollinen postinumero @@ -711,10 +711,8 @@ Autopesula Kasino Latausasema - Latausasema Päivähoito Elokuvateatteri - Keilarata Klinikka Korkeakoulu Monitoimitalo @@ -753,9 +751,9 @@ Yksityinen pysäköinti Liityntäpysäköinti Maanalainen pysäköinti - Pysäköinnin sisäänkäynti Pysäköinnin sisäänkäynti Pysäköinnin sisäänkäynti + Pysäköinnin sisäänkäynti Parkkipaikka Parkkipaikka Parkkipaikka @@ -966,27 +964,15 @@ Defibrillaattori Paloposti Hätäpuhelin - Sisäänkäynti - - Pääsisäänkäynti Lääketieteellinen laboratorio Fysioterapeutti - Vaihtoehtoinen lääketiede - Audiologia - Verenluovutuskeskus - Optometria - Jalkaterapia - Psykoterapia - Näytteenotto - Logopedia Silta Tunneli - Oma bussitie Bussipysäkki Rakenteilla oleva tie diff --git a/android/res/values-fr-rCA/strings.xml b/android/res/values-fr-rCA/strings.xml index 2e5bb77f93..70147dcf45 100644 --- a/android/res/values-fr-rCA/strings.xml +++ b/android/res/values-fr-rCA/strings.xml @@ -1,6 +1,6 @@ - + diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index f44fe132c7..059e6ab2ee 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -1,6 +1,6 @@ - + @@ -25,7 +25,7 @@ Ma position Plus tard - + Recherche Rechercher sur la carte @@ -62,7 +62,7 @@ Couleur du signet Nom du groupe de signets - + Signets Mes endroits @@ -105,7 +105,7 @@ Un endroit pour manger - Epiceries + Les courses Transport @@ -156,7 +156,7 @@ Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l\'écran du Gestionnaire de signets. - Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux. + Échec lors du téléversement des signets. Le fichier peut être corrompu ou défectueux. Modifier @@ -166,13 +166,13 @@ Le téléchargement de la carte est en cours. - Hé, regardez ma position actuelle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get + Hé, regarde ma position actuelle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get - Hé, regardez mon signet sur la carte Organic Maps ! + Hé, regarde mon signet sur la carte Organic Maps ! - Hé, regardez ma position actuelle sur la carte Organic Maps ! + Hé, regarde ma position actuelle sur la carte Organic Maps ! - Bonjour,\n\nJe suis actuellement ici : %1$s. Cliquez sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci. + Bonjour,\n\nJe suis actuellement ici : %1$s. Clique sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci. Partager @@ -182,7 +182,7 @@ Terminé - Données OpenStreetMap : %s + Données OpenStreetMap : %s Êtes-vous certain de vouloir continuer ? @@ -223,8 +223,6 @@ 12 heures 1 jour Voir sur la carte - - Menu Site internet @@ -256,7 +254,7 @@ Près de moi Cartes - Tout télécharger + Télécharger tout Téléchargement en cours : Veuillez interrompre la navigation pour supprimer la carte. @@ -271,7 +269,7 @@ Mise à jour carte - Services Google Play + Services Google Play Utilisez l\'application Google Play Services pour obtenir votre emplacement actuel @@ -294,7 +292,7 @@ Vert - Violet + Pourpre Orange @@ -336,14 +334,14 @@ Modifiez votre point de départ Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé. Choisissez un point de départ à proximité d\'une route. - Ajustez la destination + Modifiez la destination Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé. - Choisissez un lieu de destination à proximité d\'une route. + Choisissez une destination à proximité d\'une route. Impossible de localiser le point intermédiaire. Veuillez modifier votre point intermédiaire Erreur système Impossible de créer l\'itinéraire à cause d\'une erreur dans l\'application. - Veuillez réessayer + Réessayer Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte? Téléchargez des cartes pour créer un itinéraire plus direct sortant des limites de cette carte. @@ -382,7 +380,7 @@ Ajouter les heures de fermeture Heures d\'ouverture Mode avancé - Mode simplifié + Mode simple Heures de fermeture Exemple de valeurs Corriger l\'erreur @@ -393,11 +391,11 @@ Problème Le lieu n\'existe pas Fermé pour cause de maintenance - Lieu en doublon + Lieu doublon Téléchargement automatique - Quotidien - 24/24 et 7/7 + Tous les jours + Jour et nuit Fermé aujourd\'hui Fermé Aujourd\'hui @@ -420,8 +418,6 @@ Détails Ajouter une rue - - Veuillez entrer un nom de rue Choisir une langue Choisir une rue Code postal @@ -446,8 +442,8 @@ Nom du lieu Catégorie Description détaillée du problème - Autre problème - Ajouter une entreprise + Un problème différent + Ajouter une organisation Aucun objet ne peut être localisé ici Toutes les données géographiques proviennent du projet OpenStreetMap. Le principe est similaire à Wikipedia: vous pouvez ajouter et modifier des lieux et ils deviendront accessibles à des millions d\'utilisateurs partout dans le monde. Connectez vous à votre compte openstreetmap.org pour que d\'autres utilisateurs puissent voir vos changements. @@ -457,10 +453,10 @@ Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement. Saisir un numéro de maison correct Nombre d\'étages (max %d) - - Le nombre d\'étages ne doit pas dépasser %d + + Le nombre d\'étages ne doit pas dépasser 25 Code postal - Entrer un code postal correct + Entrer le code postal correct Lieu inconnu Informer les éditeurs OSM @@ -480,8 +476,6 @@ km km/h mi - - ft mph h min @@ -495,8 +489,6 @@ Supprimer le lieu ajouté ? Supprimer Ce lieu n\'existe pas - - Veuillez indiquer la raison pour laquelle vous effacez cet endroit Saisissez un numéro de téléphone valide Saisissez une adresse Internet valide @@ -505,12 +497,11 @@ Saisissez une adresse web, un nom de compte Instagram valide Saisissez une adresse web, un nom de compte Twitter valide Saisissez une adresse web, un nom de compte VK valide - Entrez une adresse web ou un ID de LINE valide Ajouter un lieu sur la carte Souhaitez-vous l’envoyer à tous les utilisateurs ? - Assurez-vous de n’avoir pas saisi de données personnelles. + Assurez-vous de n’avoir saisi aucunes données personnelles. Les éditeurs d\'OpenStreetMap vérifieront vos modifications et vous contacteront s\'ils ont des questions. Organic Maps est une application de cartographie hors ligne gratuite et open source. Pas de pubs. Pas de localisation. Si vous voyez une erreur sur la carte, veuillez la corriger dans OpenStreetMap. Le projet est créé par des passionnés pendant notre temps libre, nous avons donc besoin de vos commentaires et de votre soutien. @@ -550,7 +541,7 @@ Supprimer Ajouter un arrêt Problème d\'accès au stockage - Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support\@organicmaps.app + Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier et nous contacter via support\@organicmaps.app Émuler le mauvais stockage Entrée Veuillez entrer un nom correct @@ -569,17 +560,17 @@ Nouvelle liste Ce nom est déjà pris Merci de choisir un autre nom - Veuillez patienter… + S\'il vous plaît, attendez… Numéro de téléphone Profil OpenStreetMap %d fichier a été trouvé. Vous le verrez après la conversion. %d fichiers ont été trouvés. Vous les verrez après la conversion. + %d fichier a été trouvé. Vous le verrez après la conversion. Pas de connexion Internet - %d objet - %d objets + lieu %d %d lieu @@ -601,13 +592,13 @@ Cette liste est vide Pour ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l\'icône étoile …plus - Exporter le fichier - Paramètres de la liste - Supprimer la liste + Exporter comme fichier + Paramètres liste + Supprimer liste Accès publique Accès limité Tapez une description (texte ou html) - Privé + Personnel Radars de vitesse Auto Toujours @@ -631,7 +622,7 @@ Impossible de calculer l\'itinéraire Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez Définissez les routes à éviter - Paramètres d\'itinéraire activés + Paramètres d\'itinéraire activées Route à péage Routes non revêtues Traversées en ferry @@ -643,9 +634,9 @@ Non - oui + Oui - non + Non Ok Trier… @@ -688,7 +679,7 @@ Itinéraire de métro non trouvé Choisissez un point de départ ou d\'arrivée plus proche d\'une station de métro Terrain - Pour activer et utiliser la couche topographique, mettez à jour ou téléchargez la carte de l\'endroit désiré + Pour utiliser les lignes d\'altitude, mettez à jour ou téléchargez la carte de l\'endroit désiré Les lignes d\'élévation ne sont pas encore disponibles dans cette région Montée Descente @@ -700,20 +691,18 @@ Zoomez pour voir les courbes de niveaux Télécharger la carte du monde - Impossible de créer un dossier et de déplacer les fichiers vers la mémoire interne de l\'appareil ou la carte SD - - Erreur disque + Impossible de créer un dossier et de déplacer des fichiers sur la mémoire interne de l\'appareil ou sur la carte SD Erreur de connexion Déconnectez le câble USB - Autoriser l\'écran à se mettre en veille + Autoriser l\'écran à dormir - Lorsque ce paramètre est activé, l\'écran se mettra en veille après une période d\'inactivité. + Lorsqu\'il est activé, l\'écran sera autorisé à s\'éteindre après une période d\'inactivité. Afficher sur l\'écran de verrouillage - Lorsqu\'il est activé, vous n\'avez pas besoin de déverrouiller votre appareil à chaque fois que l\'application est en fonctionnement. + Lorsqu\'il est activé, vous n\'avez pas besoin de déverrouiller votre appareil à chaque fois quand l\'application fonctionne. Données cartographiques d\'OpenStreetMap @@ -748,11 +737,9 @@ Station d\'autopartage Station de lavage Casino - Borne de recharge - Borne de recharge + Station de recharge Garderie Cinéma - Salle de bowling Clinique Enseignement post-secondaire Centre communautaire @@ -792,9 +779,9 @@ Stationnement privé Parking relais Stationnement souterrain - Entrée du stationnement Entrée du stationnement Entrée du stationnement + Entrée du stationnement Place de stationnement Place de stationnement Place de stationnement @@ -1006,20 +993,9 @@ Défibrillateur Bouche d’incendie Téléphone d\'urgence - Entrée - - Entrée principale Laboratoire médical Physiothérapeute - Médecine alternative - Audiologie - Centre de don du sang - Optométrie - Podologie - Psychothérapie - Prélèvements biologiques - Logopédie Chemin pour cavalier @@ -1028,7 +1004,6 @@ Chemin pour cavalier Tunnel - Route réservée aux bus Arrêt de bus Route en construction Piste cyclable @@ -1285,7 +1260,6 @@ Piscine Piscine Piste de course - Piste de course Centre aquatique Brise-lames Cheminée d\'usine diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 9d74107d26..cc7cb8f139 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Saját helyzet Később - + Keresés Keresés a térképen @@ -60,7 +60,7 @@ Könyvjelző színe Könyvjelzőcsoport neve - + Könyvjelzők Saját helyeim @@ -429,8 +429,8 @@ Ez jelentősen drága lehet némely előfizetés vagy roaming keretein belül. Helyes házszámot adjon meg Az emeletek száma (legfeljebb %d) - - Ez az épület legfeljebb %d emeletes lehet + + Legfeljebb 25 emeletes épület szerkesztése Irányítószám Írja be a helyes irányítószámot @@ -693,10 +693,8 @@ Autómosó Kaszinó Töltő állomás - Töltő állomás Bölcsőde Mozi - Tekepálya Klinika Kollégium Közösségi központ @@ -735,9 +733,9 @@ Saját parkoló Parkoló Mélygarázs - Parkoló bejárata Parkoló bejárata Parkoló bejárata + Parkoló bejárata Parkolóhely Parkolóhely Parkolóhely @@ -915,27 +913,15 @@ Defibrillátor Tűzcsap Sürgősségi telefon - Bejárat - - Főbejárat Orvosi laboratórium Fizioterapeuta - Alternatív gyógyászat - Audiológia - Véradó központ - Optometria - Podiatria - Pszichoterápia - Mintavétel - Logopédia Híd Alagút - Kijelölt buszút Buszmegálló Útépítés @@ -1497,7 +1483,7 @@ Gépkocsi szervíz Gumiszerviz Drogéria - Csokoládébolt + Bolt Ruhabolt Bolt Számítógép üzlet @@ -1521,7 +1507,7 @@ Zöldséges Élelmiszerbolt Fodrász - Barkácsüzlet + Hardver üzlet Egészségügyi élelmiszerbolt Háztartási bolt Ékszer @@ -1537,7 +1523,7 @@ Bolt Újságárus Optika - Túrafelszerelés + Kültéri felszerelés Cukrászsütemény Zálogház Házikedvenc-üzlet diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 8029fcba44..9d9accd18f 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -1,6 +1,6 @@ - + @@ -25,7 +25,7 @@ Posisi Saya Nanti - + Cari Cari Peta @@ -62,7 +62,7 @@ Warna Penanda Nama Set Penanda - + Penanda Tempat-tempat Saya @@ -429,8 +429,8 @@ Ini bisa menjadi jauh mahal pada beberapa paket atau jika roaming. Masukkan nomor rumah yang benar Jumlah lantai (maksimum %d) - - Edit bangunan dengan maksimum %d lantai + + Edit bangunan dengan maksimum 25 lantai Kode Pos Masukkan Kode Pos yang benar @@ -685,10 +685,8 @@ Cuci Mobil Hiburan Pusat Pengisian Daya - Pusat Pengisian Daya Penitipan Anak Bioskop - Arena Bowling Klinik Kampus Pusat komunitas @@ -727,9 +725,9 @@ Parkir pribadi Parkir Parkir bawah tanah - Pintu masuk parkir Pintu masuk parkir Pintu masuk parkir + Pintu masuk parkir Tempat parkir Tempat parkir Tempat parkir @@ -906,27 +904,15 @@ Defibrilator Keran Kebakaran Telepon darurat - Pintu masuk - - Pintu masuk utama Laboratorium medis Fisioterapis - Pengobatan alternatif - Audiologi - Pusat Donor Darah - Optometri - Podiatri - Psikoterapi - Pengambilan sampel - Logopedik Menjembatani Terowongan - Jalan khusus bus Halte bus Jalan sedang dibangun diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 0b2bf13d8b..25f39540a6 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ La mia posizione Più tardi - + Cerca Cerca sulla mappa @@ -60,7 +60,7 @@ Colore Luogo preferito Nome dell\'elenco - + Luoghi preferiti I miei luoghi @@ -439,8 +439,8 @@ Quest\'operazione potrebbe essere piuttosto costosa con alcuni piani o in roaming. Inserisci numero civico corretto Numero di piani (massimo %d) - - Il numero di piani non deve superare %d + + Il numero di piani non deve superare 25 Codice postale Inserire il codice postale corretto @@ -692,8 +692,6 @@ Quando è abilitata, non è necessario sbloccare il dispositivo ogni volta mentre l\'app è in esecuzione. Dati della mappa da OpenStreetMap - - https://organicmaps.app/it/ Impianto a fune @@ -727,10 +725,8 @@ Lavaggio auto Casinò Stazione di ricarica - Stazione di ricarica Asilo Cinema - Sala da bowling Clinica Collegio Centro ricreativo @@ -744,7 +740,7 @@ Ambasciata Fast food Traghetto - Squadra antincendio + Scuadra antincendio Area ristorazione Fontana Stazione di rifornimento @@ -770,9 +766,9 @@ Parcheggio privato Parcheggio Parcheggio sotterraneo - Ingresso parcheggio Ingresso parcheggio Ingresso parcheggio + Ingresso parcheggio Parcheggio Parcheggio Parcheggio @@ -990,20 +986,9 @@ Defibrillatore Idrante Telefono di emergenza - Ingresso - - Entrata principale Laboratorio Medico Fisioterapista - Medicina alternativa - Audiologia - Centro di donazione del sangue - Optometria - Podologia - Psicoterapia - Campionamento - Logopedia Via @@ -1013,7 +998,6 @@ sentiero per cavalli Tunnel - Strada dedicata agli autobus Fermata dell\'autobus Strada in costruzione Pista ciclabile @@ -1268,7 +1252,6 @@ Piscina Piscina privata Pista da corsa - Pista da corsa Parco acquatico Stabilimento balneare Frangiflutti diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index 87bdc3e7ab..aa61b7f718 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -1,6 +1,6 @@ - + @@ -56,7 +56,7 @@ צבע רשימת האתרים שם רשימת האתרים - + רשימות אתרים המקומות שלי @@ -217,7 +217,7 @@ יום ולילה OpenStreetMap-ל סנכיה קוֹמָה - כל נתוני המפה מגיעים מפרויקט OpenStreetMap. זה כמו ויקיפדיה למפות, שבה אתה יכול להוסיף או לערוך מקומות, והם הופכים לזמינים למיליוני משתמשים בכל רחבי העולם. + .םלועה יבחר לכב םישמתשמ ינוילימל תונימזל תוכפוה ןהו ,תומוקמ ךורעל וא ףיסוהל לו .ןהשלכ תולאש םהל שי םא רשק ךתיא ורציו םייונישה תא וקדבי OpenStreetMap יכרוע Organic Maps היא אפליקציית מפות לא מקוונות בחינם ובקוד פתוח. ללא פרסומות. אין מעקב. אם אתה רואה שגיאה במפה, אנא תקן אותה ב-OpenStreetMap. הפרויקט נוצר על ידי חובבים בזמננו הפנוי, אז אנו זקוקים למשוב ולתמיכה שלכם. @@ -233,7 +233,6 @@ OpenStreetMap-מ הפמ ינותנ - גנילואב םלוא הקיזומל רפס תיב תופשל רפס תיב היָנָחֲ @@ -243,9 +242,9 @@ תיטרפ הינח תיטרפ הינח תיעקרק - תת הינח - הינחל הסינכ הינחל הסינכ הינחל הסינכ + הינחל הסינכ םיכנל הינח @@ -358,25 +357,14 @@ מטבח טבעוני מטבח צמחוני מטבח וייטנאמי - - תישארה הסינכ תיאופר הדבעמ פיזיותרפיסט - רפואה אלטרנטיבית - אודיולוגיה - מרכז תרומת דם - אופטומטריה - פודיאטריה - פסיכותרפיה - דְגִימָה - ריפוי בדיבור לְגַשֵׁר מִנהָרָה - ידועיי סובוטוא שיבכ לְגַשֵׁר diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index de9d3ff9cd..d2b400fc34 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ 現在地 次の機会に - + 検索 マップを検索 @@ -60,7 +60,7 @@ ブックマーク表示色 ブックマークセット名称 - + ブックマーク マイロケーション @@ -427,8 +427,8 @@ プランによって、またはローミングしている場合、非常に高額になる可能性があります。 正しい番地を入力してください フロアの数（最大%d） - - 最高%d階までのビルを編集 + + 最高25階までのビルを編集 郵便番号 正しい郵便番号を入力してください @@ -698,10 +698,8 @@ 洗車場 カジノ 充電ステーション - 充電ステーション 託児所 映画館 - ボーリング場 クリニック カレッジ コミュニティセンター @@ -741,9 +739,9 @@ 専用駐車場 駐車場 地下駐車場 - 駐車場入口 駐車場入口 駐車場入口 + 駐車場入口 駐車スペース 駐車スペース 駐車スペース @@ -941,20 +939,9 @@ 除細動器 消火栓 緊急電話 - エントランス - - 正面玄関 医療研究所 理学療法士 - 代替医療 - オーディオロジー - 献血センター - オプトメトリー - 足病学 - 心理療法 - サンプリング - ロゴペディックス 道路 @@ -964,7 +951,6 @@ 馬道 馬道(トンネル) - バス専用道路 バス停 工事中の道路 自転車道 @@ -1230,7 +1216,6 @@ プール プール トラック - トラック ウォーターパーク 構造物 防波堤 diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index f722e0526c..1f7465b8b1 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ 나의 위치 후 - + 검색하기 지도 검색하기 @@ -60,7 +60,7 @@ 색상 즐겨찾기에 추가 집합 이름을 즐겨찾기에 추가 - + 북마크 내 장소 @@ -429,8 +429,8 @@ 이는 일부 플랜이나 로밍할 경우에 비싸다고 간주될 수 있습니다. 올바른 집 번호 입력 층 수(최대 %d) - - 최대 %d층까지 입력하세요 + + 최대 25층까지 입력하세요 우편번호 올바른 우편번호를 입력하세요 @@ -688,10 +688,8 @@ 세차 카지노 충전 역 - 충전 역 보육 영화관 - 볼링장 클리닉 칼리지 커뮤니티센터 @@ -730,9 +728,9 @@ 전용 주차장 주차 지하주차장 - 주차장 입구 주차장 입구 주차장 입구 + 주차장 입구 주차장 주차장 주차장 @@ -911,27 +909,15 @@ 제세동기 소화전 긴급 전화 - 입구 - - 정문 의료 연구실 물리치료사 - 대체 약품 - 청력학 - 헌혈센터 - 검안 - 발병학 - 심리치료 - 견본 추출 - 대화 요법 다리 터널 - 버스전용도로 버스 정류장 공사 중 도로 diff --git a/android/res/values-mcc286/colors.xml b/android/res/values-mcc286/colors.xml deleted file mode 120000 index c5ceba9ced..0000000000 --- a/android/res/values-mcc286/colors.xml +++ /dev/null @@ -1 +0,0 @@ -../values-tr/colors.xml \ No newline at end of file diff --git a/android/res/values-mcc417/colors.xml b/android/res/values-mcc417/colors.xml deleted file mode 120000 index c5ceba9ced..0000000000 --- a/android/res/values-mcc417/colors.xml +++ /dev/null @@ -1 +0,0 @@ -../values-tr/colors.xml \ No newline at end of file diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml index 3096bf58af..2d18e9c7a3 100644 --- a/android/res/values-mr/strings.xml +++ b/android/res/values-mr/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ माझे स्थान नंतर - + शोधा नकाश्यात शोधा @@ -60,7 +60,7 @@ खूणपत्र रंग खूणपत्र यादीचे नाव - + खूणपत्रे माझी ठिकाणे @@ -431,8 +431,8 @@ रोमिंग वर असल्यास हे बरेच महाग पडू शकते. एक वैध बिल्डिंग क्रमांक प्रविष्ट करा मजल्यांची संख्या (कमाल %d) - - मजल्यांची संख्या %d पेक्षा जास्त नसावी + + मजल्यांची संख्या २५ पेक्षा जास्त नसावी पिनकोड वैध पिनकोड प्रविष्ट करा @@ -717,10 +717,8 @@ कार धुणे जुगारगृह चार्जिंग केंद्र - चार्जिंग केंद्र बालवाडी चित्रपटगृह - गोलंदाजी गल्ली चिकित्सालय महाविद्यालय समुदाय केंद्र @@ -904,20 +902,9 @@ कंपनरोधक अग्निशामक नळ संकटकालीन फोन - प्रवेशद्वार - - मुख्य प्रवेशद्वार वैद्यकीय प्रयोगशाळा फिजिओथेरपिस्ट - पर्यायी औषध - ऑडिओलॉजी - रक्तदान केंद्र - ऑप्टोमेट्री - पोडियाट्री - मानसोपचार - नमुना - स्पीच थेरपी महामार्ग @@ -925,7 +912,6 @@ पूल बोगदा - समर्पित बस रस्ता बस थांबा बांधकामाधीन रस्ता सायकल वाट @@ -1185,7 +1171,6 @@ जलतरण तलाव जलतरण तलाव ट्रॅक - ट्रॅक जल उद्यान समुद्री रिसॉर्ट मानवनिर्मित diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 7e2548c24a..6ef70fe5b0 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -1,6 +1,6 @@ - + @@ -25,7 +25,7 @@ Min posisjon Senere - + Søk Søk kart @@ -62,7 +62,7 @@ Bokmerk farge Bokmerk settnavn - + Bokmerker Mine steder @@ -429,8 +429,8 @@ %1$d av %2$d Skriv riktig husnummer Antall etasjer (maks. %d) - - Rediger bygningen med maks. %d etasjer + + Rediger bygningen med maks. 25 etasjer Postnummer Angi riktig postnummer @@ -693,10 +693,8 @@ Bilvask Kasino Ladestasjon - Ladestasjon Daghjem Kino - Bowlinghall Klinikk Høyskole Samfunnshus @@ -735,9 +733,9 @@ Privat parkering Parkering Underjordisk parkering - Parkeringsinngang Parkeringsinngang Parkeringsinngang + Parkeringsinngang Parkeringsplass Parkeringsplass Parkeringsplass @@ -916,20 +914,9 @@ Hjertestarter Brannhydrant Nødtelefon - Inngang - - Hovedinngang Medisinsk laboratorium Fysioterapeut - Alternativ medisin - Audiologi - Bloddonasjonssenter - Optometri - Fotterapi - Psykoterapi - Prøvetaking - Snakketerapi Ridevei @@ -938,7 +925,6 @@ Ridevei Tunnel - Dedikert bussvei Busstopp Veikonstruksjon Sykkelvei diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index d3ab613555..50a56ea85d 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Mijn locatie Later - + Zoeken Op de kaart zoeken @@ -60,7 +60,7 @@ Bladwijzer-kleur Naam van bladwijzergroep - + Bladwijzers Mijn plaatsen @@ -451,8 +451,8 @@ Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn. Een juist huisnummer invoeren Aantal verdiepingen (max. %d) - - Het gebouw mag niet meer dan %d verdiepingen hebben + + Bewerk het gebouw met maximaal 25 verdiepingen Postcode Voer de juiste postcode in @@ -744,10 +744,8 @@ Car Wash Casino Oplaadstation - Oplaadstation Crèche Bioscoop - Bowlingbaan Kliniek Hogeschool Gemeenschapscentrum @@ -786,9 +784,9 @@ Privé parkeerplaats Parkeerplaats P+R Ondergrondse parking - Parkeeringang Parkeeringang Parkeeringang + Parkeeringang Parkeerplek Parkeerplek Privé parkeerplek @@ -1013,20 +1011,9 @@ Defibrillator (AED) Brandkraan Praatpaal - Ingang - - Hoofdingang Medisch laboratorium Fysiotherapeut - Alternatieve geneeskunde - Audiologie - Bloeddonatiecentrum - Optometrie - Podologie - Psychotherapie - Bemonstering - Logopedie Straat @@ -1036,7 +1023,6 @@ Ruiterpad Tunnel - Speciale busweg Bushalte Baan in aanbouw Fietspad @@ -1303,7 +1289,6 @@ Zwembad Privé zwembad Parcours - Parcours Waterpark Strandresort Kunstmatige constructies diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 5dd7210656..b55728b36c 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Moje położenie Później - + Wyszukaj Wyszukaj mapy @@ -60,7 +60,7 @@ Kolor zakładki Nazwa zestawu zakładek - + Zakładki Moje miejsca @@ -107,7 +107,7 @@ Transport - Stacja paliw + Stacja benzynowa Parking @@ -455,8 +455,8 @@ Może to być kosztowne przy niektórych planach taryfowych lub w roamingu. Wprowadź poprawny numer domu Liczba pięter (maks. %d) - - Edytuj budynek z maksymalną liczbą %d pięter + + Edytuj budynek z maksymalną liczbą 25 pięter Kod pocztowy Podaj prawidłowy kod pocztowy @@ -748,10 +748,8 @@ Myjnia samochodowa Kasyno Stacja ładowania - Stacja ładowania Opieka nad dziećmi Kino - Kręgielnia Klinika Szkoła wyższa Centrum społecznościowe @@ -768,7 +766,7 @@ Straż pożarna Sekcja gastronomiczna Fontanna - Stacja paliw + Stacja benzynowa Cmentarz @@ -791,9 +789,9 @@ Parking prywatny Parking \"Parkuj i Jedź\" Parking podziemny - Wejście na parking Wejście na parking Wejście na parking + Wejście na parking Miejsce parkingowe Miejsce parkingowe Miejsce parkingowe @@ -1002,20 +1000,9 @@ Defibrylator Hydrant Telefon alarmowy - Wejście - - Główne wejście Laboratorium Medyczne Fizjoterapeuta - Medycyna alternatywna - Audiologia - Centrum krwiodawstwa - Optometria - Podiatria - Psychoterapia - Próbkowanie - Logopeda Droga @@ -1025,7 +1012,6 @@ Droga dla koni ograniczona Tunel drogowy dla koni - Dedykowana droga autobusowa Przystanek autobusowy Droga w trakcie budowy Droga rowerowa diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml index 641020b7ed..c1e9f4f443 100644 --- a/android/res/values-pt-rBR/strings.xml +++ b/android/res/values-pt-rBR/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Minha posição Mais tarde - + Buscar Procurar mapa @@ -60,7 +60,7 @@ Cor do favorito Nome do conjunto de favoritos - + Favoritos Meus locais @@ -444,8 +444,8 @@ Isto pode ser muito caro com alguns planos ou se você estiver em roaming. Informe o número correto do endereço Número de andares (máx. %d) - - O número de andares não pode ser maior que %d + + O número de andares não pode ultrapassar 25 CEP Informe o CEP correto @@ -736,10 +736,8 @@ Lava-jato Cassino Eletroposto - Eletroposto Creche Cinema - Pista de boliche Clínica Escola técnica Centro comunitário @@ -975,20 +973,9 @@ Desfibrilador Hidrante Telefone de emergência - Entrada - - Entrada principal Laboratório médico Fisioterapeuta - Medicina alternativa - Fonoaudiologia - Hemocentro - Optometria - Podiatria - Psicoterapia - Amostragem - Terapia da fala Rodovia @@ -998,7 +985,6 @@ Caminho para cavaleiros permissivo Túnel para cavaleiros - Via exclusiva de ônibus Ponto de ônibus Pista em construção Ciclovia @@ -1237,7 +1223,6 @@ Piscina Piscina Pista para esportes não motorizados - Pista para esportes não motorizados Parque aquático Construção humana Molhe diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index a40db122aa..773331a440 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ A minha posição Mais tarde - + Pesquisar Pesquisar mapa @@ -60,7 +60,7 @@ Cor do favorito Nome do conjunto de favoritos - + Favoritos Os meus locais @@ -436,8 +436,8 @@ Isto pode ser muito caro com alguns planos ou em roaming. Introduza um número de endereço correto Número de pisos (máx. %d) - - O número de pisos não pode ser maior que %d + + Editar o edifício com um máximo de 25 pisos Código Postal Introduza o código postal correto @@ -717,10 +717,8 @@ Lavagem de veículos Casino Posto de carregamento elétrico - Posto de carregamento elétrico Creche Cinema - Pista de bowling Clínica ou centro de saúde Escola técnica Centro comunitário @@ -760,9 +758,9 @@ Estacionamento privado Parque de estacionamento dissuasor Estacionamento subterrâneo - Entrada do estacionamento Entrada do estacionamento Entrada do estacionamento + Entrada do estacionamento Lugar de estacionamento Lugar de estacionamento Lugar de estacionamento privado @@ -972,20 +970,9 @@ Desfibrilador Boca de incêndio Telefone de emergência - Entrada - - Entrada principal Laboratório médico Fisioterapeuta - Medicina alternativa - Audiologia - Centro de Doação de Sangue - Optometria - Podiatria - Psicoterapia - Amostragem - Terapia da fala Rodovia @@ -995,7 +982,6 @@ Caminho para cavaleiros Túnel - Via exclusiva de autocarro Paragem de autocarros Estrada em construção Ciclovia @@ -1263,7 +1249,6 @@ Piscina Piscina Pista para desportos não motorizados - Pista para desportos não motorizados Parque aquático Construção humana Molhe diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index e43ebc2c41..c7a5b0868c 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Poziția mea Mai târziu - + Caută Caută pe hartă @@ -60,7 +60,7 @@ Culoare loc preferat Denumirea listei - + Locuri preferate Locurile mele @@ -439,8 +439,8 @@ Aceasta poate fi destul de costisitoare în cazul unor abonamente sau în roaming. Introdu un număr corect Număr de etaje (maximum %d) - - Numărul de etaje nu trebuie să depășească %d + + Numărul de etaje nu trebuie să depășească 25 Cod poștal Introdu codul poștal corect @@ -715,9 +715,7 @@ Spălătorie auto Divertisment Stație încărcare - Stație încărcare De îngrijire a copilului - Popicărie Clinică Colegiu Centru comunitar @@ -753,9 +751,9 @@ Parcare privată Parcare Parcare subterană - Intrare parcare Intrare parcare Intrare parcare + Intrare parcare Loc de parcare Loc de parcare Loc de parcare @@ -931,27 +929,15 @@ Defibrilator Hidrant Telefon de urgență - Intrare - - Intrarea principala Laborator medical Fizioterapeut - Medicină alternativă - Audiologie - Centrul de donare de sânge - Optometrie - Podiatrie - Psihoterapie - Eșantionare - Logopedie Pod Tunel - Drum dedicat autobuzului Stație de autobuz Drum în construcție diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index fa8b0a5834..af4983b77f 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ Мое местоположение Не сейчас - + Поиск Поиск на карте @@ -63,7 +63,7 @@ Цвет метки Название списка меток - + Метки Мои Метки @@ -458,8 +458,8 @@ На некоторых тарифных планах или в роуминге это может привести к значительным расходам. Введите корректный номер дома Количество этажей (максимум %d) - - Количество этажей не должно превышать %d + + Количество этажей не должно превышать 25 Почтовый индекс Введите корректный почтовый индекс @@ -722,10 +722,8 @@ Если эта функция включена, вам не нужно каждый раз разблокировать устройство во время работы приложения. Картографические данные из OpenStreetMap - + https://t.me/OrganicMapsRu - - https://organicmaps.app/ru/ Канатная дорога @@ -764,10 +762,8 @@ Автомойка Казино Зарядная станция - Зарядная станция Детская комната Кинотеатр - Боулинг Поликлиника Колледж Культурно-досуговый центр @@ -807,9 +803,9 @@ Частная парковка Парковка Подземный паркинг - Въезд на парковку Въезд на парковку Въезд на парковку + Въезд на парковку Парковочное место Парковочное место Парковочное место @@ -1035,20 +1031,9 @@ Дефибриллятор Пожарный гидрант Телефон для экстренных вызовов - Вход - - Главный вход Медицинская лаборатория Физиотерапевт - Альтернативная медицина - Аудиология - Центр донорства крови - Оптометрия - Подиатрия - Психотерапия - Сбор анализов - Логопедия Дорога @@ -1058,7 +1043,6 @@ Конная дорожка Тоннель - Выделенная автобусная дорога Остановка Строящаяся дорога Велодорожка @@ -1328,7 +1312,6 @@ Плавательный бассейн Плавательный бассейн Беговая дорожка - Беговая дорожка Аквапарк Пляжный курорт Искусственное сооружение diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 9681733937..6e30641a34 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Moja poloha Neskôr - + Hľadať Prehľadať mapu @@ -60,7 +60,7 @@ Farba záložky Meno záložky - + Záložky Moje miesta @@ -427,8 +427,8 @@ V prípade niektorých plánov alebo použitím roamingu by to mohlo byť značne nákladné. Zadajte správne číslo domu Počet poschodí (max %d) - - Upraviť s maximálne %d poschodiami + + Upraviť s maximálne 25 poschodiami PSČ Zadajte správne PSČ @@ -687,10 +687,8 @@ Autoumývareň Kasíno Dobíjacia stanica - Dobíjacia stanica Jasle Kino - Bowlingová dráha Poliklinika Vysoká škola Dom kultúry @@ -729,9 +727,9 @@ Súkromné parkovisko Parkovisko Podzemné parkovisko - Vstup na parkovisko Vstup na parkovisko Vstup na parkovisko + Vstup na parkovisko Parkovacie miesto Parkovacie miesto Parkovacie miesto @@ -909,27 +907,15 @@ Defibrilátor Požiarny hydrant Tiesňového volania - Vstup - - Hlavný vchod Lekárske laboratórium Fyzioterapeut - Alternatívna medicína - Audiológia - Centrum darcovstva krvi - Optometria - Podiatria - Psychoterapia - Vzorkovanie|Zber vzoriek - Logopédia Most Tunel - Vyhradená autobusová cesta Autobusová zastávka Cesta vo výstavbe diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 98251e482c..2af7ef5a9e 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Min position Senare - + Sök Sök karta @@ -60,7 +60,7 @@ Bokmärkesfärg Bokmärkessamlingens namn - + Bokmärken Mina Platser @@ -427,8 +427,8 @@ Detta kan vara mycket dyrt med vissa abonnemang och vid roaming. Ange korrekt husnummer Antal våningar (max %d) - - Redigera byggnaden med max %d våningar + + Redigera byggnaden med max 25 våningar Postnr Ange korrekt postnr @@ -685,10 +685,8 @@ Biltvätt Kasino Laddstation - Laddstation Barnomsorg Bio - Bowlinghall Klinik Högskola Stadshus @@ -727,9 +725,9 @@ Privat parkering Parkering Underjordisk parkering - Parkering entré Parkering entré Parkering entré + Parkering entré Parkeringsplats Parkeringsplats Parkeringsplats @@ -905,27 +903,15 @@ Vietnamesisk mat Brandpost Nödtelefon - Entré - - Huvudentré Medicinskt laboratorium Fysioterapeut - Alternativ medicin - Audiologi - Centrum för blodgivning - Optometri - Fotvård - Psykoterapi - Provtagning - Logopedics Bro Tunnel - Dedikerad bussväg Busshållplats Väg under uppförande diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml index f09cabc9e4..be12eefefb 100644 --- a/android/res/values-sw/strings.xml +++ b/android/res/values-sw/strings.xml @@ -1,6 +1,6 @@ - + @@ -232,7 +232,6 @@ Kistawishi Kituo cha sanaa Cykelreparationsstation - Njia ya Bowling Shule ya Muziki Shule ya Lugha Maegesho @@ -242,9 +241,9 @@ Maegesho ya Kibinafsi Maegesho ya Kibinafsi Maegesho ya chini ya ardhi - Mlango wa maegesho Mlango wa maegesho Mlango wa maegesho + Mlango wa maegesho Sehemu ya maegesho Sehemu ya maegesho Sehemu ya maegesho @@ -280,25 +279,14 @@ Mvinyo Mshonaji nguo Kahawa - - Mlango Mkuu Maabara ya Matibabu Mtaalamu wa Physiotherapist - Dawa mbadala - Mtaalamu wa kusikia - Kituo cha Uchangiaji Damu - Optometry - Matibabu ya miguu - Tiba ya kisaikolojia - Sampuli - Tiba ya hotuba Daraja Mtaro - Barabara ya basi iliyotengwa Barabara inatengenezwa Daraja diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index 462e0b5bc5..4386b6d26b 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -1,6 +1,6 @@ - + @@ -25,7 +25,7 @@ ตำแหน่งของฉัน ภายหลัง - + ค้นหา ค้นหาแผนที่ @@ -62,7 +62,7 @@ สีของบุ๊กมาร์ก ชื่อของชุดบุ๊กมาร์ก - + บุ๊กมาร์ก สถานที่ของฉัน @@ -431,8 +431,8 @@ มันอาจมีราคาสูงมากหากใช้แผนโทรศัพท์บางประเภทหรือหากทำการโรมมิ่ง กรอกบ้านเลขที่ให้ถูกต้อง จำนวนชั้น (มากสุด %d) - - แก้ไขอาคารที่มีจำนวนชั้นมากกว่า %d + + แก้ไขอาคารที่มีจำนวนชั้นมากกว่า 25 รหัสไปรษณีย์ กรุณาใส่รหัสไปรษณีย์ที่ถูกต้อง @@ -691,10 +691,8 @@ ล้างรถ คาสิโน สถานีชาร์จ - สถานีชาร์จ สถานรับเลี้ยงเด็ก โรงภาพยนตร์ - ลานโบว์ลิ่ง คลินิก วิทยาลัย ศูนย์ชุมชน @@ -733,9 +731,9 @@ ที่จอดรถส่วนตัว ที่จอดรถ ที่จอดรถใต้ดิน - ทางเข้าที่จอดรถ ทางเข้าที่จอดรถ ทางเข้าที่จอดรถ + ทางเข้าที่จอดรถ พื้นที่จอดรถ พื้นที่จอดรถ พื้นที่จอดรถ @@ -914,27 +912,15 @@ เครื่องกระตุ้นหัวใจ หัวจ่ายน้ำดับเพลิง โทรศัพท์ฉุกเฉิน - ทางเข้า - - ทางเข้าหลัก ห้องปฏิบัติการทางการแพทย์ นักกายภาพบำบัด - การแพทย์ทางเลือก - โสตวิทยา - ศูนย์รับบริจาคโลหิต - ทัศนมาตรศาสตร์ - แก้โรคเท้า - จิตบำบัด - การสุ่มตัวอย่าง - การบำบัดด้วยการพูด สะพาน อุโมงค์ - ถนนทางเดินรถโดยเฉพาะ ป้ายรถเมล์ ทางกำลังอยู่ในการก่อสร้าง diff --git a/android/res/values-tr/colors.xml b/android/res/values-tr/colors.xml deleted file mode 100644 index deea5a029c..0000000000 --- a/android/res/values-tr/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - @color/black_primary - diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 98a65c344f..1ba196dd16 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -1,6 +1,6 @@ - + @@ -25,7 +25,7 @@ Konumum Daha sonra - + Ara Haritada Ara @@ -62,7 +62,7 @@ Yer İmi Rengi Yer İmi Listesi Adı - + Yer İmleri Yerlerim @@ -236,7 +236,7 @@ Sıkça Sorulan Sorular - Bağış yapın + Bağış Yapın Sizi nasıl destekleyebilirim? @@ -455,8 +455,8 @@ Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir. Geçerli bir bina numarası girin Kat sayısı (en fazla %d) - - Kat sayısı %d\'i geçmemelidir + + Kat sayısı 25\'i geçmemelidir Posta Kodu Geçerli bir posta kodu girin @@ -711,12 +711,10 @@ Etkinleştirildiğinde, uygulama çalışırken her seferinde cihazınızın kilidini açmanıza gerek kalmaz. Harita verileri OpenStreetMap\'ten - + https://t.me/OrganicMapsTR - + https://www.instagram.com/organicmapstr - - https://organicmaps.app/tr/ Teleferik @@ -732,7 +730,7 @@ Peron Geçit Helikopter pisti - Pist + Koşu yolu Taksi yolu Terminal Tesis @@ -755,10 +753,8 @@ Araba Yıkama Kumarhane Şarj İstasyonu - Şarj İstasyonu Kreş Sinema - Bowling pisti Klinik Kolej Toplum Merkezi @@ -798,9 +794,9 @@ Özel Otopark Otopark Yeraltı otoparkı - Otopark girişi Otopark girişi Otopark girişi + Otopark girişi Park Alanı Park Alanı Park Alanı @@ -1020,20 +1016,9 @@ Defibrilatör Yangın Söndürme Musluğu Acil Telefon - Giriş - - Ana giriş Tıbbi Laboratuvar Fizyoterapist - Alternatif tıp - Odyoloji - Kan Bağışı Merkezi - Optometri - Podiatri - Psikoterapi - Örnekleme - Logopedi Otoyol @@ -1043,7 +1028,6 @@ Atlı Yolu Tünel - Özel otobüs yolu Otobüs Durağı Yapım Aşamasında Yol Bisiklet Yolu @@ -1312,7 +1296,6 @@ Yüzme Havuzu Yüzme Havuzu Pist - Pist Su Parkı Sahil Tatil Yeri İnsan Yapımı diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index af1bd2d503..24f98db750 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ Моє місцезнаходження Не зараз - + Пошук Пошук на мапі @@ -63,7 +63,7 @@ Колір мiтки Назва списка мiток - + Мітки Мої Мітки @@ -232,7 +232,7 @@ Питання та відповіді - Підтримати грошима + Пожертвувати Як нас підтримати? @@ -450,8 +450,8 @@ Це може бути задорого за деякими планами або за умовами роумінгу. Введіть правильний номер будинку Кількість поверхів (максимум %d) - - Редагуйте будівлі висотою максимум %d поверхів + + Редагуйте будівлі висотою максимум 25 поверхів Поштовий індекс Введіть коректний поштовий індекс @@ -735,10 +735,8 @@ Автомийка Казино Зарядна станція - Зарядна станція Дитяча кімната Кінотеатр - Боулінг Поліклініка Коледж Центр культури та дозвілля, Дім культури @@ -778,9 +776,9 @@ Приватна парковка Парковка Підземний паркінг - Вхід на паркінг Вхід на паркінг Вхід на паркінг + Вхід на паркінг Паркувальне місце Паркувальне місце Паркувальне місце @@ -1001,20 +999,9 @@ Дефібрилятор Пожежний гідрант Аварійний телефон - Вхід - - Головний вхід Медична лабораторія Фізіотерапевт - Альтернативна медицина - Аудіологія - Центр донорства крові - Оптометрія - Подологія - Психотерапія - Збір аналізів - Логопедія Дорога @@ -1024,7 +1011,6 @@ Кінна доріжка Тунель - Виділена автобусна дорога Зупинка Дорога, що будується Велодоріжка @@ -1294,7 +1280,6 @@ Басейн для плавання Басейн для плавання Бігова доріжка - Бігова доріжка Аквапарк Пляжний курорт Штучна споруда diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index c274cd7d81..d6cf5dbc78 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ Vị trí của Tôi Để sau - + Tìm kiếm Tìm kiếm Bản đồ @@ -60,7 +60,7 @@ Đánh dấu Màu sắc Đánh dấu Tên Bộ - + Đánh dấu Các Địa chỉ của Tôi @@ -429,8 +429,8 @@ Như vậy sẽ rất đắt tiền với một số gói dữ liệu hoặc khi chuyển vùng. Nhập số nhà chính xác Số tầng (tối đa %d) - - Sửa tòa nhà có tối đa %d tầng + + Sửa tòa nhà có tối đa 25 tầng Mã ZIP Nhập Mã ZIP chính xác @@ -689,10 +689,8 @@ Rửa Xe Giải trí Trạm Sạc điện - Trạm Sạc điện Nhà trẻ Rạp chiếu phim - Sân chơi bowling Phòng khám Trường đại học Trung Tâm Cộng Đồng @@ -731,9 +729,9 @@ Bãi đậu xe tư nhân đỗ xe Bãi đậu xe ngầm - Lối vào bãi đậu xe Lối vào bãi đậu xe Lối vào bãi đậu xe + Lối vào bãi đậu xe Chỗ để xe Chỗ để xe Chỗ để xe @@ -911,27 +909,15 @@ Máy khử rung tim Vòi chữa cháy Điện thoại khẩn cấp - Lối vào - - Lối vào chính Phòng thí nghiệm y tế Nhà vật lý trị liệu - Liều thuốc thay thế - Thính học - Trung tâm hiến máu - Khúc xạ nhãn khoa - khoa bàn chân - Tâm lý trị liệu - lấy mẫu - Ngôn ngữ trị liệu Cầu Đường hầm - Đường dành riêng cho xe buýt Bến xe buýt Đường đang thi công diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 55aa430c48..fdf1357db6 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ 我的位置 稍後 - + 搜尋 搜尋地圖 @@ -60,7 +60,7 @@ 書籤顏色 收藏夾名稱 - + 書籤 我的地點 @@ -443,8 +443,8 @@ 用某些方案或漫遊的話這可能相當昂貴。 輸入正確的門牌號碼 樓層數（最大 %d） - - 編輯最多 %d 層的建築 + + 編輯最多 25 層的建築 郵遞區號 輸入正確的郵遞區號 @@ -722,10 +722,8 @@ 洗車 賭場 充電站 - 充電站 保育 電影院 - 保齡球館 診所 學院 社區活動中心 @@ -764,9 +762,9 @@ 私人停車場 停車場 地下停車場 - 停車場入口 停車場入口 停車場入口 + 停車場入口 停車地點 停車地點 停車地點 @@ -946,27 +944,15 @@ 心臟電擊器 消防栓 緊急電話 - 入口 - - 主要入口 醫學實驗室 物理治療師 - 替代藥物 - 聽力學 - 捐血中心 - 驗光 - 足病學 - 心理治療 - 採樣 - 言語治療 橋 隧道 - 巴士專用道 巴士站 在建道路 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index e72ba3f938..00aff27593 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ 我的位置 稍后 - + 搜索 搜索地图 @@ -60,7 +60,7 @@ 书签颜色 书签集名称 - + 书签 我的位置 @@ -439,8 +439,8 @@ 用一些方案或漫游的话这可能相当昂贵。 输入正确的房屋号 楼号 (最大 %d) - - 最多可编辑 %d 层的建筑 + + 编辑最多 25 层的建筑 邮政编码 输入正确的邮政编码 @@ -711,10 +711,8 @@ 洗车 赌场 充电站 - 充电站 托儿所 电影院 - 保龄球馆 诊所 学院 社区活动中心 @@ -754,9 +752,9 @@ 私人停车场 停车场 地下停车场 - 停车场入口 停车场入口 停车场入口 + 停车场入口 停车位 停车位 停车位 @@ -964,20 +962,9 @@ 除颤器 消防栓 紧急电话 - 入口 - - 主要入口 医学实验室 物理治疗师 - 替代医学 - 听力学家 - 献血中心 - 验光师 - 足疗师 - 心理治疗师 - 样本采集设施 - 语言治疗师 公路要素 @@ -987,7 +974,6 @@ 马道 隧道 - 巴士专用道 公交站 在建道路 自行车道 @@ -1250,7 +1236,6 @@ 游泳池 游泳池 賽道 - 賽道 水上乐园 人造要素 防波堤 diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index ead34cfec6..a98809f005 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -62,8 +62,6 @@ #1E000000 #1EFFFFFF - #006C35 - #FFEEEEEE #FF32363A diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml index 59ba89091a..4e69c609be 100644 --- a/android/res/values/donottranslate.xml +++ b/android/res/values/donottranslate.xml @@ -60,4 +60,7 @@ ALWAYS AUTO com.google.android.material.bottomsheet.BottomSheetBehavior + + https://organicmaps.app/privacy + https://organicmaps.app/terms diff --git a/android/res/values/ic_launcher_background.xml b/android/res/values/ic_launcher_background.xml index a012476ad6..32e01b5423 100644 --- a/android/res/values/ic_launcher_background.xml +++ b/android/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - @color/logo + #006C35 \ No newline at end of file diff --git a/android/res/values/strings-tts.xml b/android/res/values/strings-tts.xml index 153b57188e..0b93f980a6 100644 --- a/android/res/values/strings-tts.xml +++ b/android/res/values/strings-tts.xml @@ -13,25 +13,21 @@ Otherwise we consider that this is zh-Hans. TODO: Move language list to core. - - languages should be added alphabetically in tts_language_names --> en - id + ru ca + cs da de es - eu fr - hr + id it - sw hu nl - nb pl pt ro @@ -40,38 +36,32 @@ sv vi tr - cs el - be - ru uk ar fa - mr hi - th - zh-CN:zh-Hans - zh-TW:zh-Hant ja ko + th + zh-TW:zh-Hant + zh-CN:zh-Hans English - Bahasa Indonesia + Русский Català + Čeština Dansk Deutsch Español - Euskara Français - Hrvatski + Indonesia Italiano - Kiswahili Magyar Nederlands - Norsk Bokmål Polski Português Română @@ -80,19 +70,15 @@ Svenska Tiếng Việt Türkçe - Čeština Ελληνικά - Беларуская - Русский Українська العربية فارسی - मराठी - हिन्दी - ไทย - 中文简体 - 中文繁體 + हिंदी 日本語 한국어 + ภาษาไทย + 中文繁體 + 中文简体 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 63bdce9660..5931d7789c 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ My Position Later - + Search Search Map @@ -63,7 +63,7 @@ Bookmark Color Bookmark List Name - + Bookmarks My Places @@ -237,8 +237,6 @@ [matrix] - Mastodon - Facebook Twitter @@ -480,8 +478,8 @@ This could be considerably expensive with some plans or if roaming. Enter a valid building number Number of floors (maximum of %d) - - The number of floors must non exceed %d + + The number of floors must non exceed 25 ZIP Code Enter a valid ZIP code @@ -740,12 +738,10 @@ When enabled, you don\'t need to unlock your device every time while the app is running. Map data from OpenStreetMap - + https://t.me/OrganicMapsApp - + https://www.instagram.com/organicmaps.app - - https://organicmaps.app/ Aerialway @@ -784,10 +780,8 @@ Car Wash Casino Charging Station - Charging Station Nursery Cinema - Bowling Alley Clinic College Community Centre @@ -827,9 +821,9 @@ Private Parking Parking Underground Parking - Parking entrance Parking entrance Parking entrance + Parking entrance Parking Space Parking Space Parking Space @@ -1055,20 +1049,9 @@ Defibrillator Fire Hydrant Emergency Phone - Entrance - - Main Entrance Medical Laboratory Physiotherapist - Alternative medicine - Audiology - Blood donation center - Optometry - Podiatry - Psychotherapy - Sample collection - Logopedics Highway @@ -1078,7 +1061,6 @@ Bridle Path Tunnel - Dedicated bus road Bus Stop Road Under Construction Cycle Path @@ -1363,7 +1345,6 @@ Swimming Pool Swimming Pool Track - Track Water Park Beach Resort Man Made diff --git a/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java index e42fd4300c..10862da81d 100644 --- a/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java +++ b/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java @@ -347,7 +347,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity final Intent intent = new Intent(this, MwmActivity.class); // Disable animation because MwmActivity should appear exactly over this one - intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION | Intent.FLAG_ACTIVITY_CLEAR_TOP); // Add saved task to forward to map activity. if (mMapTaskToForward != null) diff --git a/android/src/app/organicmaps/Map.java b/android/src/app/organicmaps/Map.java index 921f3dc018..df547cef44 100644 --- a/android/src/app/organicmaps/Map.java +++ b/android/src/app/organicmaps/Map.java @@ -119,6 +119,9 @@ public final class Map public void onSurfaceCreated(final Context context, final Surface surface, Rect surfaceFrame, int surfaceDpi) { + if (nativeIsEngineCreated()) + nativeDetachSurface(true); + if (isThemeChangingProcess(context)) { Logger.d(TAG, "Theme changing process, skip 'onSurfaceCreated' callback"); diff --git a/android/src/app/organicmaps/MapFragment.java b/android/src/app/organicmaps/MapFragment.java index 657a729ead..326d8cfe59 100644 --- a/android/src/app/organicmaps/MapFragment.java +++ b/android/src/app/organicmaps/MapFragment.java @@ -115,8 +115,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener @Override public void onPause() { - mMap.onPause(requireContext()); super.onPause(); + mMap.onPause(requireContext()); } @Override diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/src/app/organicmaps/MwmActivity.java index d47ac999c8..b1c92d283f 100644 --- a/android/src/app/organicmaps/MwmActivity.java +++ b/android/src/app/organicmaps/MwmActivity.java @@ -28,6 +28,7 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import app.organicmaps.Framework.PlacePageActivationListener; import app.organicmaps.api.Const; +import app.organicmaps.background.AppBackgroundTracker; import app.organicmaps.background.Notifier; import app.organicmaps.base.BaseMwmFragmentActivity; import app.organicmaps.base.CustomNavigateUpListener; @@ -51,9 +52,8 @@ import app.organicmaps.editor.ReportFragment; import app.organicmaps.help.HelpActivity; import app.organicmaps.intent.Factory; import app.organicmaps.intent.MapTask; +import app.organicmaps.location.CompassData; import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.location.LocationState; import app.organicmaps.maplayer.MapButtonsController; import app.organicmaps.maplayer.Mode; import app.organicmaps.maplayer.ToggleMapLayerFragment; @@ -77,7 +77,6 @@ import app.organicmaps.settings.RoadType; import app.organicmaps.settings.SettingsActivity; import app.organicmaps.settings.UnitLocale; import app.organicmaps.sound.TtsPlayer; -import app.organicmaps.util.log.Logger; import app.organicmaps.widget.menu.MainMenu; import app.organicmaps.widget.placepage.PlacePageController; import app.organicmaps.widget.placepage.PlacePageData; @@ -98,7 +97,6 @@ import java.util.ArrayList; import java.util.Objects; import java.util.Stack; -import static app.organicmaps.util.concurrency.UiThread.runLater; import static app.organicmaps.widget.placepage.PlacePageButtons.PLACEPAGE_MORE_MENU_ID; public class MwmActivity extends BaseMwmFragmentActivity @@ -107,20 +105,18 @@ public class MwmActivity extends BaseMwmFragmentActivity MapRenderingListener, CustomNavigateUpListener, RoutingController.Container, - LocationListener, - LocationState.ModeChangeListener, + LocationHelper.UiCallback, RoutingPlanInplaceController.RoutingPlanListener, RoutingBottomMenuListener, BookmarkManager.BookmarksLoadingListener, FloatingSearchToolbarController.SearchToolbarListener, PlacePageController.SlideListener, RoutingModeListener, + AppBackgroundTracker.OnTransitionListener, NoConnectionListener, MenuBottomSheetFragment.MenuBottomSheetInterfaceWithHeader, ToggleMapLayerFragment.LayerItemClickListener { - private static final String TAG = MwmActivity.class.getSimpleName(); - public static final String EXTRA_TASK = "map_task"; public static final String EXTRA_LAUNCH_BY_DEEP_LINK = "launch_by_deep_link"; public static final String EXTRA_BACK_URL = "backurl"; @@ -132,6 +128,7 @@ public class MwmActivity extends BaseMwmFragmentActivity EditorHostFragment.class.getName(), ReportFragment.class.getName() }; + private static final String EXTRA_LOCATION_DIALOG_IS_ANNOYING = "LOCATION_DIALOG_IS_ANNOYING"; private static final String EXTRA_CURRENT_LAYOUT_MODE = "CURRENT_LAYOUT_MODE"; private static final String EXTRA_IS_FULLSCREEN = "IS_FULLSCREEN"; public static final int REQ_CODE_ERROR_DRIVING_OPTIONS_DIALOG = 5; @@ -369,6 +366,7 @@ public class MwmActivity extends BaseMwmFragmentActivity super.onSafeCreate(savedInstanceState); if (savedInstanceState != null) { + LocationHelper.INSTANCE.setLocationErrorDialogAnnoying(savedInstanceState.getBoolean(EXTRA_LOCATION_DIALOG_IS_ANNOYING)); mCurrentLayoutMode = MapButtonsController.LayoutMode.values()[savedInstanceState.getInt(EXTRA_CURRENT_LAYOUT_MODE)]; mIsFullscreen = savedInstanceState.getBoolean(EXTRA_IS_FULLSCREEN); } @@ -648,9 +646,10 @@ public class MwmActivity extends BaseMwmFragmentActivity Map.zoomOut(); break; case myPosition: - LocationState.nativeSwitchToNextMode(); - if (!LocationHelper.INSTANCE.isActive()) - LocationHelper.INSTANCE.start(); + /// @todo Is calls order important here? Should we call onLocationButtonClicked on else branch? + LocationHelper.INSTANCE.onLocationButtonClicked(); + if (!LocationUtils.isFineLocationGranted(getApplicationContext())) + LocationHelper.INSTANCE.requestPermissions(); break; case toggleMapLayer: toggleMapLayerBottomSheet(); @@ -798,8 +797,8 @@ public class MwmActivity extends BaseMwmFragmentActivity public void startLocationToPoint(final @Nullable MapObject endPoint) { closeFloatingPanels(); - if (!LocationHelper.INSTANCE.isActive()) - LocationHelper.INSTANCE.start(); + if (!LocationUtils.isFineLocationGranted(getApplicationContext())) + LocationHelper.INSTANCE.requestPermissions(); MapObject startPoint = LocationHelper.INSTANCE.getMyPosition(); RoutingController.get().prepare(startPoint, endPoint); @@ -842,6 +841,7 @@ public class MwmActivity extends BaseMwmFragmentActivity mNavigationController.onActivitySaveInstanceState(this, outState); RoutingController.get().onSaveState(); + outState.putBoolean(EXTRA_LOCATION_DIALOG_IS_ANNOYING, LocationHelper.INSTANCE.isLocationErrorDialogAnnoying()); outState.putInt(EXTRA_CURRENT_LAYOUT_MODE, mCurrentLayoutMode.ordinal()); outState.putBoolean(EXTRA_IS_FULLSCREEN, mIsFullscreen); @@ -1049,13 +1049,9 @@ public class MwmActivity extends BaseMwmFragmentActivity RoutingController.get().attach(this); IsolinesManager.from(getApplicationContext()).attach(this::onIsolinesStateChanged); LocationHelper.INSTANCE.attach(this); - LocationState.nativeSetListener(this); - LocationHelper.INSTANCE.addListener(this); - onMyPositionModeChanged(LocationState.nativeGetMode()); mPlacePageController.onActivityStarted(this); mSearchController.attach(this); - if (!Config.isScreenSleepEnabled()) - Utils.keepScreenOn(true, getWindow()); + MwmApplication.backgroundTracker(requireActivity()).addListener(this); } @Override @@ -1064,14 +1060,12 @@ public class MwmActivity extends BaseMwmFragmentActivity super.onStop(); Framework.nativeRemovePlacePageActivationListener(); BookmarkManager.INSTANCE.removeLoadingListener(this); - LocationHelper.INSTANCE.removeListener(this); - LocationState.nativeRemoveListener(); LocationHelper.INSTANCE.detach(); RoutingController.get().detach(); mPlacePageController.onActivityStopped(this); + MwmApplication.backgroundTracker(requireActivity()).removeListener(this); IsolinesManager.from(getApplicationContext()).detach(); mSearchController.detach(); - Utils.keepScreenOn(false, getWindow()); } @CallSuper @@ -1227,9 +1221,9 @@ public class MwmActivity extends BaseMwmFragmentActivity mMapFragment.adjustCompass(offsetX, offsetY); - final double north = LocationHelper.INSTANCE.getSavedNorth(); - if (!Double.isNaN(north)) - Map.onCompassUpdated(north, true); + CompassData compass = LocationHelper.INSTANCE.getCompassData(); + if (compass != null) + Map.onCompassUpdated(compass.getNorth(), true); } public void adjustBottomWidgets() @@ -1609,10 +1603,10 @@ public class MwmActivity extends BaseMwmFragmentActivity .show(); } + @Override public void onMyPositionModeChanged(int newMode) { - Logger.d(TAG, "location newMode = " + newMode); mMapButtonsController.updateNavMyPositionButton(newMode); RoutingController controller = RoutingController.get(); if (controller.isPlanning()) @@ -1622,33 +1616,39 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void onLocationUpdated(@NonNull Location location) { - final RoutingController routing = RoutingController.get(); - if (!routing.isNavigating()) + if (!RoutingController.get().isNavigating()) return; mNavigationController.update(Framework.nativeGetRouteFollowingInfo()); TtsPlayer.INSTANCE.playTurnNotifications(getApplicationContext()); - - // TODO: consider to create callback mechanism to transfer 'ROUTE_IS_FINISHED' event from - // the core to the platform code (https://github.com/organicmaps/organicmaps/issues/3589), - // because calling the native method 'nativeIsRouteFinished' - // too often can result in poor UI performance. - if (Framework.nativeIsRouteFinished()) - { - routing.cancel(); - // Restart location with a new interval. - LocationHelper.INSTANCE.restart(); - } } @Override - public void onCompassUpdated(double north) + public void onCompassUpdated(@NonNull CompassData compass) { - Map.onCompassUpdated(north, false); + Map.onCompassUpdated(compass.getNorth(), false); mNavigationController.updateNorth(); } + @Override + public void onLocationDenied() + { + Utils.showSnackbar(this, findViewById(R.id.coordinator), findViewById(R.id.menu_frame), + R.string.location_is_disabled_long_text); + } + + @Override + public void onRoutingFinish() + { + } + + @Override + public void onTransit(boolean foreground) + { + // No op. + } + @Override public void onUseMyPositionAsStart() { diff --git a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java index ab8bc3a7f7..158bf9f642 100644 --- a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java +++ b/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java @@ -306,7 +306,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment mProviders; + private int mProviderCount = 0; + private boolean mActive = false; + static private final int MIN_PROVIDER_COUNT = 2; // PASSIVE is always available @NonNull final private NativeLocationListener mNativeLocationListener = new NativeLocationListener(); @@ -68,7 +59,6 @@ class AndroidNativeProvider extends BaseLocationProvider { super(listener); mLocationManager = (LocationManager) MwmApplication.from(context).getSystemService(Context.LOCATION_SERVICE); - mProviders = new HashSet<>(); // This service is always available on all versions of Android if (mLocationManager == null) throw new IllegalStateException("Can't get LOCATION_SERVICE"); @@ -80,53 +70,37 @@ class AndroidNativeProvider extends BaseLocationProvider public void start(long interval) { Logger.d(TAG); - if (!mProviders.isEmpty()) + if (mActive) throw new IllegalStateException("Already started"); + mActive = true; - final LocationRequestCompat locationRequest = new LocationRequestCompat.Builder(interval) - // The quality is a hint to providers on how they should weigh power vs accuracy tradeoffs. - .setQuality(LocationRequestCompat.QUALITY_HIGH_ACCURACY) - .build(); - - if (mLocationManager.isProviderEnabled(LocationUtils.FUSED_PROVIDER)) + final List providers = mLocationManager.getProviders(true); + mProviderCount = providers.size(); + if (mProviderCount < MIN_PROVIDER_COUNT) { - // The FUSED provider takes into account both GPS and NETWORK and potentially other sensors as well. - // https://issuetracker.google.com/issues/215186921#comment3 - mProviders.add(LocationUtils.FUSED_PROVIDER); - } - else - { - if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) - mProviders.add(LocationManager.GPS_PROVIDER); - - if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) - mProviders.add(LocationManager.NETWORK_PROVIDER); + mListener.onLocationDisabled(); } - if (mProviders.isEmpty()) - { - // Call this callback in the next event loop to allow LocationHelper::start() to finish. - Logger.e(TAG, "No providers available"); - runLater(mListener::onLocationDisabled); - return; - } - - for (String provider : mProviders) + for (String provider : providers) { Logger.d(TAG, "Request Android native provider '" + provider + "' to get locations at this interval = " + interval + " ms"); - LocationManagerCompat.requestLocationUpdates(mLocationManager, provider, locationRequest, - mNativeLocationListener, Looper.myLooper()); + mLocationManager.requestLocationUpdates(provider, interval, 0, mNativeLocationListener); + + final Location location = mLocationManager.getLastKnownLocation(provider); + Logger.d(TAG, "provider = '" + provider + "' last location = " + location); + if (location != null) + mListener.onLocationChanged(location); + + mProviderCount++; } } - @SuppressWarnings("MissingPermission") - // A permission is checked externally @Override public void stop() { Logger.d(TAG); - mProviders.clear(); - LocationManagerCompat.removeUpdates(mLocationManager, mNativeLocationListener); + mLocationManager.removeUpdates(mNativeLocationListener); + mActive = false; } } diff --git a/android/src/app/organicmaps/location/BaseLocationProvider.java b/android/src/app/organicmaps/location/BaseLocationProvider.java index 91f0b1a55e..9491eebcaa 100644 --- a/android/src/app/organicmaps/location/BaseLocationProvider.java +++ b/android/src/app/organicmaps/location/BaseLocationProvider.java @@ -4,6 +4,7 @@ import android.app.PendingIntent; import android.location.Location; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.UiThread; abstract class BaseLocationProvider @@ -13,11 +14,9 @@ abstract class BaseLocationProvider @UiThread void onLocationChanged(@NonNull Location location); @UiThread - void onLocationResolutionRequired(@NonNull PendingIntent pendingIntent); + void onLocationResolutionRequired(@Nullable PendingIntent pendingIntent); @UiThread void onLocationDisabled(); - @UiThread - void onFusedLocationUnsupported(); } @NonNull @@ -30,4 +29,5 @@ abstract class BaseLocationProvider protected abstract void start(long interval); protected abstract void stop(); + protected boolean trustFusedLocations() { return false; } } diff --git a/android/src/app/organicmaps/location/CompassData.java b/android/src/app/organicmaps/location/CompassData.java new file mode 100644 index 0000000000..cd4d82e6d1 --- /dev/null +++ b/android/src/app/organicmaps/location/CompassData.java @@ -0,0 +1,31 @@ +package app.organicmaps.location; + +import android.app.Activity; +import android.content.Context; + +import androidx.annotation.NonNull; + +import app.organicmaps.MwmApplication; +import app.organicmaps.util.LocationUtils; + + +public final class CompassData +{ + private double mNorth; + + public void update(@NonNull Context context, double north) + { + Activity top = MwmApplication.backgroundTracker(context).getTopActivity(); + if (top == null) + return; + + int rotation = top.getWindowManager().getDefaultDisplay().getRotation(); + mNorth = LocationUtils.correctCompassAngle(rotation, north); + } + + public double getNorth() + { + return mNorth; + } +} + diff --git a/android/src/app/organicmaps/location/GPSCheck.java b/android/src/app/organicmaps/location/GPSCheck.java new file mode 100644 index 0000000000..6a4dd9aeb0 --- /dev/null +++ b/android/src/app/organicmaps/location/GPSCheck.java @@ -0,0 +1,25 @@ +package app.organicmaps.location; + +import android.content.Context; +import android.content.Intent; +import android.location.LocationManager; +import android.text.TextUtils; + +import app.organicmaps.MwmApplication; +import app.organicmaps.MwmBroadcastReceiver; + +public class GPSCheck extends MwmBroadcastReceiver +{ + @Override + public void onReceiveInitialized(Context context, Intent intent) + { + if (!TextUtils.equals(intent.getAction(), LocationManager.PROVIDERS_CHANGED_ACTION)) + { + throw new AssertionError("An intent with wrong action detected: " + intent.getAction()); + } + if (MwmApplication.backgroundTracker(context).isForeground()) + { + LocationHelper.INSTANCE.restart(); + } + } +} diff --git a/android/src/app/organicmaps/location/LocationHelper.java b/android/src/app/organicmaps/location/LocationHelper.java index 6df1e6c371..2af9cbb735 100644 --- a/android/src/app/organicmaps/location/LocationHelper.java +++ b/android/src/app/organicmaps/location/LocationHelper.java @@ -2,6 +2,7 @@ package app.organicmaps.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static app.organicmaps.util.concurrency.UiThread.runLater; import android.app.Activity; import android.app.Dialog; @@ -62,12 +63,14 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack @NonNull private Context mContext; + private final GPSCheck mReceiver = new GPSCheck(); + private boolean mReceiverRegistered; + private static final String TAG = LocationHelper.class.getSimpleName(); @NonNull private final Listeners mListeners = new Listeners<>(); @Nullable private Location mSavedLocation; - private double mSavedNorth = Double.NaN; private MapObject mMyPosition; @SuppressWarnings("NotNullFieldNotInitialized") @NonNull @@ -76,10 +79,13 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack @NonNull private BaseLocationProvider mLocationProvider; @Nullable - private AppCompatActivity mActivity; + private UiCallback mUiCallback; private long mInterval; + private CompassData mCompassData; private boolean mInFirstRun; private boolean mActive; + private boolean mLocationUpdateStoppedByUser; + private boolean mErrorDialogAnnoying; @Nullable private Dialog mErrorDialog; @Nullable @@ -131,6 +137,15 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack @Nullable public Location getSavedLocation() { return mSavedLocation; } + public void onLocationButtonClicked() + { + Logger.d(TAG); + // Ensure that we actually request locations. We don't have turn-off mode, so this call is ok. + if (!mActive) + start(); + LocationState.nativeSwitchToNextMode(); + } + /** * Indicates about whether a location provider is polling location updates right now or not. */ @@ -139,46 +154,67 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack return mActive; } + private void setStopLocationUpdateByUser(boolean isStopped) + { + Logger.d(TAG, "isStopped = " + isStopped); + mLocationUpdateStoppedByUser = isStopped; + } + + public boolean isLocationErrorDialogAnnoying() + { + return mErrorDialogAnnoying; + } + + public void setLocationErrorDialogAnnoying(boolean isAnnoying) + { + Logger.d(TAG, "isAnnoying = " + isAnnoying); + mErrorDialogAnnoying = isAnnoying; + } + @Override public void onTransit(boolean foreground) { - Logger.d(TAG, "foreground = " + foreground + " mode = " + LocationState.nativeGetMode()); - if (foreground) { - if (isActive()) - return; + Logger.d(TAG, "Resumed in foreground"); - if (LocationState.nativeGetMode() == LocationState.NOT_FOLLOW_NO_POSITION) + if (mReceiverRegistered) { - Logger.d(TAG, "Location updates are stopped by the user manually, so skip provider start" - + " until the user starts it manually."); - return; + MwmApplication.from(mContext).unregisterReceiver(mReceiver); + mReceiverRegistered = false; } - Logger.d(TAG, "Starting in foreground"); - start(); + initialStart(); } else { - if (!isActive()) - return; + Logger.d(TAG, "Stopped in background"); + + if (!mReceiverRegistered) + { + final IntentFilter filter = new IntentFilter(); + filter.addAction(LocationManager.PROVIDERS_CHANGED_ACTION); + filter.addCategory(Intent.CATEGORY_DEFAULT); + + MwmApplication.from(mContext).registerReceiver(mReceiver, filter); + mReceiverRegistered = true; + } - Logger.d(TAG, "Stopping in background"); stop(); } } - void notifyCompassUpdated(double north) + void notifyCompassUpdated(long time, double north) { - mSavedNorth = north; - if (mActivity != null) - { - int rotation = mActivity.getWindowManager().getDefaultDisplay().getRotation(); - mSavedNorth = LocationUtils.correctCompassAngle(rotation, mSavedNorth); - } + if (mCompassData == null) + mCompassData = new CompassData(); + + mCompassData.update(mContext, north); + if (mUiCallback != null) + mUiCallback.onCompassUpdated(mCompassData); + for (LocationListener listener : mListeners) - listener.onCompassUpdated(mSavedNorth); + listener.onCompassUpdated(time, north); mListeners.finishIterate(); } @@ -210,15 +246,31 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack mSavedLocation.getAltitude(), mSavedLocation.getSpeed(), mSavedLocation.getBearing()); + + if (mUiCallback != null) + mUiCallback.onLocationUpdated(mSavedLocation); + + // TODO: consider to create callback mechanism to transfer 'ROUTE_IS_FINISHED' event from + // the core to the platform code (https://github.com/organicmaps/organicmaps/issues/3589), + // because calling the native method 'nativeIsRouteFinished' + // too often can result in poor UI performance. + if (RoutingController.get().isNavigating() && Framework.nativeIsRouteFinished()) + { + Logger.d(TAG, "End point is reached"); + if (mUiCallback != null) + mUiCallback.onRoutingFinish(); + RoutingController.get().cancel(); + + // Break onLocationChanged() -> start() -> onLocationChanged() -> start() loop. + // https://github.com/organicmaps/organicmaps/issues/3588 + runLater(this::restart); + } } @Override public void onLocationChanged(@NonNull Location location) { - if (!isActive()) - return; - - Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location); + Logger.d(TAG, "location = " + location); if (!LocationUtils.isAccuracySatisfied(location)) { @@ -228,7 +280,8 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack if (mSavedLocation != null) { - if (!LocationUtils.isFromFusedProvider(location) && !LocationUtils.isLocationBetterThanLast(location, mSavedLocation)) + final boolean isTrustedFused = mLocationProvider.trustFusedLocations() && LocationUtils.isFromFusedProvider(location); + if (!isTrustedFused && !LocationUtils.isLocationBetterThanLast(location, mSavedLocation)) { Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation); return; @@ -242,153 +295,93 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack @Override @UiThread - public void onLocationResolutionRequired(@NonNull PendingIntent pendingIntent) + public void onLocationResolutionRequired(@Nullable PendingIntent pendingIntent) { - if (!isActive()) - return; - Logger.d(TAG); - if (mResolutionRequest == null) - { - Logger.d(TAG, "Can't resolve location permissions because UI is not attached"); - stop(); - nativeOnLocationError(ERROR_GPS_OFF); + if (mResolutionRequest == null) { + onLocationDisabled(); return; } - // Cancel our dialog in favor of system dialog. - if (mErrorDialog != null && mErrorDialog.isShowing()) - mErrorDialog.dismiss(); - - // Launch system permission resolution dialog. IntentSenderRequest intentSenderRequest = new IntentSenderRequest.Builder(pendingIntent.getIntentSender()) .build(); mResolutionRequest.launch(intentSenderRequest); } - @Override - @UiThread - public void onFusedLocationUnsupported() - { - // Try to downgrade to the native provider first and restart the service before notifying the user. - Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " is not supported," + - " downgrading to use native provider"); - mLocationProvider = new AndroidNativeProvider(mContext, this); - restart(); - } - @Override @UiThread public void onLocationDisabled() { - Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + - " permissions = " + LocationUtils.isLocationGranted(mContext) + - " settings = " + LocationUtils.areLocationServicesTurnedOn(mContext)); + Logger.d(TAG, "provider = " + mLocationProvider + " permissions = " + LocationUtils.isLocationGranted(mContext) + + " settings = " + LocationUtils.areLocationServicesTurnedOn(mContext) + " isAnnoying = " + mErrorDialogAnnoying); - stop(); + if (LocationUtils.areLocationServicesTurnedOn(mContext) && + !(mLocationProvider instanceof AndroidNativeProvider)) + { + // If location service is enabled, try to downgrade to the native provider first + // and restart the service before notifying the user. + Logger.d(TAG, "Downgrading to use native provider"); + mLocationProvider = new AndroidNativeProvider(mContext, this); + restart(); + return; + } + + mSavedLocation = null; nativeOnLocationError(ERROR_GPS_OFF); - if (mActivity == null) - { - Logger.d(TAG, "Don't show 'location disabled' error dialog because Activity is not attached"); + if (mUiCallback == null || mErrorDialogAnnoying || (mErrorDialog != null && mErrorDialog.isShowing())) return; - } - if (mErrorDialog != null && mErrorDialog.isShowing()) - { - Logger.d(TAG, "Don't show 'location disabled' error dialog because another dialog is in progress"); - return; - } - - AlertDialog.Builder builder = new AlertDialog.Builder(mActivity, R.style.MwmTheme_AlertDialog) + final AppCompatActivity activity = mUiCallback.requireActivity(); + AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.MwmTheme_AlertDialog) .setTitle(R.string.enable_location_services) .setMessage(R.string.location_is_disabled_long_text) .setOnDismissListener(dialog -> mErrorDialog = null) - .setNegativeButton(R.string.close, null); - final Intent intent = Utils.makeSystemLocationSettingIntent(mActivity); + .setOnCancelListener(dialog -> setLocationErrorDialogAnnoying(true)) + .setNegativeButton(R.string.close, (dialog, which) -> setLocationErrorDialogAnnoying(true)); + final Intent intent = Utils.makeSystemLocationSettingIntent(activity); if (intent != null) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY); intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - builder.setPositiveButton(R.string.connection_settings, (dialog, which) -> mActivity.startActivity(intent)); + builder.setPositiveButton(R.string.connection_settings, (dialog, which) -> activity.startActivity(intent)); } mErrorDialog = builder.show(); } - @UiThread - private void onLocationDenied() - { - Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + - " permissions = " + LocationUtils.isLocationGranted(mContext) + - " settings = " + LocationUtils.areLocationServicesTurnedOn(mContext)); - - stop(); - nativeOnLocationError(ERROR_DENIED); - - if (mActivity == null) - { - Logger.w(TAG, "Don't show 'location denied' error dialog because Activity is not attached"); - return; - } - - if (mErrorDialog != null && mErrorDialog.isShowing()) - { - Logger.w(TAG, "Don't show 'location denied' error dialog because another dialog is in progress"); - return; - } - - mErrorDialog = new AlertDialog.Builder(mActivity, R.style.MwmTheme_AlertDialog) - .setTitle(R.string.enable_location_services) - .setMessage(R.string.location_is_disabled_long_text) - .setOnDismissListener(dialog -> mErrorDialog = null) - .setNegativeButton(R.string.close, null) - .show(); - } - @UiThread private void onLocationPendingTimeout() { - Logger.d(TAG, " permissions = " + LocationUtils.isLocationGranted(mContext) + - " settings = " + LocationUtils.areLocationServicesTurnedOn(mContext)); + Logger.d(TAG, "active = " + mActive + " permissions = " + LocationUtils.isLocationGranted(mContext) + + " settings = " + LocationUtils.areLocationServicesTurnedOn(mContext) + " isAnnoying = " + mErrorDialogAnnoying); - // - // For all cases below we don't stop location provider until user explicitly clicks "Stop" in the dialog. - // - - if (!isActive()) - { - Logger.d(TAG, "Don't show 'location timeout' error dialog because provider is already stopped"); + if (!mActive) return; - } - if (mActivity == null) - { - Logger.d(TAG, "Don't show 'location timeout' error dialog because Activity is not attached"); + /// @todo Should we stop current location request (before returns below)? + + if (!LocationUtils.isLocationGranted(mContext) || !LocationUtils.areLocationServicesTurnedOn(mContext)) return; - } - if (mErrorDialog != null && mErrorDialog.isShowing()) - { - Logger.d(TAG, "Don't show 'location timeout' error dialog because another dialog is in progress"); + if (mUiCallback == null || mErrorDialogAnnoying || (mErrorDialog != null && mErrorDialog.isShowing())) return; - } - final AppCompatActivity activity = mActivity; + final AppCompatActivity activity = mUiCallback.requireActivity(); mErrorDialog = new AlertDialog.Builder(activity, R.style.MwmTheme_AlertDialog) .setTitle(R.string.current_location_unknown_title) .setMessage(R.string.current_location_unknown_message) .setOnDismissListener(dialog -> mErrorDialog = null) .setNegativeButton(R.string.current_location_unknown_stop_button, (dialog, which) -> { - Logger.w(TAG, "Disabled by user"); - nativeOnLocationError(ERROR_GPS_OFF); + setStopLocationUpdateByUser(true); stop(); }) .setPositiveButton(R.string.current_location_unknown_continue_button, (dialog, which) -> { - // Do nothing - provider will continue to search location. + onLocationButtonClicked(); + setLocationErrorDialogAnnoying(true); }) .show(); } @@ -406,8 +399,6 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack mListeners.register(listener); if (mSavedLocation != null) listener.onLocationUpdated(mSavedLocation); - if (!Double.isNaN(mSavedNorth)) - listener.onCompassUpdated(mSavedNorth); } @UiThread @@ -423,8 +414,10 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack private void calcLocationUpdatesInterval() { + Logger.d(TAG); if (RoutingController.get().isNavigating()) { + Logger.d(TAG, "calcLocationUpdatesInterval(), it's navigation mode"); final @Framework.RouterType int router = Framework.nativeGetRouter(); switch (router) { @@ -449,7 +442,6 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack throw new IllegalArgumentException("Unsupported router type: " + router); } - Logger.d(TAG, "navigation = " + router + " interval = " + mInterval); return; } @@ -459,16 +451,15 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack case LocationState.FOLLOW: mInterval = INTERVAL_FOLLOW_MS; break; + case LocationState.FOLLOW_AND_ROTATE: mInterval = INTERVAL_FOLLOW_AND_ROTATE_MS; break; - case LocationState.NOT_FOLLOW: - case LocationState.NOT_FOLLOW_NO_POSITION: - case LocationState.PENDING_POSITION: + + default: mInterval = INTERVAL_NOT_FOLLOW_MS; break; } - Logger.d(TAG, "mode = " + mode + " interval = " + mInterval); } /** @@ -482,11 +473,17 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack */ public void restart() { - Logger.d(TAG); stop(); start(); } + private void initialStart() + { + Logger.d(TAG); + if (LocationState.nativeGetMode() != LocationState.NOT_FOLLOW_NO_POSITION) + start(); + } + /** * Starts polling location updates. */ @@ -494,37 +491,37 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack { Logger.d(TAG); - if (isActive()) - throw new IllegalStateException("Already started"); - - if (!LocationUtils.isLocationGranted(mContext)) + if (mActive) { - Logger.w(TAG, "Dynamic permissions ACCESS_COARSE_LOCATION and/or ACCESS_FINE_LOCATION are not granted"); - Logger.d(TAG, "error mode = " + getMyPositionMode()); - nativeOnLocationError(ERROR_DENIED); - - if (mPermissionRequest == null) - { - Logger.w(TAG, "Don't request location permissions because Activity is not attached"); - return; - } - mPermissionRequest.launch(new String[]{ - ACCESS_COARSE_LOCATION, - ACCESS_FINE_LOCATION - }); + Logger.w(TAG, "Provider '" + mLocationProvider + "' is already started"); return; } - checkForAgpsUpdates(); + if (mLocationUpdateStoppedByUser) + { + Logger.d(TAG, "Location updates are stopped by the user manually, so skip provider start" + + " until the user starts it manually."); + nativeOnLocationError(ERROR_GPS_OFF); + return; + } - LocationState.nativeSetLocationPendingTimeoutListener(this::onLocationPendingTimeout); - mSensorHelper.start(); - final long oldInterval = mInterval; + long oldInterval = mInterval; + Logger.d(TAG, "Old time interval (ms): " + oldInterval); calcLocationUpdatesInterval(); - Logger.i(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + - " mInFirstRun = " + mInFirstRun + " oldInterval = " + oldInterval + " interval = " + mInterval); - mActive = true; + if (!LocationUtils.isLocationGranted(mContext)) + { + Logger.w(TAG, "Dynamic permissions ACCESS_COARSE_LOCATION and/or ACCESS_FINE_LOCATION are not granted"); + mSavedLocation = null; + nativeOnLocationError(ERROR_DENIED); + if (mUiCallback != null) + requestPermissions(); + return; + } + Logger.i(TAG, "start(): interval = " + mInterval + " provider = '" + mLocationProvider + "' mInFirstRun = " + mInFirstRun); + checkForAgpsUpdates(); mLocationProvider.start(mInterval); + mSensorHelper.start(); + mActive = true; } /** @@ -534,15 +531,14 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack { Logger.d(TAG); - if (!isActive()) + if (!mActive) { - Logger.w(TAG, "Already stopped"); + Logger.w(TAG, "Provider '" + mLocationProvider + "' is already stopped"); return; } mLocationProvider.stop(); mSensorHelper.stop(); - LocationState.nativeRemoveLocationPendingTimeoutListener(); mActive = false; } @@ -570,19 +566,44 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack * Attach UI to helper. */ @UiThread - public void attach(@NonNull AppCompatActivity activity) + public void attach(@NonNull UiCallback callback) { - Logger.d(TAG, "activity = " + activity); + Logger.d(TAG, "callback = " + callback); - if (mActivity != null) - throw new IllegalStateException("Another Activity is already attached"); + if (mUiCallback != null) + { + Logger.d(TAG, " - already attached. Skip."); + return; + } - mActivity = activity; + mUiCallback = callback; - mPermissionRequest = mActivity.registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), - result -> onRequestPermissionsResult()); - mResolutionRequest = mActivity.registerForActivityResult(new ActivityResultContracts.StartIntentSenderForResult(), - result -> onLocationResolutionResult(result.getResultCode())); + mPermissionRequest = mUiCallback.requireActivity() + .registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), + result -> onRequestPermissionsResult()); + mResolutionRequest = mUiCallback.requireActivity() + .registerForActivityResult(new ActivityResultContracts.StartIntentSenderForResult(), + result -> onLocationResolutionResult(result.getResultCode())); + + if (!Config.isScreenSleepEnabled()) + Utils.keepScreenOn(true, mUiCallback.requireActivity().getWindow()); + + LocationState.nativeSetLocationPendingTimeoutListener(this::onLocationPendingTimeout); + LocationState.nativeSetListener(mUiCallback); + mUiCallback.onMyPositionModeChanged(getMyPositionMode()); + if (mCompassData != null) + mUiCallback.onCompassUpdated(mCompassData); + + if (mActive) + { + Logger.d(TAG, "attach() provider '" + mLocationProvider + "' is active, just add the listener"); + if (mSavedLocation != null) + notifyLocationUpdated(); + } + else + { + initialStart(); + } } /** @@ -591,35 +612,55 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack @UiThread public void detach() { - Logger.d(TAG, "activity = " + mActivity); + Logger.d(TAG, "callback = " + mUiCallback); - if (mActivity == null) - throw new IllegalStateException("Activity is not attached"); + if (mUiCallback == null) + { + Logger.d(TAG, " - already detached. Skip."); + return; + } - assert mPermissionRequest != null; + Utils.keepScreenOn(false, mUiCallback.requireActivity().getWindow()); + LocationState.nativeRemoveLocationPendingTimeoutListener(); + LocationState.nativeRemoveListener(); mPermissionRequest.unregister(); mPermissionRequest = null; - assert mResolutionRequest != null; mResolutionRequest.unregister(); mResolutionRequest = null; - mActivity = null; + mUiCallback = null; + } + + @UiThread + public void requestPermissions() + { + Logger.d(TAG); + + if (mUiCallback == null) + throw new IllegalStateException("Not attached"); + + mPermissionRequest.launch(new String[]{ + ACCESS_COARSE_LOCATION, + ACCESS_FINE_LOCATION + }); } @UiThread private void onRequestPermissionsResult() { - Logger.d(TAG); - - if (LocationUtils.isLocationGranted(mContext)) + if (!LocationUtils.isLocationGranted(mContext)) { - Logger.i(TAG, "Permissions have been granted"); - if (!isActive()) - start(); + Logger.w(TAG, "Permissions have not been granted"); + mSavedLocation = null; + nativeOnLocationError(ERROR_DENIED); + if (mUiCallback != null) + mUiCallback.onLocationDenied(); return; } - Logger.w(TAG, "Permissions have not been granted"); - onLocationDenied(); + Logger.i(TAG, "Permissions have been granted"); + setLocationErrorDialogAnnoying(false); + setStopLocationUpdateByUser(false); + restart(); } @UiThread @@ -627,13 +668,10 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack { if (resultCode != Activity.RESULT_OK) { - Logger.w(TAG, "Resolution has not been granted"); - stop(); - nativeOnLocationError(ERROR_GPS_OFF); + onLocationDisabled(); return; } - Logger.i(TAG, "Resolution has been granted"); restart(); } @@ -673,9 +711,10 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack restart(); } - public double getSavedNorth() + @Nullable + public CompassData getCompassData() { - return mSavedNorth; + return mCompassData; } @LocationState.Value @@ -687,4 +726,14 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack private static native void nativeOnLocationError(int errorCode); private static native void nativeLocationUpdated(long time, double lat, double lon, float accuracy, double altitude, float speed, float bearing); + + public interface UiCallback extends LocationState.ModeChangeListener + { + @NonNull + AppCompatActivity requireActivity(); + void onLocationUpdated(@NonNull Location location); + void onCompassUpdated(@NonNull CompassData compass); + void onLocationDenied(); + void onRoutingFinish(); + } } diff --git a/android/src/app/organicmaps/location/LocationListener.java b/android/src/app/organicmaps/location/LocationListener.java index 098a7432de..0c58699b1d 100644 --- a/android/src/app/organicmaps/location/LocationListener.java +++ b/android/src/app/organicmaps/location/LocationListener.java @@ -2,20 +2,17 @@ package app.organicmaps.location; import android.location.Location; -import androidx.annotation.NonNull; - public interface LocationListener { class Simple implements LocationListener { @Override - public void onLocationUpdated(@NonNull Location location) {} + public void onLocationUpdated(Location location) {} @Override - public void onCompassUpdated(double north) {} + public void onCompassUpdated(long time, double north) {} } - void onLocationUpdated(@NonNull Location location); - - void onCompassUpdated(double north); + void onLocationUpdated(Location location); + void onCompassUpdated(long time, double north); } diff --git a/android/src/app/organicmaps/location/LocationState.java b/android/src/app/organicmaps/location/LocationState.java index 1a380452a5..20f721794c 100644 --- a/android/src/app/organicmaps/location/LocationState.java +++ b/android/src/app/organicmaps/location/LocationState.java @@ -8,7 +8,7 @@ import java.lang.annotation.RetentionPolicy; public final class LocationState { - public interface ModeChangeListener + interface ModeChangeListener { void onMyPositionModeChanged(int newMode); } @@ -29,12 +29,12 @@ public final class LocationState public static final int FOLLOW = 3; public static final int FOLLOW_AND_ROTATE = 4; - public static native void nativeSwitchToNextMode(); + static native void nativeSwitchToNextMode(); @Value - public static native int nativeGetMode(); + static native int nativeGetMode(); - public static native void nativeSetListener(@NonNull ModeChangeListener listener); - public static native void nativeRemoveListener(); + static native void nativeSetListener(@NonNull ModeChangeListener listener); + static native void nativeRemoveListener(); static native void nativeSetLocationPendingTimeoutListener(@NonNull PendingTimeoutListener listener); static native void nativeRemoveLocationPendingTimeoutListener(); diff --git a/android/src/app/organicmaps/location/SensorHelper.java b/android/src/app/organicmaps/location/SensorHelper.java index 883f7ba395..fa8b2f0a7b 100644 --- a/android/src/app/organicmaps/location/SensorHelper.java +++ b/android/src/app/organicmaps/location/SensorHelper.java @@ -42,7 +42,7 @@ class SensorHelper implements SensorEventListener SensorManager.getOrientation(rotMatrix, rotVals); // rotVals indexes: 0 - yaw, 2 - roll, 1 - pitch. - LocationHelper.INSTANCE.notifyCompassUpdated(rotVals[0]); + LocationHelper.INSTANCE.notifyCompassUpdated(event.timestamp, rotVals[0]); } } diff --git a/android/src/app/organicmaps/maplayer/MapButtonsController.java b/android/src/app/organicmaps/maplayer/MapButtonsController.java index 6db0dfdd0b..5794260e35 100644 --- a/android/src/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/src/app/organicmaps/maplayer/MapButtonsController.java @@ -68,14 +68,6 @@ public class MapButtonsController extends Fragment mInnerLeftButtonsFrame = mFrame.findViewById(R.id.map_buttons_inner_left); mInnerRightButtonsFrame = mFrame.findViewById(R.id.map_buttons_inner_right); mBottomButtonsFrame = mFrame.findViewById(R.id.map_buttons_bottom); - - final FloatingActionButton helpButton = mFrame.findViewById(R.id.help_button); - if (Config.isNY() && helpButton != null) - { - helpButton.setImageResource(R.drawable.ic_christmas_tree); - helpButton.getDrawable().setTintList(null); - } - final View zoomFrame = mFrame.findViewById(R.id.zoom_buttons_container); mFrame.findViewById(R.id.nav_zoom_in) .setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.zoomIn)); @@ -106,6 +98,7 @@ public class MapButtonsController extends Fragment } }); } + final View helpButton = mFrame.findViewById(R.id.help_button); if (helpButton != null) helpButton.setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.help)); @@ -136,6 +129,13 @@ public class MapButtonsController extends Fragment return mFrame; } + @Override + public void onStart() + { + super.onStart(); + showMapButtons(true); + } + public LayoutMode getLayoutMode() { return mLayoutMode; @@ -265,7 +265,10 @@ public class MapButtonsController extends Fragment public void showMapButtons(boolean show) { if (show) + { UiUtils.show(mFrame); + showButton(true, MapButtons.zoom); + } else UiUtils.hide(mFrame); mOnBottomButtonsHeightChangedListener.OnBottomButtonsHeightChanged(); diff --git a/android/src/app/organicmaps/util/Config.java b/android/src/app/organicmaps/util/Config.java index 5e09e807b7..7ed73e0007 100644 --- a/android/src/app/organicmaps/util/Config.java +++ b/android/src/app/organicmaps/util/Config.java @@ -343,10 +343,6 @@ public final class Config { return getString(KEY_DONATE_URL); } - public static boolean isNY() - { - return getBool("NY"); - } private static native boolean nativeGetBoolean(String name, boolean defaultValue); private static native void nativeSetBoolean(String name, boolean value); diff --git a/android/src/app/organicmaps/util/Constants.java b/android/src/app/organicmaps/util/Constants.java index 4e1acc9567..e71a2ad36a 100644 --- a/android/src/app/organicmaps/util/Constants.java +++ b/android/src/app/organicmaps/util/Constants.java @@ -24,8 +24,11 @@ public final class Constants public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/102378968471811"; public static final String TWITTER = "https://twitter.com/OrganicMapsApp"; public static final String MATRIX = "https://matrix.to/#/%23organicmaps:matrix.org"; - public static final String MASTODON = "https://fosstodon.org/@organicmaps"; + public static final String SUPPORT_US = "https://organicmaps.app/support-us"; + + public static final String NEWS = "https://organicmaps.app/news/"; + public static final String WEB_SITE = "https://organicmaps.app"; public static final String GITHUB = "https://github.com/organicmaps/organicmaps"; public static final String COPYRIGHT = "file:///android_asset/copyright.html"; @@ -42,6 +45,7 @@ public final class Constants public static class Email { public static final String SUPPORT = BuildConfig.SUPPORT_MAIL; + public static final String RATING = "rating@organicmaps.app"; private Email() {} } diff --git a/android/src/app/organicmaps/util/DateUtils.java b/android/src/app/organicmaps/util/DateUtils.java index c6985d2ff7..84ebf644d9 100644 --- a/android/src/app/organicmaps/util/DateUtils.java +++ b/android/src/app/organicmaps/util/DateUtils.java @@ -5,11 +5,9 @@ import android.content.Context; import androidx.annotation.NonNull; import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.Locale; -public final class DateUtils +public class DateUtils { private DateUtils() { @@ -31,23 +29,4 @@ public final class DateUtils { return android.text.format.DateFormat.is24HourFormat(context); } - - // Converts 220131 to locale-dependent date (e.g. 31 January 2022), - @NonNull - public static String getLocalDate(long v) - { - final SimpleDateFormat format = new SimpleDateFormat("yyMMdd", Locale.getDefault()); - final String strVersion = String.valueOf(v); - try - { - final Date date = format.parse(strVersion); - if (date == null) - return strVersion; - return java.text.DateFormat.getDateInstance().format(date); - } catch (java.text.ParseException e) - { - e.printStackTrace(); - return strVersion; - } - } } diff --git a/android/src/app/organicmaps/util/Graphics.java b/android/src/app/organicmaps/util/Graphics.java index 75e86b0462..d1709a02c0 100644 --- a/android/src/app/organicmaps/util/Graphics.java +++ b/android/src/app/organicmaps/util/Graphics.java @@ -141,24 +141,5 @@ public final class Graphics return res; } - @NonNull - public static Bitmap drawableToBitmap(@NonNull Drawable drawable) - { - if (drawable instanceof BitmapDrawable) - { - final BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable; - if (bitmapDrawable.getBitmap() != null) - return bitmapDrawable.getBitmap(); - } - - final int drawableWidth = Math.max(drawable.getIntrinsicWidth(), 1); - final int drawableHeight = Math.max(drawable.getIntrinsicHeight(), 1); - final Bitmap bitmap = Bitmap.createBitmap(drawableWidth, drawableHeight, Bitmap.Config.ARGB_8888); - final Canvas canvas = new Canvas(bitmap); - drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - drawable.draw(canvas); - return bitmap; - } - private Graphics() {} } diff --git a/android/src/app/organicmaps/util/LocationUtils.java b/android/src/app/organicmaps/util/LocationUtils.java index 941dd1ae55..df7a4242f9 100644 --- a/android/src/app/organicmaps/util/LocationUtils.java +++ b/android/src/app/organicmaps/util/LocationUtils.java @@ -19,7 +19,6 @@ public class LocationUtils private LocationUtils() {} private static final double DEFAULT_SPEED_MPS = 5; - public static final String FUSED_PROVIDER = "fused"; /** * Correct compass angles due to display orientation. @@ -71,7 +70,7 @@ public class LocationUtils public static boolean isFromFusedProvider(@NonNull Location location) { - return FUSED_PROVIDER.equals(location.getProvider()); + return "fused".equals(location.getProvider()); } public static boolean isAccuracySatisfied(@NonNull Location location) diff --git a/android/src/app/organicmaps/util/UiUtils.java b/android/src/app/organicmaps/util/UiUtils.java index f3a923e8a5..3aeb3fec65 100644 --- a/android/src/app/organicmaps/util/UiUtils.java +++ b/android/src/app/organicmaps/util/UiUtils.java @@ -332,8 +332,7 @@ public final class UiUtils public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error) { - - layout.getEditText().setError(error == 0 ? null : layout.getContext().getString(error)); + layout.setError(error == 0 ? null : layout.getContext().getString(error)); layout.getEditText().setTextColor(error == 0 ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary) : layout.getContext().getResources().getColor(R.color.base_red)); } diff --git a/android/src/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/src/app/organicmaps/util/bottomsheet/MenuAdapter.java index fad1e72b5b..3d14597c70 100644 --- a/android/src/app/organicmaps/util/bottomsheet/MenuAdapter.java +++ b/android/src/app/organicmaps/util/bottomsheet/MenuAdapter.java @@ -12,7 +12,6 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.util.Config; import java.util.ArrayList; @@ -49,14 +48,7 @@ public class MenuAdapter extends RecyclerView.Adapter { final MenuBottomSheetItem item = dataSet.get(position); viewHolder.getContainer().setOnClickListener((v) -> onMenuItemClick(item)); - final ImageView iv = viewHolder.getIconImageView(); - if (item.iconRes == R.drawable.ic_donate && Config.isNY()) - { - iv.setImageResource(R.drawable.ic_christmas_tree); - iv.setImageTintMode(null); - } - else - iv.setImageResource(item.iconRes); + viewHolder.getIconImageView().setImageResource(item.iconRes); viewHolder.getTitleTextView().setText(item.titleRes); TextView badge = viewHolder.getBadgeTextView(); if (item.badgeCount > 0) diff --git a/android/src/app/organicmaps/util/log/Logger.java b/android/src/app/organicmaps/util/log/Logger.java index 677ae1f145..e50bc33d14 100644 --- a/android/src/app/organicmaps/util/log/Logger.java +++ b/android/src/app/organicmaps/util/log/Logger.java @@ -130,15 +130,14 @@ public final class Logger if (tag == null) tag = CORE_TAG; - if (logsFolder == null || BuildConfig.DEBUG) - Log.println(level, tag, sb.toString()); - if (logsFolder != null) { sb.insert(0, String.valueOf(getLevelChar(level)) + '/' + tag + ": "); LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, sb.toString(), Thread.currentThread().getName())); } + else + Log.println(level, tag, sb.toString()); } } diff --git a/android/src/app/organicmaps/widget/placepage/DirectionFragment.java b/android/src/app/organicmaps/widget/placepage/DirectionFragment.java index 20ba64550c..98c9cbf53f 100644 --- a/android/src/app/organicmaps/widget/placepage/DirectionFragment.java +++ b/android/src/app/organicmaps/widget/placepage/DirectionFragment.java @@ -8,7 +8,6 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.Framework; @@ -112,7 +111,7 @@ public class DirectionFragment extends BaseMwmDialogFragment } @Override - public void onLocationUpdated(@NonNull Location location) + public void onLocationUpdated(Location location) { if (mMapObject != null) { @@ -124,7 +123,7 @@ public class DirectionFragment extends BaseMwmDialogFragment } @Override - public void onCompassUpdated(double north) + public void onCompassUpdated(long time, double north) { final Location last = LocationHelper.INSTANCE.getSavedLocation(); if (last == null || mMapObject == null) diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageView.java b/android/src/app/organicmaps/widget/placepage/PlacePageView.java index 614fda225f..63a79d429f 100644 --- a/android/src/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/src/app/organicmaps/widget/placepage/PlacePageView.java @@ -32,6 +32,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.core.widget.NestedScrollViewClickFixed; +import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.Framework; @@ -319,12 +320,6 @@ public class PlacePageView extends NestedScrollViewClickFixed { super.onFinishInflate(); mPreview = findViewById(R.id.pp__preview); - mPreview.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - final int oldHeight = oldBottom - oldTop; - final int newHeight = bottom - top; - if (oldHeight != newHeight) - mPreview.post(() -> mOnPlacePageContentChangeListener.OnPlacePageContentChange()); - }); mTvTitle = mPreview.findViewById(R.id.tv__title); mTvTitle.setOnLongClickListener(this); mTvTitle.setOnClickListener(this); @@ -337,8 +332,6 @@ public class PlacePageView extends NestedScrollViewClickFixed View directionFrame = mPreview.findViewById(R.id.direction_frame); mTvDistance = mPreview.findViewById(R.id.tv__straight_distance); mAvDirection = mPreview.findViewById(R.id.av__direction); - UiUtils.hide(mTvDistance); - UiUtils.hide(mAvDirection); directionFrame.setOnClickListener(this); mTvAddress = mPreview.findViewById(R.id.tv__address); @@ -882,6 +875,7 @@ public class PlacePageView extends NestedScrollViewClickFixed if (mToolbar != null) mToolbar.setTitle(mapObject.getTitle()); setTextAndColorizeSubtitle(mapObject); + UiUtils.hide(mAvDirection); UiUtils.setTextAndHideIfEmpty(mTvAddress, mapObject.getAddress()); } @@ -1229,7 +1223,7 @@ public class PlacePageView extends NestedScrollViewClickFixed mButtons.setItems(buttons); } - public void refreshLocation(@NonNull Location l) + public void refreshLocation(Location l) { if (mMapObject == null) { @@ -1247,7 +1241,6 @@ public class PlacePageView extends NestedScrollViewClickFixed private void refreshMyPosition(@NonNull MapObject mapObject, Location l) { UiUtils.hide(mTvDistance); - UiUtils.hide(mAvDirection); if (l == null) return; @@ -1275,6 +1268,7 @@ public class PlacePageView extends NestedScrollViewClickFixed if (l == null) return; + mTvDistance.setVisibility(View.VISIBLE); double lat = mapObject.getLat(); double lon = mapObject.getLon(); DistanceAndAzimut distanceAndAzimuth = @@ -1309,19 +1303,16 @@ public class PlacePageView extends NestedScrollViewClickFixed final Location location = LocationHelper.INSTANCE.getSavedLocation(); if (location == null) - { - UiUtils.hide(mAvDirection); return; - } final double azimuth = Framework.nativeGetDistanceAndAzimuthFromLatLon(mMapObject.getLat(), mMapObject.getLon(), location.getLatitude(), location.getLongitude(), northAzimuth).getAzimuth(); - UiUtils.showIf(azimuth >= 0, mAvDirection); if (azimuth >= 0) { + UiUtils.show(mAvDirection); mAvDirection.setAzimuth(azimuth); } } diff --git a/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java b/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java index 0fc63a740d..a3bcf73f61 100644 --- a/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java +++ b/android/src/app/organicmaps/widget/placepage/RichPlacePageController.java @@ -241,17 +241,18 @@ public class RichPlacePageController implements PlacePageController, LocationLis } @Override - public void onLocationUpdated(@NonNull Location location) + public void onLocationUpdated(Location location) { mPlacePage.refreshLocation(location); } @Override - public void onCompassUpdated(double north) + public void onCompassUpdated(long time, double north) { @BottomSheetBehavior.State int currentState = mPlacePageBehavior.getState(); - if (PlacePageUtils.isHiddenState(currentState)) + if (PlacePageUtils.isHiddenState(currentState) || PlacePageUtils.isDraggingState(currentState) + || PlacePageUtils.isSettlingState(currentState)) return; mPlacePage.refreshAzimuth(north); diff --git a/android/src/fdroid/play/listings/ar/full-description.txt b/android/src/fdroid/play/listings/ar/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ar/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ar/release-notes.txt b/android/src/fdroid/play/listings/ar/release-notes.txt deleted file mode 100644 index ab82f0e3ba..0000000000 --- a/android/src/fdroid/play/listings/ar/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• بيانات OpenStreetMap الجديدة اعتبارًا من 10 فبراير ، بما في ذلك التغييرات التي أجراها فريق العمل الإنساني OpenStreetMap (HOT) بعد الزلزال في تركيا وسوريا -• تصفية نتائج بحث خاطئة في القائمة وعلى الخريطة -• إصلاح عطل البرنامج عند فتحه -• أيقونات أفضل لمداخل المباني الرئيسية والثانوية -• تحسين الإخطارات الصوتية للإنعطاف القادم في لمسافات أصغر -• إصلاح الترجمات الفارسية والبولندية والألمانية -... المزيد: omaps.app/news diff --git a/android/src/fdroid/play/listings/ar/short-description.txt b/android/src/fdroid/play/listings/ar/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ar/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ar/title-google.txt b/android/src/fdroid/play/listings/ar/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ar/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ar/title.txt b/android/src/fdroid/play/listings/ar/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ar/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ar/video-url.txt b/android/src/fdroid/play/listings/ar/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ar/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/az-AZ/full-description.txt b/android/src/fdroid/play/listings/az-AZ/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/az-AZ/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/az-AZ/release-notes.txt b/android/src/fdroid/play/listings/az-AZ/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/az-AZ/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/az-AZ/short-description.txt b/android/src/fdroid/play/listings/az-AZ/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/az-AZ/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/az-AZ/title-google.txt b/android/src/fdroid/play/listings/az-AZ/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/az-AZ/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/az-AZ/title.txt b/android/src/fdroid/play/listings/az-AZ/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/az-AZ/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/az-AZ/video-url.txt b/android/src/fdroid/play/listings/az-AZ/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/az-AZ/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/be/full-description.txt b/android/src/fdroid/play/listings/be/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/be/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/be/release-notes.txt b/android/src/fdroid/play/listings/be/release-notes.txt deleted file mode 100644 index 4cd633a791..0000000000 --- a/android/src/fdroid/play/listings/be/release-notes.txt +++ /dev/null @@ -1,6 +0,0 @@ -• Новыя дадзеныя OpenStreetMap за 10 лютага, уключаючы змены, унесеныя Гуманітарнай камандай OpenStreetMap (HOT) пасля землятрусу ў Турцыі і Сірыі -• Адфільтраваны памылковыя вынікі пошуку ў спісе і на карце -• Выпраўлены збой пры адкрыцці прыкладання -• Палепшаны галасавыя апавяшчэнні аб наступным павароце для невялікіх адлегласцяў -• Палепшаны абразкі для ўваходаў у будынкі -• Выпраўлены фарсі, польскі і нямецкі пераклады diff --git a/android/src/fdroid/play/listings/be/short-description.txt b/android/src/fdroid/play/listings/be/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/be/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/be/title-google.txt b/android/src/fdroid/play/listings/be/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/be/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/be/title.txt b/android/src/fdroid/play/listings/be/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/be/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/be/video-url.txt b/android/src/fdroid/play/listings/be/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/be/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/bg/release-notes.txt b/android/src/fdroid/play/listings/bg/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/bg/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/bg/short-description.txt b/android/src/fdroid/play/listings/bg/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/bg/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/bg/title-google.txt b/android/src/fdroid/play/listings/bg/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/bg/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/bg/title.txt b/android/src/fdroid/play/listings/bg/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/bg/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/bg/video-url.txt b/android/src/fdroid/play/listings/bg/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/bg/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/bn-BD/release-notes.txt b/android/src/fdroid/play/listings/bn-BD/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/bn-BD/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/bn-BD/title-google.txt b/android/src/fdroid/play/listings/bn-BD/title-google.txt deleted file mode 100644 index 5727d00586..0000000000 --- a/android/src/fdroid/play/listings/bn-BD/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps অরগানিক ম্যাপ diff --git a/android/src/fdroid/play/listings/bn-BD/title.txt b/android/src/fdroid/play/listings/bn-BD/title.txt index 13b92f4653..99d7b3b4db 100644 --- a/android/src/fdroid/play/listings/bn-BD/title.txt +++ b/android/src/fdroid/play/listings/bn-BD/title.txt @@ -1 +1 @@ -অরগানিক ম্যাপ অফলাইন হাইক, বাইক, পথ ও নির্দেশনা +অরগানিক ম্যাপ অফলাইন হাইক, বাইক পথ ও নির্দেশনা diff --git a/android/src/fdroid/play/listings/ca/release-notes.txt b/android/src/fdroid/play/listings/ca/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ca/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ca/title-google.txt b/android/src/fdroid/play/listings/ca/title-google.txt deleted file mode 100644 index 0fa869a588..0000000000 --- a/android/src/fdroid/play/listings/ca/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike Bike diff --git a/android/src/fdroid/play/listings/ca/title.txt b/android/src/fdroid/play/listings/ca/title.txt index 1a8a13ec0c..1f871cd0f6 100644 --- a/android/src/fdroid/play/listings/ca/title.txt +++ b/android/src/fdroid/play/listings/ca/title.txt @@ -1 +1 @@ -Organic Maps Offline Hike, Bike, GPS Navigation +Organic Maps Offline Hike, Bike & GPS Navigation diff --git a/android/src/fdroid/play/listings/cs-CZ/full-description.txt b/android/src/fdroid/play/listings/cs-CZ/full-description.txt index 0c48c70ae6..c0aaccc6f4 100644 --- a/android/src/fdroid/play/listings/cs-CZ/full-description.txt +++ b/android/src/fdroid/play/listings/cs-CZ/full-description.txt @@ -1,11 +1,11 @@ ‣ Naše bezplatná aplikace vás nesleduje a neobsahuje reklamy. ‣ Neustále ji vylepšuje náš malý tým, ve svém volném čase, za naše vlastní peníze. ‣ Pokud na mapě něco chybí nebo je špatně, opravte to prosím v OpenStreetMap a uvidíte své změny v budoucí aktualizaci map. -‣ Pokud nefunguje navigace nebo vyhledávání, napište nám prosím. Odpovídáme na KAŽDÝ e-mail a opravíme to co nejdříve! +‣ Pokud nefunguje navigace nebo vyhledávání'napište nám prosím. Odpovídáme na KAŽDÝ e-mail a opravíme to co nejdříve! Vaše zpětná vazba a pětihvězdičková hodnocení jsou pro nás tou nejlepší motivací! -Klíčové funkce: +Klíčové funkce: - V případě, že se vám podařilo získat informace, které vám pomohou s výběrem nejvhodnějšího produktu, můžete si vybrat z následujících možností: • Zdarma, open-source, bez reklam, bez sledování. • Podrobné offline mapy s místy, která na mapách Google neexistují, díky komunitě OpenStreetMap. • Cyklistické trasy, turistické stezky a pěší trasy @@ -15,12 +15,12 @@ Klíčové funkce: • Export a import záložek ve formátech KML/KMZ (GPX se chystá brzy). • Tmavý režim pro ochranu vašich očí -V Organic Maps zatím není k dispozici Android Auto, veřejná doprava, satelitní mapy a další skvělé funkce. Ale s vaší pomocí a podporou můžeme tento svět krok za krokem vylepšovat. +V Organic Maps zatím není k dispozici Android Auto, veřejná doprava, satelitní mapy a další skvělé funkce . Ale s vaší pomocí a podporou můžeme tento svět krok za krokem vylepšovat. Mapy Organic Maps jsou čisté a organické, vyrobené s láskou: -• Bleskově rychlý offline zážitek -• Respektují vaše soukromí +• Bleskově rychlé offline zážitky +• Respektuje vaše soukromí • Šetří vaši baterii • Žádné nečekané poplatky za mobilní data • Jednoduché používání, obsahuje pouze nejdůležitější funkce @@ -30,23 +30,23 @@ Bez sledovacích zařízení a dalších špatných věcí: • Žádné reklamy • Žádné sledování • Žádné shromažďování dat -• Žádné volání domů +• Žádné telefonování domů • Žádná obtěžující registrace • Žádné povinné výukové programy • Žádný hlučný e-mailový spam • Žádná push oznámení • Žádný crapware -• Ž̶á̶d̶n̶é̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶y̶ Čistě organické +• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Čistě ekologické produkty V Organic Maps věříme, že soukromí je základním lidským právem: • Organic Maps je nezávislý komunitní projekt s otevřeným zdrojovým kódem. -• Chráníme soukromí před zvědavýma očima Big Tech. +• Chráníme soukromí před zvědavýma očima Big Tech'. • Zůstaňte v bezpečí, ať jste kdekoli -Podle zprávy Exodus Privacy Report se zde nachází nula sledovacích zařízení a vyžadují pouze minimálně oprávnění. +Podle zprávy Exodus Privacy Report se zde nachází nula sledovacích zařízení a jen minimálně vyžadovaná oprávnění. Další podrobnosti a nejčastější dotazy najdete na organicmaps.app webové stránce a kontaktujte nás přímo na @OrganicMapsApp v aplikaci Telegram. Odmítněte dohled - přijměte svou svobodu. -Vyzkoušejte Organic Maps! +Vyzkoušejte Organic Maps!" diff --git a/android/src/fdroid/play/listings/cs-CZ/release-notes.txt b/android/src/fdroid/play/listings/cs-CZ/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/cs-CZ/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/cs-CZ/title-google.txt b/android/src/fdroid/play/listings/cs-CZ/title-google.txt deleted file mode 100644 index 0fa869a588..0000000000 --- a/android/src/fdroid/play/listings/cs-CZ/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike Bike diff --git a/android/src/fdroid/play/listings/cs-CZ/title.txt b/android/src/fdroid/play/listings/cs-CZ/title.txt index 541a4d9514..7dd99c1c73 100644 --- a/android/src/fdroid/play/listings/cs-CZ/title.txt +++ b/android/src/fdroid/play/listings/cs-CZ/title.txt @@ -1 +1 @@ -Organické mapy Offline Turistika, Kolo & GPS +Organické mapy Offline Hike Bike Trails & Navigace diff --git a/android/src/fdroid/play/listings/da-DK/full-description.txt b/android/src/fdroid/play/listings/da-DK/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/da-DK/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/da-DK/release-notes.txt b/android/src/fdroid/play/listings/da-DK/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/da-DK/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/da-DK/short-description.txt b/android/src/fdroid/play/listings/da-DK/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/da-DK/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/da-DK/title-google.txt b/android/src/fdroid/play/listings/da-DK/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/da-DK/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/da-DK/title.txt b/android/src/fdroid/play/listings/da-DK/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/da-DK/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/da-DK/video-url.txt b/android/src/fdroid/play/listings/da-DK/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/da-DK/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/de-DE/full-description.txt b/android/src/fdroid/play/listings/de-DE/full-description.txt index 23e2acc589..641d29d6dc 100644 --- a/android/src/fdroid/play/listings/de-DE/full-description.txt +++ b/android/src/fdroid/play/listings/de-DE/full-description.txt @@ -1,53 +1,53 @@ -‣ Unsere kostenlose App trackt niemanden, enthält keine Werbung und braucht deine Unterstützung. -‣ Sie wird ständig von Mitwirkenden und unserem kleinen Team verbessert, in unserer Freizeit. -‣ Wenn etwas auf der Karte falsch ist oder fehlt, dann korrigiere es bitte in OpenStreetMap und sieh deine Änderungen in der zukünftigen Kartenaktualisierung. -‣ Sollte die Navigation oder die Suche nicht funktionieren, sende uns bitte eine E-Mail. Wir antworten auf JEDE E-Mail und werden das Problem so schnell wie möglich beheben! +‣ Unsere kostenlose App trackt niemanden, enthält keine Werbung und wird durch Ihre Spenden finanziert. +‣ Laufende Weiterentwicklung durch unser kleines Team in unserer Freizeit mit unserem eigenen Geld und Spenden/Beiträgen unserer Nutzer. +‣ Bei inkorrekten oder unvollstädigen Kartendaten können Sie diese in OpenStreetMap verbessern, und ihre Änderungen in zukünftigen Updates übernommen sehen. +‣ Sollte die Navigation oder die Suche nicht funktionieren, senden Sie uns bitte eine E-Mail. Wir antworten auf JEDE E-Mail und werden das Problem so schnell wie möglich beheben! -Dein Feedback und deine 5-Sterne-Bewertungen sind die beste Motivation für uns! +Ihr Feedback und Ihre 5-Sterne-Bewertungen sind die beste Motivation für uns! -Wichtigste Funktionen: +Wichtigsten Eigenschaften: +• Detaillierte Offline-Karten mit Orten von OpenStreetMap.org, die auf vielen anderen Karten nicht zu finden sind +• Radwege, Wanderwege und Spazierwege +• Höhenlinien, Höhenprofile, Gipfel und Steigungen +• Navigation mit Abbiegehinweisen für Fußgänger, Radfahrer und Autos mit Sprachführung +• Schnelle Offlinesuche auf der Karte und in den Lesezeichen +• Import und Export von Lesezeichen in den Formaten KML/KMZ (GPX ist geplant) +• Dunkles Design zum besseren Schutz Ihrer Augen +• Geringer Speicheranspruch durch effiziente Kartendaten +• Kostenlos und Open-Source -• Kostenlos, Open-Source, keine Werbung, kein Tracking -• Detaillierte Offline-Karten mit Orten, die es auf anderen Karten nicht gibt, dank an die OpenStreetMap Community -• Rad-, Wander- und Spazierwege -• Höhenlinien, Höhenprofile, Bergspitzen und Steigungen -• Schritt-für-Schritt-Navigation für Fußgänger, Radfahrer und Autos mit Sprachführung -• Schnelle Offlinesuche -• Export und Import von Lesezeichen im KML/KMZ-Format (GPX ist geplant) -• Dunkler Modus zum Schutz deiner Augen +Android Auto, ebenso wie öffentlichen Verkehrsmittel und Satellitenbildkarten werden noch nicht unterstützt. Aber mit Ihrer Hilfe und Unterstützung können wir diese Welt und unsere Karten Schritt für Schritt besser machen. -Android Auto, ebenso wie öffentlichen Verkehrsmittel und Satellitenbildkarten werden noch nicht unterstützt. Aber mit deiner Hilfe und Unterstützung können wir diese Welt und unsere Karten Schritt für Schritt besser machen. - -Organic Maps ist rein, organisch und mit Liebe gemacht: +Organic Maps ist sauber, organisch und mit Liebe gemacht: • Rasend schnelle Offline-Erfahrung -• Respektiert deine Privatsphäre -• Schont deinen Akku -• Keine unerwarteten Gebühren für mobile Daten -• Einfach zu bedienen, nur die wichtigsten Funktionen integriert +• Respektiert Ihre Privatsphäre +• Schont Ihren Akku +• Keine unerwarteten Kosten für mobile Daten +• Einfach zu bedienen, mit nur den wichtigsten Funktionen enthalten -Frei von Trackern und schlechten Dingen: +Frei von Trackern und sonstigem schädlichen Inhalt: • Keine Werbung • Kein Tracking -• Keine Datenerfassung -• Kein Telefonieren nach Hause +• Keine Datensammlung +• Keine automatische Datenübertragung • Keine lästige Registrierung • Keine obligatorischen Tutorials • Kein lästiger E-Mail-Spam • Keine Push-Benachrichtigungen • Keine Crapware -• -K̶e̶i̶n̶e̶ ̶P̶e̶s̶t̶i̶z̶i̶d̶e̶ Rein organisch +• -K̶e̶i̶n̶e̶ ̶P̶e̶s̶t̶i̶z̶i̶d̶e̶ Rein Bio (organic) Wir bei Organic Maps glauben, dass Privatsphäre ein grundlegendes Menschenrecht ist: -• Organic Maps ist ein von einer unabhängigen Gemeinschaft betriebenes Open-Source-Projekt -• Wir schützen deine Privatsphäre vor den neugierigen Augen der großen Technologiekonzerne -• Bleib sicher, egal wo du bist +• Organic Maps ist ein Open-Source-Projekt, das von einer unabhängigen Gemeinschaft betrieben wird +• Wir schützen Ihre Privatsphäre vor den neugierigen Augen von Großunternehmen +• Bleiben Sie sicher, egal wo Sie sind Keine Tracker und nur minimal erforderliche Berechtigungen sind laut dem Exodus-Datenschutzbericht vorhanden. -Bitte besuche organicmaps.app Webseite für weitere Details und ein FAQ. Oder kontaktiere uns direkt unter @OrganicMapsApp in Telegram. +Bitte besuchen Sie organicmaps.app Website für weitere Details und ein FAQ. Oder kontaktieren Sie uns direkt unter @OrganicMapsApp in Telegram. -Lehne Überwachung ab - lebe deine Freiheit. -Teste Organic Maps! +Überwachung ablehnen - Freiheit wählen. +Testen Sie Organic Maps! diff --git a/android/src/fdroid/play/listings/de-DE/release-notes.txt b/android/src/fdroid/play/listings/de-DE/release-notes.txt deleted file mode 100644 index 59619b28f6..0000000000 --- a/android/src/fdroid/play/listings/de-DE/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Neue OpenStreetMap-Daten vom 10. Februar, einschließlich Änderungen durch das Humanitarian OpenStreetMap Team (HOT) nach dem Erdbeben in der Türkei und Syrien -• Falsche Suchergebnisse in der Liste und auf der Karte gefiltert -• Absturz beim Öffnen behoben -• Bessere Icons für Haupt- und Nebeneingänge von Gebäuden -• Verbesserte Sprachbenachrichtigungen für kleinere Entfernungen bei der nächsten Abbiegung -• Persische, polnische und deutsche Übersetzungen korrigiert -…mehr: omaps.app/news diff --git a/android/src/fdroid/play/listings/de-DE/short-description.txt b/android/src/fdroid/play/listings/de-DE/short-description.txt index 1b2f8d75e5..38d5268007 100644 --- a/android/src/fdroid/play/listings/de-DE/short-description.txt +++ b/android/src/fdroid/play/listings/de-DE/short-description.txt @@ -1 +1 @@ -Open-Source, gemeinschaftlich erstellte Karten zum Reisen, Radfahren & Wandern +Open-Source, gemeinschaftlich erstellte Karten für Alltag, Radeln und Wandern diff --git a/android/src/fdroid/play/listings/de-DE/title.txt b/android/src/fdroid/play/listings/de-DE/title.txt index 87386edbdd..7808924968 100644 --- a/android/src/fdroid/play/listings/de-DE/title.txt +++ b/android/src/fdroid/play/listings/de-DE/title.txt @@ -1 +1 @@ -Organic Maps Offline Wandern, Radfahren, GPS-Navi +Organic Maps Offline Wandern, Radeln & Navigation diff --git a/android/src/fdroid/play/listings/el-GR/full-description.txt b/android/src/fdroid/play/listings/el-GR/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/el-GR/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/el-GR/release-notes.txt b/android/src/fdroid/play/listings/el-GR/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/el-GR/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/el-GR/short-description.txt b/android/src/fdroid/play/listings/el-GR/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/el-GR/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/el-GR/title-google.txt b/android/src/fdroid/play/listings/el-GR/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/el-GR/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/el-GR/title.txt b/android/src/fdroid/play/listings/el-GR/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/el-GR/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/el-GR/video-url.txt b/android/src/fdroid/play/listings/el-GR/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/el-GR/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/en-US/full-description.txt b/android/src/fdroid/play/listings/en-US/full-description.txt index 37f92f9d4e..64f2fc5a13 100644 --- a/android/src/fdroid/play/listings/en-US/full-description.txt +++ b/android/src/fdroid/play/listings/en-US/full-description.txt @@ -1,12 +1,11 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. +‣ Our free app does not track you and does not have ads, and is driven by your donations. +‣ It is constantly being improved by our small team, in our free time, using our own money and donations/contributions from our users. ‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. ‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! Your feedback and 5-star reviews are the best motivators for us! Key features: - • Free, open-source, no ads, no tracking • Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community • Cycling routes, hiking trails, and walking paths diff --git a/android/src/fdroid/play/listings/en-US/release-notes.txt b/android/src/fdroid/play/listings/en-US/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/en-US/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/en-US/title-google.txt b/android/src/fdroid/play/listings/en-US/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/en-US/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/en-US/title.txt b/android/src/fdroid/play/listings/en-US/title.txt index 1a8a13ec0c..1f871cd0f6 100644 --- a/android/src/fdroid/play/listings/en-US/title.txt +++ b/android/src/fdroid/play/listings/en-US/title.txt @@ -1 +1 @@ -Organic Maps Offline Hike, Bike, GPS Navigation +Organic Maps Offline Hike, Bike & GPS Navigation diff --git a/android/src/fdroid/play/listings/es-ES/full-description.txt b/android/src/fdroid/play/listings/es-ES/full-description.txt deleted file mode 100644 index ef5895eaeb..0000000000 --- a/android/src/fdroid/play/listings/es-ES/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Nuestra aplicación gratuita no rastrea a nadie, no contiene anuncios y necesita su apoyo. -‣ Los colaboradores y nuestro pequeño equipo lo mejoran constantemente en nuestro tiempo libre. -‣ Si algo está mal o falta en el mapa, corríjalo en OpenStreetMap y vea los cambios en la futura actualización del mapa. -‣ Si la navegación o la búsqueda no funcionan, envíenos un correo electrónico. Respondemos a CADA correo electrónico y lo solucionaremos lo antes posible. - -¡Tus comentarios y calificaciones de 5 estrellas son la mejor motivación para nosotros! - -Funciones principales: - -• Gratis, de código abierto, sin anuncios, sin seguimiento -• Mapas sin conexión detallados con ubicaciones que no se encuentran en otros mapas, gracias a la comunidad OpenStreetMap -• Senderos para bicicletas y caminatas -• Curvas de nivel, perfiles de altura, picos de montañas y pendientes -• Navegación paso a paso para peatones, ciclistas y automóviles con guía por voz -• Búsqueda rápida sin conexión -• Exportación e importación de marcadores en formato KML/KMZ (GPX está planificado) -• Modo oscuro para proteger tus ojos - -Android Auto, transporte público y mapas satelitales no son todavía compatibles. Pero con tu ayuda y apoyo podemos mejorar este mundo y nuestros mapas, paso a paso. - -Organic Maps es puro, orgánico y hecho con amor: - -• Experiencia fuera de línea ultrarrápida -• Respeta su privacidad -• Ahorra batería -• Sin cargos de datos móviles inesperados -• Fácil de usar, solo se integran las funciones más importantes - -Libre de rastreadores y cosas malas: - -• Sin anuncios -• Sin seguimiento -• Sin recopilación de datos -• Sin telemetría -• Sin registros molestos -• Sin tutoriales obligatorios -• Sin spam al correo electrónico molesto -• Sin notificaciones automáticas -• Sin basura -• Simplemente natural en su forma y uso - -En Organic Maps, creemos que la privacidad es un derecho humano básico: - -• Organic Maps es un proyecto de código abierto mantenido por una comunidad independiente -• Protegemos su privacidad de las miradas indiscretas de los grandes gigantes tecnológicos -• Manténgase seguro sin importar dónde se encuentre - -No hay rastreadores y solo se requieren permisos mínimos, según el informe de privacidad de Exodus. - -Visite el sitio web de organicmaps.app para obtener más detalles y preguntas frecuentes. O contáctenos directamente en @OrganicMapsApp en Telegram. - -Rechaza la vigilancia: vive tu libertad. -¡Prueba Organic Maps! diff --git a/android/src/fdroid/play/listings/es-ES/release-notes.txt b/android/src/fdroid/play/listings/es-ES/release-notes.txt deleted file mode 100644 index deef2c0c4f..0000000000 --- a/android/src/fdroid/play/listings/es-ES/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Nuevos datos de OpenStreetMap desde el 10 de febrero, incluidos los cambios realizados por el Humanitarian OpenStreetMap Team (HOT) tras el terremoto de Turquía y Siria -• Corregido los fallos al buscar en la lista y en el mapa -• Corregido el fallo al abrir -• Mejoras en los iconos de las salidas principales y secundarias de los edificios -• Mejora de las notificaciones por voz de próximo giro para distancias cortas -• Corregidas las traducciones al Persa, Polaco y Alemán -...más: omaps.app/news diff --git a/android/src/fdroid/play/listings/es-ES/short-description.txt b/android/src/fdroid/play/listings/es-ES/short-description.txt deleted file mode 100644 index 42b304448c..0000000000 --- a/android/src/fdroid/play/listings/es-ES/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Mapas abiertos comunitarios para turistas, ciclistas y senderistas diff --git a/android/src/fdroid/play/listings/es-ES/title-google.txt b/android/src/fdroid/play/listings/es-ES/title-google.txt deleted file mode 100644 index 45f6f75de5..0000000000 --- a/android/src/fdroid/play/listings/es-ES/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps bici y senderismo diff --git a/android/src/fdroid/play/listings/es-ES/title.txt b/android/src/fdroid/play/listings/es-ES/title.txt deleted file mode 100644 index bc0b9677e8..0000000000 --- a/android/src/fdroid/play/listings/es-ES/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps: GPS sin conexión, bici y senderismo diff --git a/android/src/fdroid/play/listings/es-ES/video-url.txt b/android/src/fdroid/play/listings/es-ES/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/es-ES/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/et/full-description.txt b/android/src/fdroid/play/listings/et/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/et/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/et/release-notes.txt b/android/src/fdroid/play/listings/et/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/et/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/et/short-description.txt b/android/src/fdroid/play/listings/et/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/et/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/et/title-google.txt b/android/src/fdroid/play/listings/et/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/et/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/et/title.txt b/android/src/fdroid/play/listings/et/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/et/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/et/video-url.txt b/android/src/fdroid/play/listings/et/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/et/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/eu-ES/full-description.txt b/android/src/fdroid/play/listings/eu-ES/full-description.txt index ea05d78c7e..065671e0c4 100644 --- a/android/src/fdroid/play/listings/eu-ES/full-description.txt +++ b/android/src/fdroid/play/listings/eu-ES/full-description.txt @@ -3,7 +3,7 @@ ‣ Mapan zerbait gaizki badago edo falta bada, mesedez konpondu OpenStreetMap atalean eta ikusi zure aldaketak etorkizuneko mapen eguneraketan. ‣ Nabigazioak edo bilaketak ez badu funtzionatzen, bidali mezu elektronikoa. mezu elektroniko GUZTIEI erantzuten diogu eta lehenbailehen konponduko dugu! -Zure iritzia eta 5 izarreko iruzkinak dira guretzat motibazio handiena! +Zure iritzia eta 5 izarreko iruzkinak dira guretzat motibatzaile onenak! Ezaugarri nagusiak: • Doakoa, kode irekikoa, iragarkirik gabe, jarraipenik gabe @@ -40,13 +40,13 @@ Arakatzailerik eta beste gauza txarrik gabe: Organic Maps-en, pribatutasuna oinarrizko giza eskubide bat dela uste dugu: -• Organic Maps komunitate independenteek gidatutako kode irekiko proiektu bat da -• Pribatutasuna, enpresa teknologiko handiengandik babesten zaitugu +• Organic Maps komunitate indiek gidatutako kode irekiko proiektu bat da +• Pribatutasuna, Big Tech-en begiradik babesten dugu • Egon seguru zauden lekuan zaudela ere Zero arakatzaile eta gutxieneko baimenak soilik eskatzen dira Exodus Pribatutasun Txostenaren arabera. Mesedez, bisitatu organicmaps.app webgunea xehetasun gehiagorako eta ohiko galderetarako, edo jar zaitez zuzenean gurekin harremanetan @OrganicMapsApp Telegram-en. -Baztertu jarraipena - hautatu askatasuna. +Baztertu arakatzea - hautatu askatasuna. Probatu Organic Maps! diff --git a/android/src/fdroid/play/listings/eu-ES/release-notes.txt b/android/src/fdroid/play/listings/eu-ES/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/eu-ES/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/eu-ES/short-description.txt b/android/src/fdroid/play/listings/eu-ES/short-description.txt index dae5ea2d04..8ce82d6f6f 100644 --- a/android/src/fdroid/play/listings/eu-ES/short-description.txt +++ b/android/src/fdroid/play/listings/eu-ES/short-description.txt @@ -1 +1 @@ -Kode irekiko mapak bidaiari, turista, txirrindulari eta mendizaleentzat +Kode irekiko eta komunitateak gidatutako mapak diff --git a/android/src/fdroid/play/listings/eu-ES/title-google.txt b/android/src/fdroid/play/listings/eu-ES/title-google.txt deleted file mode 100644 index f3398e9a75..0000000000 --- a/android/src/fdroid/play/listings/eu-ES/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps: offline GPS diff --git a/android/src/fdroid/play/listings/eu-ES/title.txt b/android/src/fdroid/play/listings/eu-ES/title.txt index f330f13b0f..3a5e810030 100644 --- a/android/src/fdroid/play/listings/eu-ES/title.txt +++ b/android/src/fdroid/play/listings/eu-ES/title.txt @@ -1 +1 @@ -Organic Maps: offline mendi, bizikleta & GPS +Organic Maps Offline ibilbideak eta nabigazioa diff --git a/android/src/fdroid/play/listings/fa/full-description.txt b/android/src/fdroid/play/listings/fa/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/fa/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/fa/release-notes.txt b/android/src/fdroid/play/listings/fa/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/fa/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/fa/short-description.txt b/android/src/fdroid/play/listings/fa/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/fa/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/fa/title-google.txt b/android/src/fdroid/play/listings/fa/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/fa/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/fa/title.txt b/android/src/fdroid/play/listings/fa/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/fa/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/fa/video-url.txt b/android/src/fdroid/play/listings/fa/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/fa/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/fi-FI/full-description.txt b/android/src/fdroid/play/listings/fi-FI/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/fi-FI/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/fi-FI/release-notes.txt b/android/src/fdroid/play/listings/fi-FI/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/fi-FI/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/fi-FI/short-description.txt b/android/src/fdroid/play/listings/fi-FI/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/fi-FI/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/fi-FI/title-google.txt b/android/src/fdroid/play/listings/fi-FI/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/fi-FI/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/fi-FI/title.txt b/android/src/fdroid/play/listings/fi-FI/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/fi-FI/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/fi-FI/video-url.txt b/android/src/fdroid/play/listings/fi-FI/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/fi-FI/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/fr-FR/full-description.txt b/android/src/fdroid/play/listings/fr-FR/full-description.txt index e9ad12d7ee..d6b545bf27 100644 --- a/android/src/fdroid/play/listings/fr-FR/full-description.txt +++ b/android/src/fdroid/play/listings/fr-FR/full-description.txt @@ -48,5 +48,5 @@ Selon Exodus Privacy Report, il n'y a aucun traceur et les autorisations requise Veuillez visiter le site organicmaps.app pour plus de détails et une FAQ, et nous contacter directement dans Telegram : @OrganicMapsApp -Rejetez la surveillance - embrassez votre liberté. +Rejeter la surveillance - embrasser votre liberté. Essayez Organic Maps ! diff --git a/android/src/fdroid/play/listings/fr-FR/release-notes.txt b/android/src/fdroid/play/listings/fr-FR/release-notes.txt deleted file mode 100644 index 2e9f708dc0..0000000000 --- a/android/src/fdroid/play/listings/fr-FR/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Nouvelles données OpenStreetMap au 10 février, avec modifications apportées par l'équipe humanitaire OpenStreetMap (HOT) après le tremblement de terre en Turquie et en Syrie -• Résultats de recherche erronés filtrés dans la liste et sur la carte -• Correction crash à l'ouverture -• Amélioration icônes pour les entrées des bâtiments -• Amélioration annonces vocales du prochain virage pour petites distances -• Correction des traductions en persan, polonais et allemand -Plus de détails: omaps.app/news diff --git a/android/src/fdroid/play/listings/fr-FR/title.txt b/android/src/fdroid/play/listings/fr-FR/title.txt index 54558ffab5..18057109a8 100644 --- a/android/src/fdroid/play/listings/fr-FR/title.txt +++ b/android/src/fdroid/play/listings/fr-FR/title.txt @@ -1 +1 @@ -Organic Maps, cartes hors ligne et navigation GPS +Organic Maps, cartes hors ligne et navigateur GPS diff --git a/android/src/fdroid/play/listings/gl-ES/full-description.txt b/android/src/fdroid/play/listings/gl-ES/full-description.txt deleted file mode 100644 index f5e5d2d9b8..0000000000 --- a/android/src/fdroid/play/listings/gl-ES/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ A nosa aplicación gratuíta non rastrexa a ninguén, non contén anuncios e precisa do teu apoio. -‣ Os colaboradores e o noso pequeno equipo están a melloralo constantemente no noso tempo libre. -‣ Se algo está mal ou falta no mapa, corrixao en OpenStreetMap e vexa os cambios na futura actualización do mapa. -‣ Se a navegación ou a busca non funciona, envíanos un correo electrónico. Respondemos a TODOS os correos electrónicos e solucionarémolo canto antes. - -Os teus comentarios e valoracións de 5 estrelas son a mellor motivación para nós. - -Funcións principais: - -• Gratuíto, código aberto, sen anuncios, sen seguimento -• Mapas detallados sen conexión con localizacións que non se atopan noutros mapas, grazas á comunidade OpenStreetMap. -• Rutas para bicicletas e paseos -• Curvas de nivel, perfís de altura, cumes montañosos e ladeiras -• Navegación paso a paso para peóns, ciclistas e coches con guía de voz -• Busca rápida sen conexión -• Exportación e importación de marcadores en formato KML/KMZ (GPX está previsto) -• Modo escuro para protexer os ollos - -Android Auto, o transporte público e os mapas por satélite aínda non son compatibles. Pero coa a túa axuda e apoio podemos mellorar este mundo e os nosos mapas, paso a paso. - -Organic Maps é puro, orgánico e feito con amor: - -• Experiencia sen conexión rápida como un lóstrego -• Respecta a túa privacidade -• Aforrar batería -• Non hai cargos de datos móbiles inesperados -• Fácil de usar, só están integradas as funcións máis importantes - -Libre de rastreadores e cousas malas: - -• Sen anuncios -• Sen seguimento -• Sen recollida de datos -• Sen telemetría -• Sen rexistros molestos -• Sen titorías obrigatorias -• Non hai correo electrónico lixo molesto -• Non hai notificacións push -• Sen lixo -• Simplemente natural na súa forma e uso - -En Organic Maps, cremos que a privacidade é un dereito humano básico: - -• Organic Maps é un proxecto de código aberto mantido por unha comunidade independente -• Protexemos a túa privacidade das miradas indiscretas dos grandes xigantes da tecnoloxía -• Mantéñase seguro sen importar onde esteas - -Non hai rastreadores e só son necesarios permisos mínimos, segundo o informe de privacidade de Exodus. - -Visita o sitio web organicmaps.app para obter máis detalles e preguntas frecuentes. Ou póñase en contacto connosco directamente en @OrganicMapsApp en Telegram. - -Rexeita a vixilancia: vive a túa liberdade. -Proba Organic Maps! diff --git a/android/src/fdroid/play/listings/gl-ES/release-notes.txt b/android/src/fdroid/play/listings/gl-ES/release-notes.txt deleted file mode 100644 index bab8dbe734..0000000000 --- a/android/src/fdroid/play/listings/gl-ES/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Novos mapas de OpenStreetMap dende o día 10 de Febreiro, tamén os cambios do Humanitarian OpenStreetMap Team (HOT) tralo terremoto de Turquía e Siria -• Arranxouse os resultados incorrectos das listas e mapas -• Arranxado o erros ao abrila aplicación -• Novas iconas nas entradas principais e secundarias dos edificios -• Notificacións por voz melloradas nas distancias curtas, por exemplo: próximo xiro -• Traducións ao Persa, Polaco e Alemán -…máis: omaps.app/news diff --git a/android/src/fdroid/play/listings/gl-ES/short-description.txt b/android/src/fdroid/play/listings/gl-ES/short-description.txt deleted file mode 100644 index 40c13dc301..0000000000 --- a/android/src/fdroid/play/listings/gl-ES/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Mapas de código aberto feitos pola comunidade pra vida cotiá, bici e sendeirismo diff --git a/android/src/fdroid/play/listings/gl-ES/title-google.txt b/android/src/fdroid/play/listings/gl-ES/title-google.txt deleted file mode 100644 index ac35e00260..0000000000 --- a/android/src/fdroid/play/listings/gl-ES/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps GPS sen conexión diff --git a/android/src/fdroid/play/listings/gl-ES/title.txt b/android/src/fdroid/play/listings/gl-ES/title.txt deleted file mode 100644 index 1746cb7ba2..0000000000 --- a/android/src/fdroid/play/listings/gl-ES/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps GPS sen conexión: bici e sendeirismo diff --git a/android/src/fdroid/play/listings/gl-ES/video-url.txt b/android/src/fdroid/play/listings/gl-ES/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/gl-ES/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/gu/full-description.txt b/android/src/fdroid/play/listings/gu/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/gu/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/gu/release-notes.txt b/android/src/fdroid/play/listings/gu/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/gu/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/gu/short-description.txt b/android/src/fdroid/play/listings/gu/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/gu/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/gu/title-google.txt b/android/src/fdroid/play/listings/gu/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/gu/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/gu/title.txt b/android/src/fdroid/play/listings/gu/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/gu/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/gu/video-url.txt b/android/src/fdroid/play/listings/gu/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/gu/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/hi-IN/full-description.txt b/android/src/fdroid/play/listings/hi-IN/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/hi-IN/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/hi-IN/release-notes.txt b/android/src/fdroid/play/listings/hi-IN/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/hi-IN/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/hi-IN/short-description.txt b/android/src/fdroid/play/listings/hi-IN/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/hi-IN/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/hi-IN/title-google.txt b/android/src/fdroid/play/listings/hi-IN/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/hi-IN/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/hi-IN/title.txt b/android/src/fdroid/play/listings/hi-IN/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/hi-IN/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/hi-IN/video-url.txt b/android/src/fdroid/play/listings/hi-IN/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/hi-IN/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/hr/full-description.txt b/android/src/fdroid/play/listings/hr/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/hr/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/hr/release-notes.txt b/android/src/fdroid/play/listings/hr/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/hr/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/hr/short-description.txt b/android/src/fdroid/play/listings/hr/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/hr/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/hr/title-google.txt b/android/src/fdroid/play/listings/hr/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/hr/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/hr/title.txt b/android/src/fdroid/play/listings/hr/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/hr/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/hr/video-url.txt b/android/src/fdroid/play/listings/hr/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/hr/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/hu-HU/full-description.txt b/android/src/fdroid/play/listings/hu-HU/full-description.txt deleted file mode 100644 index 61a838e369..0000000000 --- a/android/src/fdroid/play/listings/hu-HU/full-description.txt +++ /dev/null @@ -1,52 +0,0 @@ -‣ Ingyenes alkalmazásunk nem követi Önt, nem tartalmaz hirdetéseket, és az Ön adományaiból működik. -‣ Kis csapatunkkal folyamatosan fejlesztjük a szabadidőnkben, a saját pénzünkből és a felhasználóink adományaiból/hozzájárulásaiból. -‣ Ha valami hibás vagy hiányzik a térképen, javítsa ki az OpenStreetMap oldalon, és a jövőbeni térképfrissítésekben láthatja a változtatásokat. -‣ Ha a navigáció vagy a keresés nem működik, írjon nekünk e-mailt. MINDEN e-mailre válaszolunk, és a hibákat a lehető leghamarabb kijavítjuk! - -A legjobb motivációnk a visszajelzések és az 5 csillagos értékelések! - -Főbb jellemzők: -• Ingyenes, nyílt forráskódú, nincs reklám, nincs nyomon követés. -• Részletes offline térképek olyan helyekkel, amelyek a Google térképeken nem is léteznek – hála az OpenStreetMap közösségnek. -• Kerékpáros útvonalak, túraútvonalak és gyalogos ösvények. -• Szintvonalak, magassági profilok, csúcsok és lejtők. -• Részletes gyalogos, kerékpáros és KÍSÉRLETI autós navigáció hangutasítással -• Gyors offline keresés -• Könyvjelzők exportálása és importálása KML/KMZ formátumban (hamarosan GPX formátumban is). -• Sötét üzemmód a szem védelméért. - -Az Organic Mapsben még nincsenek olyan menő funkciók, mint az Android Auto, tömegközlekedés és műholdas térkép. De az Ön segítségével és támogatásával, lépésről lépésre jobbá tehetjük a világot. - -Az Organic Maps tiszta és organikus, szeretettel készült: - -• Villámgyors offline élmény -• Tiszteletben tartja az adatvédelmet -• Kíméli az akkumulátort -• Nincsenek váratlan mobil adatforgalmi díjak -• Egyszerűen használható, csak a legfontosabb funkciókat tartalmazza - -Mentes a nyomkövetőktől és egyéb rossz dolgoktól: - -• Nincs reklám -• Nincs nyomkövetés -• Nincs adatgyűjtés -• Nincs hazatelefonálás -• Nincs bosszantó regisztráció -• Nincs kötelező oktatóprogram -• Nincs levélszemét -• Nincs leküldéses értesítés -• Nincs crapware -• Nincs növényvédő szer. Teljesen organikus. - -Az Organic Mapsnél hiszünk abban, hogy az adatvédelem alapvető emberi jog: - -• Az Organic Maps egy közösség által irányított, független nyílt forráskódú projekt. -• Megvédjük a magánszféráját a nagy technológiai vállalatok kíváncsi szemeitől. -• Maradjon biztonságban, bárhol is van. - -Az Exodus Privacy jelentése szerint az alkalmazás nulla nyomkövetőt tartalmaz, és csak minimálisan szükséges engedélyeket kéri el. - -Látogasson el az organicmaps.app weboldalra a további részletekért és a GYIK-ért, és lépjen kapcsolatba velünk közvetlenül az @OrganicMapsApp Telegram-csoportban. - -Le a megfigyeléssel, éljen a szabadság! -Próbálja ki az Organic Mapset! diff --git a/android/src/fdroid/play/listings/hu-HU/release-notes.txt b/android/src/fdroid/play/listings/hu-HU/release-notes.txt deleted file mode 100644 index 7121de8643..0000000000 --- a/android/src/fdroid/play/listings/hu-HU/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Február 10-i OpenStreetMap adatok, a Humanitárius OpenStreetMap Csapat változtatásaival, a törökországi és szíriai földrengések következtében -• Kiszűrtük a hibás keresési találatokat a listában és a térképen -• A megnyitáskor történő összeomlást kijavítottuk -• A főbejáratok mostantól megkülönböztethetőek az alsóbbrendű bejáratoktól a csodás új ikonokkal -• Továbbfejlesztettük a hangnavigációt kisebb távolságok esetén -• Javítottunk a perzsa, lengyel és német fordításokon -https://omaps.app/news diff --git a/android/src/fdroid/play/listings/hu-HU/short-description.txt b/android/src/fdroid/play/listings/hu-HU/short-description.txt deleted file mode 100644 index 6450aac751..0000000000 --- a/android/src/fdroid/play/listings/hu-HU/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Nyílt forráskódú közösségi térképek utazóknak, túrázóknak és kerékpárosoknak diff --git a/android/src/fdroid/play/listings/hu-HU/title-google.txt b/android/src/fdroid/play/listings/hu-HU/title-google.txt deleted file mode 100644 index f3398e9a75..0000000000 --- a/android/src/fdroid/play/listings/hu-HU/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps: offline GPS diff --git a/android/src/fdroid/play/listings/hu-HU/title.txt b/android/src/fdroid/play/listings/hu-HU/title.txt deleted file mode 100644 index d34938cb01..0000000000 --- a/android/src/fdroid/play/listings/hu-HU/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps: offline túrázás, kerékpározás & GPS diff --git a/android/src/fdroid/play/listings/hu-HU/video-url.txt b/android/src/fdroid/play/listings/hu-HU/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/hu-HU/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/id/full-description.txt b/android/src/fdroid/play/listings/id/full-description.txt index eac61364db..6a8c456133 100644 --- a/android/src/fdroid/play/listings/id/full-description.txt +++ b/android/src/fdroid/play/listings/id/full-description.txt @@ -6,7 +6,6 @@ Umpan balik dan ulasan bintang lima Anda adalah motivasi terbaik bagi kami! Fitur utama: - • Bebas, sumber terbuka, tanpa iklan, tanpa pelacakan • Peta luring terperinci dengan tempat-tempat yang tidak ada di peta Google, berkat komunitas OpenStreetMap • Rute bersepeda, jalur pendakian, dan jalur jalan kaki diff --git a/android/src/fdroid/play/listings/id/release-notes.txt b/android/src/fdroid/play/listings/id/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/id/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/id/title-google.txt b/android/src/fdroid/play/listings/id/title-google.txt deleted file mode 100644 index ab0bdb36be..0000000000 --- a/android/src/fdroid/play/listings/id/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Navigasi Luring diff --git a/android/src/fdroid/play/listings/it-IT/release-notes.txt b/android/src/fdroid/play/listings/it-IT/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/it-IT/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/iw-IL/full-description.txt b/android/src/fdroid/play/listings/iw-IL/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/iw-IL/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/iw-IL/release-notes.txt b/android/src/fdroid/play/listings/iw-IL/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/iw-IL/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/iw-IL/short-description.txt b/android/src/fdroid/play/listings/iw-IL/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/iw-IL/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/iw-IL/title-google.txt b/android/src/fdroid/play/listings/iw-IL/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/iw-IL/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/iw-IL/title.txt b/android/src/fdroid/play/listings/iw-IL/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/iw-IL/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/iw-IL/video-url.txt b/android/src/fdroid/play/listings/iw-IL/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/iw-IL/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ja-JP/full-description.txt b/android/src/fdroid/play/listings/ja-JP/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ja-JP/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ja-JP/release-notes.txt b/android/src/fdroid/play/listings/ja-JP/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ja-JP/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ja-JP/short-description.txt b/android/src/fdroid/play/listings/ja-JP/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ja-JP/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ja-JP/title-google.txt b/android/src/fdroid/play/listings/ja-JP/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ja-JP/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ja-JP/title.txt b/android/src/fdroid/play/listings/ja-JP/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ja-JP/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ja-JP/video-url.txt b/android/src/fdroid/play/listings/ja-JP/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ja-JP/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ka-GE/full-description.txt b/android/src/fdroid/play/listings/ka-GE/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ka-GE/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ka-GE/release-notes.txt b/android/src/fdroid/play/listings/ka-GE/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ka-GE/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ka-GE/short-description.txt b/android/src/fdroid/play/listings/ka-GE/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ka-GE/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ka-GE/title-google.txt b/android/src/fdroid/play/listings/ka-GE/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ka-GE/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ka-GE/title.txt b/android/src/fdroid/play/listings/ka-GE/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ka-GE/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ka-GE/video-url.txt b/android/src/fdroid/play/listings/ka-GE/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ka-GE/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/kk/full-description.txt b/android/src/fdroid/play/listings/kk/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/kk/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/kk/release-notes.txt b/android/src/fdroid/play/listings/kk/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/kk/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/kk/short-description.txt b/android/src/fdroid/play/listings/kk/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/kk/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/kk/title-google.txt b/android/src/fdroid/play/listings/kk/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/kk/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/kk/title.txt b/android/src/fdroid/play/listings/kk/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/kk/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/kk/video-url.txt b/android/src/fdroid/play/listings/kk/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/kk/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/km-KH/full-description.txt b/android/src/fdroid/play/listings/km-KH/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/km-KH/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/km-KH/release-notes.txt b/android/src/fdroid/play/listings/km-KH/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/km-KH/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/km-KH/short-description.txt b/android/src/fdroid/play/listings/km-KH/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/km-KH/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/km-KH/title-google.txt b/android/src/fdroid/play/listings/km-KH/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/km-KH/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/km-KH/title.txt b/android/src/fdroid/play/listings/km-KH/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/km-KH/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/km-KH/video-url.txt b/android/src/fdroid/play/listings/km-KH/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/km-KH/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/kn-IN/full-description.txt b/android/src/fdroid/play/listings/kn-IN/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/kn-IN/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/kn-IN/release-notes.txt b/android/src/fdroid/play/listings/kn-IN/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/kn-IN/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/kn-IN/short-description.txt b/android/src/fdroid/play/listings/kn-IN/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/kn-IN/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/kn-IN/title-google.txt b/android/src/fdroid/play/listings/kn-IN/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/kn-IN/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/kn-IN/title.txt b/android/src/fdroid/play/listings/kn-IN/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/kn-IN/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/kn-IN/video-url.txt b/android/src/fdroid/play/listings/kn-IN/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/kn-IN/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ko-KR/full-description.txt b/android/src/fdroid/play/listings/ko-KR/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ko-KR/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ko-KR/release-notes.txt b/android/src/fdroid/play/listings/ko-KR/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ko-KR/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ko-KR/short-description.txt b/android/src/fdroid/play/listings/ko-KR/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ko-KR/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ko-KR/title-google.txt b/android/src/fdroid/play/listings/ko-KR/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ko-KR/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ko-KR/title.txt b/android/src/fdroid/play/listings/ko-KR/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ko-KR/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ko-KR/video-url.txt b/android/src/fdroid/play/listings/ko-KR/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ko-KR/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/lo-LA/full-description.txt b/android/src/fdroid/play/listings/lo-LA/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/lo-LA/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/lo-LA/release-notes.txt b/android/src/fdroid/play/listings/lo-LA/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/lo-LA/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/lo-LA/short-description.txt b/android/src/fdroid/play/listings/lo-LA/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/lo-LA/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/lo-LA/title-google.txt b/android/src/fdroid/play/listings/lo-LA/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/lo-LA/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/lo-LA/title.txt b/android/src/fdroid/play/listings/lo-LA/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/lo-LA/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/lo-LA/video-url.txt b/android/src/fdroid/play/listings/lo-LA/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/lo-LA/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/lt/full-description.txt b/android/src/fdroid/play/listings/lt/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/lt/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/lt/release-notes.txt b/android/src/fdroid/play/listings/lt/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/lt/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/lt/short-description.txt b/android/src/fdroid/play/listings/lt/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/lt/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/lt/title-google.txt b/android/src/fdroid/play/listings/lt/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/lt/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/lt/title.txt b/android/src/fdroid/play/listings/lt/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/lt/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/lt/video-url.txt b/android/src/fdroid/play/listings/lt/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/lt/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/lv/full-description.txt b/android/src/fdroid/play/listings/lv/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/lv/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/lv/release-notes.txt b/android/src/fdroid/play/listings/lv/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/lv/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/lv/short-description.txt b/android/src/fdroid/play/listings/lv/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/lv/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/lv/title-google.txt b/android/src/fdroid/play/listings/lv/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/lv/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/lv/title.txt b/android/src/fdroid/play/listings/lv/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/lv/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/lv/video-url.txt b/android/src/fdroid/play/listings/lv/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/lv/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/mk-MK/full-description.txt b/android/src/fdroid/play/listings/mk-MK/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/mk-MK/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/mk-MK/release-notes.txt b/android/src/fdroid/play/listings/mk-MK/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/mk-MK/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/mk-MK/short-description.txt b/android/src/fdroid/play/listings/mk-MK/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/mk-MK/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/mk-MK/title-google.txt b/android/src/fdroid/play/listings/mk-MK/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/mk-MK/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/mk-MK/title.txt b/android/src/fdroid/play/listings/mk-MK/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/mk-MK/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/mk-MK/video-url.txt b/android/src/fdroid/play/listings/mk-MK/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/mk-MK/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ml-IN/full-description.txt b/android/src/fdroid/play/listings/ml-IN/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ml-IN/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ml-IN/release-notes.txt b/android/src/fdroid/play/listings/ml-IN/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ml-IN/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ml-IN/short-description.txt b/android/src/fdroid/play/listings/ml-IN/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ml-IN/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ml-IN/title-google.txt b/android/src/fdroid/play/listings/ml-IN/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ml-IN/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ml-IN/title.txt b/android/src/fdroid/play/listings/ml-IN/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ml-IN/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ml-IN/video-url.txt b/android/src/fdroid/play/listings/ml-IN/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ml-IN/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/mr-IN/release-notes.txt b/android/src/fdroid/play/listings/mr-IN/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/mr-IN/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ms/full-description.txt b/android/src/fdroid/play/listings/ms/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ms/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ms/release-notes.txt b/android/src/fdroid/play/listings/ms/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ms/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ms/short-description.txt b/android/src/fdroid/play/listings/ms/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ms/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ms/title-google.txt b/android/src/fdroid/play/listings/ms/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ms/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ms/title.txt b/android/src/fdroid/play/listings/ms/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ms/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ms/video-url.txt b/android/src/fdroid/play/listings/ms/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ms/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ne-NP/full-description.txt b/android/src/fdroid/play/listings/ne-NP/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ne-NP/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ne-NP/release-notes.txt b/android/src/fdroid/play/listings/ne-NP/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ne-NP/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ne-NP/short-description.txt b/android/src/fdroid/play/listings/ne-NP/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ne-NP/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ne-NP/title-google.txt b/android/src/fdroid/play/listings/ne-NP/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ne-NP/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ne-NP/title.txt b/android/src/fdroid/play/listings/ne-NP/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ne-NP/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ne-NP/video-url.txt b/android/src/fdroid/play/listings/ne-NP/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ne-NP/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/nl-NL/full-description.txt b/android/src/fdroid/play/listings/nl-NL/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/nl-NL/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/nl-NL/release-notes.txt b/android/src/fdroid/play/listings/nl-NL/release-notes.txt deleted file mode 100644 index f6987392b1..0000000000 --- a/android/src/fdroid/play/listings/nl-NL/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Nieuwe OpenStreetMap data sinds 10 februari, inclusief veranderingen van het Humanitarian OpenStreetMap Team (HOT) na de aardbeving in Turkije en Syrië -• Slechte zoekresultaten gefilterd in de lijst en op de kaart -• Gefixt: crash bij openen -• Betere iconen voor hoofd- en zij-ingangen -• Betere navigatie stembegeleiding voor korte afstanden -• Gefixt: Perzische, Poolse en Duitse vertalingen -…meer: omaps.app/news diff --git a/android/src/fdroid/play/listings/nl-NL/short-description.txt b/android/src/fdroid/play/listings/nl-NL/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/nl-NL/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/nl-NL/title-google.txt b/android/src/fdroid/play/listings/nl-NL/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/nl-NL/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/nl-NL/title.txt b/android/src/fdroid/play/listings/nl-NL/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/nl-NL/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/nl-NL/video-url.txt b/android/src/fdroid/play/listings/nl-NL/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/nl-NL/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/no-NO/full-description.txt b/android/src/fdroid/play/listings/no-NO/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/no-NO/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/no-NO/release-notes.txt b/android/src/fdroid/play/listings/no-NO/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/no-NO/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/no-NO/short-description.txt b/android/src/fdroid/play/listings/no-NO/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/no-NO/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/no-NO/title-google.txt b/android/src/fdroid/play/listings/no-NO/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/no-NO/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/no-NO/title.txt b/android/src/fdroid/play/listings/no-NO/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/no-NO/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/no-NO/video-url.txt b/android/src/fdroid/play/listings/no-NO/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/no-NO/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/pl-PL/full-description.txt b/android/src/fdroid/play/listings/pl-PL/full-description.txt deleted file mode 100644 index b269744260..0000000000 --- a/android/src/fdroid/play/listings/pl-PL/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Nasza darmowa aplikacja nie śledzi Cię, nie ma reklam i jest finansowana przez społeczność. -‣ Jest ona stale ulepszana przez nasz mały zespół i współpracowników, w naszym wolnym czasie. -‣ Jeśli widzisz błąd lub czegoś brakuje na mapie, proszę naprawić to w OpenStreetMap i sprawdź swoje zmiany w przyszłej aktualizacji map. -‣ Jeśli nawigacja lub wyszukiwanie nie działa, napisz do nas. Odpowiadamy na KAŻDY email, i naprawimy to tak szybko jak to możliwe! - -Wasze opinie i 5-gwiazdkowe recenzje to dla nas najlepsza motywacja! . - -Główne cechy: - -• Za darmo, otwarte źródło, brak reklam, brak śledzenia -• Szczegółowe mapy offline z miejscami, które nie istnieją na mapach Google, dzięki społeczności OpenStreetMap -• Trasy rowerowe, szlaki turystyczne, ścieżki spacerowe -• Linie konturowe, profile wysokościowe, szczyty i zbocza -• Nawigacja piesza, rowerowa i samochodowa typu "skręt za skrętem" ze wskazówkami głosowymi -• Szybkie wyszukiwanie w trybie offline -• Eksport i import zakładek w formatach KML/KMZ (GPX już wkrótce) -• Tryb ciemny, aby chronić Twoje oczy - -W Organic Maps nie ma jeszcze Android Auto, transportu publicznego, map satelitarnych i innych fajnych funkcji. Ale z Twoją pomocą i wsparciem możemy krok po kroku ulepszać ten świat. - -Organic Maps jest czyste i organiczne, wykonane z miłością: - -• Błyskawiczna praca w trybie offline -• Szanuje Twoją prywatność -• Oszczędza baterię -• Brak niespodziewanych opłat za transmisję danych w sieci komórkowej -• Prosta obsługa, zawierająca tylko najważniejsze funkcje - -Wolny od elementów śledzących i innych złych rzeczy: - -• Brak reklam -• Brak śledzenia -• Brak zbierania danych -• Brak telemetrii -• Brak irytującej rejestracji -• Brak obowiązkowych samouczków -• Brak hałaśliwego spamu e-mailowego -• Żadnych powiadomień typu push -• Brak oprogramowanie śmieciowe -• B̶r̶a̶k̶ ̶p̶e̶s̶t̶y̶c̶y̶d̶ó̶w Czysto organiczne - -W Organic Maps wierzymy, że prywatność jest podstawowym prawem człowieka: - -• Organic Maps to niezależny projekt o otwartym kodzie źródłowym prowadzony przez społeczność. -• Chronimy prywatność przed wścibskimi oczami Big Tech. -• Bądź bezpieczny bez względu na to, gdzie jesteś - -Według raportu Exodus Privacy nie znaleziono żadnych elementów śledzących, a wymagane uprawnienia są minimalne. - -Proszę odwiedzić stronę organicmaps.app i FAQ, aby uzyskać więcej informacji. Możesz skontaktować się z nami bezpośrednio na @OrganicMapsApp w Telegramie. - -Odrzuć inwigilację - przyjmij swoją wolność. -Wypróbuj Organic Maps! diff --git a/android/src/fdroid/play/listings/pl-PL/release-notes.txt b/android/src/fdroid/play/listings/pl-PL/release-notes.txt deleted file mode 100644 index 624c3be23c..0000000000 --- a/android/src/fdroid/play/listings/pl-PL/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Nowe dane OpenStreetMap z 10 lutego, zawierające zmiany stworzone przez Humanitarian OpenStreetMap Team (HOT) po trzesięniu ziemi w Turcji i Syrii -• Filtrowanie błędnych wyników wyszukiwania w liście i na mapie -• Naprawiono błąd przy uruchomieniu aplikacji -• Lepsze ikony dla głównych i dodatkowych wejść do budynku -• Poprawiono informacje głosowe dla następnego zakrętu przy małych odległościach -• Poprawiono perskie, polskie oraz niemieckie tłumaczenia -…więcej: omaps.app/news diff --git a/android/src/fdroid/play/listings/pl-PL/short-description.txt b/android/src/fdroid/play/listings/pl-PL/short-description.txt deleted file mode 100644 index 0857c23e2f..0000000000 --- a/android/src/fdroid/play/listings/pl-PL/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Otwarto źródłowe mapy od społeczności dla turystów, rowerzystów i wędrowców diff --git a/android/src/fdroid/play/listings/pl-PL/title-google.txt b/android/src/fdroid/play/listings/pl-PL/title-google.txt deleted file mode 100644 index 1630be2666..0000000000 --- a/android/src/fdroid/play/listings/pl-PL/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps: Wędrówki i rower diff --git a/android/src/fdroid/play/listings/pl-PL/title.txt b/android/src/fdroid/play/listings/pl-PL/title.txt deleted file mode 100644 index 8b9dfc5e15..0000000000 --- a/android/src/fdroid/play/listings/pl-PL/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps - Nawigacja GPS i mapy offline diff --git a/android/src/fdroid/play/listings/pl-PL/video-url.txt b/android/src/fdroid/play/listings/pl-PL/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/pl-PL/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/pt-BR/full-description.txt b/android/src/fdroid/play/listings/pt-BR/full-description.txt index 6ee5ac581e..333e809bec 100644 --- a/android/src/fdroid/play/listings/pt-BR/full-description.txt +++ b/android/src/fdroid/play/listings/pt-BR/full-description.txt @@ -1,12 +1,11 @@ -‣ Nosso aplicativo gratuito não te rastreia, não tem anúncios, e precisa do seu apoio. -‣ Está sendo constantemente aperfeiçoado por nossa pequena equipe, no tempo livre. +‣ Nosso aplicativo gratuito não te rastreia e não tem anúncios, e é mantido por suas doações. +‣ Está sendo constantemente aperfeiçoado por nossa pequena equipe, no tempo livre, usando nosso próprio dinheiro e doações/contribuições de nossos usuários. ‣ Se algo estiver errado ou faltando no mapa, por favor, conserte diretamente no OpenStreetMap e veja suas mudanças na próxima atualização dos mapas. ‣ Se a navegação ou a busca não funcionar, por favor, envie-nos um e-mail. Respondemos a CADA email, e vamos consertar o mais rápido possível! -Sua opinião e as avaliações de 5 estrelas são as melhores maneiras de nos motivar! +Sua opinião e as avaliações de 5 estrelas são as melhores maneiras de motivar nossa equipe! Características principais: - • Gratuito, de software livre, sem anúncios, sem rastreamento • Mapas offline detalhados com lugares que não existem Google Maps, graças à comunidade OpenStreetMap • Rotas de ciclismo, trilhas para caminhadas e caminhos para pedestres diff --git a/android/src/fdroid/play/listings/pt-BR/release-notes.txt b/android/src/fdroid/play/listings/pt-BR/release-notes.txt deleted file mode 100644 index 5a48f8fafd..0000000000 --- a/android/src/fdroid/play/listings/pt-BR/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Novos dados OSM de 10/2, incluindo alterações feitas pela Humanitarian OpenStreetMap Team (HOT) após o terremoto na Turquia e na Síria -• Resultados de busca errados são filtrados na lista e mapa -• Correção de erro na abertura -• Melhoria nos ícones para entradas principais e secundárias -• Melhoria nas notificações de voz da próxima curva para distâncias curtas -• Traduções atualizadas para alemão, persa e polonês -…mais: omaps.app/news diff --git a/android/src/fdroid/play/listings/pt-BR/title-google.txt b/android/src/fdroid/play/listings/pt-BR/title-google.txt deleted file mode 100644 index 39a38a0c9e..0000000000 --- a/android/src/fdroid/play/listings/pt-BR/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps - Mapas offline diff --git a/android/src/fdroid/play/listings/pt-PT/full-description.txt b/android/src/fdroid/play/listings/pt-PT/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/pt-PT/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/pt-PT/release-notes.txt b/android/src/fdroid/play/listings/pt-PT/release-notes.txt deleted file mode 100644 index 5a48f8fafd..0000000000 --- a/android/src/fdroid/play/listings/pt-PT/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Novos dados OSM de 10/2, incluindo alterações feitas pela Humanitarian OpenStreetMap Team (HOT) após o terremoto na Turquia e na Síria -• Resultados de busca errados são filtrados na lista e mapa -• Correção de erro na abertura -• Melhoria nos ícones para entradas principais e secundárias -• Melhoria nas notificações de voz da próxima curva para distâncias curtas -• Traduções atualizadas para alemão, persa e polonês -…mais: omaps.app/news diff --git a/android/src/fdroid/play/listings/pt-PT/short-description.txt b/android/src/fdroid/play/listings/pt-PT/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/pt-PT/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/pt-PT/title-google.txt b/android/src/fdroid/play/listings/pt-PT/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/pt-PT/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/pt-PT/title.txt b/android/src/fdroid/play/listings/pt-PT/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/pt-PT/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/pt-PT/video-url.txt b/android/src/fdroid/play/listings/pt-PT/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/pt-PT/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ro/full-description.txt b/android/src/fdroid/play/listings/ro/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ro/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ro/release-notes.txt b/android/src/fdroid/play/listings/ro/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ro/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ro/short-description.txt b/android/src/fdroid/play/listings/ro/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ro/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ro/title-google.txt b/android/src/fdroid/play/listings/ro/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ro/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ro/title.txt b/android/src/fdroid/play/listings/ro/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ro/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ro/video-url.txt b/android/src/fdroid/play/listings/ro/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ro/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ru-RU/full-description.txt b/android/src/fdroid/play/listings/ru-RU/full-description.txt index bede1da19b..86745ce054 100644 --- a/android/src/fdroid/play/listings/ru-RU/full-description.txt +++ b/android/src/fdroid/play/listings/ru-RU/full-description.txt @@ -35,7 +35,6 @@ • Без обязательного инструктажа • Без назойливого спама • Без пуш-уведомлений -• Без хлама • Б̶е̶з̶ ̶п̶е̶с̶т̶и̶ц̶и̶д̶о̶в̶ полностью органические и натуральные Мы считаем, что конфиденциальность — это право каждого: diff --git a/android/src/fdroid/play/listings/ru-RU/release-notes.txt b/android/src/fdroid/play/listings/ru-RU/release-notes.txt deleted file mode 100644 index 99f0ebaf2d..0000000000 --- a/android/src/fdroid/play/listings/ru-RU/release-notes.txt +++ /dev/null @@ -1,6 +0,0 @@ -• Новые данные OpenStreetMap за 10 февраля, включая изменения, внесенные Гуманитарной командой OpenStreetMap (HOT) после землетрясения в Турции и Сирии -• Отфильтрованы ошибочные результаты поиска в списке и на карте -• Исправлен сбой при открытии приложения -• Улучшены голосовые уведомления о следующем повороте для небольших расстояний -• Улучшены иконки для входов в здания -• Исправлены персидский, польский и немецкий переводы diff --git a/android/src/fdroid/play/listings/si-LK/full-description.txt b/android/src/fdroid/play/listings/si-LK/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/si-LK/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/si-LK/release-notes.txt b/android/src/fdroid/play/listings/si-LK/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/si-LK/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/si-LK/short-description.txt b/android/src/fdroid/play/listings/si-LK/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/si-LK/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/si-LK/title-google.txt b/android/src/fdroid/play/listings/si-LK/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/si-LK/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/si-LK/title.txt b/android/src/fdroid/play/listings/si-LK/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/si-LK/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/si-LK/video-url.txt b/android/src/fdroid/play/listings/si-LK/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/si-LK/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/sk/full-description.txt b/android/src/fdroid/play/listings/sk/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/sk/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/sk/release-notes.txt b/android/src/fdroid/play/listings/sk/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/sk/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/sk/short-description.txt b/android/src/fdroid/play/listings/sk/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/sk/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/sk/title-google.txt b/android/src/fdroid/play/listings/sk/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/sk/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/sk/title.txt b/android/src/fdroid/play/listings/sk/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/sk/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/sk/video-url.txt b/android/src/fdroid/play/listings/sk/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/sk/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/sl/full-description.txt b/android/src/fdroid/play/listings/sl/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/sl/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/sl/release-notes.txt b/android/src/fdroid/play/listings/sl/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/sl/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/sl/short-description.txt b/android/src/fdroid/play/listings/sl/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/sl/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/sl/title-google.txt b/android/src/fdroid/play/listings/sl/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/sl/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/sl/title.txt b/android/src/fdroid/play/listings/sl/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/sl/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/sl/video-url.txt b/android/src/fdroid/play/listings/sl/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/sl/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/sr/full-description.txt b/android/src/fdroid/play/listings/sr/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/sr/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/sr/release-notes.txt b/android/src/fdroid/play/listings/sr/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/sr/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/sr/short-description.txt b/android/src/fdroid/play/listings/sr/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/sr/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/sr/title-google.txt b/android/src/fdroid/play/listings/sr/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/sr/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/sr/title.txt b/android/src/fdroid/play/listings/sr/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/sr/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/sr/video-url.txt b/android/src/fdroid/play/listings/sr/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/sr/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/sv-SE/full-description.txt b/android/src/fdroid/play/listings/sv-SE/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/sv-SE/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/sv-SE/release-notes.txt b/android/src/fdroid/play/listings/sv-SE/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/sv-SE/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/sv-SE/short-description.txt b/android/src/fdroid/play/listings/sv-SE/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/sv-SE/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/sv-SE/title-google.txt b/android/src/fdroid/play/listings/sv-SE/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/sv-SE/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/sv-SE/title.txt b/android/src/fdroid/play/listings/sv-SE/title.txt deleted file mode 100644 index 4b6683ce8e..0000000000 --- a/android/src/fdroid/play/listings/sv-SE/title.txt +++ /dev/null @@ -1 +0,0 @@ -Eko-Kartor Offline Vandra, Cykla, GPS-navigera diff --git a/android/src/fdroid/play/listings/sv-SE/video-url.txt b/android/src/fdroid/play/listings/sv-SE/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/sv-SE/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/th/full-description.txt b/android/src/fdroid/play/listings/th/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/th/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/th/release-notes.txt b/android/src/fdroid/play/listings/th/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/th/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/th/short-description.txt b/android/src/fdroid/play/listings/th/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/th/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/th/title-google.txt b/android/src/fdroid/play/listings/th/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/th/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/th/title.txt b/android/src/fdroid/play/listings/th/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/th/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/th/video-url.txt b/android/src/fdroid/play/listings/th/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/th/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/tr-TR/release-notes.txt b/android/src/fdroid/play/listings/tr-TR/release-notes.txt deleted file mode 100644 index 686ac50d8c..0000000000 --- a/android/src/fdroid/play/listings/tr-TR/release-notes.txt +++ /dev/null @@ -1,11 +0,0 @@ -Kalbimiz depremden etkilenen herkesle birlikte - -Yaşamını yitirenlere Allah'tan rahmet, yaralılara acil şifalar dileriz. Tüm milletimizin başı sağ olsun. - -#GeçmişOlsunTürkiye - -Deprem bölgesindekilere yardımcı olabilmek adına Güneydoğu Anadolu'daki harita verileri güncellendi. - -Organic Maps ile şarjınızı korurken internetsiz olarak haritayı kullanabilirsiniz. Gerekli durumlarda Organic Maps ayarlarında bulunan "maksimum güç tasarrufunu" açmayı unutmayın. - -Daha fazla bilgi: omaps.app/tr/news diff --git a/android/src/fdroid/play/listings/uk/full-description.txt b/android/src/fdroid/play/listings/uk/full-description.txt deleted file mode 100644 index bd0214d5f6..0000000000 --- a/android/src/fdroid/play/listings/uk/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Наш безоплатний застосунок не відстежує вас, не містить реклами та працює за рахунок ваших пожертв. -‣ Він постійно вдосконалюється учасниками та нашою невеликою командою у вільний час. -‣ Якщо щось не так або пропущено на мапі, будь ласка, виправте це в OpenStreetMap і перегляньте свої зміни в майбутньому оновленні карт. -‣ Якщо навігація чи пошук не працюють, напишіть нам. Ми відповідаємо на КОЖЕН електронний лист, і виправимо це якнайшвидше! - -Ваш зворотний зв'язок та 5 зірок є найкращою мотивацією для нас! - -Основні функції: - -• Безплатно, з відкритим вихідним кодом, без реклами та відстеження -• Детальні офлайн-карти з місцями, яких немає на Google Maps, завдяки спільноті OpenStreetMap -• Велосипедні маршрути, туристичні стежки та пішохідні доріжки -• Контурні лінії, профілі рельєфу, вершини та схили -• Покрокова ходьба, їзда на велосипеді та ЕКСПЕРИМЕНТАЛЬНА автомобільна навігація з голосовими підказками -• Швидкий пошук в автономному режимі -• Експорт та імпорт закладок у форматах KML/KMZ (GPX незабаром) -• Темний режим для захисту ваших очей - -В Organic Maps поки немає Android Auto, громадського транспорту, супутникових карт та інших цікавих функцій. Але з вашою допомогою та підтримкою, ми можемо зробити цей світ кращим крок за кроком. - -Organic Maps - чисті та органічні, створені з любов’ю : - -• Надзвичайно швидкий офлайн режим -• Поважає вашу конфіденційність -• Економить вашу батарею -• Жодних несподіваних платежів за мобільні дані -• Простий у використанні, лише найважливіші функції - -Без відстеження та інших поганих речей: - -• Без реклами -• Без відстеження -• Без збору даних -• Без дзвінків додому -• Без дратівливої реєстрації -• Без обов'язкових навчальних посібників -• Без спаму на електронну пошту -• Без push-повідомлень -• Без сміття -• Без пестицидів! Чиста органіка! - -В Organic Maps ми віримо, що приватність є фундаментальним правом людини: - -• Organic Maps - це незалежний проєкт із відкритим вихідним кодом, керований спільнотою -• Ми захищаємо вашу конфіденційність від сторонніх очей великих компаній -• Будьте в безпеці, де б ви не були - -Відповідно до звіту про конфіденційність Exodus не знайдено жодних відстежень і лише мінімально необхідні дозволи. - -Будь ласка, відвідайте наш вебсайт organicmaps.app, щоб отримати додаткові відомості та поширені запитання, а також ви можете зв’язатися з нами безпосередньо за адресою @OrganicMapsApp у Telegram. - -Відмовтеся від стеження – отримайте свою свободу. -Спробуйте Organic Maps! diff --git a/android/src/fdroid/play/listings/uk/release-notes.txt b/android/src/fdroid/play/listings/uk/release-notes.txt deleted file mode 100644 index 8d23f86f37..0000000000 --- a/android/src/fdroid/play/listings/uk/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• Нові дані OpenStreetMap станом на 10 лютого, включно зі змінами, внесеними Гуманітарною командою OpenStreetMap (HOT) після землетрусу в Туреччині та Сирії -• Відфільтровані помилкові результати пошуку в списку та на карті -• Виправлений збій під час відкриття програми -• Покращені голосові повідомлення про наступний поворот для невеликих відстаней -• Покращені іконки для входів у будівлі -• Виправлені перський, польський і німецький переклади -…більше: omaps.app/news diff --git a/android/src/fdroid/play/listings/uk/short-description.txt b/android/src/fdroid/play/listings/uk/short-description.txt deleted file mode 100644 index 9172a8d157..0000000000 --- a/android/src/fdroid/play/listings/uk/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Карти з відкритим кодом для мандрівників, туристів, велосипедистів та пішоходів diff --git a/android/src/fdroid/play/listings/uk/title-google.txt b/android/src/fdroid/play/listings/uk/title-google.txt deleted file mode 100644 index 68eb44b96b..0000000000 --- a/android/src/fdroid/play/listings/uk/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps - офлайн карти diff --git a/android/src/fdroid/play/listings/uk/title.txt b/android/src/fdroid/play/listings/uk/title.txt deleted file mode 100644 index 68eb44b96b..0000000000 --- a/android/src/fdroid/play/listings/uk/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps - офлайн карти diff --git a/android/src/fdroid/play/listings/uk/video-url.txt b/android/src/fdroid/play/listings/uk/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/uk/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/ur/full-description.txt b/android/src/fdroid/play/listings/ur/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/ur/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/ur/release-notes.txt b/android/src/fdroid/play/listings/ur/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/ur/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/ur/short-description.txt b/android/src/fdroid/play/listings/ur/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/ur/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/ur/title-google.txt b/android/src/fdroid/play/listings/ur/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/ur/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/ur/title.txt b/android/src/fdroid/play/listings/ur/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/ur/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/ur/video-url.txt b/android/src/fdroid/play/listings/ur/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/ur/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/vi/full-description.txt b/android/src/fdroid/play/listings/vi/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/vi/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/vi/release-notes.txt b/android/src/fdroid/play/listings/vi/release-notes.txt deleted file mode 100644 index 100f18f36a..0000000000 --- a/android/src/fdroid/play/listings/vi/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria -• Filtered wrong search results in the list and on the map -• Fixed crash on opening -• Better icons for main and secondary building entrances -• Improved next-turn voice notifications for smaller distances -• Fixed Persian, Polish, and German translations -…more: omaps.app/news diff --git a/android/src/fdroid/play/listings/vi/short-description.txt b/android/src/fdroid/play/listings/vi/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/vi/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/vi/title-google.txt b/android/src/fdroid/play/listings/vi/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/vi/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/vi/title.txt b/android/src/fdroid/play/listings/vi/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/vi/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/vi/video-url.txt b/android/src/fdroid/play/listings/vi/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/vi/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/zh-CN/release-notes.txt b/android/src/fdroid/play/listings/zh-CN/release-notes.txt deleted file mode 100644 index 8a33f7eb5a..0000000000 --- a/android/src/fdroid/play/listings/zh-CN/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• 截至 2 月 10 日的新 OpenStreetMap 数据，包括土耳其和叙利亚地震后人道主义 OpenStreetMap 团队 (HOT) 所做的更改 -• 在列表和地图上过滤错误的搜索结果 -• 修复了打开时的崩溃 -• 主楼和陪楼更好的入口图标 -• 改进了小距离的下一转弯语音通知 -• 修复了波斯语、波兰语和德语翻译 -…更多：omaps.app/news diff --git a/android/src/fdroid/play/listings/zh-HK/full-description.txt b/android/src/fdroid/play/listings/zh-HK/full-description.txt deleted file mode 100644 index 37f92f9d4e..0000000000 --- a/android/src/fdroid/play/listings/zh-HK/full-description.txt +++ /dev/null @@ -1,53 +0,0 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. -‣ It is constantly being improved by contributors and our small team, in our free time. -‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! - -Your feedback and 5-star reviews are the best motivators for us! - -Key features: - -• Free, open-source, no ads, no tracking -• Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community -• Cycling routes, hiking trails, and walking paths -• Contour lines, elevation profiles, peaks, and slopes -• Turn-by-turn walking, cycling, and EXPERIMENTAL car navigation with voice guidance -• Fast offline search -• Bookmarks export and import in KML/KMZ formats (GPX is coming soon) -• Dark mode to protect your eyes - -There is no Android Auto, public transport, satellite maps, and other cool features yet in Organic Maps. But with your help and support, we can make this world better step by step. - -Organic Maps is pure and organic, made with love: - -• Blazing fast offline experience -• Respects your privacy -• Saves your battery -• No unexpected mobile data charges -• Simple to use, with only most important features included - -Free from trackers and other bad stuff: - -• No ads -• No tracking -• No data collection -• No phoning home -• No annoying registration -• No mandatory tutorials -• No noisy email spam -• No push notifications -• No crapware -• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic - -At Organic Maps, we believe that privacy is a fundamental human right: - -• Organic Maps is an indie community-driven open-source project -• We protect privacy from Big Tech's prying eyes -• Stay safe no matter wherever you are - -Zero trackers and only minimally required permissions are found according to Exodus Privacy Report. - -Please visit organicmaps.app website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram. - -Reject surveillance - embrace your freedom. -Give Organic Maps a try! diff --git a/android/src/fdroid/play/listings/zh-HK/release-notes.txt b/android/src/fdroid/play/listings/zh-HK/release-notes.txt deleted file mode 100644 index 8a33f7eb5a..0000000000 --- a/android/src/fdroid/play/listings/zh-HK/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• 截至 2 月 10 日的新 OpenStreetMap 数据，包括土耳其和叙利亚地震后人道主义 OpenStreetMap 团队 (HOT) 所做的更改 -• 在列表和地图上过滤错误的搜索结果 -• 修复了打开时的崩溃 -• 主楼和陪楼更好的入口图标 -• 改进了小距离的下一转弯语音通知 -• 修复了波斯语、波兰语和德语翻译 -…更多：omaps.app/news diff --git a/android/src/fdroid/play/listings/zh-HK/short-description.txt b/android/src/fdroid/play/listings/zh-HK/short-description.txt deleted file mode 100644 index c2f1533e8e..0000000000 --- a/android/src/fdroid/play/listings/zh-HK/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source, community-driven maps for travelers, tourists, cyclists & hikers diff --git a/android/src/fdroid/play/listings/zh-HK/title-google.txt b/android/src/fdroid/play/listings/zh-HK/title-google.txt deleted file mode 100644 index e88ecfea27..0000000000 --- a/android/src/fdroid/play/listings/zh-HK/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Offline Organic Maps Hike Bike diff --git a/android/src/fdroid/play/listings/zh-HK/title.txt b/android/src/fdroid/play/listings/zh-HK/title.txt deleted file mode 100644 index 1a8a13ec0c..0000000000 --- a/android/src/fdroid/play/listings/zh-HK/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps Offline Hike, Bike, GPS Navigation diff --git a/android/src/fdroid/play/listings/zh-HK/video-url.txt b/android/src/fdroid/play/listings/zh-HK/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/zh-HK/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/listings/zh-TW/full-description.txt b/android/src/fdroid/play/listings/zh-TW/full-description.txt deleted file mode 100644 index 67b07b18f7..0000000000 --- a/android/src/fdroid/play/listings/zh-TW/full-description.txt +++ /dev/null @@ -1,52 +0,0 @@ -‣ 我們是自由軟體，不會追蹤您，而且沒有廣告，由眾人的捐款來支援。 -‣ 這個專案持續由我們的小團隊貢獻空閒時間與自己金錢與使用者捐款/貢獻來改善。 -‣ 如果地圖有錯誤的話，請到開放街圖貢獻，而你會在未來的地圖更新看到變動。 -‣ 如果導航與搜尋功能無法運作，請傳送電子郵件給我們，我們會回覆每一封電子郵件，而且會盡快修正！ - -您的回饋與五星評論會激勵我們！ - -重要功能： -• 免費、開源、沒有廣告，不會追蹤 -• 詳細的離線地圖，包括 Google 地圖上不存在的地方，感謝開放街圖社群 -• 單車路線、登山路線與散步路徑 -• 等高線、海拔高度、山峰與谷地 -• 步驟式的行走、單車與實驗性的語言汽車導航 -• 快速的離線搜尋 -• 書籤輸出與匯入 KML/KMZ 格式（GPX 開發中） -• 深色模式來保護你的眼睛 - -沒有 Android Auto 功能，Organic Map 還沒有大眾運輸、衛星圖和其他酷功能，但有了 你的協助，我們可以讓這份地圖一步一步變得更好。 - -Organic Maps 是 純天然，用愛製作: - -• 快速的離線體驗 -• 尊重你的隱私 -• 節省你的電量 -• 不會有非預期的行動資費 -• 簡單易用，只包括最重要的功能 - -沒有追蹤器以及其他壞東西： - -• 沒有廣告 -• 不會追蹤 -• 不會收集資料 -• 不會通知基地 -• 沒有惱人的註冊程序 -• 沒有強迫的教學 -• 沒有煩人的垃圾信 -• 沒有通知 -• 不是功能不全軟體 -• 沒有殺蟲劑，純天然 - -目前 Organic Maps 我們相信隱私是基本人權： - -• Organic Maps 是獨立的社群驅動的開源專案 -• 我們從科技大廠保護你的隱私 -• 不論如何都保護你的安全 - -沒有追蹤器，只有最低權限要求，而且都有記錄在隱私報告。 - -請造訪 organicmaps.app 網站來獲得更多資訊及 FAQ，直接在 Telegram @OrganicMapsApp 聯繫。 - -拒絕追蹤 - 擁抱自由。 -試試 Organic Maps 吧！ diff --git a/android/src/fdroid/play/listings/zh-TW/release-notes.txt b/android/src/fdroid/play/listings/zh-TW/release-notes.txt deleted file mode 100644 index 8a33f7eb5a..0000000000 --- a/android/src/fdroid/play/listings/zh-TW/release-notes.txt +++ /dev/null @@ -1,7 +0,0 @@ -• 截至 2 月 10 日的新 OpenStreetMap 数据，包括土耳其和叙利亚地震后人道主义 OpenStreetMap 团队 (HOT) 所做的更改 -• 在列表和地图上过滤错误的搜索结果 -• 修复了打开时的崩溃 -• 主楼和陪楼更好的入口图标 -• 改进了小距离的下一转弯语音通知 -• 修复了波斯语、波兰语和德语翻译 -…更多：omaps.app/news diff --git a/android/src/fdroid/play/listings/zh-TW/short-description.txt b/android/src/fdroid/play/listings/zh-TW/short-description.txt deleted file mode 100644 index 381d288da7..0000000000 --- a/android/src/fdroid/play/listings/zh-TW/short-description.txt +++ /dev/null @@ -1 +0,0 @@ -開放原始碼，針對旅行者、遊客、單車騎士與登山客的社群驅動地圖 diff --git a/android/src/fdroid/play/listings/zh-TW/title-google.txt b/android/src/fdroid/play/listings/zh-TW/title-google.txt deleted file mode 100644 index 07d632c421..0000000000 --- a/android/src/fdroid/play/listings/zh-TW/title-google.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps 離線登山、單車與 GPS 導航 diff --git a/android/src/fdroid/play/listings/zh-TW/title.txt b/android/src/fdroid/play/listings/zh-TW/title.txt deleted file mode 100644 index 07d632c421..0000000000 --- a/android/src/fdroid/play/listings/zh-TW/title.txt +++ /dev/null @@ -1 +0,0 @@ -Organic Maps 離線登山、單車與 GPS 導航 diff --git a/android/src/fdroid/play/listings/zh-TW/video-url.txt b/android/src/fdroid/play/listings/zh-TW/video-url.txt deleted file mode 100644 index a82458173a..0000000000 --- a/android/src/fdroid/play/listings/zh-TW/video-url.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.youtube.com/watch?v=dK-CUuy82Uc diff --git a/android/src/fdroid/play/release-notes/ar/default.txt b/android/src/fdroid/play/release-notes/ar/default.txt deleted file mode 120000 index 468b709e46..0000000000 --- a/android/src/fdroid/play/release-notes/ar/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ar/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/az-AZ/default.txt b/android/src/fdroid/play/release-notes/az-AZ/default.txt deleted file mode 120000 index def255da6a..0000000000 --- a/android/src/fdroid/play/release-notes/az-AZ/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/az-AZ/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/be/default.txt b/android/src/fdroid/play/release-notes/be/default.txt deleted file mode 120000 index 0a565eaeea..0000000000 --- a/android/src/fdroid/play/release-notes/be/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/be/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/bg/default.txt b/android/src/fdroid/play/release-notes/bg/default.txt deleted file mode 120000 index ce62e7e16e..0000000000 --- a/android/src/fdroid/play/release-notes/bg/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/bg/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/bn-BD/default.txt b/android/src/fdroid/play/release-notes/bn-BD/default.txt deleted file mode 120000 index 91e90615d7..0000000000 --- a/android/src/fdroid/play/release-notes/bn-BD/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/bn-BD/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ca/default.txt b/android/src/fdroid/play/release-notes/ca/default.txt deleted file mode 120000 index de826b36e7..0000000000 --- a/android/src/fdroid/play/release-notes/ca/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ca/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/cs-CZ/default.txt b/android/src/fdroid/play/release-notes/cs-CZ/default.txt deleted file mode 120000 index a731395170..0000000000 --- a/android/src/fdroid/play/release-notes/cs-CZ/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/cs-CZ/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/da-DK/default.txt b/android/src/fdroid/play/release-notes/da-DK/default.txt deleted file mode 120000 index 61d681005c..0000000000 --- a/android/src/fdroid/play/release-notes/da-DK/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/da-DK/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/de-DE/default.txt b/android/src/fdroid/play/release-notes/de-DE/default.txt deleted file mode 120000 index 4c8174d503..0000000000 --- a/android/src/fdroid/play/release-notes/de-DE/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/de-DE/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/de-DE/default.txt b/android/src/fdroid/play/release-notes/de-DE/default.txt new file mode 100644 index 0000000000..0b0531ec25 --- /dev/null +++ b/android/src/fdroid/play/release-notes/de-DE/default.txt @@ -0,0 +1,12 @@ +• Neue OSM-Daten ab dem 29. Oktober +• Verbesserte Standorterkennung +• Bessere Vollbilddarstellung beim Tippen auf leeren Raum +• Viele UI- und Leistungsverbesserungen +• Behebung von Abstürzen +• Ändern der App-Sprache unter Android 13+ +• Glatte Straßenhöhenkarte +• Anzeige von "zu vermeidenden Straßen" für Fußgänger, Radfahrer und U-Bahnen +• Katalanisch TTS +• Verbesserte Suche auf der Karte und in den Dörfern +• Neue Metrosymbole, Handwerks- und historische Typen +…mehr: omaps.app/news diff --git a/android/src/fdroid/play/release-notes/el-GR/default.txt b/android/src/fdroid/play/release-notes/el-GR/default.txt deleted file mode 120000 index 6e0b0a5791..0000000000 --- a/android/src/fdroid/play/release-notes/el-GR/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/el-GR/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/en-US/default.txt b/android/src/fdroid/play/release-notes/en-US/default.txt deleted file mode 120000 index 4b76020eab..0000000000 --- a/android/src/fdroid/play/release-notes/en-US/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/en-US/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/en-US/default.txt b/android/src/fdroid/play/release-notes/en-US/default.txt new file mode 100644 index 0000000000..74142d69e6 --- /dev/null +++ b/android/src/fdroid/play/release-notes/en-US/default.txt @@ -0,0 +1,15 @@ +• New OSM data as of October 29 +• Improved location detection +• Better full-screen on empty space tap +• Many UI & performance improvements +• Fix crashes +• Change app language on Android 13+ +• Crosshair API now supports "cll=lat,lon" argument to center the map +• Smooth road altitudes chart +• Show "roads to avoid" for walking, cycling, metro +• Catalan TTS +• Improved on-map & villages search +• New craft & historic types +• New metro icons for many cities +• Updated translations +…more: omaps.app/news diff --git a/android/src/fdroid/play/release-notes/es-ES/default.txt b/android/src/fdroid/play/release-notes/es-ES/default.txt deleted file mode 120000 index 104c6e190d..0000000000 --- a/android/src/fdroid/play/release-notes/es-ES/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/es-ES/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/et/default.txt b/android/src/fdroid/play/release-notes/et/default.txt deleted file mode 120000 index 552ddc4c24..0000000000 --- a/android/src/fdroid/play/release-notes/et/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/et/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/eu-ES/default.txt b/android/src/fdroid/play/release-notes/eu-ES/default.txt deleted file mode 120000 index 8bda41730f..0000000000 --- a/android/src/fdroid/play/release-notes/eu-ES/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/eu-ES/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/fa/default.txt b/android/src/fdroid/play/release-notes/fa/default.txt deleted file mode 120000 index 41c7ffdbbc..0000000000 --- a/android/src/fdroid/play/release-notes/fa/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/fa/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/fi-FI/default.txt b/android/src/fdroid/play/release-notes/fi-FI/default.txt deleted file mode 120000 index a14e557485..0000000000 --- a/android/src/fdroid/play/release-notes/fi-FI/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/fi-FI/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/fr-FR/default.txt b/android/src/fdroid/play/release-notes/fr-FR/default.txt deleted file mode 120000 index 277a9830ca..0000000000 --- a/android/src/fdroid/play/release-notes/fr-FR/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/fr-FR/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/gl-ES/default.txt b/android/src/fdroid/play/release-notes/gl-ES/default.txt deleted file mode 120000 index b17914ae8d..0000000000 --- a/android/src/fdroid/play/release-notes/gl-ES/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/gl-ES/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/gu/default.txt b/android/src/fdroid/play/release-notes/gu/default.txt deleted file mode 120000 index c2b290dcb4..0000000000 --- a/android/src/fdroid/play/release-notes/gu/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/gu/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/hi-IN/default.txt b/android/src/fdroid/play/release-notes/hi-IN/default.txt deleted file mode 120000 index 8ecfa2fd5c..0000000000 --- a/android/src/fdroid/play/release-notes/hi-IN/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/hi-IN/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/hr/default.txt b/android/src/fdroid/play/release-notes/hr/default.txt deleted file mode 120000 index b892a74883..0000000000 --- a/android/src/fdroid/play/release-notes/hr/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/hr/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/hu-HU/default.txt b/android/src/fdroid/play/release-notes/hu-HU/default.txt deleted file mode 120000 index 189f6c9259..0000000000 --- a/android/src/fdroid/play/release-notes/hu-HU/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/hu-HU/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/id/default.txt b/android/src/fdroid/play/release-notes/id/default.txt deleted file mode 120000 index 4a4cf91713..0000000000 --- a/android/src/fdroid/play/release-notes/id/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/id/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/it-IT/default.txt b/android/src/fdroid/play/release-notes/it-IT/default.txt deleted file mode 120000 index f82dda6f21..0000000000 --- a/android/src/fdroid/play/release-notes/it-IT/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/it-IT/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/iw-IL/default.txt b/android/src/fdroid/play/release-notes/iw-IL/default.txt deleted file mode 120000 index 08d9ff6c0e..0000000000 --- a/android/src/fdroid/play/release-notes/iw-IL/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/iw-IL/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ja-JP/default.txt b/android/src/fdroid/play/release-notes/ja-JP/default.txt deleted file mode 120000 index 2398a8b70c..0000000000 --- a/android/src/fdroid/play/release-notes/ja-JP/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ja-JP/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ka-GE/default.txt b/android/src/fdroid/play/release-notes/ka-GE/default.txt deleted file mode 120000 index 29ed1fbab2..0000000000 --- a/android/src/fdroid/play/release-notes/ka-GE/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ka-GE/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/kk/default.txt b/android/src/fdroid/play/release-notes/kk/default.txt deleted file mode 120000 index 876834010b..0000000000 --- a/android/src/fdroid/play/release-notes/kk/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/kk/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/km-KH/default.txt b/android/src/fdroid/play/release-notes/km-KH/default.txt deleted file mode 120000 index a6b1c49184..0000000000 --- a/android/src/fdroid/play/release-notes/km-KH/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/km-KH/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/kn-IN/default.txt b/android/src/fdroid/play/release-notes/kn-IN/default.txt deleted file mode 120000 index b0741a7b50..0000000000 --- a/android/src/fdroid/play/release-notes/kn-IN/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/kn-IN/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ko-KR/default.txt b/android/src/fdroid/play/release-notes/ko-KR/default.txt deleted file mode 120000 index 96cbf8b7db..0000000000 --- a/android/src/fdroid/play/release-notes/ko-KR/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ko-KR/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/lo-LA/default.txt b/android/src/fdroid/play/release-notes/lo-LA/default.txt deleted file mode 120000 index 7e1cee892e..0000000000 --- a/android/src/fdroid/play/release-notes/lo-LA/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/lo-LA/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/lt/default.txt b/android/src/fdroid/play/release-notes/lt/default.txt deleted file mode 120000 index e4fb1d8ffa..0000000000 --- a/android/src/fdroid/play/release-notes/lt/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/lt/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/lv/default.txt b/android/src/fdroid/play/release-notes/lv/default.txt deleted file mode 120000 index b08234c03b..0000000000 --- a/android/src/fdroid/play/release-notes/lv/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/lv/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/mk-MK/default.txt b/android/src/fdroid/play/release-notes/mk-MK/default.txt deleted file mode 120000 index 53c33a1ff7..0000000000 --- a/android/src/fdroid/play/release-notes/mk-MK/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/mk-MK/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ml-IN/default.txt b/android/src/fdroid/play/release-notes/ml-IN/default.txt deleted file mode 120000 index 8aa0b60fe2..0000000000 --- a/android/src/fdroid/play/release-notes/ml-IN/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ml-IN/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/mr-IN/default.txt b/android/src/fdroid/play/release-notes/mr-IN/default.txt deleted file mode 120000 index 9762a453ca..0000000000 --- a/android/src/fdroid/play/release-notes/mr-IN/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/mr-IN/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ms/default.txt b/android/src/fdroid/play/release-notes/ms/default.txt deleted file mode 120000 index d4e9bc50e7..0000000000 --- a/android/src/fdroid/play/release-notes/ms/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ms/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ne-NP/default.txt b/android/src/fdroid/play/release-notes/ne-NP/default.txt deleted file mode 120000 index 31b28ca409..0000000000 --- a/android/src/fdroid/play/release-notes/ne-NP/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ne-NP/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/nl-NL/default.txt b/android/src/fdroid/play/release-notes/nl-NL/default.txt deleted file mode 120000 index e44f3e42ff..0000000000 --- a/android/src/fdroid/play/release-notes/nl-NL/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/nl-NL/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/no-NO/default.txt b/android/src/fdroid/play/release-notes/no-NO/default.txt deleted file mode 120000 index 00f41bf19a..0000000000 --- a/android/src/fdroid/play/release-notes/no-NO/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/no-NO/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/pl-PL/default.txt b/android/src/fdroid/play/release-notes/pl-PL/default.txt deleted file mode 120000 index a7f9f7aefe..0000000000 --- a/android/src/fdroid/play/release-notes/pl-PL/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/pl-PL/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/pt-BR/default.txt b/android/src/fdroid/play/release-notes/pt-BR/default.txt deleted file mode 120000 index 960e410626..0000000000 --- a/android/src/fdroid/play/release-notes/pt-BR/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/pt-BR/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/pt-BR/default.txt b/android/src/fdroid/play/release-notes/pt-BR/default.txt new file mode 100644 index 0000000000..4f26746981 --- /dev/null +++ b/android/src/fdroid/play/release-notes/pt-BR/default.txt @@ -0,0 +1,14 @@ +• Novos dados OSM de 19/10 +• Melhoria na detecção de localização +• Melhor tela cheia em toque no espaço vazio +• Melhorias de desempenho e UI +• Correção de erros +• Mudar idioma do app em Android 13+ +• Crosshair API agora suporta argumentos "cll=lat,lon" para centralizar o mapa +• Gráfico suave de elevação +• TTS catalão +• Melhoria na busca no mapa e em vilas +• Suporte a ofício e artefatos históricos +• Novos ícones de metrô para várias cidades +• Novas traduções +…mais: omaps.app/news diff --git a/android/src/fdroid/play/release-notes/pt-PT/default.txt b/android/src/fdroid/play/release-notes/pt-PT/default.txt deleted file mode 120000 index f25cc6e0f2..0000000000 --- a/android/src/fdroid/play/release-notes/pt-PT/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/pt-PT/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ro/default.txt b/android/src/fdroid/play/release-notes/ro/default.txt deleted file mode 120000 index f7cb398593..0000000000 --- a/android/src/fdroid/play/release-notes/ro/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ro/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ru-RU/default.txt b/android/src/fdroid/play/release-notes/ru-RU/default.txt deleted file mode 120000 index 97f50d2137..0000000000 --- a/android/src/fdroid/play/release-notes/ru-RU/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ru-RU/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ru-RU/default.txt b/android/src/fdroid/play/release-notes/ru-RU/default.txt new file mode 100644 index 0000000000..4065198b05 --- /dev/null +++ b/android/src/fdroid/play/release-notes/ru-RU/default.txt @@ -0,0 +1,13 @@ +• Свежие данные OSM за 29 октября +• Улучшено определение местоположения +• Полноэкранный режим при нажатии на пустое место +• Улучшен интерфейс и производительность +• Исправлены сбои +• Смена языка OM на Android 13 +• Сглаженный график высоты пути +• Настройки "избегания дорог" теперь видны не только для авто маршрутов +• Улучшенный поиск деревень и поиск на карте +• Новые ремесленные и исторические объекты +• Новые иконки метро для многих городов +• Обновленные переводы +…подробнее: omaps.app/news diff --git a/android/src/fdroid/play/release-notes/si-LK/default.txt b/android/src/fdroid/play/release-notes/si-LK/default.txt deleted file mode 120000 index ccee00417d..0000000000 --- a/android/src/fdroid/play/release-notes/si-LK/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/si-LK/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/sk/default.txt b/android/src/fdroid/play/release-notes/sk/default.txt deleted file mode 120000 index 46ab7ef662..0000000000 --- a/android/src/fdroid/play/release-notes/sk/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/sk/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/sl/default.txt b/android/src/fdroid/play/release-notes/sl/default.txt deleted file mode 120000 index 1f6499edb4..0000000000 --- a/android/src/fdroid/play/release-notes/sl/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/sl/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/sr/default.txt b/android/src/fdroid/play/release-notes/sr/default.txt deleted file mode 120000 index 29583ee4f7..0000000000 --- a/android/src/fdroid/play/release-notes/sr/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/sr/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/sv-SE/default.txt b/android/src/fdroid/play/release-notes/sv-SE/default.txt deleted file mode 120000 index a421fc5fd2..0000000000 --- a/android/src/fdroid/play/release-notes/sv-SE/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/sv-SE/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/th/default.txt b/android/src/fdroid/play/release-notes/th/default.txt deleted file mode 120000 index b026da243a..0000000000 --- a/android/src/fdroid/play/release-notes/th/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/th/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/tr-TR/default.txt b/android/src/fdroid/play/release-notes/tr-TR/default.txt deleted file mode 120000 index 6e50802399..0000000000 --- a/android/src/fdroid/play/release-notes/tr-TR/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/tr-TR/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/tr-TR/default.txt b/android/src/fdroid/play/release-notes/tr-TR/default.txt new file mode 100644 index 0000000000..0f59588bc3 --- /dev/null +++ b/android/src/fdroid/play/release-notes/tr-TR/default.txt @@ -0,0 +1,12 @@ +• Yeni OSM harita verileri (29 Ekim) +• Geliştirilmiş konum algılama +• Boş bir yere dokununca daha iyi tam ekran +• Birçok arayüz ve performans iyileştirmesi +• Çökmeler düzeltildi +• Android 13+'te uygulama dilini değiştirme +• Daha iyi yol yükseklik tablosu +• Yürüme, bisiklet, metro için "kaçınılacak yollar" seçeneği eklendi +• Geliştirilmiş harita üzerinde ve köylerde arama +• Yeni zanaat ve tarih türleri eklendi +• Birçok şehir için yeni metro simgeleri +…dahası: omaps.app/news diff --git a/android/src/fdroid/play/release-notes/uk/default.txt b/android/src/fdroid/play/release-notes/uk/default.txt deleted file mode 120000 index 2219c01989..0000000000 --- a/android/src/fdroid/play/release-notes/uk/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/uk/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/ur/default.txt b/android/src/fdroid/play/release-notes/ur/default.txt deleted file mode 120000 index 9cb5d9ca9f..0000000000 --- a/android/src/fdroid/play/release-notes/ur/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/ur/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/vi/default.txt b/android/src/fdroid/play/release-notes/vi/default.txt deleted file mode 120000 index 8fe849e822..0000000000 --- a/android/src/fdroid/play/release-notes/vi/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/vi/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/zh-CN/default.txt b/android/src/fdroid/play/release-notes/zh-CN/default.txt deleted file mode 120000 index 2877a1bf0c..0000000000 --- a/android/src/fdroid/play/release-notes/zh-CN/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/zh-CN/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/zh-HK/default.txt b/android/src/fdroid/play/release-notes/zh-HK/default.txt deleted file mode 120000 index 8fb9ca6fe0..0000000000 --- a/android/src/fdroid/play/release-notes/zh-HK/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/zh-HK/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/release-notes/zh-TW/default.txt b/android/src/fdroid/play/release-notes/zh-TW/default.txt deleted file mode 120000 index c10e07ce46..0000000000 --- a/android/src/fdroid/play/release-notes/zh-TW/default.txt +++ /dev/null @@ -1 +0,0 @@ -../../listings/zh-TW/release-notes.txt \ No newline at end of file diff --git a/android/src/fdroid/play/version.yaml b/android/src/fdroid/play/version.yaml index 2e27927fcd..ca2c9e1f90 100644 --- a/android/src/fdroid/play/version.yaml +++ b/android/src/fdroid/play/version.yaml @@ -1 +1 @@ -version: 2023.02.13-11-FDroid+23021311 +version: 2022.11.02-2-FDroid+22110202 diff --git a/android/src/google/play/listings/bn-BD/full-description.txt b/android/src/google/play/listings/bn-BD/full-description.txt new file mode 120000 index 0000000000..f9d5841145 --- /dev/null +++ b/android/src/google/play/listings/bn-BD/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/bn-BD/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/bn-BD/short-description.txt b/android/src/google/play/listings/bn-BD/short-description.txt new file mode 120000 index 0000000000..a265b64d26 --- /dev/null +++ b/android/src/google/play/listings/bn-BD/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/bn-BD/short-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/bn-BD/title.txt b/android/src/google/play/listings/bn-BD/title.txt new file mode 100644 index 0000000000..0dd15d8846 --- /dev/null +++ b/android/src/google/play/listings/bn-BD/title.txt @@ -0,0 +1 @@ +Organic Maps অরগানিক ম্যাপ diff --git a/android/src/google/play/listings/bn-BD/video-url.txt b/android/src/google/play/listings/bn-BD/video-url.txt new file mode 120000 index 0000000000..90d06c0f2a --- /dev/null +++ b/android/src/google/play/listings/bn-BD/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/bn-BD/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/ca/full-description.txt b/android/src/google/play/listings/ca/full-description.txt new file mode 120000 index 0000000000..deb0191d85 --- /dev/null +++ b/android/src/google/play/listings/ca/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/ca/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/ca/short-description.txt b/android/src/google/play/listings/ca/short-description.txt new file mode 120000 index 0000000000..9890a336d5 --- /dev/null +++ b/android/src/google/play/listings/ca/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/ca/short-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/ca/title.txt b/android/src/google/play/listings/ca/title.txt new file mode 100644 index 0000000000..ac6fd3c749 --- /dev/null +++ b/android/src/google/play/listings/ca/title.txt @@ -0,0 +1 @@ +Organic Maps Offline Hike&Bike diff --git a/android/src/google/play/listings/ca/video-url.txt b/android/src/google/play/listings/ca/video-url.txt new file mode 120000 index 0000000000..9cc82ed6b8 --- /dev/null +++ b/android/src/google/play/listings/ca/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/ca/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/cs-CZ/full-description.txt b/android/src/google/play/listings/cs-CZ/full-description.txt new file mode 120000 index 0000000000..144451b43b --- /dev/null +++ b/android/src/google/play/listings/cs-CZ/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/cs-CZ/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/cs-CZ/short-description.txt b/android/src/google/play/listings/cs-CZ/short-description.txt new file mode 120000 index 0000000000..485b865241 --- /dev/null +++ b/android/src/google/play/listings/cs-CZ/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/cs-CZ/short-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/cs-CZ/title.txt b/android/src/google/play/listings/cs-CZ/title.txt new file mode 100644 index 0000000000..ac6fd3c749 --- /dev/null +++ b/android/src/google/play/listings/cs-CZ/title.txt @@ -0,0 +1 @@ +Organic Maps Offline Hike&Bike diff --git a/android/src/google/play/listings/cs-CZ/video-url.txt b/android/src/google/play/listings/cs-CZ/video-url.txt new file mode 120000 index 0000000000..02ec9b102d --- /dev/null +++ b/android/src/google/play/listings/cs-CZ/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/cs-CZ/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/de-DE/full-description.txt b/android/src/google/play/listings/de-DE/full-description.txt new file mode 100644 index 0000000000..7a9441a826 --- /dev/null +++ b/android/src/google/play/listings/de-DE/full-description.txt @@ -0,0 +1,53 @@ +‣ Unsere kostenlose App trackt Sie nicht, enthält keine Werbung und wird durch Ihre Spenden finanziert. +‣ Sie wird laufend von unserem kleinen Team, in unserer Freizeit, mit unserem eigenen Geld und Spenden/Beiträgen unserer Nutzer, verbessert. +‣ Wenn etwas auf der Karte falsch ist oder fehlt, korrigieren Sie es bitte in OpenStreetMap und sehen Sie Ihre Änderungen in zukünftigen Karten-Updates. +‣ Sollte die Navigation oder die Suche nicht funktionieren, senden Sie uns bitte eine E-Mail. Wir antworten auf JEDE E-Mail und werden das Problem so schnell wie möglich beheben! + +Ihr Feedback und Ihre 5-Sterne-Bewertungen sind die beste Motivation für uns! + +Wichtigsten Eigenschaften: +• Detaillierte Offline-Karten mit Orten, die dank OpenStreetMap.org auf anderen Karten nicht zu finden sind +• Radwege, Wanderwege und Spazierwege +• Höhenlinien, Höhenprofile, Gipfel und Steigungen +• Navigation mit Abbiegehinweisen für Fußgänger, Radfahrer und Autos mit Sprachführung +• Schnelle Offlinesuche auf der Karte und in den Lesezeichen +• Import und Export von Lesezeichen in den Formaten KML/KMZ (GPX ist geplant) +• Dunkles Design zum besseren Schutz Ihrer Augen +• Länder und Regionen nehmen nicht viel Speicherplatz in Anspruch +• Kostenlos und Open-Source + +Es gibt noch kein Android Auto, keine öffentlichen Verkehrsmittel, keine Satellitenkarten und noch keine anderen coolen Funktionen in Organic Maps. Aber mit Ihrer Hilfe und Unterstützung können wir diese Welt Schritt für Schritt besser machen. + +Organic Maps ist sauber, organisch und mit Liebe gemacht: + +• Rasend schnelle Offline-Erfahrung +• Respektiert Ihre Privatsphäre +• Schont Ihren Akku +• Keine unerwarteten Kosten für mobile Daten +• Einfach zu bedienen, mit nur den wichtigsten Funktionen enthalten + +Frei von Trackern und sonstigem schädlichen Inhalt: + +• Keine Werbung +• Kein Tracking +• Keine Datensammlung +• Kein "Telefonieren nach Hause" +• Keine lästige Registrierung +• Keine obligatorischen Tutorials +• Kein lästiger E-Mail-Spam +• Keine Push-Benachrichtigungen +• Keine Crapware +• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic + +Wir bei Organic Maps glauben, dass Privatsphäre ein grundlegendes Menschenrecht ist: + +• Organic Maps ist ein Open-Source-Projekt, das von einer unabhängigen Gemeinschaft betrieben wird +• Wir schützen Ihre Privatsphäre vor den neugierigen Augen von Großunternehmen +• Bleiben Sie sicher, egal wo Sie sind + +Keine Tracker und nur minimal erforderliche Berechtigungen sind laut dem Exodus-Datenschutzbericht vorhanden. + +Bitte besuchen Sie organicmaps.app Website für weitere Details und FAQ, oder kontaktieren Sie uns direkt unter @OrganicMapsApp in Telegram. + +Lehnen Sie die Überwachung ab - ergreifen Sie Ihre Freiheit. +Testen Sie Organic Maps! diff --git a/android/src/google/play/listings/de-DE/short-description.txt b/android/src/google/play/listings/de-DE/short-description.txt new file mode 120000 index 0000000000..d8dedd8632 --- /dev/null +++ b/android/src/google/play/listings/de-DE/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/de-DE/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/de-DE/title-google.txt b/android/src/google/play/listings/de-DE/title.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/title-google.txt rename to android/src/google/play/listings/de-DE/title.txt diff --git a/android/src/google/play/listings/de-DE/video-url.txt b/android/src/google/play/listings/de-DE/video-url.txt new file mode 120000 index 0000000000..ec115a7ab0 --- /dev/null +++ b/android/src/google/play/listings/de-DE/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/de-DE/video-url.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/bg/full-description.txt b/android/src/google/play/listings/en-US/full-description.txt similarity index 91% rename from android/src/fdroid/play/listings/bg/full-description.txt rename to android/src/google/play/listings/en-US/full-description.txt index 37f92f9d4e..b7cb1226f9 100644 --- a/android/src/fdroid/play/listings/bg/full-description.txt +++ b/android/src/google/play/listings/en-US/full-description.txt @@ -1,12 +1,10 @@ -‣ Our free app does not track you, does not have ads, and it needs your support. +‣ Our free app does not track you and does not have ads. ‣ It is constantly being improved by contributors and our small team, in our free time. ‣ If something is wrong or missing on the map, please fix it in OpenStreetMap and see your changes in the future maps update. -‣ If navigation or search doesn't work, please email us. We reply to EVERY email, and we'll fix it ASAP! Your feedback and 5-star reviews are the best motivators for us! Key features: - • Free, open-source, no ads, no tracking • Detailed offline maps with places that don't exist on Google maps, thanks to the OpenStreetMap community • Cycling routes, hiking trails, and walking paths diff --git a/android/src/google/play/listings/en-US/short-description.txt b/android/src/google/play/listings/en-US/short-description.txt new file mode 120000 index 0000000000..9e5a9ba9d5 --- /dev/null +++ b/android/src/google/play/listings/en-US/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/en-US/short-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/en-US/title.txt b/android/src/google/play/listings/en-US/title.txt new file mode 100644 index 0000000000..20767ed6da --- /dev/null +++ b/android/src/google/play/listings/en-US/title.txt @@ -0,0 +1 @@ +Offline Organic Maps Hike&Bike diff --git a/android/src/google/play/listings/en-US/video-url.txt b/android/src/google/play/listings/en-US/video-url.txt new file mode 120000 index 0000000000..d48b58bafb --- /dev/null +++ b/android/src/google/play/listings/en-US/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/en-US/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/fr-FR/full-description.txt b/android/src/google/play/listings/fr-FR/full-description.txt new file mode 120000 index 0000000000..c13e3c11d5 --- /dev/null +++ b/android/src/google/play/listings/fr-FR/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/fr-FR/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/fr-FR/short-description.txt b/android/src/google/play/listings/fr-FR/short-description.txt new file mode 120000 index 0000000000..2bf821f636 --- /dev/null +++ b/android/src/google/play/listings/fr-FR/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/fr-FR/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/fr-FR/title-google.txt b/android/src/google/play/listings/fr-FR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/title-google.txt rename to android/src/google/play/listings/fr-FR/title.txt diff --git a/android/src/google/play/listings/fr-FR/video-url.txt b/android/src/google/play/listings/fr-FR/video-url.txt new file mode 120000 index 0000000000..d8f6427068 --- /dev/null +++ b/android/src/google/play/listings/fr-FR/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/fr-FR/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/id/full-description.txt b/android/src/google/play/listings/id/full-description.txt new file mode 120000 index 0000000000..f353148ca9 --- /dev/null +++ b/android/src/google/play/listings/id/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/id/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/id/short-description.txt b/android/src/google/play/listings/id/short-description.txt new file mode 120000 index 0000000000..446d6bc6f2 --- /dev/null +++ b/android/src/google/play/listings/id/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/id/short-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/id/title.txt b/android/src/google/play/listings/id/title.txt new file mode 100644 index 0000000000..3bc70864a8 --- /dev/null +++ b/android/src/google/play/listings/id/title.txt @@ -0,0 +1 @@ +Organic Maps Luring Navigasi diff --git a/android/src/google/play/listings/id/video-url.txt b/android/src/google/play/listings/id/video-url.txt new file mode 120000 index 0000000000..595c94196f --- /dev/null +++ b/android/src/google/play/listings/id/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/id/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/it-IT/full-description.txt b/android/src/google/play/listings/it-IT/full-description.txt new file mode 120000 index 0000000000..91afd862ed --- /dev/null +++ b/android/src/google/play/listings/it-IT/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/it-IT/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/it-IT/short-description.txt b/android/src/google/play/listings/it-IT/short-description.txt new file mode 120000 index 0000000000..dec9332dfc --- /dev/null +++ b/android/src/google/play/listings/it-IT/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/it-IT/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/it-IT/title-google.txt b/android/src/google/play/listings/it-IT/title.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/title-google.txt rename to android/src/google/play/listings/it-IT/title.txt diff --git a/android/src/google/play/listings/it-IT/video-url.txt b/android/src/google/play/listings/it-IT/video-url.txt new file mode 120000 index 0000000000..69855c49db --- /dev/null +++ b/android/src/google/play/listings/it-IT/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/it-IT/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/mr-IN/full-description.txt b/android/src/google/play/listings/mr-IN/full-description.txt new file mode 120000 index 0000000000..80270731bb --- /dev/null +++ b/android/src/google/play/listings/mr-IN/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/mr-IN/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/mr-IN/short-description.txt b/android/src/google/play/listings/mr-IN/short-description.txt new file mode 120000 index 0000000000..5d5e1aa417 --- /dev/null +++ b/android/src/google/play/listings/mr-IN/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/mr-IN/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/mr-IN/title-google.txt b/android/src/google/play/listings/mr-IN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/title-google.txt rename to android/src/google/play/listings/mr-IN/title.txt diff --git a/android/src/google/play/listings/mr-IN/video-url.txt b/android/src/google/play/listings/mr-IN/video-url.txt new file mode 120000 index 0000000000..d48b58bafb --- /dev/null +++ b/android/src/google/play/listings/mr-IN/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/en-US/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/pt-BR/full-description.txt b/android/src/google/play/listings/pt-BR/full-description.txt new file mode 120000 index 0000000000..b24a50030b --- /dev/null +++ b/android/src/google/play/listings/pt-BR/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/pt-BR/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/pt-BR/short-description.txt b/android/src/google/play/listings/pt-BR/short-description.txt new file mode 120000 index 0000000000..216b3b9370 --- /dev/null +++ b/android/src/google/play/listings/pt-BR/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/pt-BR/short-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/pt-BR/title.txt b/android/src/google/play/listings/pt-BR/title.txt new file mode 100644 index 0000000000..e76e4390ad --- /dev/null +++ b/android/src/google/play/listings/pt-BR/title.txt @@ -0,0 +1 @@ +Organic Maps, mapas offline diff --git a/android/src/google/play/listings/pt-BR/video-url.txt b/android/src/google/play/listings/pt-BR/video-url.txt new file mode 120000 index 0000000000..fe8c300d68 --- /dev/null +++ b/android/src/google/play/listings/pt-BR/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/pt-BR/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/ru-RU/full-description.txt b/android/src/google/play/listings/ru-RU/full-description.txt new file mode 120000 index 0000000000..e347fc2f85 --- /dev/null +++ b/android/src/google/play/listings/ru-RU/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/ru-RU/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/ru-RU/short-description.txt b/android/src/google/play/listings/ru-RU/short-description.txt new file mode 120000 index 0000000000..3534f9455d --- /dev/null +++ b/android/src/google/play/listings/ru-RU/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/ru-RU/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/ru-RU/title-google.txt b/android/src/google/play/listings/ru-RU/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/title-google.txt rename to android/src/google/play/listings/ru-RU/title.txt diff --git a/android/src/google/play/listings/ru-RU/video-url.txt b/android/src/google/play/listings/ru-RU/video-url.txt new file mode 120000 index 0000000000..5aa15d60df --- /dev/null +++ b/android/src/google/play/listings/ru-RU/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/ru-RU/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/tr-TR/full-description.txt b/android/src/google/play/listings/tr-TR/full-description.txt new file mode 100644 index 0000000000..2b24433411 --- /dev/null +++ b/android/src/google/play/listings/tr-TR/full-description.txt @@ -0,0 +1,51 @@ +‣ Ücretsiz uygulamamız sizi takip etmez ve reklam içermez. +‣ Küçük ekibimiz ve katkıda bulunanlar tarafından, boş zamanlarımızda sürekli olarak geliştirilmektedir. +‣ Haritada yanlış veya eksik bir şey varsa, lütfen OpenStreetMap'te düzeltin ve gelecekteki harita güncellemelerinde değişikliklerinizi görün. + +Geri bildiriminiz ve 5 yıldızlı yorumlarınız bizim için en iyi motivasyon kaynağı! + +Önemli Özellikler: +• Ücretsiz, açık kaynak, reklam yok, izleme yok +• OpenStreetMap topluluğu sayesinde, Google haritalarda bulunmayan yerleri içeren ayrıntılı çevrimdışı haritalar +• Bisiklet yolları, yürüyüş parkurları ve yürüyüş yolları +• Eş yükselti çizgileri, yükseklik profilleri, tepeler ve eğimler +• Sesli yönergelerle adım adım yürüyüş, bisiklet ve DENEYSEL araç navigasyonu +• Hızlı çevrimdışı arama +• Yer imlerini KML/KMZ formatlarında dışa ve içe aktarma (GPX yakında geliyor) +• Gözlerinizi korumak için karanlık mod + +Organic Maps'te henüz Android Auto, toplu taşıma, uydu haritaları ve diğer harika özellikler yok. Ancak sizin yardımınız ve desteğinizle bu dünyayı adım adım daha iyi hale getirebiliriz. + +Organic Maps, sevgiyle yapılmış saf ve organiktir: + +• Çarpıcı hızlı çevrimdışı deneyim +• Gizliliğinize saygı duyar +• Pilinizi korur +• Beklenmeyen mobil veri ücretleri yok +• Yalnızca en önemli özellikler dahil, kullanımı basit + +İzleyicilerden ve diğer kötü şeylerden arınmış: + +• Reklam yok +• İzleme yok +• Veri toplama yok +• Evi aramak yok +• Rahatsız edici kayıt yok +• Zorunlu öğretici yok +• Gürültülü e-posta spam yok +• Push bildirimleri yok +• Crapware yok +• Böcek ilacı yok. Tamamen organik! + +Organic Maps'te gizliliğin temel bir insan hakkı olduğuna inanıyoruz: + +- Organic Maps, bağımsız bir topluluk tarafından yönlendirilen açık kaynaklı bir projedir +- Gizliliğinizi Big Tech'in meraklı gözlerinden koruyoruz +- Nerede olursanız olun güvende kalın + +Exodus Gizlilik Raporuna göre sıfır izleyici ve yalnızca minimum düzeyde izinler gerekir. + +Ek ayrıntılar ve SSS için lütfen organicmaps.app adresini ziyaret edin. Telegram'daki @OrganicMapsTR adresinden bizimle doğrudan iletişime geçin. + +Gözetlemeyi reddedin - özgürlüğünüzü kucaklayın. +Organic Maps'i deneyin! diff --git a/android/src/google/play/listings/tr-TR/short-description.txt b/android/src/google/play/listings/tr-TR/short-description.txt new file mode 120000 index 0000000000..2da80d1681 --- /dev/null +++ b/android/src/google/play/listings/tr-TR/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/tr-TR/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/tr-TR/title-google.txt b/android/src/google/play/listings/tr-TR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/title-google.txt rename to android/src/google/play/listings/tr-TR/title.txt diff --git a/android/src/google/play/listings/tr-TR/video-url.txt b/android/src/google/play/listings/tr-TR/video-url.txt new file mode 120000 index 0000000000..5d3b1e1178 --- /dev/null +++ b/android/src/google/play/listings/tr-TR/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/tr-TR/video-url.txt \ No newline at end of file diff --git a/android/src/google/play/listings/zh-CN/full-description.txt b/android/src/google/play/listings/zh-CN/full-description.txt new file mode 120000 index 0000000000..084cc97bcd --- /dev/null +++ b/android/src/google/play/listings/zh-CN/full-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/zh-CN/full-description.txt \ No newline at end of file diff --git a/android/src/google/play/listings/zh-CN/short-description.txt b/android/src/google/play/listings/zh-CN/short-description.txt new file mode 120000 index 0000000000..a12bd1c443 --- /dev/null +++ b/android/src/google/play/listings/zh-CN/short-description.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/zh-CN/short-description.txt \ No newline at end of file diff --git a/android/src/fdroid/play/listings/zh-CN/title-google.txt b/android/src/google/play/listings/zh-CN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/title-google.txt rename to android/src/google/play/listings/zh-CN/title.txt diff --git a/android/src/google/play/listings/zh-CN/video-url.txt b/android/src/google/play/listings/zh-CN/video-url.txt new file mode 120000 index 0000000000..487a744589 --- /dev/null +++ b/android/src/google/play/listings/zh-CN/video-url.txt @@ -0,0 +1 @@ +../../../../fdroid/play/listings/zh-CN/video-url.txt \ No newline at end of file diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index dc61fe2730..27374e9784 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -2,6 +2,7 @@ project(base) set(SRC # Our code will be recompiled on modification of these headers. + ../3party/fast_double_parser/include/fast_double_parser.h ../std/boost_container_hash.hpp ../std/target_os.hpp ../std/windows.hpp @@ -109,8 +110,4 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads) -if (NOT WITH_SYSTEM_PROVIDED_3PARTY) - target_include_directories(${PROJECT_NAME} PRIVATE "${OMIM_ROOT}/3party/fast_double_parser/include") -endif() - omim_add_test_subdirectory(base_tests) diff --git a/base/base_tests/buffer_vector_test.cpp b/base/base_tests/buffer_vector_test.cpp index 2e279163cd..e6e9e3370a 100644 --- a/base/base_tests/buffer_vector_test.cpp +++ b/base/base_tests/buffer_vector_test.cpp @@ -3,7 +3,6 @@ #include "base/buffer_vector.hpp" #include "base/string_utils.hpp" -#include #include #include @@ -18,7 +17,7 @@ namespace } } -UNIT_TEST(BufferVector_PushBackAndRealloc) +UNIT_TEST(BufferVector_PushBack_And_Realloc) { using ElementT = std::vector; ElementT element({1, 2, 3}); @@ -48,7 +47,7 @@ UNIT_TEST(BufferVector_PushBackAndRealloc) } } -UNIT_TEST(BufferVector_Bounds) +UNIT_TEST(BufferVectorBounds) { buffer_vector v; @@ -76,7 +75,7 @@ UNIT_TEST(BufferVector_Bounds) CheckVector(v, 0); } -UNIT_TEST(BufferVector_Swap) +UNIT_TEST(BufferVectorSwap) { typedef buffer_vector value_t; buffer_vector v1, v2; @@ -146,7 +145,7 @@ UNIT_TEST(BufferVector_Swap) } } -UNIT_TEST(BufferVector_Resize) +UNIT_TEST(BufferVectorResize) { for (size_t size = 0; size < 20; ++size) { @@ -157,7 +156,7 @@ UNIT_TEST(BufferVector_Resize) } } -UNIT_TEST(BufferVector_Insert) +UNIT_TEST(BufferVectorInsert) { for (size_t initialLength = 0; initialLength < 20; ++initialLength) { @@ -186,7 +185,7 @@ UNIT_TEST(BufferVector_Insert) } } -UNIT_TEST(BufferVector_InsertSingleValue) +UNIT_TEST(BufferVectorInsertSingleValue) { buffer_vector v; v.insert(v.end(), 'x'); @@ -216,7 +215,7 @@ UNIT_TEST(BufferVector_InsertSingleValue) TEST_EQUAL(v[4], 'x', ()); } -UNIT_TEST(BufferVector_Append) +UNIT_TEST(BufferVectorAppend) { for (size_t initialLength = 0; initialLength < 20; ++initialLength) { @@ -242,7 +241,7 @@ UNIT_TEST(BufferVector_Append) } } -UNIT_TEST(BufferVector_PopBack) +UNIT_TEST(BufferVectorPopBack) { for (size_t len = 1; len < 6; ++len) { @@ -262,7 +261,7 @@ UNIT_TEST(BufferVector_PopBack) } } -UNIT_TEST(BufferVector_Assign) +UNIT_TEST(BufferVectorAssign) { int const arr5[] = {1, 2, 3, 4, 5}; buffer_vector v(&arr5[0], &arr5[0] + ARRAY_SIZE(arr5)); @@ -279,7 +278,7 @@ UNIT_TEST(BufferVector_Assign) } } -UNIT_TEST(BufferVector_Equality) +UNIT_TEST(BufferVectorEquality) { int const arr5[] = {1, 2, 3, 4, 5}; buffer_vector v1(&arr5[0], &arr5[0] + ARRAY_SIZE(arr5)); @@ -340,26 +339,20 @@ void TestVector(VectorT const & v, size_t sz) } // namespace -UNIT_TEST(BufferVector_Move) +UNIT_TEST(BufferVectorMove) { VectorT v1 = GetVector(); TestVector(v1, 2); - // Make intermediate array to avoid warning (moving to itself). - std::array arr = { &v1, &v1 }; - *arr[0] = std::move(*arr[1]); - TestVector(v1, 2); - v1.emplace_back("2"); TestVector(v1, 3); VectorT v2(std::move(v1)); TestVector(v2, 3); - TestVector(v1, 0); + VectorT().swap(v1); v1 = std::move(v2); TestVector(v1, 3); - TestVector(v2, 0); } UNIT_TEST(BufferVector_EraseIf) diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp index c9780231bc..7a9b331934 100644 --- a/base/buffer_vector.hpp +++ b/base/buffer_vector.hpp @@ -3,7 +3,10 @@ #include "base/checked_cast.hpp" #include +#include // for memcpy #include +#include +#include #include // Calls swap() function using argument dependant lookup. @@ -71,7 +74,7 @@ public: buffer_vector(buffer_vector const &) = default; - buffer_vector(buffer_vector && rhs) : m_size(rhs.m_size), m_dynamic(std::move(rhs.m_dynamic)) + buffer_vector(buffer_vector && rhs) : m_size(rhs.m_size), m_dynamic(move(rhs.m_dynamic)) { if (!IsDynamic()) MoveStatic(rhs); @@ -83,16 +86,13 @@ public: buffer_vector & operator=(buffer_vector && rhs) { - if (this != &rhs) - { - m_size = rhs.m_size; - m_dynamic = std::move(rhs.m_dynamic); + m_size = rhs.m_size; + m_dynamic = move(rhs.m_dynamic); - if (!IsDynamic()) - MoveStatic(rhs); + if (!IsDynamic()) + MoveStatic(rhs); - rhs.m_size = 0; - } + rhs.m_size = 0; return *this; } diff --git a/base/deferred_task.cpp b/base/deferred_task.cpp index ef5e6295db..42cd788d69 100644 --- a/base/deferred_task.cpp +++ b/base/deferred_task.cpp @@ -18,7 +18,7 @@ DeferredTask::DeferredTask(Duration const & duration) : m_duration(duration) if (m_cv.wait_for(l, m_duration) != std::cv_status::timeout || !m_fn) continue; - auto fn = std::move(m_fn); + auto fn = move(m_fn); m_fn = nullptr; l.unlock(); diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp index f70bbf9242..f2d67fff3d 100644 --- a/base/mem_trie.hpp +++ b/base/mem_trie.hpp @@ -4,9 +4,11 @@ #include "base/macros.hpp" #include +#include +#include #include #include -#include +#include #include namespace base @@ -219,7 +221,7 @@ public: template void ForEachInNode(ToDo && toDo) const { - m_node.m_values.ForEach(toDo); + m_node.m_values.ForEach(std::forward(toDo)); } String GetLabel() const { return m_node.m_edge.template As(); } @@ -289,7 +291,7 @@ public: void ForEachInTrie(ToDo && toDo) const { String prefix; - ForEachInSubtree(m_root, prefix, toDo); + ForEachInSubtree(m_root, prefix, std::forward(toDo)); } // Calls |toDo| for each key-value pair in the node that is reachable @@ -300,7 +302,7 @@ public: { MoveTo(prefix, true /* fullMatch */, [&](Node const & node, Edge const & /* edge */, size_t /* offset */) { - node.m_values.ForEach(toDo); + node.m_values.ForEach(std::forward(toDo)); }); } @@ -321,7 +323,7 @@ public: String p = prefix; for (; offset < edge.Size(); ++offset) p.push_back(edge[offset]); - ForEachInSubtree(node, p, toDo); + ForEachInSubtree(node, p, std::forward(toDo)); }); } @@ -380,7 +382,7 @@ private: { ASSERT_LESS_OR_EQUAL(n, Size(), ()); - Edge prefix(m_label.rbegin(), m_label.rbegin() + n); + Edge const prefix(m_label.rbegin(), m_label.rbegin() + n); m_label.erase(m_label.begin() + Size() - n, m_label.end()); return prefix; } diff --git a/base/string_utils.cpp b/base/string_utils.cpp index 0d0a2025b3..819a528996 100644 --- a/base/string_utils.cpp +++ b/base/string_utils.cpp @@ -2,6 +2,8 @@ #include "base/assert.hpp" +#include "3party/fast_double_parser/include/fast_double_parser.h" + #include #include #include @@ -9,7 +11,6 @@ #include #include -#include namespace strings { @@ -70,8 +71,8 @@ bool UniString::IsEqualAscii(char const * s) const SimpleDelimiter::SimpleDelimiter(char const * delims) { - std::string_view const s(delims); - auto it = s.begin(); + std::string const s(delims); + std::string::const_iterator it = s.begin(); while (it != s.end()) m_delims.push_back(utf8::unchecked::next(it)); } diff --git a/base/string_utils.hpp b/base/string_utils.hpp index 5d892104a0..8daa3fdc38 100644 --- a/base/string_utils.hpp +++ b/base/string_utils.hpp @@ -614,8 +614,7 @@ bool IsHTML(std::string const & utf8); bool AlmostEqual(std::string const & str1, std::string const & str2, size_t mismatchedCount); template -typename std::iterator_traits::value_type -JoinStrings(Iterator begin, Iterator end, Delimiter const & delimiter) +typename Iterator::value_type JoinStrings(Iterator begin, Iterator end, Delimiter const & delimiter) { if (begin == end) return {}; diff --git a/base/timer.cpp b/base/timer.cpp index 9c7bcf8d26..0c88ab2b00 100644 --- a/base/timer.cpp +++ b/base/timer.cpp @@ -101,7 +101,7 @@ std::string TimestampToString(time_t time) return std::string("INVALID_TIME_STAMP"); tm * t = gmtime(&time); - char buf[100]; + char buf[21] = { 0 }; #ifdef OMIM_OS_WINDOWS sprintf_s(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec); diff --git a/cmake/OmimHelpers.cmake b/cmake/OmimHelpers.cmake index 91af2e6f6b..fd401ee3de 100644 --- a/cmake/OmimHelpers.cmake +++ b/cmake/OmimHelpers.cmake @@ -307,3 +307,18 @@ ${include_compiled_header_dir}/${pch_file_name}.${PCH_EXTENSION}" endif() endforeach() endfunction() + + +# Macro for finding a system provided library +# that fulfills the required minimum version +# or else including the vendored library +# from a local git subdirectory +macro(find_package_or_fallback_to_3party PACKAGE_NAME MIN_REQUIRED_VERSION SUBDIRECTORY) + find_package(${PACKAGE_NAME} ${MIN_REQUIRED_VERSION} QUIET) + if (NOT ${${PACKAGE_NAME}_FOUND} OR ("${${PACKAGE_NAME}_VERSION}" VERSION_LESS "${MIN_REQUIRED_VERSION}")) + message(STATUS "Using ${PACKAGE_NAME} from submodule: ${SUBDIRECTORY}") + add_subdirectory(${SUBDIRECTORY} ${ARGN}) + else() + message(STATUS "Found ${PACKAGE_NAME} ${${PACKAGE_NAME}_VERSION} (minimum required version ${MIN_REQUIRED_VERSION})") + endif() +endmacro() diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt index b4d945351e..7a43455fbf 100644 --- a/coding/CMakeLists.txt +++ b/coding/CMakeLists.txt @@ -96,7 +96,7 @@ omim_add_library(${PROJECT_NAME} ${SRC}) target_link_libraries(${PROJECT_NAME} base expat - cppjansson + jansson succinct ICU::uc ICU::i18n # For transliteration. diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp index 41838c04a6..00d4786116 100644 --- a/coding/internal/file_data.cpp +++ b/coding/internal/file_data.cpp @@ -24,10 +24,10 @@ #include // ftruncate #endif -namespace base -{ using namespace std; +namespace base +{ FileData::FileData(string const & fileName, Op op) : m_FileName(fileName), m_Op(op) { @@ -319,14 +319,4 @@ bool IsEqualFiles(string const & firstFile, string const & secondFile) return true; } - -std::vector ReadFile(std::string const & filePath) -{ - base::FileData file(filePath, base::FileData::OP_READ); - uint64_t const sz = file.Size(); - std::vector contents(sz); - file.Read(0, contents.data(), sz); - return contents; -} - } // namespace base diff --git a/coding/internal/file_data.hpp b/coding/internal/file_data.hpp index 3437d5d626..0d7c39e7ee 100644 --- a/coding/internal/file_data.hpp +++ b/coding/internal/file_data.hpp @@ -63,7 +63,4 @@ bool CopyFileX(std::string const & fOld, std::string const & fNew); /// @return false if moving fails. DOES NOT THROW exceptions bool MoveFileX(std::string const & fOld, std::string const & fNew); bool IsEqualFiles(std::string const & firstFile, std::string const & secondFile); - -std::vector ReadFile(std::string const & filePath); - } // namespace base diff --git a/coding/internal/xmlparser.hpp b/coding/internal/xmlparser.hpp index 2fdf79c0d8..a7b5070956 100644 --- a/coding/internal/xmlparser.hpp +++ b/coding/internal/xmlparser.hpp @@ -13,7 +13,7 @@ #include #define XML_STATIC -#include +#include "3party/expat/expat/lib/expat.h" #if defined(__clang__) #pragma clang diagnostic pop diff --git a/coding/point_coding.hpp b/coding/point_coding.hpp index 9e545230f9..745fe031d5 100644 --- a/coding/point_coding.hpp +++ b/coding/point_coding.hpp @@ -70,9 +70,6 @@ uint8_t GetCoordBits(m2::RectD const & limitRect, double accuracy); // 3. If you need to temporarily store the point as an uint, // you do not need the complexity of interleaving. // -// By VNG: Well, for polys delta encoding WriteVarUint(BitwiseMerge(x, y)) is better than -// WriteVarUint(x) + WriteVarUint(y) by 15%. Check CitiesBoundaries_Compression test with World V0 vs V1. -// // Another possible reason to interleave bits of x and y arises // when implementing the Z-order curve but we have this // written elsewhere (see geometry/cellid.hpp). diff --git a/coding/reader.cpp b/coding/reader.cpp index 2734c02a30..2789335c63 100644 --- a/coding/reader.cpp +++ b/coding/reader.cpp @@ -1,5 +1,7 @@ #include "coding/reader.hpp" +#include "base/string_utils.hpp" + void Reader::ReadAsString(std::string & s) const { s.clear(); @@ -7,3 +9,20 @@ void Reader::ReadAsString(std::string & s) const s.resize(sz); Read(0, &s[0], sz); } + +std::vector Reader::ReadAsBytes() const +{ + std::vector contents; + contents.resize(static_cast(Size())); + Read(0 /* pos */, contents.data(), contents.size()); + return contents; +} + +bool Reader::IsEqual(std::string const & name1, std::string const & name2) +{ +#if defined(OMIM_OS_WINDOWS) + return strings::EqualNoCase(name1, name2); +#else + return (name1 == name2); +#endif +} diff --git a/coding/reader.hpp b/coding/reader.hpp index 1baa9828c8..9713cef5ec 100644 --- a/coding/reader.hpp +++ b/coding/reader.hpp @@ -29,6 +29,12 @@ public: virtual std::unique_ptr CreateSubReader(uint64_t pos, uint64_t size) const = 0; void ReadAsString(std::string & s) const; + + // Reads the contents of this Reader to a vector of 8-bit bytes. + // Similar to ReadAsString but makes no assumptions about the char type. + std::vector ReadAsBytes() const; + + static bool IsEqual(std::string const & name1, std::string const & name2); }; // Reader from memory. diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp index f46f4b8fe4..fc3d063b31 100644 --- a/coding/serdes_json.hpp +++ b/coding/serdes_json.hpp @@ -6,7 +6,7 @@ #include "base/exception.hpp" #include "base/scope_guard.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include @@ -238,11 +238,6 @@ public: { } - explicit DeserializerJson(char const * buffer) - : m_jsonObject(buffer), m_json(m_jsonObject.get()) - { - } - explicit DeserializerJson(json_t * json) : m_json(json) {} template diff --git a/cppjansson/CMakeLists.txt b/cppjansson/CMakeLists.txt deleted file mode 100644 index 7fc9b37fa0..0000000000 --- a/cppjansson/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(cppjansson) -set(SRC - jansson_handle.cpp - cppjansson.cpp - jansson_handle.hpp - cppjansson.hpp -) -omim_add_library(${PROJECT_NAME} ${SRC}) -target_link_libraries(${PROJECT_NAME} - jansson -) diff --git a/data/World.mwm b/data/World.mwm index 97b772c4d1..cbdc59e32b 100644 Binary files a/data/World.mwm and b/data/World.mwm differ diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm index 14930da9ba..613bf37580 100644 Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ diff --git a/data/categories.txt b/data/categories.txt index 377de02722..9e1b44058a 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -183,12 +183,12 @@ fr:3Stations-service|4Essence|4Carburant de:3Tankstelle|4Benzin|4Diesel|4Sprit hu:Benzinkút id:Bahan bakar -it:3Benzinaio +it:4Benzinaio|3Stazione di rifornimento ja:1ガソリンスタンド ko:연료|주유소 mr:पेट्रोल|इंधन|डिझेल nb:Drivstoff -pl:3Benzyna|4Paliwo +pl:3Stacja benzynowa pt:3Combustível pt-BR:Combustível ro:4Benzinărie|Benzină|Gaz @@ -251,7 +251,7 @@ fa:پارکینگ @shopping en:5Shopping|Shop ru:4Шоппинг|Магазин -be:4Закупы|магазін|крама +be:4Закупы|магазін bg:4Шопинг|Магазин ar:متجر|تسوق cs:Nákupy|Obchod @@ -647,7 +647,7 @@ cs:peníze da:3penge nl:geld fr:argent -de:Geld|Bankfiliale +de:Geld hu:pénz id:uang it:soldi @@ -903,15 +903,14 @@ cs:2pumpa da:3Tankstation nl:3Tankstation|3brandstof fr:Station-service|3carburant|3essence -de:Tankstation|3Tankstelle +de:Tankstation|Tankstelle et:3Tankla hu:3Benzinkút|benzin id:Pompa bensin -it:3Stazione di rifornimento ja:ガスステーション|ガス|燃料|軽油|給油 mr:पेट्रोल|इंधन|डिझेल|पेट्रोल पंप|पंप nb:3Bensinstasjon -pl:3Stacja paliw +pl:3Benzyna|4paliwo pt:3Posto de combustível|3Bomba de combustível|3gasolina|3gasóleo pt-BR:3Posto de combustível|3gasolina ro:3Benzinărie @@ -937,7 +936,7 @@ da:3Bager|bageri nl:3Bakkerij fi:3Leipomo fr:3Boulangerie|3Pâtisserie|pain -de:3Bäckerei|Bäckerladen|Bäcker|4Konditorei +de:3Bäckerei|Bäckerladen|Bäcker hu:3Pékség id:Toko roti|Roti it:3Panetteria|Panificio|Forno @@ -1002,7 +1001,7 @@ zh-Hans:商店 zh-Hant:1購物|店鋪|商店|雜貨店|便利商店 shop-cosmetics|@shopping -en:4Cosmetics|4Beauty Care|makeup|U+1F3EC|U+1F3EA +en:4Cosmetics|4Beauty Care|personal care|makeup|U+1F3EC|U+1F3EA ru:4Косметика bg:4Козметика be:4Касметыка @@ -1050,7 +1049,7 @@ da:Døgnbutik|døgnkiosk|kiosk nl:Buurtwinkel|kruidenier fi:Lähikauppa fr:Supérette -de:5Gemischtwarenladen|Verbauchermarkt|Lebensmittelhändler|Lebensmittelhandlung|Lebensmittelgeschäft|4Greißler|4Tante-Emma-Laden +de:Gemischtwarenladen|Verbauchermarkt|Lebensmittelhändler|Lebensmittelhandlung|Lebensmittelgeschäft|Lebensmittelmarkt|Supermarkt hu:Csemegebolt|ábécé id:Mini market it:5Minimarket @@ -1084,7 +1083,7 @@ be:Дэлікатэсы bg:Деликатеси cs:Lahůdky da:Delikatessebutik -de:4Feinkostladen|Feinkostgeschäft +de:Feinkostgeschäft el:Εκλεκτά τρόφιμα es:Delicatesen et:Maiustused @@ -1115,7 +1114,6 @@ zh-Hant:熟食店 shop-farm|@food en:Farm food -de:4Hofladen|4Bauernhofladen et:Talutoit ru:Фермерская еда tr:Çiftlik gıdaları @@ -1165,7 +1163,6 @@ tr:Market shop-health_food|@food en:Health food -de:4Reformhaus|5Naturkostladen|4Bioladen et:Tervisetoit ru:Здоровая еда tr:Sağlıklı Gıda @@ -1180,7 +1177,7 @@ da:4Mobiltelefonbutik|elektronikforretning nl:4Mobiele telefoonwinkel|elektronicawinkel fi:Elektroniikkakauppa fr:Magasin de téléphonie|magasin d'électronique -de:4Handyladen|Eletronikgeschäft|Mobiltelefone +de:Handyladen|Eletronikgeschäft|Funktelefone|Mobiltelefone hu:Mobiltelefon üzlet|elektronikai szaküzlet id:Toko telepon it:Negozio di telefonia mobile|negozio di elettronica|Negozio di cellulari @@ -1253,7 +1250,7 @@ da:Slagter|slagterbutik nl:Slager|beenhouwer fi:Lihakauppias fr:4Boucherie|Charcuterie -de:5Metzgerei|Metzger|Schlachter|4Fleischhauer +de:5Metzgerei|Metzger|Schlachter hu:Hentes|Mészáros id:Tukang daging it:Macellaio @@ -1289,7 +1286,7 @@ da:Møbelbutik|møbelforretning|møbelhandler nl:4Meubelzaak fi:Huonekalukauppa fr:Magasin de meubles|Ameublement -de:5Möbelhaus|Möbelgeschäft +de:5Möbelgeschäft|Möbelhaus hu:Bútoráruház id:Toko mebel it:Negozio di mobili @@ -1322,7 +1319,7 @@ be:Крама для кухні bg:Магазин за кухня cs:Prodejna kuchyní da:Køkkenforretning -de:6Küchenstudio|Küchengeschäft +de:6Küchengeschäft|Küchenstudio el:Κατάστημα κουζίνας es:Tienda de cocina et:Köögipood @@ -1428,11 +1425,10 @@ sk:Kníhkupectvo fa:کتاب فروشی shop-shoes|@shopping -en:Shoe Store|U+1F461|U+1F460|U+1F462|U+1F45E|U+1F45F|3shoes|4footwear +en:Shoe Store|U+1F461|U+1F460|U+1F462|U+1F45E|U+1F45F|3shoes|shoe shop|4footwear|footwear store ru:Магазин обуви|3обувь|обувной -ar:متجر أحذية|متجر -be:3Абутак|Крама абутку bg:3Обувки +ar:متجر أحذية|متجر cs:3Obuv da:Skobutik nl:Schoenenwinkel|schoenwinkel @@ -1475,7 +1471,7 @@ da:4Elektronikbutik|elektronik nl:4Elektronicazaak fi:4Elektroniikka fr:Magasin d'électroménager|4électronique -de:4Elektrofachgeschäft|Elektronikgeschäft|Elektrofachhandel +de:4Elektronik hu:4Elektronika id:4Elektronik it:Negozio di elettronica @@ -1511,7 +1507,7 @@ da:Isenkræmmer|Byggemarked nl:Ijzerhandel|Bouwmarkt fi:Rautakauppa|Työkalukauppa fr:Quincaillerie|bricolage -de:5Eisenwarengeschäft|3Baumarkt|4Heimwerkermarkt|Eisenwarenhandlung +de:5Eisenwarengeschäft|3Baumarkt|Heimwerkermarkt|Eisenwarenhandlung hu:Vas-műszaki bolt|Vaskereskedés|Barkácsüzlet|ezermester id:Toko perangkat keras|bahan bangunan it:Ferramenta|bricolage @@ -1548,7 +1544,7 @@ da:Smykkebutik|smykker|4juveler nl:4Juwelier fi:Korukauppa fr:4Bijouterie -de:4Juwelier|Juweliergeschäft|Schmuck +de:Juweliergeschäft|4Juwelier|Schmuck hu:Ékszer id:Perhiasan it:Gioielleria @@ -1621,7 +1617,7 @@ da:Gavebutik|4souvenirbutik nl:Cadeauwinkel fi:Lahjatavaraliike fr:Boutique de souvenirs|cadeaux -de:5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen +de:5Geschenkladen|Geschenke|Geschenkartikelladen|Andenkenladen|Andenken|Präsente|Mitbringsel hu:Ajándékbolt|4Souvenir|Szuvenír id:Toko hadiah it:Negozio di regali @@ -1657,7 +1653,7 @@ da:Skønhedssalon nl:Schoonheidssalon fi:Kauneushoitola fr:Salon de beauté|Institut de beauté -de:5Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung +de:Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung hu:Szépségszalon id:Salon kecantikan it:Estetista|Salone di bellezza @@ -1880,7 +1876,7 @@ da:4Drikkevarer nl:Drank|slijterij fi:Juomat fr:4Boissons -de:5Getränkemarkt +de:5Getränke hu:Italok|üdítők id:Minuman it:4Bibite|bevande @@ -1916,8 +1912,8 @@ da:Computerforretning|4computerbutik|computer nl:4Computerwinkel fi:Tietokonekauppa fr:Magasin d'informatique -de:4Computerfachgeschäft -hu:Számítógépüzlet|Számítógép üzlet +de:4Computergeschäft +hu:Számítógépüzlet id:Toko komputer it:Negozio di computer|negozio di articoli informatici ja:コンピュータショップ @@ -1942,7 +1938,7 @@ el:Κατάστημα πληροφορικής sk:Obchod s výpočtovou technikou fa:فروشگاه کامپیوتر -shop-confectionery|craft-confectionery|@food +shop-confectionery|craft-confectionery en:4Sweets|4confectionery|candies|candy store|U+1F36C|U+1F36D|cake shop|sweetshop|tuck shop|pastry|candy shop|cake shop en-AU:Lollies|Candy ru:4Кондитерская|кондитерские изделия|сладости|торты|десерты|пирожные @@ -1953,7 +1949,7 @@ da:Slikbutik|slikforretning|konfektureforretning|slik|konfekt nl:Banketbakker|snoepwinkel fi:Makeiskauppa fr:Pâtisserie|confiserie -de:3Süßwarenladen|Süßwarengeschäft|Süßwaren|4Süßigkeiten|4Konfiserie +de:3Süßwarengeschäft|Süßwaren|Süßwarenladen|4Süßigkeiten|Konditorei|Gebäck|Konfiserie|Kiosk hu:Cukrászüzlet|édességbolt id:Penganan|manisan it:Pasticceria|drogheria @@ -2125,7 +2121,6 @@ fa:لباس فروشی|بوتیک shop-caravan|@rv en:2RV dealership|4Caravan dealership|Motorhome dealership be:Продаж аўтадамоў -de:5Wohnmobilhändler|5Wohnwagenhändler es:Venta de caravanas|Venta de autocaravanas et:Haagiselamute müük fr:Concessionnaire de caravanes et camping-cars @@ -2146,7 +2141,7 @@ da:Bilforhandler nl:Autohandelaar fi:Autokauppa fr:Réparation auto|voitures|auto|concessionnaire -de:4Autohaus|Autohändler +de:4Autohaus hu:Autókereskedés|Autószalon|Kocsi id:Toko mobil it:Concessionaria|Autosalone @@ -2184,7 +2179,7 @@ nl:4Fietsenwinkel fi:3Polkupyöräliike fr:4Magasin de vélos|vélociste|bicyclette de:3Fahrradladen|Fahrrad|Velo -hu:4Kerékpárüzlet|Kerékpár üzlet +hu:4Kerékpárüzlet|Kerékpár id:3Toko sepeda it:Negozio di biciclette|4bicicletta|bici ja:自転車屋|レンタサイクル|自転車 @@ -2326,7 +2321,7 @@ da:2Busstation|2bus|station nl:Busstation|2bus|station fi:3Linja-autoasema|3Bussiasema fr:Gare routière|2bus|2autobus|arrêt -de:3Busbahnhof|Bushaltestelle|Haltestelle|Bus|Autobus|ÖPNV +de:3Busbahnhof|Haltestelle|Bus|Autobus|ÖPNV hu:2Buszpályaudvar|Buszállomás|2busz|megálló id:3Stasiun bus it:5Autostazione|4fermata|autobus @@ -2512,7 +2507,7 @@ da:3Rådhus nl:3Gemeentehuis fi:Kaupungintalo fr:3Mairie -de:3Rathaus|4Gemeindeamt +de:3Rathaus hu:3Városháza|Községháza|Önkormányzat id:3Balai kota it:3Municipio @@ -2697,7 +2692,7 @@ da:3Picnic nl:3Picknickplaats|picknickweide|picknicktafel fi:3Piknikpaikat fr:3Terrain de pique-nique|3aire de pique-nique -de:3Picknickplatz|5Grillplatz +de:3Picknickplatz|Grillplatz hu:3Piknikezőhely id:3Lokasi piknik it:3Picnic @@ -2771,7 +2766,7 @@ da:4Kirke|tempel|kultsted nl:Kerk|tempel|kathedraal|gebedsplaats|gebedshuis fi:4Kirkko|uskonnollinen kohde fr:3Église|lieu de culte|temple|basilique -de:4Kirche|Dom|3Kathedrale|4Münster|Anbetungsstätte| +de:4Kirche|Dom|3Kathedrale|4Münster|Anbetungsstätte|Tempel hu:Templom|Székesegyház|Katedrális|Dóm|Bazilika|Istentiszteleti hely id:Gereja|tempat ibadah it:Chiesa|duomo|4cattedrale|tempio|basilica @@ -2807,7 +2802,7 @@ da:4Moske|tempel|kultsted nl:4Moskee|tempel|gebedsplaats|gebedshuis fi:4Moskeija|uskonnollinen kohde fr:4Mosquée|lieu de culte|temple -de:4Moschee|Tekke|Anbetungsstätte +de:4Moschee|Tekke|Anbetungsstätte|Tempel hu:Mecset id:4Masjid|tempat ibadah it:4Moschea|duomo|tempio @@ -4150,7 +4145,7 @@ sk:3Autopožičovňa|požičovňa áut sw:Kodi ya gari|gari|kodi fa:مکان اجاره ماشین -amenity-cinema|@entertainment +amenity-cinema|@entertainment|@children en:3Cinema|U+1F3A6|U+1F3AC ru:Кинотеатр|3кино bg:3Кино|кинотеатър|филм|прожекция @@ -4187,46 +4182,6 @@ sk:3Kino sw:4Sinema|burudani fa:سینما -leisure-bowling_alley|@entertainment -en:4Bowling Alley -ar:ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ -be:Боўлінг -bg:Боулинг писта -ca:Bolera -cs:Bowlingová dráha -da:Bowling bane -de:Bowlingbahn -el:Αίθουσα σφαιρίσεως -es:Bolera -et:Bowlingusaal -eu:Bolatokia -fa:ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ -fi:Keilarata -fr:Salle de bowling -he:גנילואב םלוא -hu:Tekepálya -id:Arena Bowling -it:Sala da bowling -ja:ボーリング場 -ko:볼링장 -mr:गोलंदाजी गल्ली -nb:Bowlinghall -nl:Bowlingbaan -pl:Kręgielnia -pt:Pista de bowling -pt-BR:Pista de boliche -ro:Popicărie -ru:4Боулинг -sk:Bowlingová dráha -sv:Bowlinghall -sw:Njia ya Bowling -th:ลานโบว์ลิ่ง -tr:Bowling pisti -uk:Боулінг -vi:Sân chơi bowling -zh-Hans:保龄球馆 -zh-Hant:保齡球館 - amenity-theatre|@entertainment en:4Theatre|U+1F3AD en-US:4Theater @@ -4422,7 +4377,7 @@ fr:Caserne de pompiers de:5Feuerwehr|Feuerwache hu:Tűzoltóság id:Kantor pemadam kebakaran -it:Squadra antincendio +it:Scuadra antincendio ja:1消防署 ko:소방서 mr:अग्निशमन केंद्र|फायर ब्रिगेड @@ -4605,7 +4560,7 @@ cs:klinika|pohotovost|zdravotnické centrum|3lékař|4doktor da:sygehus nl:kliniek|hospitaal|3dokter|3eerste hulp fr:clinique|3médecin|3docteur -de:4Spital|Klinik|3Arzt|Doktor|Medizinische Einrichtung|Medizinisches Zentrum|Gesundheitswesen|3Ambulanz|Gesundheitsdienstleistungen|Erste Hilfe +de:Spital|Klinik|3Arzt|Doktor|Medizinische Einrichtung|Medizinisches Zentrum|Gesundheitswesen|3Ambulanz|Gesundheitsdienstleistungen|Erste Hilfe et:Haigla|kliinik|3arst|meditsiinikeskus|terviseteenused|esmaabi hu:rendelőintézet|3orvos ja:クリニック|医師|医者|ドクター|救急|診療 @@ -4739,7 +4694,7 @@ be:Медыцынская лабараторыя bg:Медицинска лаборатория cs:Lékařská laboratoř da:Medicinsk laboratorium -de:5Medizinisches Labor|3Labor +de:Medizinisches Labor el:Ιατρικό Εργαστήριο es:Laboratorio médico et:Meditsiinilabor|labor @@ -4808,282 +4763,6 @@ vi:Nhà vật lý trị liệu zh-Hans:物理治疗师 zh-Hant:物理治療師 -healthcare-alternative -en:alternative medicine -ar:الطب البديل -be:Альтэрнатыўная медыцына -bg:Алтернативна медицина -cs:Alternativní medicína -da:Alternativ medicin -de:Alternative Medizin -el:Εναλλακτική ιατρική -es:Medicina alternativa -et:Alternatiivne meditsiin -eu:Medikuntza alternatiboa -fa:طب جایگزین -fi:Vaihtoehtoinen lääketiede -fr:Médecine alternative -he:רפואה אלטרנטיבית -hu:Alternatív gyógyászat -id:Pengobatan alternatif -it:Medicina alternativa -ja:代替医療 -ko:대체 약품 -mr:पर्यायी औषध -nb:Alternativ medisin -nl:Alternatieve geneeskunde -pl:Medycyna alternatywna -pt:Medicina alternativa -pt-BR:Medicina alternativa -ro:Medicină alternativă -ru:Альтернативная медицина -sk:Alternatívna medicína -sv:Alternativ medicin -sw:Dawa mbadala -th:การแพทย์ทางเลือก -tr:Alternatif tıp -uk:Альтернативна медицина -vi:Liều thuốc thay thế -zh-Hans:替代医学 -zh-Hant:替代藥物 - -healthcare-audiologist -en:Audiology|Audiologist -ar:السمع|السمعيات -be:Аўдыялогія|Аўдыёлаг -bg:Аудиология|Аудиолог -cs:Audiologie|Audiolog -da:Audiologi|Audiolog -de:Audiologie|Audiologin|Audiologe -el:Ακοολογία|Ακουολόγος -es:Audiología|Audiólogo -et:Audioloogia|Audioloog -eu:Audiologia|Audiologoa -fa:شنوایی شناس|شنوایی شناسی -fi:Audiologia|Audiologi -fr:Audiologie|Audiologiste -he:אודיולוג|אודיולוגיה -hu:Audiológia|Audiológus -id:Audiologi|Audiologis -it:Audiologia|Audiologo -ja:オーディオロジー|オーディオロジスト -ko:청력학|청력학자 -mr:ऑडिओलॉजी|ऑडिओलॉजिस्ट -nb:Audiologi|Audiolog -nl:Audiologie|Audioloog -pl:Audiologia|Audiolog -pt:Audiologia|Audiologista -pt-BR:Fonoaudiologia|Fonoaudiólogo -ro:Audiologie|Audiolog -ru:Аудиология|Аудиолог -sk:Audiológia|Audiológ -sv:Audiologi|Audiolog -sw:Mtaalamu wa kusikia|Audiology -th:โสตวิทยา|นักโสตสัมผัสวิทยา -tr:Odyoloji|Odyolog -uk:Аудіологія|Аудіолог -vi:Thính học -zh-Hans:听力学家 -zh-Hant:聽力學|聽力學家 - -healthcare-blood_donation -en:Blood donation -ar:مركز التبرع بالدم -be:Донарства крыві -de:Blutspendezentrum|Blutspende -el:Αιμοδοσία -es:Donación de sangre -et:Vereloovutuskeskus|Veredoonorlus -eu:Odol ematea -fa:مرکز اهدای خون -fi:Verenluovutuskeskus|Verenluovutus -fr:Don de sang -he:מרכז תרומת דם -hu:Véradás -id:Donor darah -it:Donazione di sangue -ja:献血 -ko:헌혈 -mr:रक्तदान -nb:Bloddonasjonssenter|Bloddonasjon -nl:Bloeddonatiecentrum|Bloeddonatie -pl:Oddawanie krwi -pt:Doação de sangue -pt-BR:Doação de sangue -ro:Donarea de sânge -ru:Донорство крови -sk:Darovanie krvi -sv:Blodgivning -sw:Utoaji wa damu -th:การบริจาคเลือด -tr:Kan Bağışı -uk:Донорство крові -vi:Hiến máu -zh-Hans:献血中心 -zh-Hant:捐血中心|獻血 - -healthcare-optometrist -en:Optometry|Optometrist -ar:قياس البصر|طبيب العيون -be:Оптаметрыя|Акуліст -bg:Оптометрия|Оптометрист -cs:Optometrie|Optometrista -da:Optometri|Optometrist -de:Optometrie| -el:Οπτομετρία|Οπτομέτρης -es:Optometría|Optometrista -et:Optomeetria|Optometrist -eu:Optometria|Optometrista -fa:بینایی سنجی|اپتومتریست -fi:Optometria|Optometristi -fr:Optométrie|Optométriste -he:אופטומטריה|אופטומטריסט -hu:Optometria|Optometrista -id:Optometri|Ahli kacamata -it:Optometria|Optometrista -ja:オプトメトリー|オプトメトリスト -ko:검안|검안사 -mr:ऑप्टोमेट्री|ऑप्टोमेट्रिस्ट -nb:Optometri|Optometrist -nl:Optometrie|Optometrist -pl:Optometria|Optometrysta -pt:Optometria|Optometrista -pt-BR:Optometria|Optometrista -ro:Optometrie|Optometrist -ru:Оптометрия|Оптометрист -sk:Optometria|Optometrista -sv:Optometri|Optometrist -sw:Optometry|Daktari wa macho -th:ทัศนมาตรศาสตร์|นักทัศนมาตร -tr:Optometri|Optometrist -uk:Оптометрія|Оптометрист -vi:Khúc xạ nhãn khoa|bác sĩ nhãn khoa -zh-Hans:验光师 -zh-Hant:驗光|驗光師 - -healthcare-podiatrist -en:Podiatry|Podiatrist -ar:علاج الأرجل|طبيب الأرجل -be:Подологія|Артапед -bg:Подиология|Подиатрист -cs:Podiatrie|Podiatr -da:Fodterapi|Fodterapeut -de:Podologie|Podologe|Podologin -el:Ποδιατρική|Ποδίατρος -es:Podología|Podólogo -et:Jalaravi -eu:Podologia|Podologoa -fa:پزشکی پا|متخصص پا -fi:Jalkaterapia|Jalkaterapeutti -fr:Podologie|Podologue -he:פודיאטריה|פודיאטר -hu:Podiatria|Podiatrist -id:Podiatri|Ahli penyakit kaki -it:Podologia|Podologo -ja:足病学|足病医 -ko:발병학|발 전문의 -mr:पोडियाट्री|पोडियाट्रिस्ट -nb:Fotterapi|Fotterapeut -nl:Podologie|Podotherapeut -pl:Podiatria|Podolog -pt:Podiatria|Podiatra -pt-BR:Podiatria|Podiatra -ro:Podiatrie|Podiatru -ru:Подиатрия|Ортопед -sk:Podiatria|Podológ -sv:Fotvård|Fotvårdare -sw:Matibabu ya miguu|Daktari wa miguu -th:แก้โรคเท้า|แพทย์โรคเท้า -tr:Podiatri|Podiatrist -uk:Подологія -vi:khoa bàn chân|Bác sĩ chân -zh-Hans:足疗师 -zh-Hant:足病學|足病醫生 - -healthcare-psychotherapist -en:Psychotherapy -ar:العلاج النفسي|معالج نفسي -be:Псіхатэрапія|Псіхатэрапеўт -bg:Психотерапия|Психотерапевт -cs:Psychoterapie|Psychoterapeut -da:Psykoterapi|Psykoterapeut -de:Psychotherapie|Psychotherapeutin|Psychotherapeut -el:Ψυχοθεραπεία|Ψυχοθεραπευτής -es:Psicoterapia|Psicoterapeuta -et:Psühhoteraapia|Psühhoterapeut -eu:Psikoterapia|Psikoterapeuta -fa:روان درمانی|روان درمانگر -fi:Psykoterapia|Psykoterapeutti -fr:Psychothérapie|Psychothérapeute -he:פסיכותרפיה|פסיכותרפיסט -hu:Pszichoterápia|Pszichoterapeuta -id:Psikoterapi|Psikoterapis -it:Psicoterapia|Psicoterapeuta -ja:心理療法|サイコセラピスト -ko:심리치료|심리 치료사 -mr:मानसोपचार|मानसोपचारतज्ज्ञ -nb:Psykoterapi|Psykoterapeut -nl:Psychotherapie|Psychotherapeut -pl:Psychoterapia|Psychoterapeuta -pt:Psicoterapia|Psicoterapeuta -pt-BR:Psicoterapia|Psicoterapeuta -ro:Psihoterapie|Psihoterapeut -ru:Психотерапия|Психотерапевт -sk:Psychoterapia|Psychoterapeut -sv:Psykoterapi|Psykoterapeut -sw:Tiba ya kisaikolojia|Mwanasaikolojia -th:จิตบำบัด|นักจิตบำบัด -tr:Psikoterapi|Psikoterapist -uk:Психотерапія|Психотерапевт -vi:Tâm lý trị liệu|nhà trị liệu tâm lý -zh-Hans:心理治疗师 -zh-Hant:心理治療|心理治療師 - -healthcare-sample_collection -en:Sample collection -be:Аналізы -ru:Анализы -uk:Аналізи - -healthcare-speech_therapist -en:Logopedics|Speech therapist|Speech therapy -ar:علاج النطق|معالج النطق -be:лагапедыя|Лагапед -bg:Логопедия|Логопед -cs:Logopedie|Logoped -da:Tale terapi|Talepædagog|Talerapi -de:Logopedie|Logopädin|Logopäde -el:Λογοθεραπεία|Λογοθεραπευτής -es:Logopedia|Logopeda -et:Logopeedia|Logopeed -eu:Logopedia|Logopeda -fa:گفتار درمانی|متخصص گفتار درمانی -fi:Logopedia|Puheterapeutti|Logopedit -fr:Logopédie|Orthophoniste -he:ריפוי בדיבור|קלינאי תקשורת -hu:Logopédia|Logopédus -id:Logopedik|Terapis bicara -it:Logopedia|Logopedista -ja:ロゴペディックス|スピーチセラピスト -ko:대화 요법|언어 치료사 -mr:स्पीच थेरपी|स्पीच थेरपिस्ट -nb:Snakketerapi|Taleterapeut -nl:Logopedie|Logopedist|Spraaktherapie -pl:Logopeda|Logopedia -pt:Terapia da fala|Terapeuta da fala -pt-BR:Terapia da fala|Terapeuta da fala -ro:Logopedie|Terapeut de vorbire -ru:Логопедия|Логопед -sk:Logopédia|Logopéd -sv:Logopedics|Logoped -sw:Tiba ya hotuba|Mtaalamu wa hotuba -th:การบำบัดด้วยการพูด|นักบำบัดการพูด -tr:Logopedi|Konuşma terapisti -uk:Логопедія|Логопед -vi:Ngôn ngữ trị liệu|Trị liệu bằng lời nói -zh-Hans:语言治疗师 -zh-Hant:言語治療|語言治療師 - amenity-hunting_stand en:Hunting Stand ru:Охотничья вышка @@ -5094,7 +4773,7 @@ da:Jagtsted|hochsitz nl:Jachtplaats|jaagplek fi:Metsästyspaikka fr:Mirador -de:4Hochsitz|Anstand|4Jägerstand +de:Hochsitz|Anstand hu:Magasles id:Lokasi berburu it:Torre di caccio @@ -5121,12 +4800,11 @@ sw:Uwanja wa mawindo fa:شکارگاه amenity-kindergarten -en:5Kindergarten|U+1F476|U+1F37C|U+1F6BC|nursery|4Child Care|childcare +en:5Kindergarten|U+1F476|U+1F37C|U+1F6BC|day care center|nursery school|nursery|play school|childcare center|preschool en-AU:Kindy -ru:Детсад|ясли|4детский сад|садик -ar:حضانة أطفال|روضة أطفال -be:Дзіцячы садок|сад +ru:Детсад|ясли|4детский сад|дошкольное образование|детские ясли|садик bg:4Детска градина|деца|ясла +ar:حضانة أطفال|روضة أطفال cs:Školka|mateřská škola|dětská školka|mateřská školka da:4Børnehave nl:Kleuterschool @@ -5562,7 +5240,7 @@ fr:Vêtement usagés|Déposer des affaires non-utilisées de:4Altkleider|Alte Kleidung|Sachen spenden hu:Régi ruhák|Régi ruhák újrahasznosítása id:Pakaian lama|Mendaur ulang pakaian lama -it:Vestiti usati|Riciclare vestiti usati|Raccolta indumenti +it:Vestiti usati|Riciclare vestiti usati ja:古着|古着のリサイクル ko:낡은 옷|낡은 옷 재활|낡은 옷 재활용 mr:कपडे भंगारवाला @@ -6673,39 +6351,39 @@ fa:مسیر mr:मार्ग highway-pedestrian|highway-primary|highway-primary_link|highway-residential|highway-secondary|highway-secondary_link|highway-tertiary|highway-tertiary_link|highway-service|highway-road|highway-track|highway-trunk|highway-trunk_link|highway-living_street|highway-unclassified|highway-motorway_link|highway-motorway|highway-cycleway -en:Street|Road|Drive|Lane|Avenue -ru:Улица -bg:Улица -ar:شارع -cs:Ulice -da:Gade|Vej -nl:Straat +en:Street|st|str|ave|road|rd +ru:Улица|переулок|проезд|тракт|проспект|ул +bg:Улица|път|ул|бул| +ar:شارع|طريق +cs:Ulice|cesta|silnice|ul +da:Gade|vej|stræde +nl:Straat|st|str|laan|weg fi:Katu -fr:Rue -de:Straße -hu:Utca +fr:Rue|avenue|av|boul|boulevard|route +de:Straße|Boulevard|Avenue|Weg|Gasse|Schnellstraße|Spielstraße|Fußweg|Hauptstraße +hu:Utca|út|u. id:Jalan -it:Via|Strada -ja:ストリート|通り|道路|辻|筋 +it:Via|strada|corso|vicolo +ja:1ストリート|通り|道路|辻|筋 ko:거리 -nb:Gate -pl:Ulica -pt:Rua|Avenida -pt-BR:Rua|Avenida -ro:Strada -es:Calle|Avenida +nb:Gate|vei|gågate +pl:3Ulica|droga +pt:Rua|rodovia|estrada|avenida +pt-BR:Rua|rodovia|estrada|avenida +ro:Stradă +es:Calle et:Tänav eu:Kalea sv:Gata|väg th:ถนน -tr:Sokak|Sokağı -uk:Вулиця +tr:Sokak|sk|sok|cadde|cad|cd +uk:Вулиця|провулок|проїзд|проспект|бульвар|вул vi:Phố zh-Hans:街头 zh-Hant:路|街 -el:δρόμος -sk:Ulica -sw:mtaani +el:2Οδός|4Λεωφόρος|2δρόμος +sk:Ulica|cesta|ul +sw:Barabara|mtaa|barabara kuu fa:جاده mr:रस्ता @@ -7094,7 +6772,7 @@ da:3Frisør nl:3Kapper|kapsalon|haarsalon|kapperszaak fi:Kampaamo fr:3Coiffeur|salon de coiffure -de:3Friseur|Frisiersalon|Frisör|4Coiffeur +de:3Friseur|Frisiersalon|Frisör|Coiffeur hu:3Fodrász id:Penata rambut it:4Parrucchiera @@ -8422,7 +8100,7 @@ da:Ambassade nl:4Ambassade fi:6Suurlähetystö fr:4Ambassade -de:4Botschaft|4Konsulat|4Verbindungsbüro +de:4Botschaft hu:4Nagykövetség|Külképviselet id:Kedutaan it:4Ambasciata @@ -9194,7 +8872,7 @@ da:Regeringskontor nl:Overheidskantoor|overheidspand|regeringskantoor fi:Viranomaistoimisto fr:Administration publique -de:3Regierungsstelle|Amt|3Behörde +de:Regierungsstelle hu:Kormányzati iroda id:Kantor pemerintah it:Ufficio governativo|ufficio amministrativo @@ -9231,7 +8909,7 @@ da:4Advokatkontor nl:4Advocatenkantoor|advocaat fi:Lakitoimisto fr:Cabinet d'avocat -de:5Anwaltskanzlei|Anwaltsbüro|Anwalt|Rechtsanwalt|Jurist|Gerichtsanwalt|Rechtsbeistand|Rechtsberater|Verteidiger +de:Anwaltsbüro|5Anwaltskanzlei|Anwalt|Rechtsanwalt|Jurist|Gerichtsanwalt|Rechtsbeistand|Rechtsberater|Verteidiger hu:Ügyvéd|Ügyvédi iroda id:Kantor pengacara it:Studio legale @@ -9267,7 +8945,7 @@ da:Mobiloperatør nl:Mobiele provider|provider fi:Matkapuhelinoperaattori fr:Opérateur mobile -de:5Mobilfunkbetreiber|Mobilfunkanbieter +de:Mobilbetreiber|Mobilfunkanbieter hu:Mobiltelefon-társaság id:Operator seluler it:Operatore di telefonia mobile @@ -9300,7 +8978,7 @@ be:Пчаляр bg:Пчелар cs:Včelař da:Biavler -de:3Imker +de:Imker el:Μελισσοκόμος es:Apicultor et:Mesinik @@ -9453,7 +9131,7 @@ be:Кандытар bg:Сладкарски изделия cs:Cukrářské výrobky da:Konfekture -de:Süßwarenladen +de:Konditor el:Ζαχαροπλάστης es:Confitería et:Kondiiter @@ -9568,7 +9246,7 @@ be:Садоўнік bg:Градинар cs:Zahradník da:Gartner -de:Landschaftsgärtner|4Gärtnerei +de:Landschaftsgärtner|Gärtnerei el:Κηπουρός es:Paisajista et:Aednik @@ -9606,7 +9284,7 @@ be:Рамесніцтва bg:Занаят cs:Ruční práce da:Kunsthåndværk -de:4Kunsthandwerk +de:Kunsthandwerk el:Χειροτεχνία es:Artesanía et:Käsitöö @@ -9644,7 +9322,7 @@ be:Ацяпленне, вентыляцыя і кандыцыянаванне bg:Отопление, вентилация и климатизация cs:HVAC da:Blikkenslager -de:4Heizung, Lüftung und Klimatisierung +de:Heizung, Lüftung und Klimatisierung el:Ψυκτικός es:Aire acondicionado et:Õhkkonditsioneer @@ -9682,7 +9360,7 @@ be:5Металаканструкцыі bg:5Метални конструкции|металургия|ковач|метал|занаят cs:Kovodílna da:5Metalarbejder -de:4Schlosser +de:Schlosser el:5Μεταλλουργός es:Trabajador del metal et:5Metallitööline @@ -9797,7 +9475,7 @@ be:Вадаправодчык bg:Водопроводчик cs:Instalatér da:VVS-mand -de:5Installateur +de:Installateur el:Υδραυλικός es:Fontanero et:Santehnik @@ -9836,7 +9514,7 @@ be:Лесапільня bg:Дъскорезница cs:Pila da:Savværk -de:4Sägewerk +de:Sägewerk el:Πριστήριο es:Serrería et:Saeveski @@ -9913,7 +9591,7 @@ be:Вінакурня bg:Винарна cs:Vinařství da:Vingård -de:4Weingut|3Winzer|Weinbauer +de:4Weingut el:Οινοποιείο es:4Bodega|Vino et:Veinikelder @@ -10342,7 +10020,7 @@ nl:4Fotowinkel|kaders fi:Valokuvakauppa|kehykset fr:Matériel de photographie|Cadres|Boutique de:4Fotofachgeschäft|Rahmen -hu:4Fotósüzlet|Fényképüzlet|Fénykép üzlet|keretek +hu:4Fotósüzlet|Fényképüzlet|keretek|üzlet id:Studio Foto|bingkai it:Negozio di fotografia|cornici ja:写真屋|フレーム|店 @@ -10485,7 +10163,7 @@ nl:Bandenwinkel fi:Rengasliike fr:Magasin de pneus de:Reifen-Shop|4Autoreifen|Reifen -hu:Gumiszaküzlet|Gumi szaküzlet +hu:Gumiszaküzlet id:Toko Ban it:Gommista ja:タイヤ専門店|ショップ @@ -10591,7 +10269,7 @@ cs:Nabíjecí stanice|nabíjení da:Ladestation|opladning nl:Oplaadstation|opladen fi:Latausasema|lataus -fr:3Borne de recharge|4station de recharge|4voiture électrique|recharge +fr:Station de recharge|Recharge de:4Ladestation|aufladen hu:Töltőállomás|töltés id:Pusat Pengisian Daya|pengisian daya @@ -10619,11 +10297,10 @@ fa:ایستگاه شارژ mr:चार्जिंग स्टेशन|प्रभाराक केंद्र amenity-childcare -en:Nursery|4Child Care|childcare +en:Nursery|4Child Care ru:Детская комната|3ясли -ar:حضانة|رعاية أطفال -be:Яслі bg:3Ясла|деца +ar:حضانة|رعاية أطفال cs:4Jesle|Péče o děti da:Vuggestue|Børnehave nl:Crèche|kinderopvang|kinderzorg @@ -11504,7 +11181,7 @@ da:5Bookmaker nl:5Bookmaker fi:Kustantaja fr:5Bookmaker -de:5Buchmacher|3Wettbüro +de:5Buchmacher|Wettbüro hu:Fogadóiroda id:Bandar judi it:Centro scommesse @@ -11540,7 +11217,7 @@ da:Fiskehandler nl:Visboer|vismarkt|vis|zeevoedsel|schelpdier fi:Kalakauppias fr:Poissonnier|fruits de mer -de:Fischhändler|5Fischmarkt|Fisch|Meeresfrüchte|Schalentier +de:Fischhändler|Fischmarkt|Fisch|Meeresfrüchte|Schalentier hu:Halüzlet id:Penjual Ikan it:Pescivendolo @@ -11566,14 +11243,14 @@ sk:Obchodník s rybami fa:فروشگاه غذای دریایی mr:सीफूड शॉप -shop-second_hand|@shopping +shop-second_hand en:4Second Hand|Thrift shop|Flea market ar:ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ be:Сэканд-хэнд bg:Магазин втора употреба cs:Obchod z druhé ruky da:Genbrugsbutik -de:Second-Hand-Laden|5Gebrauchtwarenladen|Trödelladen +de:Second-Hand-Laden el:Κατάστημα μεταχειρισμένων es:Tienda de segunda mano et:4Kasutatud|Kirbuturg @@ -11611,7 +11288,7 @@ be:Дабрачынная крама bg:Благотворителен магазин cs:Charitativní obchod da:Velgørenhedsbutik -de:5Wohltätigkeitsladen +de:Wohltätigkeitsladen el:Φιλανθρωπικό κατάστημα es:Tienda de caridad et:Heategevuspood @@ -11689,7 +11366,7 @@ da:Vinhandel nl:Slijterij|Wijn fi:Alkoholimyymälä fr:Cave à vins|Caviste|Magasin de vins -de:4Weinhandlung|Weinladen|Weingeschäft +de:Wein- und Spirituosengeschäft|Weinladen|Weingeschäft|Weinhändler hu:Borkereskedés id:Toko anggur it:Negozio di alcolici @@ -12231,7 +11908,7 @@ da:Ejendomsmægler nl:Makelaar fi:Kiinteistönvälittäjä fr:Agence immobilière|agent immobilier -de:4Immobilienmakler +de:9Immobilienmakler hu:Ingatlaniroda id:Agen ril estat it:Agenzia immobiliare @@ -12805,7 +12482,7 @@ zh-Hant:機車停車格 fa:پارکینگ موتورسیکلت mr:दुचाकी पार्किंग -amenity-parking_space-disabled|@parking +amenity-parking_space-disabled en:Disabled Parking Space ar:ﺔﺻﺎﺨﻟﺍ ﺕﺎﺟﺎﻴﺘﺣﻻﺍ ﻱﻭﺬﻟ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻮﻟ ﻦﻛﺎﻣﺃ be:Паркоўка для інвалідаў @@ -13074,7 +12751,7 @@ bg:5Застрахователна служба|Застрахователен ar:مكتب تأمين cs:Pojišťovací kancelář da:Forsikringskontor -de:4Versicherungsbüro +de:Versicherungsbüro el:Ασφαλιστικό γραφείο es:Oficina de seguros et:Kindlustusasutus @@ -13111,7 +12788,7 @@ bg:НПО|офис|4неправителствена организация ar:مكتب مؤسسة خيرية cs:Kancelář nevládní organizace da:3NGO-kontor -de:5Nichtregierungsorganisation +de:Büro einer Nichtregierungsorganisation el:Γραφείο ΜΚΟ es:Sede de ONG et:Valitsusest sõltumatu ühenduse kontor @@ -13148,7 +12825,7 @@ bg:4Секс-шоп|Еротика|4Еротичен магазин ar:متجر منتجات جنسية cs:Obchod s erotickými pomůckami da:4Erotisk butik -de:Erotikladen|3Sexshop|4Erotikshop +de:4Erotikladen|3Sexshop|Erotikshop el:Κατάστημα ερωτικών ειδών es:3Sex Shop et:3Erootikapood @@ -13258,7 +12935,7 @@ bg:Стойка за вестници|4вестници|киоск|бутка ar:كشك الجرائد cs:Novinový stánek da:Avis-kiosk -de:4Zeitungsstand|Trafik +de:Zeitungsstand|Trafik el:Εφημεριδοπώλης|πρακτορείο εφημερίδων et:Ajalehepunkt|4ajalehed es:Puesto de venta de periódicos @@ -13295,7 +12972,7 @@ bg:Заложна къща ar:سمسار تسليف cs:Zastavárna da:Pantelåner -de:5Pfandleihe +de:Pfandleihe el:Ενεχυροδανειστήριο es:Casa de empeños et:Pandimaja @@ -13405,7 +13082,7 @@ bg:Магазин за разнообразни стоки ar:متجر متنوع\n cs:Smíšené zboží da:Småtingsbutik -de:5Billigladen|Niedrigpreisgeschäft +de:Billigladen|Niedrigpreisgeschäft el:Παντοπωλείο|Μπακάλικο|Ψιλικατζίδικο es:Tienda de Variedades et:Odavpood @@ -13860,7 +13537,7 @@ zh-Hant:活動場所 shop-chocolate|@food en:Chocolate Shop be:Шакалад -de:4Schokoladengeschäft +de:Schokoladengeschäft es:Tienda de chocolate et:Šokolaadipood fr:Chocolatier @@ -13876,7 +13553,7 @@ tr:Çikolata mağazası shop-coffee|@food en:Cofee store be:Кава -de:6Kaffeegeschäft +de:Kaffeegeschäft et:Kohvipood fr:Boutique de cafés it:Negozio di caffè @@ -13890,7 +13567,7 @@ tr:Kahve mağazası shop-fabric en:Fabric shop -de:4Textilgeschäft +de:Textilgeschäft et:Kangapood fr:Magasin de tissus it:Merceria @@ -13902,7 +13579,7 @@ tr:Kumaş mağazası|Tekstil mağazası shop-money_lender en:Money lender be:Ліхвяр -de:4Geldverleiher +de:Geldverleiher et:Rahalaenutus pl:ożyczkodawca pt:Prestamista @@ -13911,9 +13588,9 @@ ru:Ростовщик tr:Tefeci shop-music -en:Record store|vinyl|Music +en:Record store|vinyl be:Музыка -de:5Musikgeschäft|5Plattenladen +de:Musikgeschäft es:Disquería|Tienda de discos et:Plaadipood fr:Disquaire|vinyle|CD @@ -13930,7 +13607,7 @@ tr:Plak mağazası shop-musical_instrument en:Musical instruments be:Музычныя інструменты -de:5Musikinstrumenteladen|Musikhaus +de:4Musikinstrumenteladen|Musikhaus et:Muusikariistad fr:Magasin d'instruments de musique it:Negozio di strumenti @@ -13948,7 +13625,7 @@ en:Tea store be:Гарбата es:Tienda de té et:Teepood -de:3Teegeschäft +de:Teegeschäft fr:Boutique de thés it:Negozio di tè ja:茶販売店 @@ -13961,14 +13638,14 @@ ru:Чай tr:Çay mağazası zh-Hans:茶叶商店 -shop-antiques|@shopping +shop-antiques en:Antiques ar:ﻒﺤﺘﻟﺍ be:Антыкварыят bg:Антики cs:Starožitnosti da:Antikviteter -de:5Antiquitäten +de:Antiquitäten el:Αντίκες es:Antigüedades et:Antikvariaat @@ -13999,14 +13676,14 @@ vi:Đồ cổ zh-Hans:古董 zh-Hant:古董 -shop-art|@shopping +shop-art en:Arts Shop ar:ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ be:Крама мастацтваў bg:Магазин за изкуства cs:Obchod s uměním da:Kunstbutik -de:5Kunstgeschäft +de:Kunstgeschäft el:Κατάστημα Τεχνών es:Tienda de artes et:Kunstipood @@ -14037,7 +13714,7 @@ vi:Cửa hàng nghệ thuật zh-Hans:艺术商店 zh-Hant:藝術商店 -shop-baby_goods|@children +shop-baby_goods en:Baby Goods ar:ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ be:Дзіцячая крама @@ -14075,14 +13752,14 @@ vi:Cửa hàng trẻ em zh-Hans:儿童商店 zh-Hant:兒童商店 -shop-bag|@shopping +shop-bag en:Bags Store ar:ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ be:Крама сумак bg:Магазин за чанти cs:Obchod s taškami da:Tasker butik -de:5Taschen Shop +de:Taschen Shop el:Κατάστημα τσαντών es:Tienda de bolsos et:Kotipood @@ -14158,7 +13835,7 @@ be:Малочныя прадукты bg:Млечни продукти cs:Mléčné výrobky da:Mejeriprodukter -de:5Milchprodukte +de:Milchprodukte el:Γαλακτοκομικά προϊόντα es:Productos lácteos et:Piimatooted @@ -14196,7 +13873,7 @@ be:Крама электратэхнікі bg:Електрически магазин cs:Elektro obchod da:El-butik -de:5Elektrogeschäft +de:Elektrogeschäft el:Μαγαζί ηλεκτρικών ειδών es:Tienda de electricidad et:Elektritarvikute pood @@ -14234,7 +13911,7 @@ be:Рыбалоўны магазін bg:Риболовен магазин cs:Rybářský obchod da:Fiskeri butik -de:5Angelgeschäft +de:Angelgeschäft el:Κατάστημα ψαρέματος es:Tienda de pesca et:Kalapüügi pood @@ -14272,7 +13949,7 @@ be:Ўпрыгажэнні інтэр'еру bg:Вътрешни декорации cs:Interiérové dekorace da:Indvendige dekorationer -de:4Einrichtungsgeschäft|5Innendekorationen +de:Innendekorationen el:Διακοσμήσεις εσωτερικών χώρων es:Decoraciones interiores et:Sisustuse kaunistused @@ -14310,7 +13987,7 @@ be:Латарэйныя білеты bg:Лотарийни билети cs:Loterijní lístky da:Lotterikuponer -de:4Lotteriescheine +de:Lotteriescheine el:Λαχεία es:Boletos de lotería et:Loteriipiletid @@ -14348,7 +14025,7 @@ be:Медыцынскія прыналежнасці bg:Медицински изделия cs:Zdravotní zásoby da:Medicinske forsyninger -de:4Medizinische Versorgung|5Heilbehelfe +de:Medizinische Versorgung el:Ιατρικά Είδη es:Suministros médicos et:Meditsiinitarvikud @@ -14455,14 +14132,14 @@ vi:Sơn zh-Hans:油漆 zh-Hant:油漆 -shop-perfumery|@shopping +shop-perfumery en:Perfumery ar:ﺭﻮﻄﻌﻟﺍ be:Парфумерыя bg:Парфюмерия cs:Parfumerie da:Parfumeri -de:4Parfümerie +de:Parfümerie el:Αρωματοποιία es:Perfumería et:Parfümeeria @@ -14538,7 +14215,7 @@ be:Арэнда сховішчаў bg:Склад под наем cs:Pronájem skladu da:Lagerudlejning -de:5Speichermiete +de:Speichermiete el:Ενοικίαση αποθηκευτικού χώρου es:Alquiler de almacenamiento et:Ladustuse rent @@ -14576,7 +14253,7 @@ be:Тытунь bg:Тютюн cs:Tabák da:Tobak -de:Tabak|4Trafik +de:Tabak el:Καπνός es:Tabaco et:Tubakas @@ -14645,7 +14322,7 @@ vi:Nguồn cung cấp Giao dịch zh-Hans:贸易用品 zh-Hant:貿易用品 -shop-watches|@shopping +shop-watches en:Watches ar:ﺕﺎﻋﺎﺳ be:Гадзіннік @@ -14690,7 +14367,7 @@ be:Аптовая крама bg:Магазин на едро cs:Velkoobchodní prodejna da:Engros butik -de:5Großhandelsgeschäft +de:Großhandelsgeschäft el:Κατάστημα χονδρικής es:Almacén al por mayor et:Hulgimüügi pood @@ -14720,20 +14397,3 @@ uk:Оптовий магазин vi:Cửa hàng bán buôn zh-Hans:批发店 zh-Hant:批髮店 - -area:leisure-track|leisure-track -en:Track -de:Laufbahn -es:Pista deportiva -et:Jooksurada -fr:Piste de course -it:Pista da corsa -ja:トラック -mr:ट्रॅक -nl:Parcours -pt:Pista para desportos não motorizados -pt-BR:Pista para esportes não motorizados -ru:Беговая дорожка -tr:Pist -uk:Бігова доріжка -zh-Hans = 賽道 diff --git a/data/classificator.txt b/data/classificator.txt index 216f1168cf..58381de9d7 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -338,20 +338,10 @@ world + fire_hydrant - phone - {} - entrance + - main - - {} + entrance - healthcare + - alternative - - audiologist - - blood_donation - laboratory - - optometrist - physiotherapist - - podiatrist - - psychotherapist - - sample_collection - - speech_therapist - {} highway + bridleway + @@ -360,10 +350,6 @@ world + tunnel - {} bus_stop - - busway + - bridge - - tunnel - - {} construction - cycleway + bridge - @@ -445,7 +431,6 @@ world + service + area - bridge - - busway - driveway - parking_aisle - tunnel - @@ -600,7 +585,6 @@ world + {} leisure + beach_resort - - bowling_alley - common - dance - dog_park - @@ -849,7 +833,6 @@ world + beijing - bengalore - berlin - - bilbao - brasilia - brescia - brussels - diff --git a/data/colors.txt b/data/colors.txt index ad63659c4d..fcd89bc2ef 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -366,7 +366,7 @@ 1511594265 1523897290 1545508592 -1560281087 +1548466662 1711276032 1712264192 1712394496 diff --git a/data/config.xsd b/data/config.xsd index d9010f5247..4e6d31456a 100644 --- a/data/config.xsd +++ b/data/config.xsd @@ -8,10 +8,10 @@ - + - The root element, "omaps", for now contains only one entry, "editor". + The root element, "mapsme", for now contains only one entry, "editor". diff --git a/data/countries-strings/ar.json/localize.json b/data/countries-strings/ar.json/localize.json index 6fbfc1cf10..891eb7615c 100644 --- a/data/countries-strings/ar.json/localize.json +++ b/data/countries-strings/ar.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"منطقة كانتابريا", "Spain_Castile and Leon":"منطقة قـشتالة وليون", "Spain_Castile-La Mancha":"منطقة كاستيا لا مانتشا", -"Spain_Catalonia_Provincia de Barcelona":"كاتالونيا – برشلونة", -"Spain_Catalonia_Provincia de Girona":"كاتالونيا – جرندة", -"Spain_Catalonia_Provincia de Lleida":"كاتالونيا – لاردة", -"Spain_Catalonia_Provincia de Tarragona":"كاتالونيا – طراغونة", +"Spain_Catalonia_Provincia de Barcelona":"برشلونة", +"Spain_Catalonia_Provincia de Girona":"جرندة", +"Spain_Catalonia_Provincia de Lleida":"لاردة", +"Spain_Catalonia_Provincia de Tarragona":"طراغونة", "Spain_Ceuta":"سبتة", "Spain_Community of Madrid":"منطقة مدريد", "Spain_Comunidad Foral de Navarra":"منطقة نافارا", diff --git a/data/countries-strings/be.json/localize.json b/data/countries-strings/be.json/localize.json index 87b93389ba..154f8a08f1 100644 --- a/data/countries-strings/be.json/localize.json +++ b/data/countries-strings/be.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castile and León", "Spain_Castile-La Mancha":"Castile-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Каталонія – правінцыя Барселона", -"Spain_Catalonia_Provincia de Girona":"Каталонія – правінцыя Жирона", -"Spain_Catalonia_Provincia de Lleida":"Каталонія – правінцыя Лерыда", -"Spain_Catalonia_Provincia de Tarragona":"Каталонія – правінцыя Таррагона", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona Province", +"Spain_Catalonia_Provincia de Girona":"Girona Province", +"Spain_Catalonia_Provincia de Lleida":"Lleida Province", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona Province", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Community of Madrid", "Spain_Comunidad Foral de Navarra":"Navarre", diff --git a/data/countries-strings/ca.json/localize.json b/data/countries-strings/ca.json/localize.json deleted file mode 100644 index 9f86c48367..0000000000 --- a/data/countries-strings/ca.json/localize.json +++ /dev/null @@ -1,2553 +0,0 @@ -{ -"Abkhazia":"Abkhàzia", -"Afghanistan":"Afganistan", -"Alabama":"Alabama", -"Albania":"Albània", -"Algeria":"Algèria", -"Algeria_Central":"Algèria — centre", -"Algeria_Coast":"Algèria — nord", -"Andorra":"Andorra", -"Angola":"Angola", -"Anguilla":"Anguilla", -"Antarctica":"Antàrtida", -"Antigua and Barbuda":"Antigua i Barbuda", -"Argentina":"Argentina", -"Argentina_Buenos Aires_North":"Província de Buenos Aires — nord", -"Argentina_Buenos Aires_South":"Província de Buenos Aires — sud", -"Argentina_Cuyo":"Cuyo", -"Argentina_Mesopotamia":"Mesopotàmia", -"Argentina_Northwest":"Nord-oest de l'Argentina", -"Argentina_Pampas":"Pampas", -"Argentina_Patagonia":"Patagònia", -"Arizona":"Arizona", -"Armenia":"Armènia", -"Australia":"Austràlia", -"Australia_Melbourne":"Melbourne", -"Australia_New South Wales":"Nova Gal·les del Sud", -"Australia_Northern Territory":"Territori del Nord", -"Australia_Queensland":"Queensland", -"Australia_South Australia":"Austràlia Meridional", -"Australia_Tasmania":"Tasmània", -"Australia_Victoria":"Victoria", -"Australia_Western Australia":"Austràlia Occidental", -"Austria":"Àustria", -"Austria_Burgenland":"Burgenland", -"Austria_Carinthia":"Caríntia", -"Austria_Lower Austria_West":"Baixa Àustria — oest", -"Austria_Lower Austria_Wien":"Viena", -"Austria_Salzburg":"Salzburg", -"Austria_Styria":"Estíria", -"Austria_Tyrol":"Tirol", -"Austria_Upper Austria":"Alta Àustria", -"Austria_Vorarlberg":"Vorarlberg", -"Azerbaijan":"Azerbaidjan", -"Azerbaijan Region":"Azerbaidjan", -"Bahrain":"Bahrain", -"Bangladesh":"Bangla Desh", -"Barbados":"Barbados", -"Belarus":"Belarús", -"Belarus_Brest Region":"Regió de Brest", -"Belarus_Homiel Region":"Regió de Gomel", -"Belarus_Hrodna Region":"Regió de Grodno", -"Belarus_Maglieu Region":"Regió de Mogilev", -"Belarus_Minsk Region":"Regió de Minsk", -"Belarus_Vitebsk Region":"Regió de Vitebsk", -"Belgium":"Bèlgica", -"Belgium_Antwerp":"Província d'Anvers", -"Belgium_East Flanders":"Província de Flandes Oriental", -"Belgium_Flemish Brabant":"Província de Brabant Flamenc", -"Belgium_Hainaut":"Província de Hainaut", -"Belgium_Liege":"Província de Lieja", -"Belgium_Limburg":"Província de Limburg", -"Belgium_Luxembourg":"Província de Luxemburg", -"Belgium_Namur":"Província de Namur", -"Belgium_Walloon Brabant":"Província de Brabant Való", -"Belgium_West Flanders":"Província de Flandes Occidental", -"Belize":"Belize", -"Benin":"Benín", -"Bermuda":"Bermuda", -"Bhutan":"Bhutan", -"Bolivia":"Bolívia", -"Bolivia_North":"Bolívia – nord", -"Bolivia_South":"Bolívia – sud", -"Bosnia and Herzegovina":"Bòsnia i Hercegovina", -"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Districte Brčko", -"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Federació de Bòsnia i Hercegovina", -"Bosnia and Herzegovina_Republic of Srpska":"República de Sèrbia", -"Botswana":"Botswana", -"Brazil":"Brasil", -"Brazil_Bahia":"Bahia", -"Brazil_Goias":"Goiás", -"Brazil_Mato Grosso":"Mato Grosso", -"Brazil_Mato Grosso Do Sul":"Mato Grosso do Sul", -"Brazil_North Region":"Brasil, regió nord", -"Brazil_Northeast Region":"Regió nord-est", -"Brazil_Paraiba":"Paraíba", -"Brazil_Parana":"Paranà", -"Brazil_Rio Grande do Norte":"Rio Grande do Norte", -"Brazil_Santa Catarina":"Santa Catarina", -"Brazil_South Region":"Brasil meridional", -"Brazil_Southeast Region_Espirito Santo":"Espírito Santo", -"Brazil_Southeast Region_Minas Gerais_Contagem":"Minas Gerais — Contagem", -"Brazil_Southeast Region_Minas Gerais_North":"Minas Gerais — nord", -"Brazil_Southeast Region_Rio de Janeiro":"Rio de Janeiro", -"Brazil_Southeast Region_Sao Paulo_Campinas":"Sso Paulo — Campinas", -"Brazil_Southeast Region_Sao Paulo_City":"São Paulo — Santos", -"Brazil_Southeast Region_Sao Paulo_West":"São Paulo — Ribeirão Preto", -"British Indian Ocean Territory":"Territori Britànic de l'Oceà Índic", -"British Virgin Islands":"Illes Verges Britàniques", -"Brunei":"Brunei", -"Bulgaria":"Bulgària", -"Burkina Faso":"Burkina Faso", -"Burundi":"Burundi", -"California":"Califòrnia", -"Cambodia":"Cambodja", -"Cameroon":"Camerun", -"Cameroon_Central":"Camerun — centre", -"Cameroon_West":"Camerun — oest", -"Campo de Hielo Sur":"Camp de gel de la Patagònia meridional", -"Canada":"Canadà", -"Canada_Alberta":"Alberta", -"Canada_Alberta_Edmonton":"Edmonton", -"Canada_Alberta_North":"Alberta — nord", -"Canada_Alberta_South":"Alberta — sud", -"Canada_British Columbia":"Colúmbia Britànica", -"Canada_British Columbia_Central":"Colúmbia Britànica — centre", -"Canada_British Columbia_Far_North":"Colúmbia Britànica — est", -"Canada_British Columbia_Islands":"Illa de Vancouver", -"Canada_British Columbia_North":"Colúmbia Britànica — oest", -"Canada_British Columbia_Northeast":"Colúmbia Britànica — nord", -"Canada_British Columbia_Southeast":"Kelowna", -"Canada_British Columbia_Vancouver":"Vancouver", -"Canada_Labrador":"Labrador", -"Canada_Labrador_North":"Labrador — nord", -"Canada_Labrador_South":"Labrador — sud", -"Canada_Labrador_West":"Labrador — oest", -"Canada_Manitoba":"Manitoba", -"Canada_Manitoba_Northeast":"Manitoba — nord", -"Canada_Manitoba_Northwest":"Manitoba — oest", -"Canada_Manitoba_South":"Brandon", -"Canada_Manitoba_Winnipeg":"Winnipeg", -"Canada_New Brunswick":"New Brunswick", -"Canada_Newfoundland":"Terranova", -"Canada_Newfoundland_East":"Terranova — est", -"Canada_Newfoundland_North":"Terranova — nord", -"Canada_Newfoundland_South":"Terranova — sud", -"Canada_Newfoundland_West":"Terranova — oest", -"Canada_Northwest Territories":"Territoris del Nord-oest", -"Canada_Northwest Territories_East":"Territoris del Nord-oest — est", -"Canada_Northwest Territories_North":"Territoris del Nord-oest — nord", -"Canada_Northwest Territories_Yellowknife":"Yellowknife", -"Canada_Nova Scotia":"Nova Escòcia", -"Canada_Nova Scotia_Halifax":"Halifax", -"Canada_Nova Scotia_Sydney":"Sydney", -"Canada_Nunavut":"Nunavut", -"Canada_Nunavut_North":"Nunavut — nord", -"Canada_Nunavut_South":"Nunavut — sud", -"Canada_Ontario":"Barrera", -"Canada_Ontario_Bame":"Barrie", -"Canada_Ontario_Kingston":"Kingston", -"Canada_Ontario_London":"Londres", -"Canada_Ontario_Northeastern_Central":"Timmins", -"Canada_Ontario_Northeastern_North":"Moose Factory", -"Canada_Ontario_Northeastern_S":"Greater Sudbury", -"Canada_Ontario_Northeastern_SE":"North Bay", -"Canada_Ontario_Northeastern_SW":"Sault Ste. Marie", -"Canada_Ontario_Northeastern_Wawa":"Wawa", -"Canada_Ontario_Northern":"Thunder Bay", -"Canada_Ontario_Northwestern":"Ontario — nord", -"Canada_Ontario_Toronto":"Toronto", -"Canada_Prince Edward Island":"Illa del Príncep Eduard", -"Canada_Quebec":"Quebec", -"Canada_Quebec_Quebec":"Ciutat del Quebec", -"Canada_Quebek_Far North":"Quebec — nord", -"Canada_Quebek_Montreal":"Montreal", -"Canada_Quebek_North":"Sept-Îles", -"Canada_Quebek_Southeast_Rimouski":"Rimouski", -"Canada_Quebek_Southeast_Saguenay":"Saguenay", -"Canada_Quebek_West_Chibougamau":"Chibougamau", -"Canada_Quebek_West_Rouyn-Noranda":"Rouyn-Noranda", -"Canada_Saskatchewan":"Saskatchewan", -"Canada_Saskatchewan_North":"Saskatchewan — nord", -"Canada_Saskatchewan_South":"Saskatchewan — sud", -"Canada_Yukon":"Yukon", -"Canada_Yukon_North":"Yukon — nord", -"Canada_Yukon_Whitehorse":"Whitehorse", -"Cape Verde":"Cap Verd", -"Caribees":"Antilles menors", -"Caribisch Nederland":"Aruba, Curaçao i Antilles Neerlandeses", -"Cayman Islands":"Illes Caiman", -"Central African Republic":"República Centreafricana", -"Central Anatolia Region":"Regió d'Anatòlia Central", -"Chad":"Txad", -"Chile":"Xile", -"Chile_North":"Xile — nord", -"Chile_South":"Xile — sud", -"China_Anhui":"Anhui", -"China_Chongqing":"Chongqing", -"China_Fujian":"Fujian", -"China_Gansu":"Gansu", -"China_Guangdong":"Guangdong", -"China_Guangxi":"Regió Autònoma de Guangxi Zhuang", -"China_Guizhou":"Guizhou", -"China_Hebei":"Hebei", -"China_Heilongjiang":"Heilongjiang", -"China_Henan":"Henan", -"China_Hubei":"Hubei", -"China_Hunan":"Hunan", -"China_Inner Mongolia":"Mongòlia Interior", -"China_Jiangsu":"Jiangsu", -"China_Jiangxi":"Jiangxi", -"China_Jilin":"Jilin", -"China_Liaoning":"Liaoning", -"China_Ningxia Hui":"Regió Autònoma de Ningxia Hui", -"China_Qinghai":"Qinghai", -"China_Shaanxi":"Shaanxi", -"China_Shandong":"Shandong", -"China_Shanghai":"Xangai", -"China_Shanxi":"Shanxi", -"China_Sichuan":"Sichuan", -"China_Tibet Autonomous Region":"Regió Autònoma del Tibet", -"China_Xinjiang":"Regió Autònoma Uigur de Xinjiang", -"China_Yunnan":"Yunnan", -"China_Zhejiang":"Zhejiang", -"Colombia":"Colòmbia", -"Colombia_East":"Colòmbia — est", -"Colombia_North":"Colòmbia — nord", -"Colombia_West":"Colòmbia — oest", -"Colorado":"Colorado", -"Comoros":"Comores", -"Congo-Brazzaville":"República del Congo", -"Congo-Kinshasa":"República Democràtica del Congo", -"Cook Islands":"Illes Cook", -"Costa Rica":"Costa Rica", -"Cote dIvoire":"Costa d'Ivori", -"Crimea":"Península de Crimea", -"Croatia":"Croàcia", -"Cuba":"Cuba", -"Cyprus":"Xipre", -"Czech Republic":"República Txeca", -"Czech_Jihovychod_Jihomoravsky kraj":"Regió Moràvia Meridional", -"Czech_Jihovychod_Kraj Vysocina":"Regió de Vysočina", -"Czech_Jihozapad_Jihocesky kraj":"Regió del sud de Bohèmia", -"Czech_Jihozapad_Plzensky kraj":"Regió de Plzeň", -"Czech_Karlovasky kraj":"Regió de Karlovy Vary", -"Czech_Moravskoslezsko":"Regió Moràvia-Silesiana", -"Czech_Olomoucky kraj":"Regió de Olomouc", -"Czech_Praha":"Praga", -"Czech_Severovychod_Kralovehradecky kraj":"Regió de Hradec Králové", -"Czech_Severovychod_Liberecky kraj":"Regió de Liberec", -"Czech_Severovychod_Pardubicky kraj":"Regió de Pardubice", -"Czech_Stredni Cechy_East":"Regió de bohèmia central — est", -"Czech_Stredni Cechy_West":"Regió de Bohèmia central — oest", -"Czech_Ustecky kraj":"Regió d'Ústí nad Labem", -"Czech_Zlinsky Kraj":"Regió de Zlín", -"Denmark":"Dinamarca", -"Denmark_Capital Region of Denmark":"Regió capital de Dinamarca", -"Denmark_Central Denmark Region":"Regió del centre de Dinamarca", -"Denmark_North Denmark Region":"Regió del nord de Dinamarca", -"Denmark_Region Zealand":"Regió de Zelanda", -"Denmark_Region of Southern Denmark":"Regió del sud de Dinamarca", -"Djibouti":"Djibouti", -"Dominica":"Dominica", -"Dominican Republic":"República Dominicana", -"East Timor":"Timor Oriental", -"Ecuador":"Equador", -"Egypt":"Egipte", -"El Salvador":"El Salvador", -"Equatorial Guinea":"Guinea Equatorial", -"Eritrea":"Eritrea", -"Estonia":"Estònia", -"Estonia_East":"Estònia — est", -"Estonia_West":"Estònia — oest", -"Ethiopia":"Etiòpia", -"Falkland Islands":"Illes Falkland", -"Faroe Islands":"Illes Faroe", -"Federated States of Micronesia":"Estats federats de Micronèsia", -"Fiji":"Fiji", -"Finland":"Finlàndia", -"Finland_Eastern Finland":"Finlàndia oriental", -"Finland_Northern Finland":"Finlàndia septentrional", -"Finland_Southern Finland_Helsinki":"Finlàndia meridional — Hèlsinki", -"Finland_Southern Finland_Lappeenranta":"Finlàndia meridional — Lappeenranta", -"Finland_Southern Finland_West":"Finlàndia sud-oest", -"Finland_Western Finland":"Finlàndia occidental", -"Florida":"Florida", -"France":"França", -"France_Alsace":"Alsàcia", -"France_Alsace_Bas-Rhin":"Bas-Rhin", -"France_Alsace_Haut-Rhin":"Haut-Rhin", -"France_Aquitaine":"Aquitània", -"France_Aquitaine_Dordogne":"Dordogne", -"France_Aquitaine_Gironde":"Gironde", -"France_Aquitaine_Landes":"Landes", -"France_Aquitaine_Lot-et-Garonne":"Lot-et-Garonne", -"France_Aquitaine_Pyrenees-Atlantiques":"Pirineus Atlàntics", -"France_Auvergne":"Alvèrnia", -"France_Auvergne_Allier":"Alier", -"France_Auvergne_Cantal":"Cantal", -"France_Auvergne_Haute-Loire":"Alt Loira", -"France_Auvergne_Puy-de-Dome":"Puèi Domat", -"France_Brittany":"Bretanya", -"France_Brittany_Cotes-dArmor":"Costes del Nord", -"France_Brittany_Finistere":"Finisterre", -"France_Brittany_Ille-et-Vilaine":"Ille i Vilaine", -"France_Brittany_Morbihan":"Morbihan", -"France_Burgundy":"Borgonya", -"France_Burgundy_Cote-dOr":"Costa d’Or", -"France_Burgundy_Nievre":"Nièvre", -"France_Burgundy_Saone-et-Loire":"Saona i Loira", -"France_Burgundy_Yonne":"Yonne", -"France_Centre-Val de Loire":"Centre-Val de Loira", -"France_Centre-Val de Loire_Cher":"Cher", -"France_Centre-Val de Loire_Eure-et-Loir":"Eure-et-Loir", -"France_Centre-Val de Loire_Indre":"Indre", -"France_Centre-Val de Loire_Indre-et-Loire":"Indre-et-Loire", -"France_Centre-Val de Loire_Loir-et-Cher":"Loir-et-Cher", -"France_Centre-Val de Loire_Loiret":"Loiret", -"France_Champagne-Ardenne":"Champagne-Ardenne", -"France_Corsica":"Còrsega", -"France_Free County":"Franc Comtat", -"France_French Guiana":"Guaiana Francesa", -"France_Ile-de-France":"Illa de França", -"France_Ile-de-France_Essonne":"Essonne", -"France_Ile-de-France_Hauts-de-Seine":"Hauts-de-Seine", -"France_Ile-de-France_Paris":"París", -"France_Ile-de-France_Seine-Saint-Denis":"Sena-Sant-Denis", -"France_Ile-de-France_Seine-et-Marne":"Sena-et-Marne", -"France_Ile-de-France_Val-dOise":"Val-d'Oise", -"France_Ile-de-France_Val-de-Marne":"Val-de-Marne", -"France_Ile-de-France_Yvelines":"Yvelines", -"France_Languedoc-Roussillon":"Llenguadoc-Rosselló", -"France_Languedoc-Roussillon_Aude":"Aude", -"France_Languedoc-Roussillon_Gard":"Gard", -"France_Languedoc-Roussillon_Herault":"Hérault", -"France_Languedoc-Roussillon_Lozere":"Lozère", -"France_Languedoc-Roussillon_Pyrenees-Orientales":"Pirineus orientals", -"France_Limousin":"Llemosí", -"France_Lorraine":"Lorena", -"France_Lorraine_Meurthe-et-Moselle":"Meurthe-et-Moselle", -"France_Lorraine_Meuse":"Meuse", -"France_Lorraine_Moselle":"Mosel·la", -"France_Lorraine_Vosges":"Vosges", -"France_Lower Normandy":"Baixa Normandia", -"France_Lower Normandy_Calvados":"Calvados", -"France_Lower Normandy_Manche":"Manche", -"France_Lower Normandy_Orne":"Orne", -"France_Midi-Pyrenees":"Midi-Pyrénées", -"France_Midi-Pyrenees_Ariege":"Ariège", -"France_Midi-Pyrenees_Aveyron":"Aveyron", -"France_Midi-Pyrenees_Gers":"Gers", -"France_Midi-Pyrenees_Haute-Garonne":"Alta Garona", -"France_Midi-Pyrenees_Hautes-Pyrenees":"Alts Pirineus", -"France_Midi-Pyrenees_Lot":"Lot", -"France_Midi-Pyrenees_Tarn":"Tarn", -"France_Midi-Pyrenees_Tarn-et-Garonne":"Tarn-et-Garonne", -"France_New Caledonia":"Nova Caledònia", -"France_Nord-Pas-de-Calais":"Nord-Pas-de-Calais", -"France_Nord-Pas-de-Calais_Lille":"Lille", -"France_Nord-Pas-de-Calais_Nord":"Nord", -"France_Nord-Pas-de-Calais_Pas-de-Calais":"Pas-de-Calais", -"France_Pays de la Loire":"País del Loira", -"France_Pays de la Loire_Loire-Atlantique":"Loira-Atlàntic", -"France_Pays de la Loire_Maine-et-Loire":"Maine-et-Loire", -"France_Pays de la Loire_Mayenne":"Mayenne", -"France_Pays de la Loire_Sarthe":"Sarthe", -"France_Pays de la Loire_Vendee":"Vendée", -"France_Picardy":"Picardia", -"France_Picardy_Aisne":"Aisne", -"France_Picardy_Oise":"Oise", -"France_Picardy_Somme":"Somme", -"France_Poitou-Charentes":"Poitou-Charentes", -"France_Poitou-Charentes_Charente":"Charente", -"France_Poitou-Charentes_Charente-Maritime":"Charente-Marítima", -"France_Poitou-Charentes_Deux-Sevres":"Deux-Sèvres", -"France_Poitou-Charentes_Vienne":"Viena", -"France_Provence-Alpes-Cote dAzur":"Provença-Alps-Costa Blava", -"France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence":"Alpes de l’Alta Provença", -"France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone":"Bouches-du-Rhnene", -"France_Provence-Alpes-Cote dAzur_Hautes-Alpes":"Alts Alps", -"France_Provence-Alpes-Cote dAzur_Maritime Alps":"Alps Marítims", -"France_Provence-Alpes-Cote dAzur_Var":"Var", -"France_Provence-Alpes-Cote dAzur_Vaucluse":"Vaucluse", -"France_Rhone-Alpes":"Roine-Alps", -"France_Rhone-Alpes_Ain":"Ain", -"France_Rhone-Alpes_Ardeche":"Ardèche", -"France_Rhone-Alpes_Drome":"Droma", -"France_Rhone-Alpes_Haute-Savoie":"Alta Savoia", -"France_Rhone-Alpes_Isere":"Isèra", -"France_Rhone-Alpes_Loire":"Loira", -"France_Rhone-Alpes_Rhone":"Roine", -"France_Rhone-Alpes_Savoie":"Savoia", -"France_Southern Islands":"Terres Australs i Antàrtiques Franceses", -"France_Upper Normandy":"Alta Normandia", -"French Polynesia":"Polinèsia Francesa", -"Gabon":"Gabon", -"Georgia Region":"Geòrgia", -"Georgia":"Geòrgia", -"Germany":"Alemanya", -"Germany_Baden-Wurttemberg":"Baden-Württemberg", -"Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg":"Friburg de Brisgòvia", -"Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe":"Karlsruhe", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn":"Stuttgart — Heilbronn", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart":"Stuttgart — Stuttgart", -"Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen":"Tübingen", -"Germany_Berlin":"Berlín", -"Germany_Brandenburg_North":"Brandenburg — nord", -"Germany_Brandenburg_South":"Brandenburg — sud", -"Germany_Free State of Bavaria":"Baviera", -"Germany_Free State of Bavaria_Lower Bavaria":"Baixa Baviera", -"Germany_Free State of Bavaria_Lower Franconia":"Baixa Francònia", -"Germany_Free State of Bavaria_Middle Franconia":"Francònia Mitjana", -"Germany_Free State of Bavaria_Swabia":"Suàbia", -"Germany_Free State of Bavaria_Upper Bavaria_East":"Alta Baviera — est", -"Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt":"Alta Baviera — Ingolstadt", -"Germany_Free State of Bavaria_Upper Bavaria_Munchen":"Alta Baviera — Munic", -"Germany_Free State of Bavaria_Upper Franconia":"Alta Francònia", -"Germany_Free State of Bavaria_Upper Palatinate":"Alt Palatinat", -"Germany_Hamburg_main":"Hamburg", -"Germany_Hesse":"Hesse", -"Germany_Hesse_Regierungsbezirk Darmstadt":"Darmstadt", -"Germany_Hesse_Regierungsbezirk Giessen":"Giessen", -"Germany_Hesse_Regierungsbezirk Kassel":"Kassel", -"Germany_Lower Saxony":"Baixa Saxònia", -"Germany_Lower Saxony_Bremen_Bremen":"Bremen", -"Germany_Lower Saxony_Bremen_Munster":"Lüneburg", -"Germany_Lower Saxony_Hannover":"Hannover", -"Germany_Lower Saxony_Oldenburg":"Oldenburg", -"Germany_Mecklenburg-Vorpommern":"Mecklenburg-Vorpommern", -"Germany_North Rhine-Westphalia":"Rin del Nord-Westfàlia", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg":"Arnsberg — Arnsberg", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund":"Arnsberg — Dortmund", -"Germany_North Rhine-Westphalia_Regierungsbezirk Detmold":"Detmold", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf":"Düsseldorf — Düsseldorf", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim":"Düsseldorf — Mülheim del Ruhr", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel":"Düsseldorf — Wesel", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen":"Colònia — Aquisgrà", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln":"Colònia — Colònia", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster":"Münster — Münster", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen":"Münster — Recklinghausen", -"Germany_Rhineland-Palatinate_Koblenz":"Renània-Palatinat — Coblença", -"Germany_Rhineland-Palatinate_South":"Renània-Palatinat — Magúncia", -"Germany_Saarland":"Saarland", -"Germany_Saxony-Anhalt":"Saxònia-Anhalt", -"Germany_Saxony_Dresden":"Saxònia — Dresden", -"Germany_Saxony_Leipzig":"Saxònia — Leipzig", -"Germany_Schleswig-Holstein":"Schleswig-Holstein", -"Germany_Thuringia":"Turíngia", -"Ghana":"Ghana", -"Gibraltar":"Gibraltar", -"Greece":"Grècia", -"Greece_Decentralized Administration of Aegean":"Egeu", -"Greece_Decentralized Administration of Attica":"Àtica", -"Greece_Decentralized Administration of Crete":"Creta", -"Greece_Decentralized Administration of Epirus - Western Macedonia":"Epir i Macedònia Occidental", -"Greece_Decentralized Administration of Macedonia and Thrace":"Macedònia i Tràcia", -"Greece_Decentralized Administration of Thessaly - Central Greece":"Tessàlia i Grècia Central", -"Greece_Decentralized Administration of West Greece":"Peloponès", -"Greenland":"Groenlàndia", -"Grenada":"Grenada", -"Guadeloupe":"Guadeloupe", -"Guatemala":"Guatemala", -"Guernsey":"Guernsey", -"Guinea":"Guinea", -"Guinea-Bissau":"Guinea Bissau", -"Guyana":"Guyana", -"Haiti":"Haití", -"Honduras":"Hondures", -"Hungary":"Hongria", -"Hungary_Kozep-Magyarorszag":"Hongria central", -"Hungary_Northern Great Plain":"Hongria — est", -"Hungary_Transdanubia":"Hongria — oest", -"Iceland":"Islàndia", -"Illinois":"Illinois", -"India":"Índia", -"India_Andaman and Nicobar Islands":"Illes Andaman i Nicobar", -"India_Andhra Pradesh":"Andhra Pradesh", -"India_Arunachal Pradesh":"Arunachal Pradesh", -"India_Assam":"Assam", -"India_Bihar":"Bihar", -"India_Chandigarh":"Chandigarh", -"India_Chhattisgarh":"Chhattisgarh", -"India_Delhi":"Delhi", -"India_Goa":"Goa", -"India_Gujarat":"Gujarat", -"India_Haryana":"Haryana", -"India_Himachal Pradesh":"Himachal Pradesh", -"India_Jammu and Kashmir":"Jammu i Caixmir", -"India_Jharkhand":"Jharkhand", -"India_Karnataka":"Karnataka", -"India_Kerala":"Kerala", -"India_Lakshadweep":"Lakshadweep", -"India_Madhya Pradesh":"Madhya Pradesh", -"India_Maharashtra":"Maharashtra", -"India_Manipur":"Manipur", -"India_Meghalaya":"Meghalaya", -"India_Mizoram":"Mizoram", -"India_Nagaland":"Nagaland", -"India_Odisha":"Odisha", -"India_Punjab":"Panjab", -"India_Rajasthan":"Rajasthan", -"India_Sikkim":"Sikkim", -"India_Tamil Nadu":"Tamil Nadu", -"India_Telangana":"Telangana", -"India_Tripura":"Tripura", -"India_Uttar Pradesh":"Uttar Pradesh", -"India_Uttarakhand":"Uttarakhand", -"India_West Bengal":"Bengala occidental", -"Indiana":"Indiana", -"Indonesia":"Indonèsia", -"Indonesia_Central":"Sulawesi, Kalimantan", -"Indonesia_East":"Indonèsia — est", -"Indonesia_Jawa Barat":"Província de Java Occidental", -"Indonesia_Jawa Tengah":"Província central de Java", -"Indonesia_Jawa Timur":"Província de Java Oriental", -"Indonesia_Nusa Tenggara":"Illes Petites de la Sonda", -"Indonesia_West":"Sumatra", -"Iowa":"Iowa", -"Iran":"Iran", -"Iran_North":"Iran — nord", -"Iran_South":"Iran — sud", -"Iraq":"Iraq", -"Ireland":"Irlanda", -"Ireland_Connacht":"Connacht", -"Ireland_Leinster":"Leinster", -"Ireland_Munster":"Munster", -"Ireland_Northern Counties":"Ulster", -"Isle of Man":"Illa de Man", -"Israel":"Israel", -"Israel Region":"Israel", -"Italy":"Itàlia", -"Italy_Abruzzo":"Abruzzo", -"Italy_Aosta Valley":"Vall d'Aosta", -"Italy_Apulia":"Pulla", -"Italy_Basilicata":"Basilicata", -"Italy_Calabria":"Calàbria", -"Italy_Campania":"Campània", -"Italy_Emilia":"Emília-Romanya", -"Italy_Emilia-Romagna_Bologna":"Província de Bolonya", -"Italy_Emilia-Romagna_Ferrara":"Província de Ferrara", -"Italy_Emilia-Romagna_Forli-Cesena":"Província de Forlì-Cesena", -"Italy_Emilia-Romagna_Modena":"Província de Mòdena", -"Italy_Emilia-Romagna_Parma":"Província de Parma", -"Italy_Emilia-Romagna_Piacenza":"Província de Piacenza", -"Italy_Emilia-Romagna_Ravenna":"Província de Ravenna", -"Italy_Emilia-Romagna_Reggio Emilia":"Província de Reggio de l'Emília", -"Italy_Emilia-Romagna_Rimini":"Província de Rimini", -"Italy_Friuli":"Friül-Venezia Giulia", -"Italy_Friuli-Venezia Giulia_Gorizia":"Província de Gorizia", -"Italy_Friuli-Venezia Giulia_Pordenone":"Província de Pordenone", -"Italy_Friuli-Venezia Giulia_Trieste":"Província de Trieste", -"Italy_Friuli-Venezia Giulia_Udine":"Província d'Udine", -"Italy_Lazio":"Lazio", -"Italy_Liguria":"Ligúria", -"Italy_Lombardy":"Llombardia", -"Italy_Lombardy_Bergamo":"Província de Bèrgam", -"Italy_Lombardy_Brescia":"Província de Brescia", -"Italy_Lombardy_Como":"Província de Como", -"Italy_Lombardy_Cremona":"Província de Cremona", -"Italy_Lombardy_Lecco":"Província de Lecco", -"Italy_Lombardy_Lodi":"Província de Lodi", -"Italy_Lombardy_Mantua":"Província de Màntua", -"Italy_Lombardy_Milan":"Província de Milà", -"Italy_Lombardy_Monza and Brianza":"Província de Monza i Brianza", -"Italy_Lombardy_Pavia":"Província de Pavia", -"Italy_Lombardy_Sondrio":"Província de Sondrio", -"Italy_Lombardy_Varese":"Província de Varese", -"Italy_Marche":"Marques", -"Italy_Molise":"Molise", -"Italy_Piemont":"Piemont", -"Italy_Piemont_Alessandria":"Província d'Alessandria", -"Italy_Piemont_Asti":"Província d'Asti", -"Italy_Piemont_Biella":"Província de Biella", -"Italy_Piemont_Cuneo":"Província de Cuneo", -"Italy_Piemont_Novara":"Província de Novara", -"Italy_Piemont_Torino":"Província de Torí", -"Italy_Piemont_Verbano-Cusio-Ossola":"Verbano-Cusio-Ossola", -"Italy_Piemont_Vercelli":"Província de Vercelli", -"Italy_Sardinia":"Sardenya", -"Italy_Sicily":"Sicília", -"Italy_Trentino-Alto Adige Sudtirol":"Trentino-Tirol Sud", -"Italy_Tuscany_Grosseto":"Toscana — Província de Grosseto", -"Italy_Tuscany_Massa e Carrara":"Toscana - Província de Massa i Carrara", -"Italy_Umbria":"Umbria", -"Italy_Veneto":"Vèneto", -"Italy_Veneto_Belluno":"Província de Belluno", -"Italy_Veneto_Padova":"Província de Pàdua", -"Italy_Veneto_Rovigo":"Província de Rovigo", -"Italy_Veneto_Treviso":"Província de Treviso", -"Italy_Veneto_Venezia":"Província de Venècia", -"Italy_Veneto_Verona":"Província de Verona", -"Italy_Veneto_Vicenza":"Província de Vicenza", -"Jamaica":"Jamaica", -"Japan":"Japó", -"Japan_Chubu Region":"Regió de Chbubu", -"Japan_Chubu Region_Aichi":"Prefectura d'Aichi", -"Japan_Chubu Region_Fukui":"Prefectura de Fukui", -"Japan_Chubu Region_Gifu":"Prefectura de Gifu", -"Japan_Chubu Region_Ishikawa":"Prefectura d'Ishikawa", -"Japan_Chubu Region_Nagano":"Prefectura de Nagano", -"Japan_Chubu Region_Niigata":"Prefectura de Niigata", -"Japan_Chubu Region_Shizuoka":"Prefectura de Shizuoka", -"Japan_Chubu Region_Toyama":"Prefectura de Toyama", -"Japan_Chubu Region_Yamanashi":"Prefectura de Yamanashi", -"Japan_Chugoku Region":"Regió de Chggoku", -"Japan_Chugoku Region_Hiroshima":"Prefectura d'Hiroshima", -"Japan_Chugoku Region_Okayama":"Prefectura d'Okayama", -"Japan_Chugoku Region_Shimane":"Prefectura de Shimane", -"Japan_Chugoku Region_Tottori":"Tottori Prefectura", -"Japan_Chugoku Region_Yamaguchi":"Prefectura de Yamaguchi", -"Japan_Hokkaido Region":"Hokkaidō", -"Japan_Hokkaido Region_East":"Hokkaidō — est", -"Japan_Hokkaido Region_North":"Hokkaidō — nord", -"Japan_Hokkaido Region_West":"Hokkaidō — oest", -"Japan_Kanto":"Regió de Kantō", -"Japan_Kanto_Chiba":"Prefectura de Chiba", -"Japan_Kanto_Gunma":"Prefectura de Gunma", -"Japan_Kanto_Ibaraki":"Prefectura d'Ibaraki", -"Japan_Kanto_Kanagawa":"Prefectura de Kanagawa", -"Japan_Kanto_Saitama":"Prefectura de Saitama", -"Japan_Kanto_Tochigi":"Prefectura de Tochigi", -"Japan_Kanto_Tokyo":"Prefectura de Tòquio", -"Japan_Kinki Region":"Regió de Kansai", -"Japan_Kinki Region_Mie":"Prefectura Mie", -"Japan_Kinki Region_Nara":"Prefectura de Nara", -"Japan_Kinki Region_Osaka":"Prefectura d’Osaka", -"Japan_Kinki Region_Wakayama":"Prefectura de Wakayama", -"Japan_Kyushu Region":"Kyushu", -"Japan_Kyushu Region_Fukuoka":"Prefectura de Fukuoka", -"Japan_Kyushu Region_Kagoshima":"Prefectura de Kagoshima", -"Japan_Kyushu Region_Kumamoto":"Prefectura de Kumamoto", -"Japan_Kyushu Region_Miyazaki":"Prefectura de Miyazaki", -"Japan_Kyushu Region_Nagasaki":"Prefectura de Nagasaki", -"Japan_Kyushu Region_Oita":"Prefectura d’Oita", -"Japan_Kyushu Region_Okinawa":"Prefectura d'Okinawa", -"Japan_Kyushu Region_Saga":"Prefectura de Saga", -"Japan_Shikoku Region":"Shikoku", -"Japan_Shikoku Region_Ehime":"Prefectura d'Ehime", -"Japan_Shikoku Region_Kagawa":"Prefectura de Kagawa", -"Japan_Shikoku Region_Kochi":"Prefectura de Kchichi", -"Japan_Shikoku Region_Kyoto":"Prefectura de Kytoto", -"Japan_Shikoku Region_Tokushima":"Prefectura de Tokushima", -"Japan_Tohoku":"Regió de Tkuhoku", -"Japan_Tohoku_Akita":"Prefectura d'Akita", -"Japan_Tohoku_Aomori":"Prefectura d'Aomori", -"Japan_Tohoku_Fukushima":"Prefectura de Fukushima", -"Japan_Tohoku_Iwate":"Prefectura d'Iwate", -"Japan_Tohoku_Miyagi":"Prefectura de Miyagi", -"Japan_Tohoku_Yamagata":"Prefectura de Yamagata", -"Jersey":"Jersey", -"Jerusalem":"Jerusalem", -"Jordan":"Jordà", -"Kansas":"Kansas", -"Kazakhstan":"Kazakhstan", -"Kentucky":"Kentucky", -"Kenya":"Kenya", -"Kingdom of Lesotho":"Lesotho", -"Kiribati":"Kiribati", -"Kuwait":"Kuwait", -"Kyrgyzstan":"Kirguizistan", -"Laos":"Laos", -"Latvia":"Letònia", -"Lebanon":"Líban", -"Liberia":"Libèria", -"Libya":"Líbia", -"Liechtenstein":"Liechtenstein", -"Lithuania":"Lituània", -"Louisiana":"Louisiana", -"Luxembourg":"Luxemburg", -"Macedonia":"Macedònia", -"Madagascar":"Madagascar", -"Malawi":"Malawi", -"Malaysia":"Malàisia", -"Maldives":"Maldives", -"Mali":"Mali", -"Malta":"Malta", -"Marshall Islands":"Illes Marshall", -"Martinique":"Martinica", -"Maryland":"Maryland", -"Massachusetts":"Massachusetts", -"Mauritania":"Mauritània", -"Mauritius":"Maurici", -"Mexico":"Mèxic", -"Mexico_California":"Baixa Califòrnia", -"Mexico_Central_East":"Nuevo León", -"Mexico_Central_West":"Nayarit", -"Mexico_East":"Mèxic — est", -"Mexico_Mexico":"Ciutat de Mèxic", -"Mexico_North":"Mèxic — nord", -"Mexico_South":"Mèxic — sud", -"Michigan":"Michigan", -"Minnesota":"Minnesota", -"Missouri":"Missouri", -"Moldova":"Moldàvia", -"Monaco":"Mònaco", -"Mongolia":"Mongòlia", -"Montenegro":"Montenegro", -"Montserrat":"Montserrat", -"Morocco":"Marroc", -"Morocco_Doukkala-Abda":"Doukkala-Abda", -"Morocco_Rabat-Sale-Zemmour-Zaer":"Rabat-Salé-Zemmour-Zaer", -"Morocco_Southern":"Marroc — sud", -"Morocco_Western Sahara":"Sàhara Occidental", -"Mozambique":"Moçambic", -"Myanmar":"Myanmar", -"Nagorno-Karabakh":"Nagorno-Karabakh", -"Namibia":"Namíbia", -"Nauru":"Nauru", -"Nepal":"Nepal", -"Nepal_East":"Nepal — est", -"Nepal_West":"Nepal — oest", -"Netherlands":"Països Baixos", -"Netherlands_Drenthe":"Drenthe", -"Netherlands_Flevoland":"Flevoland", -"Netherlands_Friesland":"Frísia", -"Netherlands_Gelderland_Nijmegen":"Gelderland — Nijmegen", -"Netherlands_Gelderland_North":"Gelderland — Apeldoorn", -"Netherlands_Gelderland_Zutphen":"Gelderland — Zutphen", -"Netherlands_Groningen":"Groningen", -"Netherlands_Limburg":"Limburg", -"Netherlands_North Brabant_Eindhoven":"Brabant Septentrional — Eindhoven", -"Netherlands_North Brabant_Roosendaal":"Brabant Septentrional — Roosendaal", -"Netherlands_North Brabant_Tiburg":"Brabant Septentrional — Tilburg", -"Netherlands_North Brabant_Uden":"Brabant Septentrional — Uden", -"Netherlands_North Holland_Alkmaar":"Holanda Septentrional — Alkmaar", -"Netherlands_North Holland_Amsterdam":"Holanda Septentrional — Amsterdam", -"Netherlands_North Holland_Zaandam":"Holanda Septentrional — Zaanstad", -"Netherlands_Overijssel_Enschede":"Overijssel — Enschede", -"Netherlands_Overijssel_Zwolle":"Overijssel — Zwolle", -"Netherlands_South Holland_Brielle":"Holanda Meridional — Brielle", -"Netherlands_South Holland_Den Haag":"Holanda Meridional — La Haia", -"Netherlands_South Holland_Leiden":"Holanda Meridional — Leiden", -"Netherlands_South Holland_Rotterdam":"Holanda Meridional — Rotterdam", -"Netherlands_Utrecht_Amersfoort":"Utrecht — Amersfoort", -"Netherlands_Utrecht_Utrecht":"Utrecht — Utrecht", -"Netherlands_Zeeland":"Zeeland", -"New Jersey":"Nova Jersey", -"New York":"Nova York", -"New Zealand":"Nova Zelanda", -"New Zealand North_Auckland":"Nord — Auckland", -"New Zealand North_Wellington":"Nord — Wellington", -"New Zealand South_Canterbury":"Sud — Regió de Canterbury", -"New Zealand South_Southland":"Sud — Regió de Southland", -"Nicaragua":"Nicaragua", -"Niger":"Níger", -"Nigeria":"Nigèria", -"Niue":"Niue", -"North Carolina":"Carolina del Nord", -"North Dakota":"Dakota del Nord", -"North Korea":"Corea del Nord", -"Norway":"Noruega", -"Norway_Bouvet Island":"Illa Bouvet", -"Norway_Central":"Oslo", -"Norway_Hedmark":"Hedmark", -"Norway_Jan Mayen":"Jan Mayen", -"Norway_Northern":"Nord de Noruega", -"Norway_Oppland":"Oppland", -"Norway_Southern":"Noruega meridional", -"Norway_Svalbard":"Svalbard", -"Norway_Trondelag":"Tragndelag", -"Norway_Western":"Noruega occidental", -"Ohio":"Ohio", -"Oklahoma":"Oklahoma", -"Oman":"Oman", -"Oregon":"Oregon", -"Pakistan":"Pakistan", -"Palau":"Palau", -"Palestine":"Territoris Palestins", -"Palestine Region":"Territoris Palestins", -"Panama":"Panamà", -"Papua New Guinea":"Papua Nova Guinea", -"Paraguay":"Paraguai", -"Pennsylvania":"Pennsilvània", -"People's Republic of China":"Xina", -"Peru":"Perú", -"Peru_North":"Perú — nord", -"Peru_South":"Perú — sud", -"Philippines":"Filipines", -"Philippines_Luzon_Manila":"Metròpoli de Manila", -"Philippines_Luzon_North":"Luzon — nord", -"Philippines_Luzon_South":"Luzon — sud", -"Philippines_Mindanao":"Mindanao", -"Philippines_Visayas":"Visayas", -"Pitcairn Islands":"Pitcairn", -"Poland":"Polònia", -"Poland_Greater Poland Voivodeship":"Voivodat de Gran Polònia", -"Poland_Kuyavian-Pomeranian Voivodeship":"Voivodat de Kuyavian-Pomerània", -"Poland_Lesser Poland Voivodeship":"Voivodat de Polònia Menor", -"Poland_Lodz Voivodeship":"Voivodat de Łódź", -"Poland_Lower Silesian Voivodeship":"Voivodat de Baixa Silèsia", -"Poland_Lublin Voivodeship":"Voivodat de Lublin", -"Poland_Lubusz Voivodeship":"Voivodat de Lubusz", -"Poland_Masovian Voivodeship":"Voivodat de Masovian", -"Poland_Opole Voivodeship":"Voivodat d'Opole", -"Poland_Podlaskie Voivodeship":"Voivodat de Podlaskie", -"Poland_Pomeranian Voivodeship":"Voivodat de Pomerània", -"Poland_Silesian Voivodeship":"Voivodat de Silèsia", -"Poland_Subcarpathian Voivodeship":"Voivodat de Podkarpackie", -"Poland_Swietokrzyskie Voivodeship":"Voivodat de Świętokrzyskie", -"Poland_Warmian-Masurian Voivodeship":"Voivodat de Warmian-Masurian", -"Poland_West Pomeranian Voivodeship":"Voivodat de Pomerània Occidental", -"Portugal":"Portugal", -"Portugal_North":"Portugal — nord", -"Portugal_South":"Portugal — sud", -"Qatar":"Qatar", -"Republic of Kosovo":"Kosovo", -"Romania":"Romania", -"Romania_Centre":"Centre", -"Romania_North_East":"Nord-est", -"Romania_North_West":"Nord-oest", -"Romania_South":"Sud", -"Romania_South_East":"Sud-est", -"Romania_South_West":"Sud-oest", -"Romania_West":"Oest", -"Russia_Altai Krai":"Altai Krai", -"Russia_Altai Republic":"República d'Altai", -"Russia_Amur Oblast":"Óblast d'Amur", -"Russia_Arkhangelsk Oblast_Central":"Óblast d'Arkhangelsk — centre", -"Russia_Arkhangelsk Oblast_North":"Província d'Arkhangelsk — nord", -"Russia_Astrakhan Oblast":"Óblast d'Astrakhan", -"Russia_Bashkortostan":"República de Baixkortostan", -"Russia_Belgorod Oblast":"Óblast de Belgorod", -"Russia_Bryansk Oblast":"Óblast de Bryansk", -"Russia_Buryatia":"República de Buryat", -"Russia_Chechen Republic":"República de Txetxènia", -"Russia_Chelyabinsk Oblast":"Província de Txeliàbinsk", -"Russia_Chukotka Autonomous Okrug":"Ókrug autònom de Txukotka", -"Russia_Chuvashia":"República de Txuvaix", -"Russia_Ingushetia":"República d'Ingushetia", -"Russia_Irkutsk Oblast":"Óblast d'Irkutsk", -"Russia_Ivanovo Oblast":"Óblast d'Ivanovo", -"Russia_Jewish Autonomous Oblast":"Óblast Autònom Jueu", -"Russia_Kabardino-Balkaria":"República de Kabardino-Balkar", -"Russia_Kaliningrad Oblast":"Óblast de Kaliningrad", -"Russia_Kaluga Oblast":"Óblast de Kaluga", -"Russia_Kamchatka Krai":"Krai de Kamtxatka", -"Russia_Karachay-Cherkessia":"República de Karachay-Cherkess", -"Russia_Kemerov Oblast":"Óblast de Kemerovo", -"Russia_Khabarovsk Krai":"Krai de Khabarovsk", -"Russia_Khakassia":"República de Khakassia", -"Russia_Kirov Oblast":"Óblast de Kirov", -"Russia_Komi Republic":"República de Komi", -"Russia_Kostroma Oblast":"Óblast de Kostroma", -"Russia_Krasnodar Krai":"Krasnodar Krai — nord", -"Russia_Krasnodar Krai_Adygeya":"Krasnodar Krai, República d'Adygea", -"Russia_Krasnoyarsk Krai":"Krasnoyarsk Krai", -"Russia_Kurgan Oblast":"Óblast de Kurgan", -"Russia_Kursk Oblast":"Óblast de Kursk", -"Russia_Leningradskaya Oblast_Karelsky":"Óblast de Leningrad — nord", -"Russia_Leningradskaya Oblast_Southeast":"Óblast de Leningrad — sud", -"Russia_Lipetsk Oblast":"Óblast de Lipetsk", -"Russia_Magadan Oblast":"Óblast de Magadan", -"Russia_Mari El":"República de Mari El", -"Russia_Moscow":"Moscou", -"Russia_Moscow Oblast":"Óblast de Moscou", -"Russia_Murmansk Oblast":"Óblast de Murmansk", -"Russia_Nenets Autonomous Okrug":"Okrug autònom de Nenets", -"Russia_Nizhny Novgorod Oblast":"Óblast de Nizhni Novgorod", -"Russia_North Ossetia-Alania":"República d'Ossètia del Nord-Alania", -"Russia_Novgorod Oblast":"Óblast de Novgorod", -"Russia_Novosibirsk Oblast":"Província de Novosibirsk", -"Russia_Omsk Oblast":"Óblast d'Omsk", -"Russia_Orenburg Oblast":"Óblast d'Orenburg", -"Russia_Oryol Oblast":"Óblast d'Oryol", -"Russia_Penza Oblast":"Óblast de Penza", -"Russia_Perm Krai":"Krai de Perm", -"Russia_Primorsky Krai":"Krai de Primorski", -"Russia_Pskov Oblast":"Óblast de Pskov", -"Russia_Republic of Dagestan":"República de Daguestan", -"Russia_Republic of Kalmykia":"República de Kalmykia", -"Russia_Republic of Karelia":"República de Carèlia", -"Russia_Republic of Mordovia":"República de Mordòvia", -"Russia_Rostov Oblast":"Óblast de Rostov", -"Russia_Ryazan Oblast":"Óblast de Ryazan", -"Russia_Saint Petersburg":"Sant Petersburg", -"Russia_Sakha Republic":"República de Sakha", -"Russia_Sakhalin Oblast":"Província de Sakhalín", -"Russia_Samara Oblast":"Óblast de Samara", -"Russia_Saratov Oblast":"Óblast de Saratov", -"Russia_Smolensk Oblast":"Óblast de Smolensk", -"Russia_Stavropol Krai":"Krai de Stavropol", -"Russia_Sverdlovsk Oblast":"Óblast de Sverdlovsk", -"Russia_Tambov Oblast":"Óblast de Tambov", -"Russia_Tatarstan":"República de Tatarstan", -"Russia_Tomsk Oblast":"Óblast de Tomsk", -"Russia_Tula Oblast":"Óblast de Tula", -"Russia_Tuva":"República de Tuva", -"Russia_Tver Oblast":"Óblast de Tver", -"Russia_Tyumen Oblast":"Óblast de Tyumen", -"Russia_Udmurt Republic":"República Udmurt", -"Russia_Ulyanovsk Oblast":"Óblast d'Uliànovsk", -"Russia_Vladimir Oblast":"Óblast de Vladimir", -"Russia_Volgograd Oblast":"Óblast de Volgograd", -"Russia_Vologda Oblast":"Óblast de Vologda", -"Russia_Voronezh Oblast":"Óblast de Voronezh", -"Russia_Yamalo-Nenets Autonomous Okrug":"Okrug autònom Yamalo-Nenets", -"Russia_Yaroslavl Oblast":"Província de Iaroslavl", -"Russia_Yugra":"Okrug autònom Khanty-Mansi", -"Russia_Zabaykalsky Krai":"Krai de Zabaykalski", -"Russian Federation":"Rússia", -"Rwanda":"Ruanda", -"Sahrawi Arab Democratic Republic":"República Àrab Sharaui Democràtica", -"Saint Barthelemy":"Saint-Barthélemy", -"Saint Helena Ascension and Tristan da Cunha":"Santa Helena, Ascensió i Tristan da Cunha", -"Saint Kitts and Nevis":"Saint Kitts i Nevis", -"Saint Lucia":"Saint Lucia", -"Saint Martin":"Saint Martin", -"Saint Vincent and the Grenadines":"Saint Vincent i les granades", -"Samoa":"Samoa", -"San Marino":"San Marino", -"Sao Tome and Principe":"Sao Tomé i Príncipe", -"Saudi Arabia":"Aràbia Saudita", -"Senegal":"Senegal", -"Serbia":"Sèrbia", -"Seychelles":"Seychelles", -"Sierra Leone":"Sierra Leone", -"Singapore":"Singapur", -"Slovakia":"Eslovàquia", -"Slovakia_Region of Banska Bystrica":"Regió de Banská Bystrica", -"Slovakia_Region of Bratislava":"Regió de Bratislava", -"Slovakia_Region of Kosice":"Regió de Koiceice", -"Slovakia_Region of Nitra":"Regió de Nitra", -"Slovakia_Region of Presov":"Regió de Preovov", -"Slovakia_Region of Trencin":"Regió de Trenčín", -"Slovakia_Region of Trnava":"Regió de Trnava", -"Slovakia_Region of Zilina":"Regió de Žilina", -"Slovenia":"Eslovènia", -"Solomon Islands":"Illes Salomó", -"Somalia":"Somàlia", -"South Africa":"Sud-àfrica", -"South Africa_Eastern Cape":"Cap oriental", -"South Africa_Free State":"Estat lliure", -"South Africa_Gauteng":"Gauteng", -"South Africa_KwaZulu-Natal":"KwaZulu-Natal", -"South Africa_Limpopo":"Limpopo", -"South Africa_Mpumalanga":"Mpumalanga", -"South Africa_North West":"Nord-oest", -"South Africa_Northern Cape":"Cap septentrional", -"South Africa_Western Cape":"Cap occidental", -"South Carolina":"Carolina del Sud", -"South Georgia and the South Sandwich Islands":"Geòrgia del Sud i les Illes Sandwich del Sud", -"South Korea":"Corea del Sud", -"South Korea_North":"Corea del Sud — nord", -"South Korea_South":"Corea del Sud — sud", -"South Ossetia":"Ossètia del Sud", -"South Sudan":"Sudan del Sud", -"Spain":"Espanya", -"Spain_Andalusia":"Andalusia", -"Spain_Aragon":"Aragó", -"Spain_Balearic Islands":"Illes Balears", -"Spain_Basque Country":"País Basc", -"Spain_Canary Islands":"Illes Canàries", -"Spain_Cantabria":"Cantàbria", -"Spain_Castile and Leon":"Castella i Lleó", -"Spain_Castile-La Mancha":"Castella-la Manxa", -"Spain_Catalonia_Provincia de Barcelona":"Catalunya – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalunya – Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalunya – Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Catalunya – Tarragona", -"Spain_Ceuta":"Ceuta", -"Spain_Community of Madrid":"Comunitat de Madrid", -"Spain_Comunidad Foral de Navarra":"Navarra", -"Spain_Extremadura":"Extremadura", -"Spain_Galicia":"Galícia", -"Spain_La Rioja":"La Rioja", -"Spain_Melilla":"Melilla", -"Spain_Principado de Asturias":"Astúries", -"Spain_Region de Murcia":"Regió de Múrcia", -"Spain_Valencian Community":"País Valencià", -"Sri Lanka":"Sri Lanka", -"Sudan":"Sudan", -"Suriname":"Surinari", -"Swaziland":"Eswatini", -"Sweden":"Suècia", -"Sweden_Bergslagen":"Bergslagen", -"Sweden_Malardalen":"Regió capital", -"Sweden_Mellannorrland":"Mellannorrland", -"Sweden_Norra Sverige":"Nord de Suècia", -"Sweden_Ostra Gotaland":"Glandtaland oriental", -"Sweden_Sodra Gotaland":"Glandtaland meridional", -"Sweden_Vastra Gotaland":"Glandtaland occidental", -"Switzerland":"Suïssa", -"Switzerland_Central":"Suïssa central", -"Switzerland_Eastern":"Suïssa oriental", -"Switzerland_Espace Mittelland":"Espace Mittelland", -"Switzerland_Lake Geneva region":"Regió del llac de Ginebra", -"Switzerland_Northwestern":"Nord-oest de Suïssa", -"Switzerland_Ticino":"Ticino", -"Switzerland_Zurich":"Zuric", -"Syria":"Síria", -"Taiwan":"Taiwan", -"Tajikistan":"Tadjikistan", -"Tanzania":"Tanzània", -"Tennessee":"Tennessee", -"Texas":"Texas", -"Thailand":"Tailàndia", -"Thailand_North":"Tailàndia — nord", -"Thailand_South":"Tailàndia — sud", -"The Bahamas":"Bahames", -"The Gambia":"Gàmbia", -"Togo":"Togo", -"Tokelau":"Tokelau", -"Tonga":"Tonga", -"Trinidad and Tobago":"Trinitat i Tobago", -"Tunisia":"Tunísia", -"Turkey":"Turquia", -"Turkey_Aegean Region":"Regió de l'Egeu", -"Turkey_Black Sea Region":"Regió del mar Negre", -"Turkey_Eastern Anatolia Region":"Regió d'Anatòlia Oriental", -"Turkey_Marmara Region":"Regió de la Màrmara", -"Turkey_Mediterranean Region":"Regió mediterrània", -"Turkey_Southeastern Anatolia Region":"Regió del sud-est d'Anatòlia", -"Turkmenistan":"Turkmenistan", -"Turks and Caicos Islands":"Illes Turks i Caicos", -"Tuvalu":"Tuvalu", -"UK_England_East Midlands":"East Midlands", -"UK_England_East of England_Essex":"Est d'Anglaterra — Essex", -"UK_England_East of England_Norfolk":"Est d'Anglaterra — Norfolk", -"UK_England_Greater London":"Gran Londres", -"UK_England_North East England":"Nord-est d'Anglaterra", -"UK_England_North West England":"Nord-oest d'Anglaterra", -"UK_England_South East_Brighton":"Sud-est d’Anglaterra— Brighton", -"UK_England_South East_Oxford":"Sud-est d’Anglaterra — Oxford", -"UK_England_South West England_Bristol":"Sud-oest d’Anglaterra — Bristol", -"UK_England_South West England_Cornwall":"Anglaterra del sud-oest — Cornualla", -"UK_England_West Midlands":"West Midlands", -"UK_England_Yorkshire and the Humber":"Yorkshire and the Humber", -"UK_Northern Ireland":"Irlanda del Nord", -"UK_Scotland_North":"Escòcia — nord", -"UK_Scotland_South":"Escòcia — sud", -"UK_Wales":"Gal·les", -"US_Alabama_Birmingham":"Birmingham", -"US_Alabama_Montgomery":"Montgomery", -"US_Alaska":"Alaska", -"US_Arizona_Flagstaff":"Flagstaff", -"US_Arizona_Phoenix":"Phoenix", -"US_Arizona_Tucson":"Tucson", -"US_Arkansas":"Arkansas", -"US_California_Bakersfield_Bakersfield":"Bakersfield", -"US_California_Bakersfield_Lancaster":"Lancaster", -"US_California_Chico":"Chico", -"US_California_LA":"Los Angeles", -"US_California_LA North":"Los Angeles — nord", -"US_California_Redding":"Redding", -"US_California_Sacramento_Fresno":"Fresno", -"US_California_Sacramento_Sacramento":"Sacramento", -"US_California_Sacramento_Stockton":"Stockton", -"US_California_San Diego":"San Diego", -"US_California_Santa_Clara_Palo Alto":"San Francisco", -"US_California_Santa_Clara_Santa Cruz":"Santa Cruz", -"US_Colorado_Aspen":"Aspen", -"US_Colorado_Denver":"Denver", -"US_Colorado_South":"Colorado — sud", -"US_Connecticut":"Connecticut", -"US_Delaware":"Delaware", -"US_Florida_Jacksonville":"Jacksonville", -"US_Florida_Miami":"Miami", -"US_Florida_Orlando":"Orlando", -"US_Florida_Tampa":"Tampa", -"US_Georgia":"Geòrgia", -"US_Georgia_Atlanta":"Atlanta", -"US_Georgia_Macon":"Macon", -"US_Georgia_North":"Geòrgia — nord", -"US_Georgia_South":"Geòrgia — sud", -"US_Guam":"Guam", -"US_Hawaii":"Hawaii", -"US_Idaho":"Idaho", -"US_Illinois_Chickago":"Chicago", -"US_Illinois_Elgin":"Elgin", -"US_Illinois_Rockford":"Rockford", -"US_Illinois_South":"Illinois — sud", -"US_Illinois_Springfield":"Springfield", -"US_Indiana_North":"Indiana — nord", -"US_Indiana_South":"Indiana — sud", -"US_Iowa_Des Moines":"Des Moines", -"US_Iowa_Waterloo":"Waterloo", -"US_Iowa_West":"Iowa — oest", -"US_Kansas_East":"Kansas — est", -"US_Kansas_West":"Kansas — oest", -"US_Kentucky_East":"Kentucky — est", -"US_Kentucky_West":"Kentucky — oest", -"US_Louisiana_Central":"Louisiana — oest", -"US_Louisiana_New Orleans":"Nova Orleans", -"US_Maine":"Maine", -"US_Maryland_Baltimore":"Baltimore", -"US_Maryland_and_DC":"West, Washington, DC", -"US_Massachusetts_Boston":"Boston", -"US_Massachusetts_Central":"Worcester", -"US_Massachusetts_Plymouth":"Plymouth", -"US_Massachusetts_Southeastern":"Barnstable", -"US_Massachusetts_West":"Springfield", -"US_Michigan_Detroit":"Detroit", -"US_Michigan_North":"Michigan — nord", -"US_Michigan_South":"Michigan — sud", -"US_Minnesota_Minneapolis":"Minneapolis", -"US_Minnesota_North":"Minnesota — nord", -"US_Minnesota_Rochester":"Rochester", -"US_Minnesota_Saint Cloud":"St. Cloud", -"US_Mississippi":"Mississipí", -"US_Missouri_East":"Missouri — est", -"US_Missouri_West":"Missouri — oest", -"US_Montana":"Montana", -"US_Nebraska":"Nebraska", -"US_Nevada":"Nevada", -"US_New Hampshire":"Nou Hampshire", -"US_New Jersey_North":"Nova Jersey — nord", -"US_New Jersey_South":"Nova Jersey — sud", -"US_New Mexico":"Nou Mèxic", -"US_New York_East":"Nova York — Long Island", -"US_New York_New York":"Nova York — Nova York", -"US_New York_North":"Nova York — nord", -"US_New York_West":"Nova York — oest", -"US_North Carolina_Asheville":"Asheville", -"US_North Carolina_Charlotte":"Charlotte", -"US_North Carolina_Greensboro":"Greensboro", -"US_North Carolina_Raleigh":"Raleigh", -"US_North Carolina_Wilmington":"Wilmington", -"US_North Carolina_Wilson":"Wilson", -"US_North Dakota_Bismarck":"Bismarck", -"US_North Dakota_East":"Fargo", -"US_North Dakota_Minot":"Minot", -"US_Ohio_Cleveland":"Cleveland", -"US_Ohio_Dayton":"Dayton", -"US_Oklahoma_East":"Oklahoma — est", -"US_Oklahoma_West":"Oklahoma — oest", -"US_Oregon_Eugene":"Eugene", -"US_Oregon_Portland":"Portland", -"US_Oregon_West":"Oregon — est", -"US_Pennsylvania_Central":"Altoona", -"US_Pennsylvania_Pittsburgh":"Pittsburgh", -"US_Pennsylvania_Reading":"Reading", -"US_Pennsylvania_Scranton":"Scranton", -"US_Puerto Rico":"Puerto Rico", -"US_Rhode Island":"Rhode Island", -"US_South Carolina_Columbia":"Columbia", -"US_South Carolina_Florence":"Florence", -"US_South Dakota":"Dakota del Sud", -"US_Tennessee_East":"Tennessee — est", -"US_Tennessee_West":"Tennessee — oest", -"US_Texas_Austin":"Austin", -"US_Texas_Dallas":"Dallas", -"US_Texas_Houston":"Houston", -"US_Texas_Northwest":"Amarillo", -"US_Texas_San Antonio":"San Antonio", -"US_Texas_Southwest":"Laredo", -"US_Texas_Tyler":"Tyler", -"US_Texas_Wako":"Waco", -"US_Texas_West":"Odessa", -"US_United States Minor Outlying Islands":"Illes Menors dels Estats Units", -"US_Utah":"Utah", -"US_Vermont":"Vermont", -"US_Virginia_Chesapeake":"Chesapeake", -"US_Virginia_Lynchburg":"Lynchburg", -"US_Virginia_Richmond":"Richmond", -"US_Virginia_Roanoke":"Roanoke", -"US_Washington_Coast":"Tacoma", -"US_Washington_Seattle":"Seattle", -"US_Washington_Yakima":"Yakima", -"US_West Virginia":"Virgínia Occidental", -"US_Wisconsin_Milwaukee":"Milwaukee", -"US_Wisconsin_North":"North Wisconsin", -"US_Wyoming":"Wyoming", -"Uganda":"Uganda", -"Ukraine":"Ucraïna", -"Ukraine_Cherkasy Oblast":"Província de Txerkasy", -"Ukraine_Chernihiv Oblast":"Província de Txerníhiv", -"Ukraine_Chernivtsi Oblast":"Província de Chernivtsi", -"Ukraine_Dnipropetrovsk Oblast":"Província de Dnipropetrovsk", -"Ukraine_Donetsk Oblast":"Província de Donetsk", -"Ukraine_Ivano-Frankivsk Oblast":"Província d'Ivano-Frankivsk", -"Ukraine_Kharkiv Oblast":"Província de Kharkiv", -"Ukraine_Kherson Oblast":"Província de Kherson", -"Ukraine_Khmelnytskyi Oblast":"Província de Khmelnitski", -"Ukraine_Kirovohrad Oblast":"Província de Kirovohrad", -"Ukraine_Kyiv Oblast":"Província de Kíiv", -"Ukraine_Luhansk Oblast":"Província de Luhansk", -"Ukraine_Lviv Oblast":"Província de Lviv", -"Ukraine_Mykolaiv Oblast":"Província de Mykolaiv", -"Ukraine_Odessa Oblast":"Província d'Odessa", -"Ukraine_Poltava Oblast":"Província de Poltava", -"Ukraine_Rivne Oblast":"Província de Rivne", -"Ukraine_Sumy Oblast":"Província de Sumy", -"Ukraine_Ternopil Oblast":"Província de Ternopil", -"Ukraine_Vinnytsia Oblast":"Província de Vinnytsia", -"Ukraine_Volyn Oblast":"Província de Volyn", -"Ukraine_Zakarpattia Oblast":"Província de Zakarpattia", -"Ukraine_Zaporizhia Oblast":"Província de Zaporizhzhya", -"Ukraine_Zhytomyr Oblast":"Província de Zhytomyr", -"United Arab Emirates":"Emirats Àrabs Units", -"United Kingdom":"Regne Unit", -"United States Virgin Islands":"Illes Verges dels Estats Units", -"United States of America":"Estats Units d'Amèrica", -"Uruguay":"Uruguai", -"Uzbekistan":"Uzbekistan", -"Vanuatu":"Vanuatu", -"Venezuela":"Veneçuela", -"Vietnam":"Vietnam", -"Virginia":"Virgínia", -"Wallis and Futuna":"Wallis i Futuna", -"Washington":"Washington", -"Willis Island":"Illa Willis", -"Wisconsin":"Wisconsin", -"Yemen":"Iemen", -"Zambia":"Zàmbia", -"Zimbabwe":"Zimbàbue", -"Argentina_Santa Fe":"Província de Santa Fe", -"Australia_Brisbane":"Brisbane", -"Australia_Sydney":"Sydney", -"Austria_Styria_Graz":"Estíria — Graz", -"Austria_Styria_Leoben":"Estíria — Leoben", -"Austria_Upper Austria_Linz":"Alta Àustria — Linz", -"Austria_Upper Austria_Wels":"Alta Àustria — Wels", -"Brazil_Goias_Brasilia":"Goiás — Brasília", -"Brazil_Goias_North":"Goiás — nord", -"Brazil_North Region_East":"Regió del Nord — est", -"Brazil_North Region_West":"Regió del Nord — oest", -"Brazil_Northeast Region_East":"Regió nord-est — est", -"Brazil_Northeast Region_West":"Regió nord-est — oest", -"Brazil_Parana_East":"Paranà — est", -"Brazil_Parana_West":"Paranà — oest", -"Brazil_South Region_East":"Regió del sud — est", -"Brazil_South Region_West":"Regió del sud — oest", -"Bulgaria_East":"Bulgària — est", -"Bulgaria_West":"Bulgària — oest", -"Canada_Ontario_Northeastern_W":"Wawa", -"Chile_Central":"Xile — centre", -"Congo-Kinshasa_Kivu":"Kivu", -"Congo-Kinshasa_West":"Congo — oest", -"Croatia_Central":"Croàcia — centre", -"Croatia_West":"Croàcia — oest", -"Ecuador_East":"Equador — est", -"Ecuador_West":"Equador — oest", -"Finland_Eastern Finland_North":"Finlàndia oriental — nord", -"Finland_Eastern Finland_South":"Finlàndia oriental — sud", -"Finland_Western Finland_Jyvaskyla":"Finlàndia occidental — Jyväskylä", -"Finland_Western Finland_Tampere":"Finlàndia occidental — Tampere", -"France_Free County_North":"Franc Comtat — nord", -"France_Free County_South":"Franc Comtat — sud", -"France_Pays de la Loire_Loire-Atlantique_Nantes":"Loira Atlàntic — Nantes", -"France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire":"Loira Atlàntic — Saint-Nazaire", -"Germany_Free State of Bavaria_Upper Bavaria_South":"Alta Baviera — sud", -"India_Karnataka_North":"Karnataka — nord", -"India_Karnataka_South":"Karnataka — sud", -"Iran_East":"Iran — est", -"Iraq_North":"Iraq — nord", -"Iraq_South":"Iraq — sud", -"Japan_Chubu Region_Aichi_Nagoya":"Aichi — Nagoya", -"Japan_Chubu Region_Aichi_Toyohashi":"Aichi — Toyohashi", -"Japan_Hokkaido Region_Sapporo":"Sapporo", -"Japan_Kinki Region_Osaka_Osaka":"Ōsaka", -"Japan_Kinki Region_Osaka_West":"Ōsaka — oest", -"Kazakhstan_North":"Kazakhstan — nord", -"Kazakhstan_South":"Kazakhstan — sud", -"Lithuania_East":"Lituània — est", -"Lithuania_West":"Lituània — oest", -"Mexico_Chihuahua":"Chihuahua", -"Mexico_Sonora":"Sonora", -"Nepal_Kathmandu":"Katmandú", -"Nepal_Madhyamanchal":"Regió central", -"Nepal_Purwanchal":"Regió oriental", -"Nigeria_North":"Nigèria — nord", -"Nigeria_South":"Nigèria — sud", -"Norway_Hordaland":"Hordaland", -"Norway_Nordland":"Nordland", -"Norway_North Trondelag":"Nord-Trøndelag", -"Norway_Rogaland":"Rogaland", -"Norway_South Trondelag":"Sør-Trøndelag", -"Peru_Lima":"Lima", -"Portugal_Islands":"Illes de Portugal", -"Portugal_Viseu":"Viseu", -"Russia_Krasnoyarsk Krai_North":"Krai de Krasnoyarsk — nord", -"Russia_Krasnoyarsk Krai_South":"Krai de Krasnoyarsk — sud", -"Russia_Moscow Oblast_East":"Óblast de Moscou — est", -"Russia_Moscow Oblast_West":"Óblast de Moscou — oest", -"Russia_Perm Krai_North":"Krai del Perm — nord", -"Russia_Perm Krai_South":"Krai del Perm — sud", -"Russia_Republic of Karelia_North":"República de Carèlia — nord", -"Russia_Republic of Karelia_South":"República de Carèlia — sud", -"Russia_Sverdlovsk Oblast_North":"Óblast de Sverdlovsk — nord", -"Russia_Sverdlovsk Oblast_Ekaterinburg":"Província de Sverdlovsk — Yekaterinburg", -"Russia_Yugra_Khanty":"Yugra — Khanty-Mansiysk", -"Russia_Yugra_Surgut":"Yugra — Surgut", -"Saudi Arabia_North":"Aràbia Saudita — nord", -"Saudi Arabia_South":"Aràbia Saudita — sud", -"Slovenia_East":"Eslovènia — est", -"Slovenia_West":"Eslovènia — oest", -"Spain_Andalusia_Granada":"Andalusia — Granada", -"Spain_Andalusia_Sevilla":"Andalusia — Sevilla", -"Spain_Castile and Leon_East":"Castella i Lleó — est", -"Spain_Castile and Leon_West":"Castella i Lleó — oest", -"Spain_Galicia_North":"Galícia — nord", -"Spain_Galicia_South":"Galícia — sud", -"Sudan_East":"Sudan — est", -"Sudan_West":"Sudan — oest", -"Sweden_Stockholm":"Estocolm", -"Switzerland_Espace Mittelland_Bern":"Espace Mittelland — Berna", -"Switzerland_Espace Mittelland_East":"Espace Mittelland — est", -"Taiwan_North":"Taiwan — nord", -"Taiwan_South":"Taiwan — sud", -"Thailand_Central":"Tailàndia — centre", -"Turkey_Central Anatolia Region_Ankara":"Anatòlia Central — Ankara", -"Turkey_Central Anatolia Region_Kayseri":"Anatòlia Central — Kayseri", -"Turkey_Marmara Region_Bursa":"Regió de la Màrmara — Bursa", -"Turkey_Marmara Region_Istanbul":"Regió de Marmara — Istanbul", -"US_Arkansas_North":"Arkansas — nord", -"US_Arkansas_South":"Arkansas — sud", -"US_Florida_Gainesvile":"Gainesville", -"US_Idaho_North":"Idaho — nord", -"US_Idaho_South":"Idaho — sud", -"US_Indiana_Evansville":"Evansville", -"US_Indiana_Indianapolis":"Indianapolis", -"US_Kansas_Wichita":"Wichita", -"US_Kentucky_Louisville":"Louisville", -"US_Michigan_Grand Rapids":"Grand Rapids", -"US_Michigan_Lansing":"Lansing", -"US_Mississippi_Gulfport":"Gulfport", -"US_Mississippi_North":"Mississipí — nord", -"US_Missouri_Kansas":"Kansas City", -"US_Missouri_Springfield":"Springfield", -"US_Missouri_St Louis":"St. Louis", -"US_Montana_East":"Montana — est", -"US_Montana_West":"Montana — oest", -"US_Nebraska_East":"Nebraska — est", -"US_Nebraska_West":"Nebraska — oest", -"US_New Mexico_Albuquerque":"Albuquerque", -"US_New Mexico_Roswell":"Roswell", -"US_Ohio_Cincinnati":"Cincinnati", -"US_Ohio_Columbus":"Columbus", -"US_Ohio_Toledo":"Toledo", -"US_Oklahoma_Oklahoma":"Oklahoma City", -"US_Oklahoma_Tulsa":"Tulsa", -"US_South Carolina_Charleston":"Charleston", -"US_Texas_Amarillo":"Amarillo", -"US_Texas_Lubbock":"Lubbock", -"US_Utah_North":"Utah — nord", -"US_Utah_South":"Utah — sud", -"US_Virginia_Alexandria":"Alexandria", -"US_Wisconsin_Eau Claire":"Eau Claire", -"US_Wisconsin_Madison":"Madison", -"Venezuela_North":"Veneçuela — nord", -"Venezuela_South":"Veneçuela — sud", -"Argentina_Buenos Aires_Buenos Aires":"Buenos Aires", -"Canada_Quebek_Lachute":"Lachute", -"Canada_Saskatchewan_Regina":"Regina", -"Canada_Saskatchewan_Saskatoon":"Saskatoon", -"Germany_Lower Saxony_Braunschweig":"Braunschweig", -"Germany_Saxony-Anhalt_Halle":"Saxònia-Anhalt — Halle", -"Germany_Saxony-Anhalt_Magdeburg":"Saxònia-Anhalt — Magdeburg", -"Germany_Schleswig-Holstein_Flensburg":"Schleswig-Holstein — Flensburg", -"Germany_Schleswig-Holstein_Kiel":"Schleswig-Holstein — Kiel", -"Portugal_Porto":"Porto", -"UK_England_North West England_Lancaster":"North West England — Lancaster", -"UK_England_North West England_Manchester":"North West England — Manchester", -"US_Florida_Gainesville":"Gainesville", -"US_Texas_Victoria":"Victoria", -"US_Virginia_Norfolk":"Norfolk", -"Abkhazia Description":"Pitsunda, Gudauta, Sukhum", -"Afghanistan Description":"Kabul, Kandahar, Tokzar", -"Albania Description":"Tiranë, Kavaje, Shkoder", -"Algeria_Central Description":"Batna, Djelfa, Biskra", -"Algeria_Coast Description":"Algiers, Oran, Constantine", -"Andorra Description":"Andorra la Vella, La Massana, Ordino", -"Angola Description":"Luanda, Lobito, Namibe", -"Anguilla Description":"The Valley, George Hill, Stoney Ground", -"Antarctica Description":"McMurdo Station, Stația științifică chileeană „Villa Las Estrellas”, Rocky Cove", -"Antigua and Barbuda Description":"St. John's, English Harbour, Freetown", -"Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán", -"Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell", -"Argentina_Buenos Aires_South Description":"Bahía Blanca, Miramar, Tandil", -"Argentina_Cuyo Description":"San Juan, San Rafael, San Luis", -"Argentina_Mesopotamia Description":"Federación, Paraná, Alvear", -"Argentina_Northwest Description":"San Miguel de Tucumán, San Fernando del Valle de Catamarca, San Salvador de Jujuy", -"Argentina_Pampas Description":"Córdoba, Santa Rosa, Río Cuarto", -"Argentina_Patagonia Description":"Cutral Co, Viedma, Comodoro Rivadavia", -"Argentina_Santa Fe Description":"Rosario, Santa Fe, Las Parejas", -"Armenia Description":"Yerevan, Ashtarak, Gyumri", -"Australia_Brisbane Description":"Brisbane, Redcliffe, Gold Coast", -"Australia_Melbourne Description":"Melbourne, Geelong, Yering", -"Australia_New South Wales Description":"Barham, Tuncurry, Tocumwal", -"Australia_Northern Territory Description":"Darwin, Tennant Creek, Mutitjulu", -"Australia_Queensland Description":"Charleville, Winton, Townsville", -"Australia_South Australia Description":"Adelaide, Port Lincoln, Murray Bridge", -"Australia_Sydney Description":"Sydney, Canberra, Newcastle", -"Australia_Tasmania Description":"Hobart, Strahan, Huonville", -"Australia_Victoria Description":"Wangaratta, Bendigo, Ballarat", -"Australia_Western Australia Description":"Perth, Joondalup, Kalgoorlie", -"Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg", -"Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg", -"Austria_Lower Austria_West Description":"St. Pölten", -"Austria_Lower Austria_Wien Description":"Vienna, Wiener Neustadt", -"Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau", -"Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg", -"Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld", -"Austria_Tyrol Description":"Innsbruck, Kufstein, Schwaz", -"Austria_Upper Austria_Linz Description":"Linz, Steyr, Ansfelden", -"Austria_Upper Austria_Wels Description":"Attnang-Puchheim, Wels, Schwanenstadt", -"Austria_Vorarlberg Description":"Dornbirn, Feldkirch, Bregenz", -"Azerbaijan Description":"Baku, Sumgayit, Ganja", -"Bahrain Description":"Manama, Riffa, Muharraq", -"Bangladesh Description":"Sylhet, Dhaka, Comilla", -"Barbados Description":"Bridgetown, Oistins, Speightstown", -"Belarus_Brest Region Description":"Brest, Pinsk, Baranovichi", -"Belarus_Homiel Region Description":"Homel, Mazyr, Zhlobin", -"Belarus_Hrodna Region Description":"Hrodna, Lida, Vawkavysk", -"Belarus_Maglieu Region Description":"Mahilyow, Babruysk, Čerykaŭ", -"Belarus_Minsk Region Description":"Minsk, Barysaw, Soligorsk", -"Belarus_Vitebsk Region Description":"Vitebsk, Orsha, Navapolatsk", -"Belgium_Antwerp Description":"Antwerp, Zwijndrecht, Berchem", -"Belgium_East Flanders Description":"Ghent, Deinze, Sint-Martens-Latem", -"Belgium_Flemish Brabant Description":"Brussels, Schaerbeek - Schaarbeek, Anderlecht", -"Belgium_Hainaut Description":"Mons, Charleroi, La Louvière", -"Belgium_Liege Description":"Liège, Seraing, Verviers", -"Belgium_Limburg Description":"Houthalen-Helchteren, Maasmechelen, Hasselt", -"Belgium_Luxembourg Description":"Arlon, Marche-en-Famenne, Bastogne", -"Belgium_Namur Description":"Namur, Mettet, Saint-Marc", -"Belgium_Walloon Brabant Description":"Braine-l'Alleud, Wavre, Ottignies-Louvain-la-Neuve", -"Belgium_West Flanders Description":"Bruges, Koksijde, Nieuwpoort", -"Belize Description":"Benque Viejo del Carmen, Belize City, Belmopan", -"Benin Description":"Natitingou, Abomey, Djougou", -"Bermuda Description":"St. George's, Hamilton, Somerset", -"Bhutan Description":"Thimphu, Ha, Mongar", -"Bolivia_North Description":"La Paz, Santa Cruz de la Sierra, El Alto", -"Bolivia_South Description":"Sucre, Cochabamba, Tupiza", -"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina Description":"Brčko, Dubrave, Rašljani", -"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina Description":"Sarajevo, Mostar", -"Bosnia and Herzegovina_Republic of Srpska Description":"Banja Luka, Bijeljina, Derventa", -"Botswana Description":"Gaborone, Tsabong, Mochudi", -"Brazil_Bahia Description":"Salvador, Feira de Santana, Vitória da Conquista", -"Brazil_Goias_Brasilia Description":"Brasília, Goiânia, Aparecida de Goiânia", -"Brazil_Goias_North Description":"Goianésia, Jaraguá, Porangatu", -"Brazil_Mato Grosso Description":"Cuiabá, Várzea Grande, Rondonopolis", -"Brazil_Mato Grosso Do Sul Description":"Campo Grande, Dourados, Três Lagoas", -"Brazil_North Region_East Description":"Belém, Ananindeua, Macapa", -"Brazil_North Region_West Description":"Manaus, Porto Velho, Rio Branco", -"Brazil_Northeast Region_East Description":"Recife, Maceió, Jaboatão dos Guararapes", -"Brazil_Northeast Region_West Description":"Fortaleza, São Luís, Teresina", -"Brazil_Paraiba Description":"João Pessoa, Campina Grande, Santa Rita", -"Brazil_Parana_East Description":"Curitiba, Ponta Grossa, São José dos Pinhais", -"Brazil_Parana_West Description":"Londrina, Maringa, Cascavel", -"Brazil_Rio Grande do Norte Description":"Natal, Mossoró, Parnamirim", -"Brazil_Santa Catarina Description":"Joinville, Florianópolis, Blumenau", -"Brazil_South Region_East Description":"Porto Alegre, Caxias do Sul, Canoas", -"Brazil_South Region_West Description":"Santa Maria, Passo Fundo, Uruguaiana", -"Brazil_Southeast Region_Espirito Santo Description":"Serra, Vila Velha, Cariacica", -"Brazil_Southeast Region_Minas Gerais_Contagem Description":"Belo Horizonte, Contagem, Juiz de Fora", -"Brazil_Southeast Region_Minas Gerais_North Description":"Uberlandia, Montes Claros, Uberaba", -"Brazil_Southeast Region_Rio de Janeiro Description":"Rio de Janeiro, São Gonçalo, Duque de Caxias", -"Brazil_Southeast Region_Sao Paulo_Campinas Description":"Campinas, Sorocaba, Jundiaí", -"Brazil_Southeast Region_Sao Paulo_City Description":"São Paulo, Guarulhos, São Bernardo do Campo", -"Brazil_Southeast Region_Sao Paulo_West Description":"Ribeirão Preto, São José do Rio Preto, Franca", -"British Indian Ocean Territory Description":"Seabreeze Village, Camp Justice", -"British Virgin Islands Description":"Spanish Town, Road Town, East End", -"Brunei Description":"Bandar Seri Begawan, Muara, Seria", -"Bulgaria_East Description":"Varna, Burgas, Dobrich", -"Bulgaria_West Description":"Sofia, Plovdiv, Pleven", -"Burkina Faso Description":"Ouagadougou, Bobo-Dioulasso", -"Burundi Description":"Bujumbura, Bubanza, Cibitoke", -"Cambodia Description":"Phnom Penh, Kampong Speu, Takeo", -"Cameroon_Central Description":"Yaounde, Kousséri, Kribi", -"Cameroon_West Description":"Douala, Buea, Bamenda", -"Canada_Alberta_Edmonton Description":"Edmonton, Lacombe, Wetaskiwin", -"Canada_Alberta_North Description":"Grande Prairie, Peace River, Fort McMurray", -"Canada_Alberta_South Description":"Calgary, Chestermere, Lethbridge", -"Canada_British Columbia_Central Description":"Williams Lake, Quesnel, Prince George", -"Canada_British Columbia_Far_North Description":"East Pine, Tumbler Ridge, Hudson's Hope", -"Canada_British Columbia_Islands Description":"Saanich, Nanaimo, Victoria", -"Canada_British Columbia_North Description":"Prince Rupert, Terrace, Kitimat", -"Canada_British Columbia_Northeast Description":"Muskwa, Fort Nelson, Fontas", -"Canada_British Columbia_Southeast Description":"Merritt, Revelstoke, Vernon", -"Canada_British Columbia_Vancouver Description":"Vancouver, Surrey, Powell River", -"Canada_Labrador_North Description":"Nain, Postville, Hopedale", -"Canada_Labrador_South Description":"L'Anse-au-Clair, L'Anse-au-Clair, Forteau", -"Canada_Labrador_West Description":"Churchill Falls, Happy Valley-Goose Bay, Happy Valley - Goose Bay", -"Canada_Manitoba_Northeast Description":"Caribou, Manigotagan, English Brook", -"Canada_Manitoba_Northwest Description":"Young Point, Cormorant, Pickerel Narrows", -"Canada_Manitoba_South Description":"Foxwarren, Shoal Lake, Brandon", -"Canada_Manitoba_Winnipeg Description":"Winnipeg, Portage La Prairie, Killarney", -"Canada_New Brunswick Description":"Edmundston, Fredericton, Campbellton", -"Canada_Newfoundland_East Description":"Mount Pearl, St John's, Badger", -"Canada_Newfoundland_North Description":"St. Anthony, Kippens, Gallants", -"Canada_Newfoundland_South Description":"Fortune, Lamaline, Seal Cove", -"Canada_Newfoundland_West Description":"Codroy Valley, Port Aux Basques, Margaree", -"Canada_Northwest Territories_East Description":"Łutselk’e, Rocher River, Fork Lake", -"Canada_Northwest Territories_North Description":"Norman Wells, Inuvik, Fort Simpson", -"Canada_Northwest Territories_Yellowknife Description":"Yellowknife, Hay River, Fort Smith", -"Canada_Nova Scotia_Halifax Description":"Halifax, Bedford, Yarmouth", -"Canada_Nova Scotia_Sydney Description":"Sydney, Inverness, Westville", -"Canada_Nunavut_North Description":"CFB Alert, Grise Fiord, Eureka", -"Canada_Nunavut_South Description":"Repulse Bay, Arctic Bay, Naujaat", -"Canada_Ontario_Bame Description":"Barrie, Wasaga Beach, Deep River", -"Canada_Ontario_Kingston Description":"Ottawa, Belleville, Peterborough", -"Canada_Ontario_London Description":"London, Welland, Woodstock", -"Canada_Ontario_Northeastern_Central Description":"Timmins, Timmins, Iroquois Falls", -"Canada_Ontario_Northeastern_North Description":"Moose Factory, Moosonee, Kashechewan", -"Canada_Ontario_Northeastern_S Description":"Sudbury, Onaping, Dowling", -"Canada_Ontario_Northeastern_SE Description":"Englehart, Temagami, Mattawa", -"Canada_Ontario_Northeastern_SW Description":"Sault Ste. Marie, Sault Ste. Marie, Bruce Mines", -"Canada_Ontario_Northeastern_W Description":"Wawa, Dubreuilville, White River", -"Canada_Ontario_Northern Description":"Thunder Bay, Geraldton, Longlac", -"Canada_Ontario_Northwestern Description":"Pikangikum, Peawanuck, Sandy Lake", -"Canada_Ontario_Toronto Description":"Toronto, Guelph, Mississauga", -"Canada_Prince Edward Island Description":"Summerside, Charlottetown, Borden", -"Canada_Quebec_Quebec Description":"Quebec, Sherbrooke, Drummondville", -"Canada_Quebek_Far North Description":"Radisson, Akulivik, Inukjuak", -"Canada_Quebek_Lachute Description":"Gatineau, Maniwaki, Mansfield-et-Pontefract", -"Canada_Quebek_Montreal Description":"Montreal, Granby, Laval", -"Canada_Quebek_North Description":"Sept-Îles, Port-Cartier, Fermont", -"Canada_Quebek_Southeast_Rimouski Description":"Gaspé, Rimouski, Saint-Pascal", -"Canada_Quebek_Southeast_Saguenay Description":"Baie-Comeau, Saguenay, Saint-Félicien", -"Canada_Quebek_West_Chibougamau Description":"Chapais, Chibougamau, La Tuque", -"Canada_Quebek_West_Rouyn-Noranda Description":"Rouyn-Noranda, Lebel-sur-Quévillon, Senneterre", -"Canada_Saskatchewan_North Description":"Meadow Lake, Blaine Lake, Saint Walburg", -"Canada_Saskatchewan_Regina Description":"Melfort, Melville, Regina", -"Canada_Saskatchewan_Saskatoon Description":"Saskatoon, Warman, Hague", -"Canada_Yukon_North Description":"Ross River, Mayo, Dawson City", -"Canada_Yukon_Whitehorse Description":"Watson Lake, Whitehorse, Haines Junction", -"Cape Verde Description":"Praia, Ribeira Grande, Cidade de Espargos", -"Caribisch Nederland Description":"San Nicolaas, Willemstad, Oranjestad", -"Cayman Islands Description":"George Town, West Bay, West End", -"Central African Republic Description":"Bangui, Bouar, Baoro", -"Chad Description":"N'Djamena, Mao, Bol", -"Chile_Central Description":"Santiago, Pichilemu, San Antonio", -"Chile_North Description":"Hanga Roa, Iquique, Coquimbo", -"Chile_South Description":"Valdivia, Talcahuano, Coronel", -"China_Anhui Description":"Hefei, 包河区, 蜀山区", -"China_Chongqing Description":"Chongqing, Changshou, Kai", -"China_Fujian Description":"Longyan, Sanming, Shaowu", -"China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan", -"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén", -"China_Guangxi Description":"Guigang, Dongxing, Wuzhou", -"China_Guizhou Description":"Guiyang, Liupanshui, Weining", -"China_Hebei Description":"Beijing, Tianjin, Shijiazhuang", -"China_Heilongjiang Description":"Harbin, Jixi, Ning'an", -"China_Henan Description":"Zhengzhou, 水磨村, Wugang", -"China_Hubei Description":"Wuhan, Jīngzhōu City, Dangyang", -"China_Hunan Description":"Changsha, Lianyuan, Liling", -"China_Inner Mongolia Description":"Hohhot, Baotou, Erenhot", -"China_Jiangsu Description":"Nanjing, Taixing, Xinyi", -"China_Jiangxi Description":"Ganzhou, Shangrao, Yichun", -"China_Jilin Description":"Changchun, Jilin, Meihekou", -"China_Liaoning Description":"Shenyang, Lingyuan, Wafangdian", -"China_Ningxia Hui Description":"Zhongwei, Wuzhong, Qingtongxia", -"China_Qinghai Description":"Dulan, Delingha, Gyêgu", -"China_Shaanxi Description":"Xi'an, Baoji, Hanzhong", -"China_Shandong Description":"Jinan, Tai'an, Zibo", -"China_Shanghai Description":"Shanghai, Jinshan, Putuo", -"China_Shanxi Description":"Taiyuan, Changzhi, Huozhou", -"China_Sichuan Description":"Chengdu, Panzhihua, Yibin", -"China_Tibet Autonomous Region Description":"Gya'gya, Chabkha, Shelkar", -"China_Xinjiang Description":"Kashgar, Tumxuk, Hotan", -"China_Yunnan Description":"Kunming, Zhedao, Yongbei", -"China_Zhejiang Description":"Jiande, Hangzhou, Lin'an", -"Colombia_East Description":"Mocoa, Villavicencio, Florencia", -"Colombia_North Description":"Cúcuta, Medellín, Cartagena", -"Colombia_West Description":"Bogota, Cali, Soacha", -"Comoros Description":"Moroni, Mutsamudu, Bazimini", -"Congo-Brazzaville Description":"Brazzaville, Pointe-Noire, Impfondo", -"Congo-Kinshasa_Kivu Description":"Bukavu, Beni, Goma", -"Congo-Kinshasa_West Description":"Kinshasa, Mbuji-Mayi, Lubumbashi", -"Cook Islands Description":"Rarotonga Muri, Avarua, Kimiangatau", -"Costa Rica Description":"San José, Palmira, Alajuela", -"Cote dIvoire Description":"Abidjan, Abobo, Yopougon", -"Crimea Description":"Sevastopol, Simferopol, Kerch", -"Croatia_Central Description":"Zagreb, Osijek, Ozalj", -"Croatia_West Description":"Split, Rijeka, Opatija", -"Cuba Description":"Havana, Santiago de Cuba, Cienfuegos", -"Cyprus Description":"Nicosia, Nicosia, Limassol", -"Czech_Jihovychod_Jihomoravsky kraj Description":"Brno, Znojmo", -"Czech_Jihovychod_Kraj Vysocina Description":"Jihlava, Třebíč", -"Czech_Jihozapad_Jihocesky kraj Description":"Budweis, Tábor, Písek", -"Czech_Jihozapad_Plzensky kraj Description":"Pilsen, Klatovy, Rokycany", -"Czech_Karlovasky kraj Description":"Carlsbad, Cheb, Sokolov", -"Czech_Moravskoslezsko Description":"Ostrava, Havířov, Karviná", -"Czech_Olomoucky kraj Description":"Olomouc, Prostějov, Přerov", -"Czech_Praha Description":"Prague, Netluky", -"Czech_Severovychod_Kralovehradecky kraj Description":"Hradec Králové, Náchod, Trutnov", -"Czech_Severovychod_Liberecky kraj Description":"Liberec, Jablonec nad Nisou, Hejnice", -"Czech_Severovychod_Pardubicky kraj Description":"Pardubice, Chrudim, Svitavy", -"Czech_Stredni Cechy_West Description":"Kladno, Mladá Boleslav, Mělník", -"Czech_Ustecky kraj Description":"Ústí nad Labem, Most, Chomutov", -"Czech_Zlinsky Kraj Description":"Zlín, Vsetín, Kroměříž", -"Denmark_Capital Region of Denmark Description":"Copenhagen, Skovlunde, Virum", -"Denmark_Central Denmark Region Description":"Aarhus, Juelsminde, Brabrand", -"Denmark_North Denmark Region Description":"Aalborg, Hjørring, Frederikshavn", -"Denmark_Region Zealand Description":"Roskilde, Næstved, Greve Strand", -"Denmark_Region of Southern Denmark Description":"Odense, Morud, Korup", -"Djibouti Description":"Djibouti, Randa, Yoboki", -"Dominica Description":"Roseau, Salisbury, Grand Bay", -"Dominican Republic Description":"Santo Domingo, Barahona, Azua", -"East Timor Description":"Dili, Pante Macassar, Viqueque", -"Ecuador_East Description":"Quito, Cuenca, Tena", -"Ecuador_West Description":"Guayaquil, Manta, Machala", -"Egypt Description":"Cairo, Alexandria, Giza", -"El Salvador Description":"San Salvador, Ahuachapan, Sonsonate", -"Equatorial Guinea Description":"Malabo, Mongomo, Bata", -"Eritrea Description":"ኣስመራ, Keren, Omhajer", -"Estonia_East Description":"Põltsamaa linn, Võru, Tartu", -"Estonia_West Description":"Tallinn, Pärnu, Maardu", -"Ethiopia Description":"Addis Ababa, Asella, Bahir Dar", -"Falkland Islands Description":"Stanley, Falkland Islands, Dunnose Head, Port Edgar", -"Faroe Islands Description":"Tórshavn, Klaksvík, Norðdepil", -"Federated States of Micronesia Description":"Palikir, Colonia, Tamworohi", -"Fiji Description":"Suva, Nasinu, Nadi", -"Finland_Eastern Finland_North Description":"Alapitkä, Koli, Kajaani", -"Finland_Eastern Finland_South Description":"Kuopio, Joensuu, Mikkeli", -"Finland_Northern Finland Description":"Oulu, Rovaniemi, Kokkola", -"Finland_Southern Finland_Helsinki Description":"Helsinki, Espoo, Vantaa", -"Finland_Southern Finland_Lappeenranta Description":"Kouvola, Lappeenranta, Kotka", -"Finland_Southern Finland_West Description":"Turku, Hämeenlinna, Salo", -"Finland_Western Finland_Jyvaskyla Description":"Jyväskylä, Lehtimäki, Kuorevesi", -"Finland_Western Finland_Tampere Description":"Tampere, Pori, Vaasa", -"France_Alsace_Bas-Rhin Description":"Strasbourg, Haguenau, Schiltigheim", -"France_Alsace_Haut-Rhin Description":"Mulhouse, Colmar, Saint-Louis", -"France_Aquitaine_Dordogne Description":"Périgueux, Bergerac, Sarlat-la-Canéda", -"France_Aquitaine_Gironde Description":"Bordeaux, Mérignac, Pessac", -"France_Aquitaine_Landes Description":"Mont-de-Marsan, Dax, Saint-Paul-lès-Dax", -"France_Aquitaine_Lot-et-Garonne Description":"Agen, Villeneuve-sur-Lot, Marmande", -"France_Aquitaine_Pyrenees-Atlantiques Description":"Pau, Bayonne, Anglet", -"France_Auvergne_Allier Description":"Montluçon, Vichy, Moulins", -"France_Auvergne_Cantal Description":"Aurillac, Saint-Flour, Arpajon-sur-Cère", -"France_Auvergne_Haute-Loire Description":"Le Puy-en-Velay, Monistrol-sur-Loire, Yssingeaux", -"France_Auvergne_Puy-de-Dome Description":"Clermont-Ferrand, Cournon-d'Auvergne, Riom", -"France_Brittany_Cotes-dArmor Description":"Saint-Brieuc, Kerbrézellic, Lannion", -"France_Brittany_Finistere Description":"Brest, Quimper, Le Relecq-Kerhuon", -"France_Brittany_Ille-et-Vilaine Description":"Rennes, Saint-Malo, Fougères", -"France_Brittany_Morbihan Description":"Lorient, Vannes, Lanester", -"France_Burgundy_Cote-dOr Description":"Dijon, Beaune, Chenôve", -"France_Burgundy_Nievre Description":"Nevers, Cosne-Cours-sur-Loire, Varennes-Vauzelles", -"France_Burgundy_Saone-et-Loire Description":"Chalon-sur-Saône, Mâcon, Le Creusot", -"France_Burgundy_Yonne Description":"Auxerre, Sens, Joigny", -"France_Centre-Val de Loire_Cher Description":"Bourges, Vierzon, Saint-Amand-Montrond", -"France_Centre-Val de Loire_Eure-et-Loir Description":"Chartres, Dreux, Lucé", -"France_Centre-Val de Loire_Indre Description":"Châteauroux, Issoudun, Déols", -"France_Centre-Val de Loire_Indre-et-Loire Description":"Tours, Joué-lès-Tours, Saint-Cyr-sur-Loire", -"France_Centre-Val de Loire_Loir-et-Cher Description":"Blois, Romorantin-Lanthenay, Vendôme", -"France_Centre-Val de Loire_Loiret Description":"Orléans, Fleury-les-Aubrais, Olivet", -"France_Champagne-Ardenne Description":"Reims, Troyes, Charleville-Mézières", -"France_Corsica Description":"Ajaccio, Bastia, Porto-Vecchio", -"France_Free County_North Description":"Besançon, Belfort, Montbéliard", -"France_Free County_South Description":"Pontarlier, Lons-le-Saunier, Saint-Claude", -"France_French Guiana Description":"Cayenne, Saint-Laurent-du-Maroni, Matoury", -"France_Ile-de-France_Essonne Description":"Évry, Corbeil-Essonnes, Massy", -"France_Ile-de-France_Hauts-de-Seine Description":"Boulogne-Billancourt, Nanterre, Courbevoie", -"France_Ile-de-France_Paris Description":"Paris, Campagne à Paris", -"France_Ile-de-France_Seine-Saint-Denis Description":"Saint-Denis, Montreuil, Aulnay-sous-Bois", -"France_Ile-de-France_Seine-et-Marne Description":"Chelles, Meaux, Jouarre", -"France_Ile-de-France_Val-dOise Description":"Argenteuil, Sarcelles, Cergy", -"France_Ile-de-France_Val-de-Marne Description":"Créteil, Vitry-sur-Seine, Champigny-sur-Marne", -"France_Ile-de-France_Yvelines Description":"Versailles, Sartrouville, Mantes-la-Jolie", -"France_Languedoc-Roussillon_Aude Description":"Narbonne, Carcassonne, ?", -"France_Languedoc-Roussillon_Gard Description":"Nîmes, Alès, Bagnols-sur-Cèze", -"France_Languedoc-Roussillon_Herault Description":"Montpellier, Béziers, Sète", -"France_Languedoc-Roussillon_Lozere Description":"Aumont-Aubrac, Mende, Marvejols", -"France_Languedoc-Roussillon_Pyrenees-Orientales Description":"Perpignan, Canet-en-Roussillon, Saint-Estève", -"France_Limousin Description":"Limoges, Brive-la-Gaillarde, Tulle", -"France_Lorraine_Meurthe-et-Moselle Description":"Nancy, Vandœuvre-lès-Nancy, Lunéville", -"France_Lorraine_Meuse Description":"Verdun, Bar-le-Duc, Commercy", -"France_Lorraine_Moselle Description":"Metz, Thionville, Montigny-lès-Metz", -"France_Lorraine_Vosges Description":"Épinal, Saint-Dié-des-Vosges, Gérardmer", -"France_Lower Normandy_Calvados Description":"Caen, Lisieux, Hérouville-Saint-Clair", -"France_Lower Normandy_Manche Description":"Cherbourg-Octeville, Cherbourg, Saint-Lô", -"France_Lower Normandy_Orne Description":"Alençon, Flers, Argentan", -"France_Midi-Pyrenees_Ariege Description":"Pamiers, Foix, Saint-Girons", -"France_Midi-Pyrenees_Aveyron Description":"Rodez, Millau, Villefranche-de-Rouergue", -"France_Midi-Pyrenees_Gers Description":"Auch, L'Isle-Jourdain, Condom", -"France_Midi-Pyrenees_Haute-Garonne Description":"Toulouse, Colomiers, Tournefeuille", -"France_Midi-Pyrenees_Hautes-Pyrenees Description":"Tarbes, Lourdes, Aureilhan", -"France_Midi-Pyrenees_Lot Description":"Cahors, Figeac, Gourdon", -"France_Midi-Pyrenees_Tarn Description":"Albi, Castres, Carmaux", -"France_Midi-Pyrenees_Tarn-et-Garonne Description":"Montauban, Castelsarrasin, Moissac", -"France_New Caledonia Description":"Poindimié, Nouméa, Ponérihouen", -"France_Nord-Pas-de-Calais_Lille Description":"Lille, Roubaix, Tourcoing", -"France_Nord-Pas-de-Calais_Nord Description":"Valenciennes, Douai, Cambrai", -"France_Nord-Pas-de-Calais_Pas-de-Calais Description":"Calais, Boulogne-sur-Mer, Arras", -"France_Pays de la Loire_Loire-Atlantique_Nantes Description":"Nantes, Saint-Herblain, Rezé", -"France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire Description":"Saint-Nazaire, Guérande, La Baule-Escoublac", -"France_Pays de la Loire_Maine-et-Loire Description":"Angers, Cholet, Chemillé", -"France_Pays de la Loire_Mayenne Description":"Laval, Mayenne, Château-Gontier", -"France_Pays de la Loire_Sarthe Description":"Le Mans, La Flèche, Sablé-sur-Sarthe", -"France_Pays de la Loire_Vendee Description":"La Roche-sur-Yon, Challans, Les Herbiers", -"France_Picardy_Aisne Description":"Saint-Quentin, Soissons, Laon", -"France_Picardy_Oise Description":"Beauvais, Compiègne, Creil", -"France_Picardy_Somme Description":"Amiens, Abbeville, Albert", -"France_Poitou-Charentes_Charente Description":"Angoulême, Roumazières, Cognac", -"France_Poitou-Charentes_Charente-Maritime Description":"La Rochelle, Saintes, Rochefort", -"France_Poitou-Charentes_Deux-Sevres Description":"Niort, Bressuire, Parthenay", -"France_Poitou-Charentes_Vienne Description":"Poitiers, Châtellerault, Buxerolles", -"France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence Description":"Manosque, Digne-les-Bains, Sisteron", -"France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone Description":"Marseille, Aix-en-Provence, Arles", -"France_Provence-Alpes-Cote dAzur_Hautes-Alpes Description":"Gap, Briançon, Embrun", -"France_Provence-Alpes-Cote dAzur_Maritime Alps Description":"Nice, Antibes, Cannes", -"France_Provence-Alpes-Cote dAzur_Var Description":"Toulon, La Seyne-sur-Mer, Hyères", -"France_Provence-Alpes-Cote dAzur_Vaucluse Description":"Avignon, Carpentras, Orange", -"France_Rhone-Alpes_Ain Description":"Bourg-en-Bresse, Oyonnax, Ambérieu-en-Bugey", -"France_Rhone-Alpes_Ardeche Description":"Annonay, Aubenas, Guilherand-Granges", -"France_Rhone-Alpes_Drome Description":"Valence, Montélimar, Romans-sur-Isère", -"France_Rhone-Alpes_Haute-Savoie Description":"Annecy, Thonon-les-Bains, Annemasse", -"France_Rhone-Alpes_Isere Description":"Grenoble, Saint-Martin-d'Hères, Échirolles", -"France_Rhone-Alpes_Loire Description":"Saint-Étienne, Roanne, Saint-Chamond", -"France_Rhone-Alpes_Rhone Description":"Lyon, Villeurbanne, Vénissieux", -"France_Rhone-Alpes_Savoie Description":"Chambéry, Aix-les-Bains, Albertville", -"France_Southern Islands Description":"Le Port, Saint-Denis, Coconi", -"France_Upper Normandy Description":"Le Havre, Rouen, Évreux", -"French Polynesia Description":"Vaitape, Vaitahu, Tiputa", -"Gabon Description":"Libreville, Port-Gentil, Sangala", -"Georgia Description":"Tbilisi, Kutaisi, Batumi", -"Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg Description":"Freiburg im Breisgau, Villingen-Schwenningen, Constance", -"Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe Description":"Mannheim, Karlsruhe, Heidelberg", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn Description":"Heilbronn, Schwäbisch Hall, Crailsheim", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart Description":"Stuttgart, Esslingen am Neckar, Ludwigsburg", -"Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen Description":"Ulm, Reutlingen, Tübingen", -"Germany_Berlin Description":"Berlin, Falkenberg, Siedlung Grüneck", -"Germany_Brandenburg_North Description":"Brandenburg an der Havel, Potsdam, Panketal", -"Germany_Brandenburg_South Description":"Frankfurt (Oder), Cottbus, Cottbus", -"Germany_Free State of Bavaria_Lower Bavaria Description":"Landshut, Passau, Straubing", -"Germany_Free State of Bavaria_Lower Franconia Description":"Würzburg, Aschaffenburg, Schweinfurt", -"Germany_Free State of Bavaria_Middle Franconia Description":"Nuremberg, Fürth, Erlangen", -"Germany_Free State of Bavaria_Swabia Description":"Augsburg, Kempten (Allgäu), Neu-Ulm", -"Germany_Free State of Bavaria_Upper Bavaria_East Description":"Rosenheim, Rosenheim", -"Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt Description":"Ingolstadt, Freising, Neuburg an der Donau", -"Germany_Free State of Bavaria_Upper Bavaria_Munchen Description":"Munich, Dachau", -"Germany_Free State of Bavaria_Upper Bavaria_South Description":"Pfistern, Schongau, Hohenpeißenberg", -"Germany_Free State of Bavaria_Upper Franconia Description":"Bayreuth, Bamberg, Hof", -"Germany_Free State of Bavaria_Upper Palatinate Description":"Regensburg, Amberg, Weiden in der Oberpfalz", -"Germany_Hamburg_main Description":"Hamburg, Nettelnburg, Fünfhausen", -"Germany_Hesse_Regierungsbezirk Darmstadt Description":"Frankfurt am Main, Wiesbaden, Darmstadt", -"Germany_Hesse_Regierungsbezirk Giessen Description":"Lauterbach, Gießen, Marburg", -"Germany_Hesse_Regierungsbezirk Kassel Description":"Kassel, Fulda, Vöhl", -"Germany_Lower Saxony_Braunschweig Description":"Brunswick, Göttingen, Wolfsburg", -"Germany_Lower Saxony_Bremen_Bremen Description":"Bremen, Bremerhaven, Uchte", -"Germany_Lower Saxony_Bremen_Munster Description":"Rotenburg (Wümme), Winsen (Luhe), Buxtehude", -"Germany_Lower Saxony_Hannover Description":"Hanover, Hildesheim, Bad Nenndorf", -"Germany_Lower Saxony_Oldenburg Description":"Osnabrück, Oldenburg, Nordhorn", -"Germany_Mecklenburg-Vorpommern Description":"Rostock, Schwerin, Wismar", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg Description":"Siegen, Arnsberg, Lüdenscheid", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund Description":"Dortmund, Bochum, Hagen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Detmold Description":"Bielefeld, Paderborn, Gütersloh", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf Description":"Düsseldorf, Wuppertal, Mönchengladbach", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim Description":"Essen, Duisburg, Krefeld", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel Description":"Wesel, Kleve, Geldern", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen Description":"Aachen, Düren, Simmerath", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln Description":"Cologne, Bonn, Leverkusen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster Description":"Münster, Rheine, Ahlen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen Description":"Gelsenkirchen, Bottrop, Recklinghausen", -"Germany_Rhineland-Palatinate_Koblenz Description":"Koblenz, Trier, Neuwied", -"Germany_Rhineland-Palatinate_South Description":"Mainz, Ludwigshafen am Rhein, Kaiserslautern", -"Germany_Saarland Description":"Saarbruecken, Neunkirchen (Saar), Homburg", -"Germany_Saxony-Anhalt_Halle Description":"Halle (Saale), Dessau-Roßlau, Zerbst/Anhalt", -"Germany_Saxony-Anhalt_Magdeburg Description":"Magdeburg, Halberstadt, Aschersleben", -"Germany_Saxony_Dresden Description":"Dresden, Görlitz, Schirgiswalde-Kirschau", -"Germany_Saxony_Leipzig Description":"Leipzig, Chemnitz, Zwickau", -"Germany_Schleswig-Holstein_Flensburg Description":"Flensburg, Elmshorn, Pinneberg", -"Germany_Schleswig-Holstein_Kiel Description":"Kiel, Lübeck, Neumünster", -"Germany_Thuringia Description":"Erfurt, Jena, Gera", -"Ghana Description":"Accra, Kumasi, Wechiau", -"Gibraltar Description":"Gibraltar, Catalan Bay", -"Greece_Decentralized Administration of Aegean Description":"Kos, Parikia, Naoussa", -"Greece_Decentralized Administration of Attica Description":"Athens, Egaleo, Kamatero", -"Greece_Decentralized Administration of Crete Description":"Heraklion, Elounda, Chania", -"Greece_Decentralized Administration of Epirus - Western Macedonia Description":"Eani, Ioannina, Galatini", -"Greece_Decentralized Administration of Macedonia and Thrace Description":"Thessaloniki, Makrochori, Platy", -"Greece_Decentralized Administration of Thessaly - Central Greece Description":"Chalkida, Larissa, Volos", -"Greece_Decentralized Administration of West Greece Description":"Patras, Lefkas, Kalamata", -"Greenland Description":"Kangaatsiaq, Qaqortoq, Paamiut", -"Grenada Description":"St. George's, Gouyave, Calivigny", -"Guadeloupe Description":"Les Abymes, Baie-Mahault, Le Gosier", -"Guatemala Description":"Guatemala City, Quetzaltenango (Xela), Santo Tomas De Castilla", -"Guernsey Description":"Saint Peter Port, St Anne, The Bridge", -"Guinea Description":"Conakry, Coyah, Nzérékoré", -"Guinea-Bissau Description":"Bissau, Mansôa, Bubaque", -"Guyana Description":"Georgetown, New Amsterdam, Port Kaituma", -"Haiti Description":"Port-au-Prince, Carrefour, Tabarre", -"Honduras Description":"Tegucigalpa, San Pedro Sula, Santa Barbara", -"Hungary_Kozep-Magyarorszag Description":"Budapest, Érd, Dunakeszi", -"Hungary_Northern Great Plain Description":"Debrecen, Szeged, Miskolc", -"Hungary_Transdanubia Description":"Pécs, Győr, Székesfehérvár", -"Iceland Description":"Reykjavik, Patreksfjörður, Grundarfjörður", -"India_Andaman and Nicobar Islands Description":"Port Blair, Wandoor, Ferrargunj", -"India_Andhra Pradesh Description":"Vijayawada, Visakhapatnam, Guntur", -"India_Arunachal Pradesh Description":"Koloriang, Along", -"India_Assam Description":"Guwahati, Silchar, Jorhat", -"India_Bihar Description":"Buxar, Patna, Gaya", -"India_Chandigarh Description":"Chandigarh, Palsora, Kaheri", -"India_Chhattisgarh Description":"Bilaspur, Ambikapur, Bhilai", -"India_Delhi Description":"Delhi, New Delhi, Nankheri", -"India_Goa Description":"Panaji, Margao, Bicholim", -"India_Gujarat Description":"Ahmedabad, Jamnagar, Surat", -"India_Haryana Description":"Panchkula, Rewari, Rohtak", -"India_Himachal Pradesh Description":"Nurpur, Mandi, Bharmour", -"India_Jammu and Kashmir Description":"Srinagar, Jammu, Udhampur", -"India_Jharkhand Description":"Ranchi, Dhanbad, Jamshedpur", -"India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru", -"India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields", -"India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur", -"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center", -"India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior", -"India_Maharashtra Description":"Mumbai, Pune, Nagpur", -"India_Manipur Description":"Imphal, Imphal, Jiribam", -"India_Meghalaya Description":"Shillong, Garobandha, Betasing", -"India_Mizoram Description":"Aizawl, Lunglei, Mamit", -"India_Nagaland Description":"Kohima, Peren", -"India_Odisha Description":"Cuttack, Rourkela, Brahmapur", -"India_Punjab Description":"Jalandhar, Amritsar, Bathinda", -"India_Rajasthan Description":"Jaipur, Jodhpur, Kota", -"India_Sikkim Description":"Gangtok, Gayzing, Jorethang", -"India_Tamil Nadu Description":"Chennai, Kanyakumari, Namakkal", -"India_Telangana Description":"Hyderabad, Warangal, Khammam", -"India_Tripura Description":"Agartala, Bisramganj, Belonia", -"India_Uttar Pradesh Description":"Allahabad, Lucknow, Varanasi", -"India_Uttarakhand Description":"Dehradun, Roorkee, Haridwār", -"India_West Bengal Description":"Kolkata, Siliguri, Asansol", -"Indonesia_Central Description":"Makassar, Samarinda, Pontianak", -"Indonesia_East Description":"Sorong, Timika, Manokwari", -"Indonesia_Jawa Barat Description":"Jakarta, Bandung, Tangerang Selatan", -"Indonesia_Jawa Tengah Description":"Semarang, Yogyakarta, Surakarta", -"Indonesia_Jawa Timur Description":"Sumenep, Tulungagung, Batu", -"Indonesia_Nusa Tenggara Description":"Denpasar, Semarapura, Tambolaka", -"Indonesia_West Description":"Medan, SIak Sri Indrapura, Lampung Town", -"Iran_East Description":"Mashhad, Zahedan, Yazd", -"Iran_North Description":"Tehran, Karaj, Tabriz", -"Iran_South Description":"Isfahan, Shiraz, Ahvaz", -"Iraq_North Description":"Mosul, Erbil, Kirkuk", -"Iraq_South Description":"Baghdad, Karbala, Nasiriyah", -"Ireland_Connacht Description":"Galway City, Swinford, Mohill", -"Ireland_Leinster Description":"Dublin, Durrow, Prosperous", -"Ireland_Munster Description":"Cork, Caherciveen", -"Ireland_Northern Counties Description":"Glencolumbkille, Ardara, Glenties", -"Isle of Man Description":"Douglas, Onchan", -"Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut", -"Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto", -"Italy_Aosta Valley Description":"Quart, Aosta, Aosta", -"Italy_Apulia Description":"Bari, Taranto, Foggia", -"Italy_Basilicata Description":"Potenza, Matera, Melfi", -"Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza", -"Italy_Campania Description":"Naples, Salerno, Torre del Greco", -"Italy_Emilia-Romagna_Bologna Description":"Bologna, Imola, Casalecchio di Reno", -"Italy_Emilia-Romagna_Ferrara Description":"Ferrara, Longastrino, Anita", -"Italy_Emilia-Romagna_Forli-Cesena Description":"Forlì, Cesena, Cesenatico", -"Italy_Emilia-Romagna_Modena Description":"Modena, Carpi, Sassuolo", -"Italy_Emilia-Romagna_Parma Description":"Parma, Fidenza, Salsomaggiore Terme", -"Italy_Emilia-Romagna_Piacenza Description":"Piacenza, San Nicolò a Trebbia, Ziano Piacentino", -"Italy_Emilia-Romagna_Ravenna Description":"Ravenna, Faenza, Lugo", -"Italy_Emilia-Romagna_Reggio Emilia Description":"Reggio nell'Emilia, Scandiano, Casalgrande", -"Italy_Emilia-Romagna_Rimini Description":"Rimini, Riccione, Santarcangelo di Romagna", -"Italy_Friuli-Venezia Giulia_Gorizia Description":"Gorizia, Monfalcone, Ronchi dei Legionari", -"Italy_Friuli-Venezia Giulia_Pordenone Description":"Pordenone, Sacile, San Vito al Tagliamento", -"Italy_Friuli-Venezia Giulia_Trieste Description":"Triest, Muggia / Milje, Aurisina / Nabrežina", -"Italy_Friuli-Venezia Giulia_Udine Description":"Udine, Codroipo, Cervignano del Friuli", -"Italy_Lazio Description":"Rome, Latina, Fiumicino", -"Italy_Liguria Description":"Genoa, La Spezia, La Spezia", -"Italy_Lombardy_Bergamo Description":"Bergamo, Tagliuno, Treviglio", -"Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane", -"Italy_Lombardy_Como Description":"Como, Como, Cantù", -"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco", -"Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte", -"Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo", -"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara", -"Italy_Lombardy_Milan Description":"Milan, Sesto San Giovanni, Cinisello Balsamo", -"Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno", -"Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella", -"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno", -"Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate", -"Italy_Marche Description":"Ancona, Pesaro", -"Italy_Molise Description":"Campobasso, Termoli, Isernia", -"Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure", -"Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato", -"Italy_Piemont_Biella Description":"Biella, Biella, Cossato", -"Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo", -"Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate", -"Italy_Piemont_Torino Description":"Turin, Moncalieri, Rivoli", -"Italy_Piemont_Verbano-Cusio-Ossola Description":"Verbania, Domodossola, Omegna", -"Italy_Piemont_Vercelli Description":"Vercelli, Borgosesia, Santhià", -"Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena", -"Italy_Sicily Description":"Palermo, Catania, Messina", -"Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto", -"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto", -"Italy_Tuscany_Massa e Carrara Description":"Lucca, Florence, Prato", -"Italy_Umbria Description":"Perugia, Terni, Foligno", -"Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico", -"Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro", -"Italy_Veneto_Rovigo Description":"Rovigo, Badia Polesine, Adria", -"Italy_Veneto_Treviso Description":"Treviso, Conegliano, Castelfranco Veneto", -"Italy_Veneto_Venezia Description":"Venice, Mestre, Chioggia", -"Italy_Veneto_Verona Description":"Verona, Villafranca di Verona, Legnago", -"Italy_Veneto_Vicenza Description":"Vicenza, Bassano del Grappa, Schio", -"Jamaica Description":"Kingston, Montego Bay, Spanish Town", -"Japan_Chubu Region_Aichi_Nagoya Description":"Nagoya, Tsushima, Kiyosu", -"Japan_Chubu Region_Aichi_Toyohashi Description":"Tahara, Gamagori, Nishio", -"Japan_Chubu Region_Fukui Description":"Obama, Fukui, Sakai", -"Japan_Chubu Region_Gifu Description":"Gifu, Hida, Ena", -"Japan_Chubu Region_Ishikawa Description":"Kanazawa, Komatsu, Hakusan", -"Japan_Chubu Region_Nagano Description":"Okaya, Omachi, Nagano", -"Japan_Chubu Region_Niigata Description":"Niigata, Myoko, Sado", -"Japan_Chubu Region_Shizuoka Description":"Hamamatsu, Kosai, Fukuroi", -"Japan_Chubu Region_Toyama Description":"Toyama, Takaoka, Imizu", -"Japan_Chubu Region_Yamanashi Description":"Hokuto, Kofu, Nirasaki", -"Japan_Chugoku Region_Hiroshima Description":"Hiroshima, Ōtake, Kure", -"Japan_Chugoku Region_Okayama Description":"Okayama, Niimi, Kasaoka", -"Japan_Chugoku Region_Shimane Description":"Masuda, Gotsu, Hamada", -"Japan_Chugoku Region_Tottori Description":"Sakai-Minato, Kurayoshi, Yonago", -"Japan_Chugoku Region_Yamaguchi Description":"Nagato, Sanyo-Onoda, Shimonoseki", -"Japan_Hokkaido Region_East Description":"Kushiro, Nemuro, Obihiro", -"Japan_Hokkaido Region_North Description":"Asahikawa, Furano, Shibetsu", -"Japan_Hokkaido Region_Sapporo Description":"Sapporo, Ishikari, Iwamizawa", -"Japan_Hokkaido Region_West Description":"Hokuto, Date, Noboribetsu", -"Japan_Kanto_Chiba Description":"Tateyama, Kamagaya, Minamiboso", -"Japan_Kanto_Gunma Description":"Fujioka, Midori, Numata", -"Japan_Kanto_Ibaraki Description":"Inashiki, Hokota, Ishioka", -"Japan_Kanto_Kanagawa Description":"Yokohama, Sagamihara, Fujisawa", -"Japan_Kanto_Saitama Description":"Saitama, Kawaguchi, Hannō", -"Japan_Kanto_Tochigi Description":"Ashikaga, Kanuma, Sano", -"Japan_Kanto_Tokyo Description":"Tokyo, Setagaya, Hachiōji", -"Japan_Kinki Region_Mie Description":"Kumano, Tsu, Kameyama", -"Japan_Kinki Region_Nara Description":"Nara, Kashihara, Ikoma", -"Japan_Kinki Region_Osaka_Osaka Description":"Osaka, Ashiya, Sennan", -"Japan_Kinki Region_Osaka_West Description":"Kobe, Himeji, Ako", -"Japan_Kinki Region_Wakayama Description":"Wakayama, Tanabe, Kinokawa", -"Japan_Kyushu Region_Fukuoka Description":"Fukuoka, Kitakyūshū, Itoshima", -"Japan_Kyushu Region_Kagoshima Description":"Kagoshima, Satsumasendai, Minamisatsuma", -"Japan_Kyushu Region_Kumamoto Description":"Kumamoto, Amakusa, Kamiamakusa", -"Japan_Kyushu Region_Miyazaki Description":"Ebino, Kushima, Miyakonojo", -"Japan_Kyushu Region_Nagasaki Description":"Nagasaki, Goshima, Hirado", -"Japan_Kyushu Region_Oita Description":"Ōita, Yufu, Taketa", -"Japan_Kyushu Region_Okinawa Description":"Naha, Okinawa, Uruma", -"Japan_Kyushu Region_Saga Description":"Imari, Karatsu, Takeo", -"Japan_Shikoku Region_Ehime Description":"Matsuyama, Yawatahama, Uwajima", -"Japan_Shikoku Region_Kagawa Description":"Takamatsu, Tadotsu, Sakaide", -"Japan_Shikoku Region_Kochi Description":"Sukumo, Shimanto, Tosa-Shimizu", -"Japan_Shikoku Region_Kyoto Description":"Kyoto, Kyotango, Fukuchiyama", -"Japan_Shikoku Region_Tokushima Description":"Miyoshi, Awa, Yoshinogawa", -"Japan_Tohoku_Akita Description":"Oga, Nikaho, Daisen", -"Japan_Tohoku_Aomori Description":"Hirakawa, Towada, Aomori", -"Japan_Tohoku_Fukushima Description":"Kitakata, Sukagawa, Shirakawa", -"Japan_Tohoku_Iwate Description":"Morioka, Hachimantai, Ninohe", -"Japan_Tohoku_Miyagi Description":"Sendai, Higashimatsushima, Tome", -"Japan_Tohoku_Yamagata Description":"Nanyo, Higashine, Obanazawa", -"Jersey Description":"Saint Helier, St. Saviour, St. John", -"Jerusalem Description":"Jerusalem, 'Anata, Al-Walaja", -"Jordan Description":"Amman, Zarqa, Irbid", -"Kazakhstan_North Description":"Astana, Karaganda, Pavlodar", -"Kazakhstan_South Description":"Almaty, Shymkent, Aktobe", -"Kenya Description":"Nairobi, Kisumu, Kitale", -"Kingdom of Lesotho Description":"Maseru, Butha-Buthe, Mohale's Hoek", -"Kiribati Description":"Betio, Kabuna, Bairiki", -"Kuwait Description":"Kuwait City, Al Ahmadi, Jahra", -"Kyrgyzstan Description":"Bishkek, Osh, Balykchy", -"Laos Description":"Vientiane, Pakxan, Oudomxay", -"Latvia Description":"Riga, Daugavpils, Liepāja", -"Lebanon Description":"Beirut, Zahle, Sidon", -"Liberia Description":"Monrovia, Sanniquellie, Fish Town City", -"Libya Description":"Tripoli, Benghazi, Misrata", -"Liechtenstein Description":"Vaduz, Schaan, Triesen", -"Lithuania_East Description":"Vilnius, Kaunas, Alytus", -"Lithuania_West Description":"Klaipėda, Šiauliai, Panevėžys", -"Luxembourg Description":"Luxembourg, Mondorf-les-Bains, Esch-sur-Alzette", -"Macedonia Description":"Skopje, Ohrid, Kavadarci", -"Madagascar Description":"Antananarivo, Toamasina, Fianarantsoa", -"Malawi Description":"Lilongwe, Blantyre, Mzuzu", -"Malaysia Description":"Kuala Lumpur, Petaling Jaya, Kota Kinabalu", -"Maldives Description":"Feridhoo, Malé, Dhiggiri", -"Mali Description":"Bamako, Koulikoro, Ségou", -"Malta Description":"Valletta, Victoria, Zebbug", -"Marshall Islands Description":"Majuro, Jelter, Ebeye", -"Martinique Description":"Fort-de-France, Saint-Esprit, Schœlcher", -"Mauritania Description":"Nouakchott, Aleg, Ayoun el Atrous", -"Mauritius Description":"Port Louis, Flic en Flac, Rose Hill", -"Mexico_California Description":"Tijuana, Mexicali, La Paz", -"Mexico_Central_East Description":"Monterrey, Saltillo, Torreón", -"Mexico_Central_West Description":"Guadalajara, Aguascalientes, Zapopan", -"Mexico_Chihuahua Description":"Ciudad Juárez, Chihuahua, Ciudad Acuña", -"Mexico_East Description":"Mérida, Villahermosa, Cancún", -"Mexico_Mexico Description":"Mexico City, Puebla, Cuautitlán Izcalli", -"Mexico_Sonora Description":"Hermosillo, Ciudad Obregon, Heroica Nogales", -"Mexico_South Description":"León, Querétaro, Acapulco", -"Moldova Description":"Chișinău, Tiraspol, Bălți", -"Monaco Description":"Monaco, Monaco", -"Mongolia Description":"Ulaanbaatar, Khovd, Erdenet", -"Montenegro Description":"Podgorica, Niksic, Tuzi", -"Montserrat Description":"Brades, Salem", -"Morocco_Doukkala-Abda Description":"Casablanca, Marrakesh, Safi ⴰⵙⴼⵉ آسفي", -"Morocco_Rabat-Sale-Zemmour-Zaer Description":"Fez, Rabat, Salé ⵙⵍⴰ سلا", -"Morocco_Southern Description":"Meknès ⴰⵎⴽⵏⴰⵙ مكناس, Agadir, Oujda", -"Morocco_Western Sahara Description":"Laayoune, Guelmim, Assa ⴰⵙⵙⴰ آسـا", -"Mozambique Description":"Maputo, Matola, Praia de Bilene", -"Myanmar Description":"Yangon, Naypyidaw, Mandalay", -"Nagorno-Karabakh Description":"Stepanakert, Stepanakert, Hadrut", -"Namibia Description":"Windhoek, Opuwo, Eenhana", -"Nauru Description":"Yaren, Buada, Orro", -"Nepal_Kathmandu Description":"Kathmandu, Kathmandu, Patan", -"Nepal_Madhyamanchal Description":"Bharatpur, Birganj", -"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar", -"Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City", -"Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen", -"Netherlands_Flevoland Description":"Almere, Lelystad, Dronten", -"Netherlands_Friesland Description":"Leeuwarden, Drachten, Sneek", -"Netherlands_Gelderland_Nijmegen Description":"Nijmegen, Groesbeek, Tiel", -"Netherlands_Gelderland_North Description":"Apeldoorn, Arnhem, Ede", -"Netherlands_Gelderland_Zutphen Description":"Doetinchem, Zutphen, Winterswijk", -"Netherlands_Groningen Description":"Groningen, Leek, Bedum", -"Netherlands_Limburg Description":"Maastricht, Venlo, Heerlen", -"Netherlands_North Brabant_Eindhoven Description":"'s-Hertogenbosch, Eindhoven, Helmond", -"Netherlands_North Brabant_Roosendaal Description":"Steenbergen, Roosendaal, Bergen op Zoom", -"Netherlands_North Brabant_Tiburg Description":"Tilburg, Breda, Baarle-Hertog", -"Netherlands_North Brabant_Uden Description":"Oss, Uden, Deurne", -"Netherlands_North Holland_Alkmaar Description":"Alkmaar, Hoorn, Den Helder", -"Netherlands_North Holland_Amsterdam Description":"Amsterdam, Haarlem, Hilversum", -"Netherlands_North Holland_Zaandam Description":"Purmerend, Zaandam, Beverwijk", -"Netherlands_Overijssel_Enschede Description":"Enschede, Hengelo, Almelo", -"Netherlands_Overijssel_Zwolle Description":"Zwolle, Deventer, Kampen", -"Netherlands_South Holland_Brielle Description":"Spijkenisse, Hellevoetsluis, Oud-Beijerland", -"Netherlands_South Holland_Den Haag Description":"The Hague, Zoetermeer, Delft", -"Netherlands_South Holland_Leiden Description":"Leiden, Alphen aan den Rijn, Leiderdorp", -"Netherlands_South Holland_Rotterdam Description":"Rotterdam, Dordrecht, Schiedam", -"Netherlands_Utrecht_Amersfoort Description":"Amersfoort, Veenendaal, Zeist", -"Netherlands_Utrecht_Utrecht Description":"Utrecht, Nieuwegein, Houten", -"Netherlands_Zeeland Description":"Middelburg, Vlissingen, Goes", -"New Zealand North_Auckland Description":"Auckland, Hamilton, Tauranga", -"New Zealand North_Wellington Description":"Wellington, Lower Hutt, Palmerston North", -"New Zealand South_Canterbury Description":"Christchurch, Nelson, Waimate", -"New Zealand South_Southland Description":"Dunedin, Invercargill, Tuatapere", -"Nicaragua Description":"Managua, Matagalpa, Bluefields", -"Niger Description":"Niamey, Maradi, Zinder", -"Nigeria_North Description":"Kano, Maiduguri, Sokoto", -"Nigeria_South Description":"Lagos, Ibadan, Abuja", -"Niue Description":"Alofi, Liku, Lakepa", -"North Korea Description":"Pyongyang, Hamhung, Nampo", -"Norway_Central Description":"Oslo, Sandvika, Drammen", -"Norway_Hedmark Description":"Brumunddal, Hamar, Elverum", -"Norway_Hordaland Description":"Bergen, Leirvik, Vossevangen", -"Norway_Jan Mayen Description":"Olonkin City", -"Norway_Nordland Description":"Bodø, Brønnøysund, Mosjøen", -"Norway_North Trondelag Description":"Kolvereid, Stjørdal, Steinkjer", -"Norway_Northern Description":"Tromsø, Finnsnes, Hammerfest", -"Norway_Oppland Description":"Lom, Raufoss, Gjøvik", -"Norway_Rogaland Description":"Stavanger, Sandnes, Haugesund", -"Norway_South Trondelag Description":"Trondheim, Røros, Titran", -"Norway_Southern Description":"Fredrikstad, Kristiansand, Sarpsborg", -"Norway_Svalbard Description":"Grumantbyen, Pyramiden, Longyearbyen", -"Norway_Western Description":"Ålesund, Molde", -"Oman Description":"Muscat, Al Khasal, As Suwaiq", -"Pakistan Description":"Karachi, Lahore, Faisalabad", -"Palau Description":"Melekeok, Palau, Koror", -"Palestine Description":"Gaza, Modi'in Illit, Nablus", -"Panama Description":"Panama, Santiago de Veraguas, Colón", -"Papua New Guinea Description":"Port Moresby, Lae, Vanimo", -"Paraguay Description":"Asuncion, San Lorenzo, Ciudad del Este", -"Peru_Lima Description":"Lima, Ica, Nazca", -"Peru_North Description":"Chiclayo, Iquitos, Piura", -"Peru_South Description":"Arequipa, Abancay, Moquegua", -"Philippines_Luzon_Manila Description":"Manila, Quezon City, Pasig", -"Philippines_Luzon_North Description":"Angeles, Palayan, Malolos", -"Philippines_Luzon_South Description":"Puerto Princesa, Masbate, Calapan", -"Philippines_Mindanao Description":"Zamboanga City, General Santos, Koronadal", -"Philippines_Visayas Description":"Bacolod, Cebu City, Tagbilaran", -"Pitcairn Islands Description":"Adamstown", -"Poland_Greater Poland Voivodeship Description":"Poznan, Kalisz, Jaraczewo", -"Poland_Kuyavian-Pomeranian Voivodeship Description":"Bydgoszcz, Toruń, Włocławek", -"Poland_Lesser Poland Voivodeship Description":"Krakow, Tarnów, Nowy Sącz", -"Poland_Lodz Voivodeship Description":"Łódź, Piotrków Trybunalski, Pabianice", -"Poland_Lower Silesian Voivodeship Description":"Wrocław, Wałbrzych, Legnica", -"Poland_Lublin Voivodeship Description":"Lublin, Chełm, Zamość", -"Poland_Lubusz Voivodeship Description":"Gorzów Wielkopolski, Zielona Góra, Lubniewice", -"Poland_Masovian Voivodeship Description":"Warsaw, Radom, Płock", -"Poland_Opole Voivodeship Description":"Opole, Biała, Baborów", -"Poland_Podlaskie Voivodeship Description":"Białystok, Czyżew, Suwałki", -"Poland_Pomeranian Voivodeship Description":"Gdańsk, Gdynia, Słupsk", -"Poland_Silesian Voivodeship Description":"Katowice, Częstochowa, Sosnowiec", -"Poland_Subcarpathian Voivodeship Description":"Rzeszów, Jedlicze, Dynów", -"Poland_Swietokrzyskie Voivodeship Description":"Kielce, Ostrowiec Świętokrzyski, Starachowice", -"Poland_Warmian-Masurian Voivodeship Description":"Olsztyn, Elbląg, Elk", -"Poland_West Pomeranian Voivodeship Description":"Szczecin, Koszalin, Redło", -"Portugal_Islands Description":"Funchal, Madalena, Calheta", -"Portugal_Porto Description":"Vila Nova de Gaia, Porto, Braga", -"Portugal_South Description":"Lisbon, Odivelas, Setúbal", -"Portugal_Viseu Description":"Viseu, Santo Adrião de Vizela, Felgueiras", -"Qatar Description":"Doha, Al-Rayyan, Barwa City", -"Republic of Kosovo Description":"Pristina, Mitrovica e Veriut, Ferizaj", -"Romania_Centre Description":"Brasov, Sibiu, Târgu Mureș", -"Romania_North_East Description":"Iași, Bacău, Botoșani", -"Romania_North_West Description":"Cluj-Napoca, Dej, Oradea", -"Romania_South Description":"Bucharest, Ploiești, Pitești", -"Romania_South_East Description":"Constanța, Galați, Brăila", -"Romania_South_West Description":"Craiova, Slatina, Râmnicu Vâlcea", -"Romania_West Description":"Timișoara, Arad, Reșița", -"Russia_Altai Krai Description":"Barnaul, Biysk, Rubtsovsk", -"Russia_Altai Republic Description":"Gorno-Altaysk, Mayma, Kosh-Agach", -"Russia_Amur Oblast Description":"Blagoveshchensk, Belogorsk, Svobodny", -"Russia_Arkhangelsk Oblast_Central Description":"Arkhangelsk, Severodvinsk, Novodvinsk", -"Russia_Arkhangelsk Oblast_North Description":"Kotlas, Koryazhma, Vychegodskiy", -"Russia_Astrakhan Oblast Description":"Astrakhan, Gospitomnika, Akhtubinsk", -"Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat", -"Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin", -"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы", -"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида", -"Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali", -"Russia_Chelyabinsk Oblast Description":"Chelyabinsk, Magnitogorsk, Zlatoust", -"Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek", -"Russia_Chuvashia Description":"Cheboksary, Novocheboksarsk, Kanash", -"Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak", -"Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk", -"Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya", -"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Облучье, Николаевка", -"Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan", -"Russia_Kaliningrad Oblast Description":"Kaliningrad, Sovetsk, Chernyakhovsk", -"Russia_Kaluga Oblast Description":"Kaluga, Obninsk, Babynino", -"Russia_Kamchatka Krai Description":"Petropavlovsk-Kamchatsky, Yelizovo, Vilyuchinsk", -"Russia_Karachay-Cherkessia Description":"Cherkessk, Pregradnaya, Ust-Dzheguta", -"Russia_Kemerov Oblast Description":"Kemerovo, Novokuznetsk, Prokopyevsk", -"Russia_Khabarovsk Krai Description":"Khabarovsk, Komsomolsk-on-Amur, Amursk", -"Russia_Khakassia Description":"Abakan, Chernogorsk, Sayanogorsk", -"Russia_Kirov Oblast Description":"Kirov, Kirovo-Chepetsk, Slobodskoy", -"Russia_Komi Republic Description":"Syktyvkar, Ukhta, Vorkuta", -"Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya", -"Russia_Krasnodar Krai Description":"Krasnodar, Novorossiysk, Armavir", -"Russia_Krasnodar Krai_Adygeya Description":"Sochi, Maykop, Gelendzhik", -"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский", -"Russia_Krasnoyarsk Krai_South Description":"Krasnoyarsk, Achinsk, Kansk", -"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши", -"Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov", -"Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo", -"Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin", -"Russia_Lipetsk Oblast Description":"Lipetsk, Yelets, Gryazi", -"Russia_Magadan Oblast Description":"Magadan, Ola, Susuman", -"Russia_Mari El Description":"Yoshkar-Ola, Volzhsk, Kozmodemyansk", -"Russia_Moscow Description":"Moscow, Khimki, Troitsk", -"Russia_Moscow Oblast_East Description":"Balashikha, Podolsk, Korolyov", -"Russia_Moscow Oblast_West Description":"Zelenograd, Odintsovo, Krasnogorsk", -"Russia_Murmansk Oblast Description":"Murmansk, Apatity, Severomorsk", -"Russia_Nenets Autonomous Okrug Description":"Красное, Nar'yan-Mar, Искателей", -"Russia_Nizhny Novgorod Oblast Description":"Nizhny Novgorod, Dzerzhinsk, Arzamas", -"Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok, Beslan", -"Russia_Novgorod Oblast Description":"Veliky Novgorod, Borovichi, Staraya Russa", -"Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim", -"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль", -"Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk", -"Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk", -"Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy", -"Russia_Perm Krai_North Description":"Berezniki, Solikamsk, Lysva", -"Russia_Perm Krai_South Description":"Perm, Chaikovsky, Kungur", -"Russia_Primorsky Krai Description":"Vladivostok, Ussurijsk, Nahodka", -"Russia_Pskov Oblast Description":"Pskov, Velikiye Luki, Ostrov", -"Russia_Republic of Dagestan Description":"Makhachkala, Khasavyurt, Derbent", -"Russia_Republic of Kalmykia Description":"Elista, Lagan, Tsagan Aman", -"Russia_Republic of Karelia_North Description":"Kostomuksha, Segezha, Kem", -"Russia_Republic of Karelia_South Description":"Petrozavodsk, Kondopoga, Sortavala", -"Russia_Republic of Mordovia Description":"Saransk, Рузаевка, Kovylkino", -"Russia_Rostov Oblast Description":"Rostov-on-Don, Taganrog, Shakhty", -"Russia_Ryazan Oblast Description":"Ryazan, Kasimov, Skopin", -"Russia_Saint Petersburg Description":"Saint Petersburg, Kolpino, Pushkin", -"Russia_Sakha Republic Description":"Yakutsk, Neryungri, Mirny", -"Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk", -"Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran", -"Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo", -"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl", -"Russia_Stavropol Krai Description":"Stavropol, Pyatigorsk, Kislovodsk", -"Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Yekaterinburg, Kamensk-Uralsky, Pervouralsk", -"Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk", -"Russia_Tambov Oblast Description":"Tambov, Michurinsk, Rasskazovo", -"Russia_Tatarstan Description":"Kazan, Naberezhnye Chelny, Nizhnekamsk", -"Russia_Tomsk Oblast Description":"Tomsk, Seversk, Strezhevoy", -"Russia_Tula Oblast Description":"Tula, Novomoskovsk, Donskoj", -"Russia_Tuva Description":"Kyzyl, Kaa-Khem, Ak-Dovurak", -"Russia_Tver Oblast Description":"Tver, Rzhev, Vysnij Volocek", -"Russia_Tyumen Oblast Description":"Tyumen, Tobolsk, Ishim", -"Russia_Udmurt Republic Description":"Izhevsk, Sarapul, Votkinsk", -"Russia_Ulyanovsk Oblast Description":"Ulyanovsk, Dimitrovgrad, Inza", -"Russia_Vladimir Oblast Description":"Vladimir, Kovrov, Murom", -"Russia_Volgograd Oblast Description":"Volgograd, Volzhskiy, Kamyshin", -"Russia_Vologda Oblast Description":"Vologda, Cherepovets, Сокол", -"Russia_Voronezh Oblast Description":"Voronezh, Borisoglebsk, Rossosh", -"Russia_Yamalo-Nenets Autonomous Okrug Description":"Novy Urengoy, Noyabrsk, Salekhard", -"Russia_Yaroslavl Oblast Description":"Yaroslavl, Rybinsk, Pereslavl-Zalessky", -"Russia_Yugra_Khanty Description":"Khanty-Mansiysk, Nyagan, Uray", -"Russia_Yugra_Surgut Description":"Surgut, Nizhnevartovsk, Nefteyugansk", -"Russia_Zabaykalsky Krai Description":"Chita, Krasnokamensk, Borzya", -"Rwanda Description":"Kigali, Gisenyi, Huye", -"Sahrawi Arab Democratic Republic Description":"Lagouira ⵍⴳⵡⵉⵔⴰ الكويرة, Tifariti ⵜⵉⴼⴰⵔⵉⵜⵉ تيفاريتي, Mijik", -"Saint Barthelemy Description":"Gustavia", -"Saint Helena Ascension and Tristan da Cunha Description":"Jamestown, Half Tree Hollow, Georgetown", -"Saint Kitts and Nevis Description":"Basseterre, Charlestown, Newcastle", -"Saint Lucia Description":"Castries, Castries, Soufriere", -"Saint Martin Description":"Philipsburg, Cul-de-Sac, Cole Bay", -"Saint Vincent and the Grenadines Description":"Kingstown, Clifton, Ashton", -"Samoa Description":"Āpia, Sālelologa, Asau", -"San Marino Description":"City of San Marino, Serravalle, Borgo Maggiore", -"Sao Tome and Principe Description":"São Tomé, Neves, São João dos Angolares", -"Saudi Arabia_North Description":"Jeddah, Mecca, Medina", -"Saudi Arabia_South Description":"Riyadh, Hofuf, Dammam", -"Senegal Description":"Dakar, Pikine, Fatick", -"Serbia Description":"Belgrade, Novi Sad, Nis", -"Seychelles Description":"Victoria, Port Launay, Bel Ombre", -"Sierra Leone Description":"Freetown, Bo, Kambia", -"Singapore Description":"Singapore, Ladang, Rocky Hill", -"Slovakia_Region of Banska Bystrica Description":"Banská Bystrica, Zvolen, Lučenec", -"Slovakia_Region of Bratislava Description":"Bratislava, Petržalka, Ružinov", -"Slovakia_Region of Kosice Description":"Košice, gelnica, Michalovce", -"Slovakia_Region of Nitra Description":"Nitra, Nové Zámky", -"Slovakia_Region of Presov Description":"Prešov, Poprad, Humenné", -"Slovakia_Region of Trencin Description":"Trenčín, Prievidza, Považská Bystrica", -"Slovakia_Region of Trnava Description":"Trnava, Trnava, Piešťany", -"Slovakia_Region of Zilina Description":"Žilina, Martin, Liptovský Mikuláš", -"Slovenia_East Description":"Maribor, Dobova, Kisovec", -"Slovenia_West Description":"Ljubljana, Jagodje, Naklo", -"Solomon Islands Description":"Buala, Lata, Honiara", -"Somalia Description":"Mogadishu, Baardheere, Baidoa", -"South Africa_Eastern Cape Description":"Port Elizabeth, Grahamstown, Mthatha", -"South Africa_Free State Description":"Botshabelo, Thaba Nchu, Welkom", -"South Africa_Gauteng Description":"Johannesburg, Pretoria, Soweto", -"South Africa_KwaZulu-Natal Description":"Durban, Ladysmith, Pietermaritzburg", -"South Africa_Limpopo Description":"Mokopane, Louis Trichardt, Polokwane", -"South Africa_Mpumalanga Description":"Emalahleni, Nelspruit, Secunda", -"South Africa_North West Description":"Mafikeng, Rustenburg, Klerksdorp", -"South Africa_Northern Cape Description":"Upington, Kimberley, Pofadder", -"South Africa_Western Cape Description":"Cape Town, Mitchells Plain, Khayelitsha", -"South Georgia and the South Sandwich Islands Description":"Husvik, King Edward Point, Grytviken", -"South Korea_North Description":"Seoul, Incheon, Daejeon", -"South Korea_South Description":"Busan, Daegu, Changwon", -"South Ossetia Description":"Tskhinval, Khumisarta, Chitiani", -"South Sudan Description":"Juba, Yambio, Leer", -"Spain_Andalusia_Granada Description":"Granada, Almeria, Jaén", -"Spain_Andalusia_Sevilla Description":"Málaga, Seville, Córdoba", -"Spain_Aragon Description":"Zaragoza, Teruel, Huesca", -"Spain_Balearic Islands Description":"Palma de Mallorca, Ibiza city, Santa Eulària des Riu", -"Spain_Basque Country Description":"Bilbao, Vitoria-Gasteiz, Donostia-San Sebastián", -"Spain_Canary Islands Description":"Las Palmas de Gran Canaria, Santa Cruz de Tenerife, Arrecife", -"Spain_Cantabria Description":"Santander, Tanos, San Román de la Llanilla", -"Spain_Castile and Leon_East Description":"Burgos, Valladolid, Palencia", -"Spain_Castile and Leon_West Description":"Salamanca, León, Zamora", -"Spain_Castile-La Mancha Description":"Albacete, Guadalajara, Cuenca", -"Spain_Catalonia_Provincia de Barcelona Description":"Barcelona, l'Hospitalet de Llobregat, Badalona", -"Spain_Catalonia_Provincia de Girona Description":"Sant Antoni, Girona, Figueres", -"Spain_Catalonia_Provincia de Lleida Description":"Lleida, Mollerussa, Balaguer", -"Spain_Catalonia_Provincia de Tarragona Description":"Tarragona, Reus, el Vendrell", -"Spain_Ceuta Description":"Ceuta, Fronteriza", -"Spain_Community of Madrid Description":"Madrid, Móstoles, Alcalá de Henares", -"Spain_Comunidad Foral de Navarra Description":"Pamplona, Tudela, Barañáin", -"Spain_Extremadura Description":"Badajoz, Mérida, Cáceres", -"Spain_Galicia_North Description":"A Coruña, Lugo, Santiago de Compostela", -"Spain_Galicia_South Description":"Vigo, Ourense, Pontevedra", -"Spain_La Rioja Description":"Logroño, Arnedo, Calahorra", -"Spain_Melilla Description":"Melilla", -"Spain_Principado de Asturias Description":"Oviedo / Uviéu, Xixón, Avilés", -"Spain_Region de Murcia Description":"Murcia, Cartagena, Lorca", -"Spain_Valencian Community Description":"Valencia, Alacant/Alicante, Castellón de la Plana", -"Sri Lanka Description":"Colombo, Kandy, Rambukkana", -"Sudan_East Description":"Port Sudan, Kassala, El Hawata", -"Sudan_West Description":"Khartoum, Omdurman, Nyala", -"Suriname Description":"Paramaribo, Groningen, Brokopondo", -"Swaziland Description":"Mbabane, Sidvokodvo, Bulembu", -"Sweden_Bergslagen Description":"Örebro, Gävle, Karlstad", -"Sweden_Malardalen Description":"Uppsala, Västerås, Eskilstuna", -"Sweden_Mellannorrland Description":"Sundsvall, Östersund, Örnsköldsvik", -"Sweden_Norra Sverige Description":"Umeå, Luleå, Piteå", -"Sweden_Ostra Gotaland Description":"Linköping, Norrköping, Jönköping", -"Sweden_Sodra Gotaland Description":"Malmö, Helsingborg, Lund", -"Sweden_Stockholm Description":"Stockholm, Huddinge, Nacka", -"Sweden_Vastra Gotaland Description":"Gothenburg, Borås, Mölndal", -"Switzerland_Central Description":"Lucerne, Oberarth, Emmen", -"Switzerland_Eastern Description":"St. Gallen, Schaffhausen, Chur", -"Switzerland_Espace Mittelland_Bern Description":"Bern, Biel/Bienne, Köniz", -"Switzerland_Espace Mittelland_East Description":"Thun, Langenthal, Steffisburg", -"Switzerland_Lake Geneva region Description":"Geneva, Lausanne, Vernier", -"Switzerland_Northwestern Description":"Basel, Lenzburg, Riehen", -"Switzerland_Ticino Description":"Lugano, Bellinzona, Locarno", -"Switzerland_Zurich Description":"Zurich, Winterthur, Illnau", -"Syria Description":"Damascus, Aleppo, Homs", -"Taiwan_North Description":"Taipei City, Taoyuan District, Taichung City", -"Taiwan_South Description":"Kaohsiung City, Tainan City, Chiayi City", -"Tajikistan Description":"Dushanbe, Khujand, Shahrinav", -"Tanzania Description":"Dar es Salaam, Dodoma, Kigoma", -"Thailand_Central Description":"Nam Som, Nakhon Ratchasima, Udon Thani", -"Thailand_North Description":"Chiang Mai, Santi Suk District, Mae Ai", -"Thailand_South Description":"Bangkok, Nonthaburi, Chaophraya Surasak", -"The Bahamas Description":"Nassau, Freeport, Tarpum Bay", -"The Gambia Description":"Banjul, Serrekunda, Wassu", -"Togo Description":"Lomé, Dapaong, Niamtougou", -"Tokelau Description":"Tokelau", -"Tonga Description":"Nuku'alofa, Ma'ufanga, Neiafu", -"Trinidad and Tobago Description":"Port of Spain, San Fernando, Chaguanas", -"Tunisia Description":"Tunis, Sfax, Ariana", -"Turkey_Aegean Region Description":"Izmir, Denizli, Muğla", -"Turkey_Black Sea Region Description":"Bolu, Samsun, Trabzon", -"Turkey_Central Anatolia Region_Ankara Description":"Ankara, Eskişehir, Konya", -"Turkey_Central Anatolia Region_Kayseri Description":"Kırşehir, Sivas, Nevşehir", -"Turkey_Eastern Anatolia Region Description":"Muş, Ağrı, Van", -"Turkey_Marmara Region_Bursa Description":"Bursa, Çanakkale, Yalova", -"Turkey_Marmara Region_Istanbul Description":"Istanbul, Edirne, Tekirdağ", -"Turkey_Mediterranean Region Description":"Antalya, Burdur, Antakya", -"Turkey_Southeastern Anatolia Region Description":"Gaziantep, Şanlıurfa, Adıyaman", -"Turkmenistan Description":"Ashgabat, Dashoguz, Türkmenabat", -"Turks and Caicos Islands Description":"Cockburn Town, Providenciales, Cockburn Harbor", -"Tuvalu Description":"Funafuti, Vaiaku, Tokelau", -"UK_England_East Midlands Description":"Nottingham, Leicester, Derby", -"UK_England_East of England_Essex Description":"Luton, Colchester, Southend-on-Sea", -"UK_England_East of England_Norfolk Description":"Norwich, Peterborough, Cambridge", -"UK_England_Greater London Description":"London, Croydon, Ilford", -"UK_England_North East England Description":"Sunderland, Newcastle upon Tyne", -"UK_England_North West England_Lancaster Description":"Blackpool, Whitehaven, Egremont", -"UK_England_North West England_Manchester Description":"Manchester, Liverpool, Salford", -"UK_England_South East_Brighton Description":"Brighton, Royal Tunbridge Wells, Maidstone", -"UK_England_South East_Oxford Description":"Southampton, Milton Keynes, Portsmouth", -"UK_England_South West England_Bristol Description":"Bristol, City of Bath, Bournemouth", -"UK_England_South West England_Cornwall Description":"Plymouth, Exeter, St Ives", -"UK_England_West Midlands Description":"Birmingham, Coventry, Wolverhampton", -"UK_England_Yorkshire and the Humber Description":"Sheffield, Wakefield, Bradford", -"UK_Northern Ireland Description":"Newry, Belfast, Londonderry/Derry", -"UK_Scotland_North Description":"Aberdeen, Dundee, Tobermory", -"UK_Scotland_South Description":"Glasgow, Edinburgh, Millport", -"UK_Wales Description":"Cardiff, Swansea, Newport", -"US_Alabama_Birmingham Description":"Warrior, Vestavia Hills, Scottsboro", -"US_Alabama_Montgomery Description":"Creola, Centreville, Valley", -"US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright", -"US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low", -"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa", -"US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee", -"US_Arkansas_North Description":"Ward, Cabot, Des Arc", -"US_Arkansas_South Description":"Stamps, Rockport, Rockport", -"US_California_Bakersfield_Bakersfield Description":"Arroyo Grande, Pismo Beach, Maricopa", -"US_California_Bakersfield_Lancaster Description":"Hesperia, Big Bear Lake, Holtville", -"US_California_Chico Description":"Tehama, Cloverdale, Cloverdale", -"US_California_LA Description":"Los Angeles, Long Beach, Rosemead", -"US_California_LA North Description":"Santa Barbara, Ojai, Avalon", -"US_California_Redding Description":"Ferndale, Rio Dell, Arcata", -"US_California_Sacramento_Fresno Description":"Fresno, Selma, Bishop", -"US_California_Sacramento_Sacramento Description":"Sacramento, West Sacramento, Placerville", -"US_California_Sacramento_Stockton Description":"Ceres, Ione, Tracy", -"US_California_San Diego Description":"San Diego, San Marcos, Banning", -"US_California_Santa_Clara_Palo Alto Description":"San José, San Francisco, Los Altos", -"US_California_Santa_Clara_Santa Cruz Description":"Seaside, Gonzales, Gonzales", -"US_Colorado_Aspen Description":"Central City, Black Hawk, Woodland Park", -"US_Colorado_Denver Description":"Denver, Colorado Springs, Commerce City", -"US_Colorado_South Description":"Salida, Walsenburg, Las Animas", -"US_Connecticut Description":"East Haven, Groton, Thomaston", -"US_Delaware Description":"City of Seaford, Rehoboth Beach, Milford", -"US_Florida_Gainesville Description":"Gainesville, Palm Bay, Melbourne", -"US_Florida_Jacksonville Description":"Jacksonville, Panama City Beach, Lynn Haven", -"US_Florida_Miami Description":"Miami, Marco Island, Fort Lauderdale", -"US_Florida_Orlando Description":"Orlando, Deltona, Kissimmee", -"US_Florida_Tampa Description":"Oldsmar, Tampa, Saint Petersburg", -"US_Georgia_Atlanta Description":"Atlanta, Chamblee, Walnut Grove", -"US_Georgia_Macon Description":"Grovetown, Perry, Byron", -"US_Georgia_North Description":"Emerson, Jefferson, Cartersville", -"US_Georgia_South Description":"De Soto, Santa Claus, Pearson", -"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José", -"US_Hawaii Description":"Hilo, Kailua-Kona, Kahului", -"US_Idaho_North Description":"Huetter, Peck, Hayden", -"US_Idaho_South Description":"Arco, Middleton, Greenleaf", -"US_Illinois_Chickago Description":"Chicago, Palos Hills, Park City", -"US_Illinois_Elgin Description":"Geneva, Country Club Hills, Wheaton", -"US_Illinois_Rockford Description":"Princeton, Prophetstown, Moline", -"US_Illinois_South Description":"Casey, Wamac, Mount Vernon", -"US_Illinois_Springfield Description":"Mount Pulaski, Lacon, Kewanee", -"US_Indiana_Evansville Description":"Rockport, New Albany, Princeton", -"US_Indiana_Indianapolis Description":"Indianapolis, Connersville, Greensburg", -"US_Indiana_North Description":"Elwood, Kokomo, Whiting", -"US_Iowa_Des Moines Description":"Indianola, Slater, Martensdale", -"US_Iowa_Waterloo Description":"Dixon, Floyd, Elma", -"US_Iowa_West Description":"Churdan, Orange City, Paton", -"US_Kansas_East Description":"Benedict, Coffeyville, Severance", -"US_Kansas_West Description":"Burr Oak, Hunter, Randolph", -"US_Kansas_Wichita Description":"Whitewater, Cedar Point, Sublette", -"US_Kentucky_East Description":"Hyden, Stanton, Pineville", -"US_Kentucky_Louisville Description":"Louisville, Fordsville, Meadowview Estates", -"US_Kentucky_West Description":"Marion, Corydon, Barlow", -"US_Louisiana_Central Description":"Pineville, Marksville, Bunkie", -"US_Louisiana_New Orleans Description":"Bogalusa, Gonzales, Plaquemine", -"US_Maine Description":"Westbrook, Brewer, South Portland", -"US_Maryland_Baltimore Description":"Baltimore, Pocomoke City, Crisfield", -"US_Maryland_and_DC Description":"Washington, D.C., Gaithersburg, Bowie", -"US_Massachusetts_Boston Description":"Boston, Lowell, Cambridge", -"US_Massachusetts_Central Description":"Fitchburg, Southbridge, Leominster", -"US_Massachusetts_Plymouth Description":"Brockton, New Bedford, Fall River", -"US_Massachusetts_Southeastern Description":"Barnstable, Falmouth, Yarmouth", -"US_Massachusetts_West Description":"Greenfield, Springfield", -"US_Michigan_Detroit Description":"Detroit, Hamtramck, Keego Harbor", -"US_Michigan_Grand Rapids Description":"Manton, Whitehall, Muskegon", -"US_Michigan_Lansing Description":"City of Burton, Lapeer, Tawas City", -"US_Michigan_North Description":"Caspian, Iron Mountain, Gaastra", -"US_Minnesota_Minneapolis Description":"Lindstrom, Forest Lake, Greenfield", -"US_Minnesota_North Description":"Erskine, Gully, Hackensack", -"US_Minnesota_Rochester Description":"Arco, New Auburn, Welcome", -"US_Minnesota_Saint Cloud Description":"Brooten, St. Rosa, Genola", -"US_Mississippi_Gulfport Description":"D'Iberville, Ocean Springs, Lucedale", -"US_Mississippi_North Description":"Rolling Fork, Leland, Collins", -"US_Missouri_East Description":"Scott City, Ellington, Viburnum", -"US_Missouri_Kansas Description":"Kansas City, Belton, Gallatin", -"US_Missouri_Springfield Description":"Conway, Osceola, Battlefield", -"US_Missouri_St Louis Description":"Queen City, La Grange, Fulton", -"US_Montana_East Description":"Harlem, Hobson, Colstrip", -"US_Montana_West Description":"Cut Bank, Kalispell, Shelby", -"US_Nebraska_East Description":"Omaha, Stanton, Pawnee City", -"US_Nebraska_West Description":"Bassett, Long Pine, Bloomfield", -"US_Nevada Description":"Las Vegas, Winnemucca, Caliente", -"US_New Hampshire Description":"Somersworth, Laconia, Franklin", -"US_New Jersey_North Description":"Hackensack, Garfield, Lambertville", -"US_New Jersey_South Description":"Absecon, Long Branch, Margate City", -"US_New Mexico_Albuquerque Description":"Albuquerque, Raton, Bloomfield", -"US_New Mexico_Roswell Description":"Eunice, Socorro, Jal", -"US_New York_East Description":"Brookhaven, New Rochelle, Mount Vernon", -"US_New York_New York Description":"New York, New York City, Inwood", -"US_New York_North Description":"City of Cohoes, City of Schenectady, Beacon", -"US_New York_West Description":"Oswego, Jamestown, North Tonawanda", -"US_North Carolina_Asheville Description":"Morganton, Brevard, Marion", -"US_North Carolina_Charlotte Description":"Charlotte, Shelby, Statesville", -"US_North Carolina_Greensboro Description":"Thomasville, Hamlet, Albemarle", -"US_North Carolina_Raleigh Description":"Raleigh, Roxboro, Graham", -"US_North Carolina_Wilmington Description":"Clinton, Boiling Spring Lakes, Laurinburg", -"US_North Carolina_Wilson Description":"New Bern, Havelock, Elizabeth City", -"US_North Dakota_Bismarck Description":"Zap, Reeder, Stanton", -"US_North Dakota_East Description":"Harwood, Cavalier, Lakota", -"US_North Dakota_Minot Description":"Makoti, Bowdon, Kramer", -"US_Ohio_Cincinnati Description":"St. Bernard, Centerville, Madeira", -"US_Ohio_Cleveland Description":"Streetsboro, Willoughby Hills, Avon Lake", -"US_Ohio_Columbus Description":"Columbus, Pickerington, Reynoldsburg", -"US_Ohio_Toledo Description":"Bucyrus, Crestline, Maumee", -"US_Oklahoma_East Description":"Ada, Coalgate, Konawa", -"US_Oklahoma_Oklahoma Description":"Oklahoma City, Noble, Del City", -"US_Oklahoma_Tulsa Description":"Shidler, Prague, Beggs", -"US_Oklahoma_West Description":"Cherokee, Thomas, Perry", -"US_Oregon_Eugene Description":"Albany, Medford, Coos Bay", -"US_Oregon_Portland Description":"Salem, Newport, Government Camp", -"US_Oregon_West Description":"Bend, The Dalles, Klamath Falls", -"US_Pennsylvania_Central Description":"DuBois, St. Marys, Latrobe", -"US_Pennsylvania_Pittsburgh Description":"New Kensington, Uniontown, Monongahela", -"US_Pennsylvania_Reading Description":"Philadelphia, Coatesville, Reading", -"US_Pennsylvania_Scranton Description":"Carbondale, Pittston, Williamsport", -"US_Puerto Rico Description":"San Juan, Mayaguez, Ponce", -"US_Rhode Island Description":"Narragansett, Providence, Warwick", -"US_South Carolina_Charleston Description":"Barnwell, Goose Creek, Folly Beach", -"US_South Carolina_Columbia Description":"Belton, Travelers Rest, Walhalla", -"US_South Carolina_Florence Description":"Tega Cay, Bishopville, Johnsonville", -"US_South Dakota Description":"Irene, Centerville, Baltic", -"US_Tennessee_East Description":"Pigeon Forge, Celina, Friendsville", -"US_Tennessee_West Description":"Memphis, Nashville, Medina", -"US_Texas_Amarillo Description":"Pampa, Jolly, Howardwick", -"US_Texas_Austin Description":"Austin, Hutto, Belton", -"US_Texas_Dallas Description":"Dallas, Fort Worth, Rowlett", -"US_Texas_Houston Description":"Houston, Seabrook, Plum Grove", -"US_Texas_Lubbock Description":"Sudan, Ralls, Goree", -"US_Texas_San Antonio Description":"San Antonio, Rockport, Mathis", -"US_Texas_Southwest Description":"Leakey, Camp Wood, Carrizo Springs", -"US_Texas_Tyler Description":"Troup, Cottonwood, Fate", -"US_Texas_Victoria Description":"Niederwald, Lockhart, Palacios", -"US_Texas_Wako Description":"Calvert, Golinda, Bruceville-Eddy", -"US_Texas_West Description":"El Paso, Westbrook, Stanton", -"US_United States Minor Outlying Islands Description":"Lulu Town, Millersville", -"US_Utah_North Description":"Holladay, South Ogden, Murray", -"US_Utah_South Description":"Parowan, Hildale, Enoch", -"US_Vermont Description":"Saint Albans, Barre, South Burlington", -"US_Virginia_Alexandria Description":"Fairfax, Fredericksburg, Falls Church", -"US_Virginia_Lynchburg Description":"Lynchburg City, Bedford, Staunton", -"US_Virginia_Norfolk Description":"Virginia Beach, Poquoson City, Franklin City", -"US_Virginia_Richmond Description":"Emporia, Colonial Heights, Richmond", -"US_Virginia_Roanoke Description":"Galax, Norton, Radford City", -"US_Washington_Coast Description":"Raymond, Camas, Port Townsend", -"US_Washington_Seattle Description":"Seattle, Edmonds, Sultan", -"US_Washington_Yakima Description":"Pullman, Grand Coulee, White Salmon", -"US_West Virginia Description":"Stonewood, Bluefield, Mullens", -"US_Wisconsin_Eau Claire Description":"Durand, Fountain City, River Falls", -"US_Wisconsin_Madison Description":"Edgerton, Mineral Point, Brodhead", -"US_Wisconsin_Milwaukee Description":"Milwaukee, Lake Mills, Brillion", -"US_Wisconsin_North Description":"Montreal, Tomahawk, Marinette", -"US_Wyoming Description":"Worland, Rawlins, Kemmerer", -"Uganda Description":"Kampala, Yumbe, Kanoni", -"Ukraine_Cherkasy Oblast Description":"Cherkasy, Uman, Smila", -"Ukraine_Chernihiv Oblast Description":"Chernihiv, Nizhyn, Pryluky", -"Ukraine_Chernivtsi Oblast Description":"Chernivtsi, Storozhynets, Zastavna", -"Ukraine_Dnipropetrovsk Oblast Description":"Dnipropetrovsk, Krivoy Rog, Dniprodzerzhynsk", -"Ukraine_Donetsk Oblast Description":"Donetsk, Mariupol, Makiivka", -"Ukraine_Ivano-Frankivsk Oblast Description":"Ivano-Frankivsk, Kalush, Kolomyia", -"Ukraine_Kharkiv Oblast Description":"Kharkiv, Lozova, Kupiansk", -"Ukraine_Kherson Oblast Description":"Kherson, Nova Kakhovka, Наддніпрянське", -"Ukraine_Khmelnytskyi Oblast Description":"Khmelnytskyi, Kamianets-Podilskyi, Shepetivka", -"Ukraine_Kirovohrad Oblast Description":"Kirovohrad, Oleksandriia, Svitlovodsk", -"Ukraine_Kyiv Oblast Description":"Kyiv, Bila Tserkva, Brovary", -"Ukraine_Luhansk Oblast Description":"Luhansk, Alchevsk, Sievierodonetsk", -"Ukraine_Lviv Oblast Description":"Lviv, Sambir City Council, Drohobych", -"Ukraine_Mykolaiv Oblast Description":"Mykolaiv, Pervomaisk, Yuzhnoukrainsk", -"Ukraine_Odessa Oblast Description":"Odessa, Izmail, Chornomorsk", -"Ukraine_Poltava Oblast Description":"Poltava, Kremenchuk, Komsomolsk", -"Ukraine_Rivne Oblast Description":"Rivne, Kuznetsovsk, Dubno", -"Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka", -"Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets", -"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Ворошиловка, Zhmerynka", -"Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk", -"Ukraine_Zakarpattia Oblast Description":"Uzhhorod, Mukacheve, Khust", -"Ukraine_Zaporizhia Oblast Description":"Zaporizhzhia, Melitopol, Berdiansk", -"Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten", -"United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman", -"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted", -"Uruguay Description":"Montevideo, Ciudad de la Costa, Salto", -"Uzbekistan Description":"Tashkent, Kokand, Namangan", -"Vanuatu Description":"Port Vila, Vao Mainland, Saratamata", -"Venezuela_North Description":"Valencia, Barquisimeto, Maracay", -"Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal", -"Vietnam Description":"Hanoi, Ho Chi Minh City, Vung Tau", -"Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai", -"Yemen Description":"Sana'a, Sanʿaʾ, Aden", -"Zambia Description":"Lusaka, Kitwe, Ndola", -"Zimbabwe Description":"Harare, Hwange, Masvingo", -"United States of America Short":"USA", -"Bosnia and Herzegovina Short":"B&H", -"Palestine Region Short":"Palestine", -"United Kingdom Short":"UK", -"Czech Republic Short":"Czechia", -"Argentina_Buenos Aires_North Short":"Buenos Aires", -"Argentina_Buenos Aires_South Short":"Buenos Aires", -"Austria_Lower Austria_West Short":"Lower Austria", -"Brazil_Southeast Region_Minas Gerais_North Short":"Minas Gerais", -"Brazil_Southeast Region_Sao Paulo_West Short":"São Paulo", -"Czech_Stredni Cechy_East Short":"Central Bohemian Region", -"Czech_Stredni Cechy_West Short":"Central Bohemian Region", -"Finland_Southern Finland_West Short":"Southwest Finland", -"Germany_Brandenburg_North Short":"Brandenburg", -"Germany_Brandenburg_South Short":"Brandenburg", -"Germany_Rhineland-Palatinate_South Short":"Rhineland-Palatinate", -"Mexico_Central_East Short":"Nuevo León", -"Mexico_Central_West Short":"Nayarit", -"Netherlands_Gelderland_North Short":"Gelderland", -"Norway_Central Short":"Oslo", -"Philippines_Luzon_North Short":"Luzon", -"Philippines_Luzon_South Short":"Luzon", -"Romania_North_East Short":"Nord-Est", -"Romania_North_West Short":"Nord-Vest", -"Romania_South Short":"Sud", -"Romania_South_East Short":"Sud-Est", -"Romania_South_West Short":"Sud-Vest", -"Romania_West Short":"Vest", -"Russia_Arkhangelsk Oblast_Central Short":"Arkhangelsk Oblast", -"Russia_Arkhangelsk Oblast_North Short":"Arkhangelsk Oblast", -"Switzerland_Central Short":"Central Switzerland", -"UK_Scotland_North Short":"Scotland", -"UK_Scotland_South Short":"Scotland", -"Brazil_Goias_North Short":"Goiás", -"Brazil_North Region_East Short":"North Region", -"Brazil_North Region_West Short":"North Region", -"Brazil_Northeast Region_East Short":"Northeast Region", -"Brazil_Northeast Region_West Short":"Northeast Region", -"Brazil_Parana_East Short":"Paraná", -"Brazil_Parana_West Short":"Paraná", -"Brazil_South Region_East Short":"Southern Region", -"Brazil_South Region_West Short":"Southern Region", -"Congo-Kinshasa Short":"Congo", -"Finland_Eastern Finland_North Short":"Eastern Finland", -"Finland_Eastern Finland_South Short":"Eastern Finland", -"France_Free County_North Short":"Franche-Comté", -"France_Free County_South Short":"Franche-Comté", -"India_Karnataka_North Short":"Karnataka", -"India_Karnataka_South Short":"Karnataka", -"Russia_Krasnoyarsk Krai_North Short":"Krasnoyarsk Krai", -"Russia_Krasnoyarsk Krai_South Short":"Krasnoyarsk Krai", -"Russia_Moscow Oblast_East Short":"Moscow Oblast", -"Russia_Moscow Oblast_West Short":"Moscow Oblast", -"Russia_Perm Krai_North Short":"Perm Krai", -"Russia_Perm Krai_South Short":"Perm Krai", -"Russia_Republic of Karelia_North Short":"Republic of Karelia", -"Russia_Republic of Karelia_South Short":"Republic of Karelia", -"Russia_Sverdlovsk Oblast_North Short":"Sverdlovsk Oblast", -"Spain_Castile and Leon_East Short":"Castile and León", -"Spain_Castile and Leon_West Short":"Castile and León", -"Spain_Galicia_North Short":"Galicia", -"Spain_Galicia_South Short":"Galicia", -"Switzerland_Espace Mittelland_East Short":"Espace Mittelland" -} diff --git a/data/countries-strings/cs.json/localize.json b/data/countries-strings/cs.json/localize.json index c9d9618d74..2f502aa83a 100644 --- a/data/countries-strings/cs.json/localize.json +++ b/data/countries-strings/cs.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantábrie", "Spain_Castile and Leon":"Kastilie a León", "Spain_Castile-La Mancha":"Kastilie-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalánsko – Provincie Barcelona", -"Spain_Catalonia_Provincia de Girona":"Katalánsko – Provincie Girona", -"Spain_Catalonia_Provincia de Lleida":"Katalánsko – Provincie Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Katalánsko – Provincie Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Provincie Barcelona", +"Spain_Catalonia_Provincia de Girona":"Provincie Girona", +"Spain_Catalonia_Provincia de Lleida":"Provincie Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Provincie Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/da.json/localize.json b/data/countries-strings/da.json/localize.json index 5f9212533a..a28c6109b8 100644 --- a/data/countries-strings/da.json/localize.json +++ b/data/countries-strings/da.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabrien", "Spain_Castile and Leon":"Castilla y León", "Spain_Castile-La Mancha":"Castilla-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonien – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalonien – Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalonien – Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Catalonien – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona (provins)", +"Spain_Catalonia_Provincia de Lleida":"Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/de.json/localize.json b/data/countries-strings/de.json/localize.json index 648358b701..5ee47a46e1 100644 --- a/data/countries-strings/de.json/localize.json +++ b/data/countries-strings/de.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabrien", "Spain_Castile and Leon":"Kastilien und León", "Spain_Castile-La Mancha":"Kastilien-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalonien – Provinz Barcelona", -"Spain_Catalonia_Provincia de Girona":"Katalonien – Provinz Girona", -"Spain_Catalonia_Provincia de Lleida":"Katalonien – Provinz Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Katalonien – Provinz Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Provinz Barcelona", +"Spain_Catalonia_Provincia de Girona":"Provinz Girona", +"Spain_Catalonia_Provincia de Lleida":"Provinz Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Autonome Gemeinschaft Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/el.json/localize.json b/data/countries-strings/el.json/localize.json index bf20aff6c3..58c77a9284 100644 --- a/data/countries-strings/el.json/localize.json +++ b/data/countries-strings/el.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Κανταβρία", "Spain_Castile and Leon":"Καστίλλη και Λεόν", "Spain_Castile-La Mancha":"Καστίλη - Λα Μάντσα", -"Spain_Catalonia_Provincia de Barcelona":"Καταλονία – Επαρχία της Βαρκελώνης", -"Spain_Catalonia_Provincia de Girona":"Καταλονία – Επαρχία της Γκιρόνα", -"Spain_Catalonia_Provincia de Lleida":"Καταλονία – Επαρχία Λέιντα", -"Spain_Catalonia_Provincia de Tarragona":"Καταλονία – Επαρχία Ταραγόνα", +"Spain_Catalonia_Provincia de Barcelona":"Επαρχία της Βαρκελώνης", +"Spain_Catalonia_Provincia de Girona":"Επαρχία της Γκιρόνα", +"Spain_Catalonia_Provincia de Lleida":"Επαρχία Λέιντα", +"Spain_Catalonia_Provincia de Tarragona":"Επαρχία Ταραγόνα", "Spain_Ceuta":"Θέουτα", "Spain_Community of Madrid":"Κοινότητα της Μαδρίτης", "Spain_Comunidad Foral de Navarra":"Ναβάρρα", diff --git a/data/countries-strings/en.json/localize.json b/data/countries-strings/en.json/localize.json index ff569bd4f1..5073450dfe 100644 --- a/data/countries-strings/en.json/localize.json +++ b/data/countries-strings/en.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castile and León", "Spain_Castile-La Mancha":"Castile-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonia – Barcelona Province", -"Spain_Catalonia_Provincia de Girona":"Catalonia – Girona Province", -"Spain_Catalonia_Provincia de Lleida":"Catalonia – Lleida Province", -"Spain_Catalonia_Provincia de Tarragona":"Catalonia – Tarragona Province", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona Province", +"Spain_Catalonia_Provincia de Girona":"Girona Province", +"Spain_Catalonia_Provincia de Lleida":"Lleida Province", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona Province", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Community of Madrid", "Spain_Comunidad Foral de Navarra":"Navarre", diff --git a/data/countries-strings/es.json/localize.json b/data/countries-strings/es.json/localize.json index 2d06b4d554..7c2e236671 100644 --- a/data/countries-strings/es.json/localize.json +++ b/data/countries-strings/es.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castilla y León", "Spain_Castile-La Mancha":"Castilla-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Cataluña – Provincia de Barcelona", -"Spain_Catalonia_Provincia de Girona":"Cataluña – Provincia de Gerona", -"Spain_Catalonia_Provincia de Lleida":"Cataluña – Provincia de Lérida", -"Spain_Catalonia_Provincia de Tarragona":"Cataluña – Provincia de Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Provincia de Barcelona", +"Spain_Catalonia_Provincia de Girona":"Provincia de Gerona", +"Spain_Catalonia_Provincia de Lleida":"Provincia de Lérida", +"Spain_Catalonia_Provincia de Tarragona":"Provincia de Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Comunidad de Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", @@ -2216,10 +2216,10 @@ "Spain_Castile and Leon_East Description":"Valladolid, Palencia", "Spain_Castile and Leon_West Description":"Salamanca, Zamora", "Spain_Castile-La Mancha Description":"Guadalajara, Cuenca", -"Spain_Catalonia_Provincia de Barcelona Description":"Barcelona, Hospitalet de Llobregat, Badalona", -"Spain_Catalonia_Provincia de Girona Description":"San Antonio, Gerona, Figueras", -"Spain_Catalonia_Provincia de Lleida Description":"Lérida, Mollerussa, Balaguer", -"Spain_Catalonia_Provincia de Tarragona Description":"Tarragona, Reus, Vendrell", +"Spain_Catalonia_Provincia de Barcelona Description":"Barcelona, Hospitalet de Llobregat", +"Spain_Catalonia_Provincia de Girona Description":"Gerona, Figueras", +"Spain_Catalonia_Provincia de Lleida Description":"Lérida", +"Spain_Catalonia_Provincia de Tarragona Description":"Tarragona, Reus, el Vendrell", "Spain_Ceuta Description":"Ceuta, Fronteriza", "Spain_Community of Madrid Description":"Alcalá de Henares", "Spain_Comunidad Foral de Navarra Description":"Pamplona, Tudela", diff --git a/data/countries-strings/et.json/localize.json b/data/countries-strings/et.json/localize.json deleted file mode 100644 index c846f3603c..0000000000 --- a/data/countries-strings/et.json/localize.json +++ /dev/null @@ -1,2553 +0,0 @@ -{ -"Abkhazia":"Abhaasia", -"Afghanistan":"Afganistan", -"Alabama":"Alabama", -"Albania":"Albaania", -"Algeria":"Alžeeria", -"Algeria_Central":"Alžeeria - Keskosa", -"Algeria_Coast":"Alžeeria - Põhi", -"Andorra":"Andorra", -"Angola":"Angola", -"Anguilla":"Anguilla", -"Antarctica":"Antarktika", -"Antigua and Barbuda":"Antigua ja Barbuda", -"Argentina":"Argentiina", -"Argentina_Buenos Aires_North":"Buenos Aires - Põhi", -"Argentina_Buenos Aires_South":"Buenos Aires - Lõuna", -"Argentina_Cuyo":"Cuyo", -"Argentina_Mesopotamia":"Mesopotaamia", -"Argentina_Northwest":"Loode-Argentiina", -"Argentina_Pampas":"Pampa", -"Argentina_Patagonia":"Patagoonia", -"Arizona":"Arizona", -"Armenia":"Armeenia", -"Australia":"Austraalia", -"Australia_Melbourne":"Melbourne", -"Australia_New South Wales":"Uus Lõuna-Wales", -"Australia_Northern Territory":"Põhjaterritoorium", -"Australia_Queensland":"Queensland", -"Australia_South Australia":"Lõuna-Austraalia", -"Australia_Tasmania":"Tasmaania", -"Australia_Victoria":"Victoria", -"Australia_Western Australia":"Lääne-Austraalia", -"Austria":"Austria", -"Austria_Burgenland":"Burgenland", -"Austria_Carinthia":"Kärnten", -"Austria_Lower Austria_West":"Alam-Austria - Lääs", -"Austria_Lower Austria_Wien":"Viin", -"Austria_Salzburg":"Salzburg", -"Austria_Styria":"Steiermark", -"Austria_Tyrol":"Tirool", -"Austria_Upper Austria":"Ülem-Austria", -"Austria_Vorarlberg":"Vorarlberg", -"Azerbaijan":"Aserbaidžaan", -"Azerbaijan Region":"Aserbaidžaan", -"Bahrain":"Bahrein", -"Bangladesh":"Bangladesh", -"Barbados":"Barbados", -"Belarus":"Valgevene", -"Belarus_Brest Region":"Bresti piirkond", -"Belarus_Homiel Region":"Gomeli piirkond", -"Belarus_Hrodna Region":"Grodno piirkond", -"Belarus_Maglieu Region":"Mogilevi piirkond", -"Belarus_Minsk Region":"Minski piirkond", -"Belarus_Vitebsk Region":"Vitebski piirkond", -"Belgium":"Belgia", -"Belgium_Antwerp":"Antwerpeni maakond", -"Belgium_East Flanders":"Ida-Flandria maakond", -"Belgium_Flemish Brabant":"Flaami Brabanti maakond", -"Belgium_Hainaut":"Hainaut maakond", -"Belgium_Liege":"Liège'i maakond", -"Belgium_Limburg":"Limburgi maakond", -"Belgium_Luxembourg":"Luksemburgi maakond", -"Belgium_Namur":"Namuri maakond", -"Belgium_Walloon Brabant":"Valloonia Brabanti maakond", -"Belgium_West Flanders":"Lääne-Flandria maakond", -"Belize":"Belize", -"Benin":"Benin", -"Bermuda":"Bermuda", -"Bhutan":"Bhutan", -"Bolivia":"Boliivia", -"Bolivia_North":"Boliivia - Põhi", -"Bolivia_South":"Boliivia - Lõuna", -"Bosnia and Herzegovina":"Bosnia ja Hertsegoviina", -"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Brčko piirkond", -"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Bosnia ja Hertsegoviina Föderatsioon", -"Bosnia and Herzegovina_Republic of Srpska":"Serbia Vabariik", -"Botswana":"Botswana", -"Brazil":"Brasiilia", -"Brazil_Bahia":"Bahia", -"Brazil_Goias":"Goiás", -"Brazil_Mato Grosso":"Mato Grosso", -"Brazil_Mato Grosso Do Sul":"Mato Grosso do Sul", -"Brazil_North Region":"Põhjapiirkond, Brasiilia", -"Brazil_Northeast Region":"Kirdepiirkond", -"Brazil_Paraiba":"Paraíba", -"Brazil_Parana":"Paraná", -"Brazil_Rio Grande do Norte":"Rio Grande do Norte", -"Brazil_Santa Catarina":"Santa Catarina", -"Brazil_South Region":"Lõuna-Brasiilia", -"Brazil_Southeast Region_Espirito Santo":"Espírito Santo", -"Brazil_Southeast Region_Minas Gerais_Contagem":"Minas Gerais — Contagem", -"Brazil_Southeast Region_Minas Gerais_North":"Minas Gerais - Põhi", -"Brazil_Southeast Region_Rio de Janeiro":"Rio de Janeiro", -"Brazil_Southeast Region_Sao Paulo_Campinas":"São Paulo — Campinas", -"Brazil_Southeast Region_Sao Paulo_City":"São Paulo — Santos", -"Brazil_Southeast Region_Sao Paulo_West":"São Paulo — Ribeirão Preto", -"British Indian Ocean Territory":"Briti India ookeani territoorium", -"British Virgin Islands":"Briti Neitsisaared", -"Brunei":"Brunei", -"Bulgaria":"Bulgaaria", -"Burkina Faso":"Burkina Faso", -"Burundi":"Burundi", -"California":"Kalifornia", -"Cambodia":"Kambodža", -"Cameroon":"Kamerun", -"Cameroon_Central":"Kamerun - Keskosa", -"Cameroon_West":"Kamerun - Lääs", -"Campo de Hielo Sur":"Lõuna-Patagoonia jääväli", -"Canada":"Kanada", -"Canada_Alberta":"Alberta", -"Canada_Alberta_Edmonton":"Edmonton", -"Canada_Alberta_North":"Alberta - Põhi", -"Canada_Alberta_South":"Alberta - Lõuna", -"Canada_British Columbia":"Briti Kolumbia", -"Canada_British Columbia_Central":"Briti Kolumbia - Keskosa", -"Canada_British Columbia_Far_North":"Briti Kolumbia - Ida", -"Canada_British Columbia_Islands":"Vancouveri saar", -"Canada_British Columbia_North":"Briti Kolumbia - Lääs", -"Canada_British Columbia_Northeast":"Briti Kolumbia - Põhi", -"Canada_British Columbia_Southeast":"Kelowna", -"Canada_British Columbia_Vancouver":"Vancouver", -"Canada_Labrador":"Labrador", -"Canada_Labrador_North":"Labrador - Põhi", -"Canada_Labrador_South":"Labrador - Lõuna", -"Canada_Labrador_West":"Labrador - Lääs", -"Canada_Manitoba":"Manitoba", -"Canada_Manitoba_Northeast":"Manitoba — Põhi", -"Canada_Manitoba_Northwest":"Manitoba — Lääs", -"Canada_Manitoba_South":"Brandon", -"Canada_Manitoba_Winnipeg":"Winnipeg", -"Canada_New Brunswick":"New Brunswick", -"Canada_Newfoundland":"Newfoundland", -"Canada_Newfoundland_East":"Newfoundland — Ida", -"Canada_Newfoundland_North":"Newfoundland — Põhi", -"Canada_Newfoundland_South":"Newfoundland — Lõuna", -"Canada_Newfoundland_West":"Newfoundland — Lääs", -"Canada_Northwest Territories":"Loodeterritooriumid", -"Canada_Northwest Territories_East":"Loodeterritooriumid - Ida", -"Canada_Northwest Territories_North":"Loodeterritooriumid - Põhi", -"Canada_Northwest Territories_Yellowknife":"Yellowknife", -"Canada_Nova Scotia":"Nova Scotia", -"Canada_Nova Scotia_Halifax":"Halifax", -"Canada_Nova Scotia_Sydney":"Sydney", -"Canada_Nunavut":"Nunavut", -"Canada_Nunavut_North":"Nunavut - Põhi", -"Canada_Nunavut_South":"Nunavut - Lõuna", -"Canada_Ontario":"Ontario", -"Canada_Ontario_Bame":"Barrie", -"Canada_Ontario_Kingston":"Kingston", -"Canada_Ontario_London":"London", -"Canada_Ontario_Northeastern_Central":"Timmins", -"Canada_Ontario_Northeastern_North":"Moose Factory", -"Canada_Ontario_Northeastern_S":"Greater Sudbury", -"Canada_Ontario_Northeastern_SE":"North Bay", -"Canada_Ontario_Northeastern_SW":"Sault Ste. Marie", -"Canada_Ontario_Northeastern_Wawa":"Wawa", -"Canada_Ontario_Northern":"Thunder Bay", -"Canada_Ontario_Northwestern":"Ontario - Põhi", -"Canada_Ontario_Toronto":"Toronto", -"Canada_Prince Edward Island":"Prints Edwardi saar", -"Canada_Quebec":"Quebec", -"Canada_Quebec_Quebec":"Quebec", -"Canada_Quebek_Far North":"Quebec - Põhi", -"Canada_Quebek_Montreal":"Montreal", -"Canada_Quebek_North":"Sept-Îles", -"Canada_Quebek_Southeast_Rimouski":"Rimouski", -"Canada_Quebek_Southeast_Saguenay":"Saguenay", -"Canada_Quebek_West_Chibougamau":"Chibougamau", -"Canada_Quebek_West_Rouyn-Noranda":"Rouyn-Noranda", -"Canada_Saskatchewan":"Saskatchewan", -"Canada_Saskatchewan_North":"Saskatchewan — Põhi", -"Canada_Saskatchewan_South":"Saskatchewan — Lõuna", -"Canada_Yukon":"Yukon", -"Canada_Yukon_North":"Yukon - Põhi", -"Canada_Yukon_Whitehorse":"Whitehorse", -"Cape Verde":"Roheneemesaared", -"Caribees":"Väikesed Antillid", -"Caribisch Nederland":"Aruba, Curaçao ja Kariibi mere piirkonna Holland", -"Cayman Islands":"Kaimani saared", -"Central African Republic":"Kesk-Aafrika Vabariik", -"Central Anatolia Region":"Kesk-Anatoolia piirkond", -"Chad":"Tšaad", -"Chile":"Tšiili", -"Chile_North":"Tšiili - Põhi", -"Chile_South":"Tšiili - Lõuna", -"China_Anhui":"Anhui", -"China_Chongqing":"Chongqing", -"China_Fujian":"Fujian", -"China_Gansu":"Gansu", -"China_Guangdong":"Guangdong", -"China_Guangxi":"Guangxi", -"China_Guizhou":"Guizhou", -"China_Hebei":"Hebei", -"China_Heilongjiang":"Heilongjiang", -"China_Henan":"Henan", -"China_Hubei":"Hubei", -"China_Hunan":"Hunan", -"China_Inner Mongolia":"Sise-Mongoolia", -"China_Jiangsu":"Jiangsu", -"China_Jiangxi":"Jiangxi", -"China_Jilin":"Jilin", -"China_Liaoning":"Liaoning", -"China_Ningxia Hui":"Ningxia", -"China_Qinghai":"Qinghai", -"China_Shaanxi":"Shaanxi", -"China_Shandong":"Shandong", -"China_Shanghai":"Shanghái", -"China_Shanxi":"Shanxi", -"China_Sichuan":"Sichuan", -"China_Tibet Autonomous Region":"Tiibeti autonoomne piirkond", -"China_Xinjiang":"Xinjiangi uiguuri autonoomne piirkond", -"China_Yunnan":"Yunnan", -"China_Zhejiang":"Zhejiang", -"Colombia":"Kolumbia", -"Colombia_East":"Kolumbia - Ida", -"Colombia_North":"Kolumbia - Põhi", -"Colombia_West":"Kolumbia - Lääs", -"Colorado":"Colorado", -"Comoros":"Komoorid", -"Congo-Brazzaville":"Kongo Vabariik", -"Congo-Kinshasa":"Kongo Demokraatlik Vabariik", -"Cook Islands":"Cooki saared", -"Costa Rica":"Costa Rica", -"Cote dIvoire":"Elevandiluurannik", -"Crimea":"Krimmi poolsaar", -"Croatia":"Horvaatia", -"Cuba":"Kuuba", -"Cyprus":"Küpros", -"Czech Republic":"Tšehhi Vabariik", -"Czech_Jihovychod_Jihomoravsky kraj":"Lõuna-Moravi piirkond", -"Czech_Jihovychod_Kraj Vysocina":"Vysočina piirkond", -"Czech_Jihozapad_Jihocesky kraj":"Lõuna-Böömimaa piirkond", -"Czech_Jihozapad_Plzensky kraj":"Pilseni piirkond", -"Czech_Karlovasky kraj":"Karlovy Vary piirkond", -"Czech_Moravskoslezsko":"Moraavia-Sileesia piirkond", -"Czech_Olomoucky kraj":"Olomouci piirkond", -"Czech_Praha":"Praha", -"Czech_Severovychod_Kralovehradecky kraj":"Hradec Králové piirkond", -"Czech_Severovychod_Liberecky kraj":"Libereci piirkond", -"Czech_Severovychod_Pardubicky kraj":"Pardubice piirkond", -"Czech_Stredni Cechy_East":"Kesk-Böömimaa piirkond – Ida", -"Czech_Stredni Cechy_West":"Kesk-Böömimaa piirkond – Lääs", -"Czech_Ustecky kraj":"Ústí nad Labemi piirkond", -"Czech_Zlinsky Kraj":"Zlini piirkond", -"Denmark":"Taani", -"Denmark_Capital Region of Denmark":"Taani pealinna piirkond", -"Denmark_Central Denmark Region":"Kesk-Taani piirkond", -"Denmark_North Denmark Region":"Põhja-Taani piirkond", -"Denmark_Region Zealand":"Själlandi piirkond", -"Denmark_Region of Southern Denmark":"Lõuna-Taani piirkond", -"Djibouti":"Djibouti", -"Dominica":"Dominica", -"Dominican Republic":"Dominikaani Vabariik", -"East Timor":"Ida-Timor", -"Ecuador":"Ecuador", -"Egypt":"Egiptus", -"El Salvador":"El Salvador", -"Equatorial Guinea":"Ekvatoriaal-Guinea", -"Eritrea":"Eritrea", -"Estonia":"Eesti", -"Estonia_East":"Eesti - Ida", -"Estonia_West":"Eesti - Lääs", -"Ethiopia":"Etioopia", -"Falkland Islands":"Falklandi saared", -"Faroe Islands":"Fääri saared", -"Federated States of Micronesia":"Mikroneesia", -"Fiji":"Fidži", -"Finland":"Soome", -"Finland_Eastern Finland":"Ida-Soome", -"Finland_Northern Finland":"Põhja-Soome", -"Finland_Southern Finland_Helsinki":"Lõuna-Soome - Helsingi", -"Finland_Southern Finland_Lappeenranta":"Lõuna-Soome - Lappeenranta", -"Finland_Southern Finland_West":"Edela-Soome", -"Finland_Western Finland":"Lääne-Soome", -"Florida":"Florida", -"France":"Prantsusmaa", -"France_Alsace":"Alsace", -"France_Alsace_Bas-Rhin":"Alam-Rein", -"France_Alsace_Haut-Rhin":"Ülem-Rein", -"France_Aquitaine":"Akvitaania", -"France_Aquitaine_Dordogne":"Dordogne", -"France_Aquitaine_Gironde":"Gironde", -"France_Aquitaine_Landes":"Landes", -"France_Aquitaine_Lot-et-Garonne":"Lot-et-Garonne", -"France_Aquitaine_Pyrenees-Atlantiques":"Atlandi-Püreneed", -"France_Auvergne":"Auvergne", -"France_Auvergne_Allier":"Allier", -"France_Auvergne_Cantal":"Cantal", -"France_Auvergne_Haute-Loire":"Ülem-Loire", -"France_Auvergne_Puy-de-Dome":"Puy-de-Dôme", -"France_Brittany":"Bretagne", -"France_Brittany_Cotes-dArmor":"Côtes-d'Armor", -"France_Brittany_Finistere":"Finistère", -"France_Brittany_Ille-et-Vilaine":"Ille-et-Vilaine", -"France_Brittany_Morbihan":"Morbihan", -"France_Burgundy":"Burgundia", -"France_Burgundy_Cote-dOr":"Côte-d'Or", -"France_Burgundy_Nievre":"Nièvre", -"France_Burgundy_Saone-et-Loire":"Saône-et-Loire", -"France_Burgundy_Yonne":"Yonne", -"France_Centre-Val de Loire":"Kesk-Loire'i org", -"France_Centre-Val de Loire_Cher":"Cher", -"France_Centre-Val de Loire_Eure-et-Loir":"Eure-et-Loir", -"France_Centre-Val de Loire_Indre":"Indre", -"France_Centre-Val de Loire_Indre-et-Loire":"Indre-et-Loire", -"France_Centre-Val de Loire_Loir-et-Cher":"Loir-et-Cher", -"France_Centre-Val de Loire_Loiret":"Loiret", -"France_Champagne-Ardenne":"Champagne-Ardenne", -"France_Corsica":"Korsika", -"France_Free County":"Franche-Comté", -"France_French Guiana":"Prantsuse Guajaana", -"France_Ile-de-France":"Île-de-France", -"France_Ile-de-France_Essonne":"Essonne", -"France_Ile-de-France_Hauts-de-Seine":"Hauts-de-Seine", -"France_Ile-de-France_Paris":"Pariis", -"France_Ile-de-France_Seine-Saint-Denis":"Seine-Saint-Denis", -"France_Ile-de-France_Seine-et-Marne":"Seine-et-Marne", -"France_Ile-de-France_Val-dOise":"Val-d'Oise", -"France_Ile-de-France_Val-de-Marne":"Val-de-Marne", -"France_Ile-de-France_Yvelines":"Yvelines", -"France_Languedoc-Roussillon":"Languedoc-Roussillon", -"France_Languedoc-Roussillon_Aude":"Aude", -"France_Languedoc-Roussillon_Gard":"Gard", -"France_Languedoc-Roussillon_Herault":"Hérault", -"France_Languedoc-Roussillon_Lozere":"Lozère", -"France_Languedoc-Roussillon_Pyrenees-Orientales":"Pyrénées-Orientales", -"France_Limousin":"Limousin", -"France_Lorraine":"Lorraine", -"France_Lorraine_Meurthe-et-Moselle":"Meurthe-et-Moselle", -"France_Lorraine_Meuse":"Meuse", -"France_Lorraine_Moselle":"Moselle", -"France_Lorraine_Vosges":"Vosges", -"France_Lower Normandy":"Alam-Normandia", -"France_Lower Normandy_Calvados":"Calvados", -"France_Lower Normandy_Manche":"Manche", -"France_Lower Normandy_Orne":"Orne", -"France_Midi-Pyrenees":"Midi-Pyrénées", -"France_Midi-Pyrenees_Ariege":"Ariège", -"France_Midi-Pyrenees_Aveyron":"Aveyron", -"France_Midi-Pyrenees_Gers":"Gers", -"France_Midi-Pyrenees_Haute-Garonne":"Ülem-Garonne", -"France_Midi-Pyrenees_Hautes-Pyrenees":"Ülem-Püreneed", -"France_Midi-Pyrenees_Lot":"Lot", -"France_Midi-Pyrenees_Tarn":"Tarn", -"France_Midi-Pyrenees_Tarn-et-Garonne":"Tarn-et-Garonne", -"France_New Caledonia":"Uus-Kaledoonia", -"France_Nord-Pas-de-Calais":"Nord-Pas-de-Calais", -"France_Nord-Pas-de-Calais_Lille":"Lille", -"France_Nord-Pas-de-Calais_Nord":"Nord", -"France_Nord-Pas-de-Calais_Pas-de-Calais":"Pas-de-Calais", -"France_Pays de la Loire":"Pays de la Loire", -"France_Pays de la Loire_Loire-Atlantique":"Loire-Atlantique", -"France_Pays de la Loire_Maine-et-Loire":"Maine-et-Loire", -"France_Pays de la Loire_Mayenne":"Mayenne", -"France_Pays de la Loire_Sarthe":"Sarthe", -"France_Pays de la Loire_Vendee":"Vendée", -"France_Picardy":"Pikardia", -"France_Picardy_Aisne":"Aisne", -"France_Picardy_Oise":"Oise", -"France_Picardy_Somme":"Somme", -"France_Poitou-Charentes":"Poitou-Charentes", -"France_Poitou-Charentes_Charente":"Charente", -"France_Poitou-Charentes_Charente-Maritime":"Charente-Maritime", -"France_Poitou-Charentes_Deux-Sevres":"Deux-Sèvres", -"France_Poitou-Charentes_Vienne":"Vienne", -"France_Provence-Alpes-Cote dAzur":"Provence-Alpes-Côte d'Azur", -"France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence":"Alpes-de-Haute-Provence", -"France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone":"Bouches-du-Rhône", -"France_Provence-Alpes-Cote dAzur_Hautes-Alpes":"Hautes-Alpes", -"France_Provence-Alpes-Cote dAzur_Maritime Alps":"Alpes-Maritimes", -"France_Provence-Alpes-Cote dAzur_Var":"Var", -"France_Provence-Alpes-Cote dAzur_Vaucluse":"Vaucluse", -"France_Rhone-Alpes":"Rhône-Alpes", -"France_Rhone-Alpes_Ain":"Ain", -"France_Rhone-Alpes_Ardeche":"Ardèche", -"France_Rhone-Alpes_Drome":"Drôme", -"France_Rhone-Alpes_Haute-Savoie":"Haute-Savoie", -"France_Rhone-Alpes_Isere":"Isère", -"France_Rhone-Alpes_Loire":"Loire", -"France_Rhone-Alpes_Rhone":"Rhône", -"France_Rhone-Alpes_Savoie":"Savoie", -"France_Southern Islands":"Prantsuse lõuna- ja Antarktika maad", -"France_Upper Normandy":"Ülem-Normandia", -"French Polynesia":"Prantsuse Polüneesia", -"Gabon":"Gabon", -"Georgia Region":"Gruusia", -"Georgia":"Gruusia", -"Germany":"Saksamaa", -"Germany_Baden-Wurttemberg":"Baden-Württemberg", -"Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg":"Freiburg im Breisgau", -"Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe":"Karlsruhe", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn":"Stuttgart — Heilbronn", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart":"Stuttgart — Stuttgart", -"Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen":"Tübingen", -"Germany_Berlin":"Berliin", -"Germany_Brandenburg_North":"Brandenburg — Põhi", -"Germany_Brandenburg_South":"Brandenburg — Lõuna", -"Germany_Free State of Bavaria":"Baieri", -"Germany_Free State of Bavaria_Lower Bavaria":"Alam-Baieri", -"Germany_Free State of Bavaria_Lower Franconia":"Alam-Frangoonia", -"Germany_Free State of Bavaria_Middle Franconia":"Kesk-Frangoonia", -"Germany_Free State of Bavaria_Swabia":"Švaabimaa", -"Germany_Free State of Bavaria_Upper Bavaria_East":"Ülem-Baieri - Ida", -"Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt":"Ülem-Baieri - Ingolstadt", -"Germany_Free State of Bavaria_Upper Bavaria_Munchen":"Ülem-Baieri - München", -"Germany_Free State of Bavaria_Upper Franconia":"Ülem-Frangoonia", -"Germany_Free State of Bavaria_Upper Palatinate":"Ülem-Pfalz", -"Germany_Hamburg_main":"Hamburg", -"Germany_Hesse":"Hesse", -"Germany_Hesse_Regierungsbezirk Darmstadt":"Darmstadt", -"Germany_Hesse_Regierungsbezirk Giessen":"Giessen", -"Germany_Hesse_Regierungsbezirk Kassel":"Kassel", -"Germany_Lower Saxony":"Alam-Saksimaa", -"Germany_Lower Saxony_Bremen_Bremen":"Bremen", -"Germany_Lower Saxony_Bremen_Munster":"Lüneburg", -"Germany_Lower Saxony_Hannover":"Hannover", -"Germany_Lower Saxony_Oldenburg":"Oldenburg", -"Germany_Mecklenburg-Vorpommern":"Mecklenburg-Vorpommern", -"Germany_North Rhine-Westphalia":"Nordrhein-Westfalen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg":"Arnsberg — Arnsberg", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund":"Arnsberg — Dortmund", -"Germany_North Rhine-Westphalia_Regierungsbezirk Detmold":"Detmold", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf":"Düsseldorf — Düsseldorf", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim":"Düsseldorf — Mülheim an der Ruhr", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel":"Düsseldorf — Wesel", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen":"Köln — Aachen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln":"Köln — Köln", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster":"Münster — Münster", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen":"Münster — Recklinghausen", -"Germany_Rhineland-Palatinate_Koblenz":"Rheinland-Pfalz – Koblenz", -"Germany_Rhineland-Palatinate_South":"Rheinland-Pfalz – Mainz", -"Germany_Saarland":"Saarland", -"Germany_Saxony-Anhalt":"Saksimaa-Anhalt", -"Germany_Saxony_Dresden":"Saksimaa - Dresden", -"Germany_Saxony_Leipzig":"Saksimaa - Leipzig", -"Germany_Schleswig-Holstein":"Schleswig-Holstein", -"Germany_Thuringia":"Tüüringi", -"Ghana":"Ghana", -"Gibraltar":"Gibraltar", -"Greece":"Kreeka", -"Greece_Decentralized Administration of Aegean":"Egeuse", -"Greece_Decentralized Administration of Attica":"Atika", -"Greece_Decentralized Administration of Crete":"Kreeta", -"Greece_Decentralized Administration of Epirus - Western Macedonia":"Epeiros ja Lääne-Makedoonia", -"Greece_Decentralized Administration of Macedonia and Thrace":"Makedoonia ja Traakia", -"Greece_Decentralized Administration of Thessaly - Central Greece":"Tessaalia ja Kesk-Kreeka", -"Greece_Decentralized Administration of West Greece":"Peloponnesos", -"Greenland":"Gröönimaa", -"Grenada":"Grenada", -"Guadeloupe":"Guadeloupe", -"Guatemala":"Guatemala", -"Guernsey":"Guernsey", -"Guinea":"Guinea", -"Guinea-Bissau":"Guinea-Bissau", -"Guyana":"Guyana", -"Haiti":"Haiti", -"Honduras":"Honduras", -"Hungary":"Ungari", -"Hungary_Kozep-Magyarorszag":"Kesk-Ungari", -"Hungary_Northern Great Plain":"Ungari - Ida", -"Hungary_Transdanubia":"Ungari - Lääs", -"Iceland":"Island", -"Illinois":"Illinois", -"India":"India", -"India_Andaman and Nicobar Islands":"Andamani ja Nicobari saared", -"India_Andhra Pradesh":"Andhra Pradesh", -"India_Arunachal Pradesh":"Arunachal Pradesh", -"India_Assam":"Assam", -"India_Bihar":"Bihar", -"India_Chandigarh":"Chandigarh", -"India_Chhattisgarh":"Chhattisgarh", -"India_Delhi":"Delhi", -"India_Goa":"Goa", -"India_Gujarat":"Gujarat", -"India_Haryana":"Haryana", -"India_Himachal Pradesh":"Himachal Pradesh", -"India_Jammu and Kashmir":"Jammu ja Kashmir", -"India_Jharkhand":"Jharkhand", -"India_Karnataka":"Karnataka", -"India_Kerala":"Kerala", -"India_Lakshadweep":"Lakshadweep", -"India_Madhya Pradesh":"Madhya Pradesh", -"India_Maharashtra":"Maharashtra", -"India_Manipur":"Manipur", -"India_Meghalaya":"Meghalaya", -"India_Mizoram":"Mizoram", -"India_Nagaland":"Nagaland", -"India_Odisha":"Odisha", -"India_Punjab":"Punjab", -"India_Rajasthan":"Rajasthan", -"India_Sikkim":"Sikkim", -"India_Tamil Nadu":"Tamil Nadu", -"India_Telangana":"Telangana", -"India_Tripura":"Tripura", -"India_Uttar Pradesh":"Uttar Pradesh", -"India_Uttarakhand":"Uttarakhand", -"India_West Bengal":"Lääne-Bengal", -"Indiana":"Indiana", -"Indonesia":"Indoneesia", -"Indonesia_Central":"Sulawesi, Kalimantan", -"Indonesia_East":"Indoneesia - Ida", -"Indonesia_Jawa Barat":"Lääne-Jaava maakond", -"Indonesia_Jawa Tengah":"Kesk-Jaava maakond", -"Indonesia_Jawa Timur":"Ida-Jaava maakond", -"Indonesia_Nusa Tenggara":"Väikesed Sunda saared", -"Indonesia_West":"Sumatra", -"Iowa":"Iowa", -"Iran":"Iraan", -"Iran_North":"Iraan - Põhi", -"Iran_South":"Iraan - Lõuna", -"Iraq":"Iraak", -"Ireland":"Iirimaa", -"Ireland_Connacht":"Connacht", -"Ireland_Leinster":"Leinster", -"Ireland_Munster":"Munster", -"Ireland_Northern Counties":"Ulster", -"Isle of Man":"Isle of Man", -"Israel":"Iisrael", -"Israel Region":"Iisrael", -"Italy":"Itaalia", -"Italy_Abruzzo":"Abruzzo", -"Italy_Aosta Valley":"Aosta org", -"Italy_Apulia":"Apulia", -"Italy_Basilicata":"Basilicata", -"Italy_Calabria":"Calabria", -"Italy_Campania":"Campania", -"Italy_Emilia":"Emilia-Romagna", -"Italy_Emilia-Romagna_Bologna":"Bologna maakond", -"Italy_Emilia-Romagna_Ferrara":"Ferrara maakond", -"Italy_Emilia-Romagna_Forli-Cesena":"Forlì-Cesena maakond", -"Italy_Emilia-Romagna_Modena":"Modena maakond", -"Italy_Emilia-Romagna_Parma":"Parma maakond", -"Italy_Emilia-Romagna_Piacenza":"Piacenza maakond", -"Italy_Emilia-Romagna_Ravenna":"Ravenna maakond", -"Italy_Emilia-Romagna_Reggio Emilia":"Reggio Emilia maakond", -"Italy_Emilia-Romagna_Rimini":"Rimini maakond", -"Italy_Friuli":"Friuli–Venezia Giulia", -"Italy_Friuli-Venezia Giulia_Gorizia":"Gorizia maakond", -"Italy_Friuli-Venezia Giulia_Pordenone":"Pordenone maakond", -"Italy_Friuli-Venezia Giulia_Trieste":"Trieste maakond", -"Italy_Friuli-Venezia Giulia_Udine":"Udine maakond", -"Italy_Lazio":"Lazio", -"Italy_Liguria":"Liguria", -"Italy_Lombardy":"Lombardia", -"Italy_Lombardy_Bergamo":"Bergamo maakond", -"Italy_Lombardy_Brescia":"Brescia maakond", -"Italy_Lombardy_Como":"Como maakond", -"Italy_Lombardy_Cremona":"Cremona maakond", -"Italy_Lombardy_Lecco":"Lecco maakond", -"Italy_Lombardy_Lodi":"Lodi maakond", -"Italy_Lombardy_Mantua":"Mantua maakond", -"Italy_Lombardy_Milan":"Milano maakond", -"Italy_Lombardy_Monza and Brianza":"Monza ja Brianza maakond", -"Italy_Lombardy_Pavia":"Pavia maakond", -"Italy_Lombardy_Sondrio":"Sondrio maakond", -"Italy_Lombardy_Varese":"Varese maakond", -"Italy_Marche":"Marche", -"Italy_Molise":"Molise", -"Italy_Piemont":"Piedmont", -"Italy_Piemont_Alessandria":"Alessandria maakond", -"Italy_Piemont_Asti":"Asti maakond", -"Italy_Piemont_Biella":"Biella maakond", -"Italy_Piemont_Cuneo":"Cuneo maakond", -"Italy_Piemont_Novara":"Novara maakond", -"Italy_Piemont_Torino":"Torino maakond", -"Italy_Piemont_Verbano-Cusio-Ossola":"Verbano-Cusio-Ossola", -"Italy_Piemont_Vercelli":"Vercelli maakond", -"Italy_Sardinia":"Sardiinia", -"Italy_Sicily":"Sitsiilia", -"Italy_Trentino-Alto Adige Sudtirol":"Trentino-Lõuna-Tirool", -"Italy_Tuscany_Grosseto":"Toscana - Grosseto maakond", -"Italy_Tuscany_Massa e Carrara":"Toscana - Massa ja Carrara maakond", -"Italy_Umbria":"Umbria", -"Italy_Veneto":"Veneto", -"Italy_Veneto_Belluno":"Belluno maakond", -"Italy_Veneto_Padova":"Padua maakond", -"Italy_Veneto_Rovigo":"Rovigo maakond", -"Italy_Veneto_Treviso":"Treviso maakond", -"Italy_Veneto_Venezia":"Veneetsia maakond", -"Italy_Veneto_Verona":"Verona maakond", -"Italy_Veneto_Vicenza":"Vicenza maakond", -"Jamaica":"Jamaica", -"Japan":"Jaapan", -"Japan_Chubu Region":"Chūbu piirkond", -"Japan_Chubu Region_Aichi":"Aichi prefektuur", -"Japan_Chubu Region_Fukui":"Fukui prefektuur", -"Japan_Chubu Region_Gifu":"Gifu prefektuur", -"Japan_Chubu Region_Ishikawa":"Ishikawa prefektuur", -"Japan_Chubu Region_Nagano":"Nagano prefektuur", -"Japan_Chubu Region_Niigata":"Niigata prefektuur", -"Japan_Chubu Region_Shizuoka":"Shizuoka prefektuur", -"Japan_Chubu Region_Toyama":"Toyama prefektuur", -"Japan_Chubu Region_Yamanashi":"Yamanashi prefektuur", -"Japan_Chugoku Region":"Chūgoku piirkond", -"Japan_Chugoku Region_Hiroshima":"Hiroshima prefektuur", -"Japan_Chugoku Region_Okayama":"Okayama prefektuur", -"Japan_Chugoku Region_Shimane":"Shimane prefektuur", -"Japan_Chugoku Region_Tottori":"Tottori prefektuur", -"Japan_Chugoku Region_Yamaguchi":"Yamaguchi prefektuur", -"Japan_Hokkaido Region":"Hokkaido", -"Japan_Hokkaido Region_East":"Hokkaido - Ida", -"Japan_Hokkaido Region_North":"Hokkaido - Põhi", -"Japan_Hokkaido Region_West":"Hokkaido - Lääs", -"Japan_Kanto":"Kanto piirkond", -"Japan_Kanto_Chiba":"Chiba prefektuur", -"Japan_Kanto_Gunma":"Gunma prefektuur", -"Japan_Kanto_Ibaraki":"Ibaraki prefektuur", -"Japan_Kanto_Kanagawa":"Kanagawa prefektuur", -"Japan_Kanto_Saitama":"Saitama prefektuur", -"Japan_Kanto_Tochigi":"Tochigi prefektuur", -"Japan_Kanto_Tokyo":"Tokyo prefektuur", -"Japan_Kinki Region":"Kansai piirkond", -"Japan_Kinki Region_Mie":"Mie prefektuur", -"Japan_Kinki Region_Nara":"Nara prefektuur", -"Japan_Kinki Region_Osaka":"Osaka prefektuur", -"Japan_Kinki Region_Wakayama":"Wakayama prefektuur", -"Japan_Kyushu Region":"Kyushu", -"Japan_Kyushu Region_Fukuoka":"Fukuoka prefektuur", -"Japan_Kyushu Region_Kagoshima":"Kagoshima prefektuur", -"Japan_Kyushu Region_Kumamoto":"Kumamoto prefektuur", -"Japan_Kyushu Region_Miyazaki":"Miyazaki prefektuur", -"Japan_Kyushu Region_Nagasaki":"Nagasaki prefektuur", -"Japan_Kyushu Region_Oita":"Oita prefektuur", -"Japan_Kyushu Region_Okinawa":"Okinawa prefektuur", -"Japan_Kyushu Region_Saga":"Saga prefektuur", -"Japan_Shikoku Region":"Shikoku", -"Japan_Shikoku Region_Ehime":"Ehime prefektuur", -"Japan_Shikoku Region_Kagawa":"Kagawa prefektuur", -"Japan_Shikoku Region_Kochi":"Kochi prefektuur", -"Japan_Shikoku Region_Kyoto":"Kyoto prefektuur", -"Japan_Shikoku Region_Tokushima":"Tokushima prefektuur", -"Japan_Tohoku":"Tohoku piirkond", -"Japan_Tohoku_Akita":"Akita prefektuur", -"Japan_Tohoku_Aomori":"Aomori prefektuur", -"Japan_Tohoku_Fukushima":"Fukushima prefektuur", -"Japan_Tohoku_Iwate":"Iwate prefektuur", -"Japan_Tohoku_Miyagi":"Miyagi prefektuur", -"Japan_Tohoku_Yamagata":"Yamagata prefektuur", -"Jersey":"Jersey", -"Jerusalem":"Jeruusalemm", -"Jordan":"Jordaania", -"Kansas":"Kansas", -"Kazakhstan":"Kasahstan", -"Kentucky":"Kentucky", -"Kenya":"Keenia", -"Kingdom of Lesotho":"Lesotho", -"Kiribati":"Kiribati", -"Kuwait":"Kuveit", -"Kyrgyzstan":"Kõrgõzstan", -"Laos":"Laos", -"Latvia":"Läti", -"Lebanon":"Liibanon", -"Liberia":"Libeeria", -"Libya":"Liibüa", -"Liechtenstein":"Liechtenstein", -"Lithuania":"Leedu", -"Louisiana":"Louisiana", -"Luxembourg":"Luksemburg", -"Macedonia":"Makedoonia", -"Madagascar":"Madagaskar", -"Malawi":"Malawi", -"Malaysia":"Malaisia", -"Maldives":"Maldiivid", -"Mali":"Mali", -"Malta":"Malta", -"Marshall Islands":"Marshalli saared", -"Martinique":"Martinique", -"Maryland":"Maryland", -"Massachusetts":"Massachusetts", -"Mauritania":"Mauritaania", -"Mauritius":"Mauritius", -"Mexico":"Mehhiko", -"Mexico_California":"Baja California", -"Mexico_Central_East":"Nuevo León", -"Mexico_Central_West":"Nayarit", -"Mexico_East":"Mehhiko - Ida", -"Mexico_Mexico":"Mexico City", -"Mexico_North":"Mehhiko - Põhi", -"Mexico_South":"Mehhiko - Lõuna", -"Michigan":"Michigan", -"Minnesota":"Minnesota", -"Missouri":"Missouri", -"Moldova":"Moldova", -"Monaco":"Monaco", -"Mongolia":"Mongoolia", -"Montenegro":"Montenegro", -"Montserrat":"Montserrat", -"Morocco":"Maroko", -"Morocco_Doukkala-Abda":"Doukkala-Abda", -"Morocco_Rabat-Sale-Zemmour-Zaer":"Rabat-Salé-Zemmour-Zaer", -"Morocco_Southern":"Maroko - Lõuna", -"Morocco_Western Sahara":"Lääne-Sahara", -"Mozambique":"Mosambiik", -"Myanmar":"Myanmar", -"Nagorno-Karabakh":"Nagorno-Karabakh", -"Namibia":"Namiibia", -"Nauru":"Nauru", -"Nepal":"Nepal", -"Nepal_East":"Nepal - Ida", -"Nepal_West":"Nepal - Lääs", -"Netherlands":"Holland", -"Netherlands_Drenthe":"Drenthe", -"Netherlands_Flevoland":"Flevoland", -"Netherlands_Friesland":"Friisimaa", -"Netherlands_Gelderland_Nijmegen":"Gelderland — Nijmegen", -"Netherlands_Gelderland_North":"Gelderland — Apeldoorn", -"Netherlands_Gelderland_Zutphen":"Gelderland — Zutphen", -"Netherlands_Groningen":"Groningen", -"Netherlands_Limburg":"Limburg", -"Netherlands_North Brabant_Eindhoven":"Põhja-Brabant - Eindhoven", -"Netherlands_North Brabant_Roosendaal":"Põhja-Brabant — Roosendaal", -"Netherlands_North Brabant_Tiburg":"Põhja-Brabant — Tilburg", -"Netherlands_North Brabant_Uden":"Põhja-Brabant — Uden", -"Netherlands_North Holland_Alkmaar":"Põhja-Holland - Alkmaar", -"Netherlands_North Holland_Amsterdam":"Põhja-Holland - Amsterdam", -"Netherlands_North Holland_Zaandam":"Põhja-Holland - Zaanstad", -"Netherlands_Overijssel_Enschede":"Overijssel — Enschede", -"Netherlands_Overijssel_Zwolle":"Overijssel — Zwolle", -"Netherlands_South Holland_Brielle":"Lõuna-Holland - Brielle", -"Netherlands_South Holland_Den Haag":"Lõuna-Holland - Haag", -"Netherlands_South Holland_Leiden":"Lõuna-Holland - Leiden", -"Netherlands_South Holland_Rotterdam":"Lõuna-Holland - Rotterdam", -"Netherlands_Utrecht_Amersfoort":"Utrecht — Amersfoort", -"Netherlands_Utrecht_Utrecht":"Utrecht — Utrecht", -"Netherlands_Zeeland":"Zeeland", -"New Jersey":"New Jersey", -"New York":"New York", -"New Zealand":"Uus-Meremaa", -"New Zealand North_Auckland":"Põhi - Auckland", -"New Zealand North_Wellington":"Põhi - Wellington", -"New Zealand South_Canterbury":"Lõuna - Canterbury piirkond", -"New Zealand South_Southland":"Lõuna - Southland", -"Nicaragua":"Nicaragua", -"Niger":"Niger", -"Nigeria":"Nigeeria", -"Niue":"Niue", -"North Carolina":"Põhja-Carolina", -"North Dakota":"Põhja-Dakota", -"North Korea":"Põhja-Korea", -"Norway":"Norra", -"Norway_Bouvet Island":"Bouvet' saar", -"Norway_Central":"Oslo", -"Norway_Hedmark":"Hedmark", -"Norway_Jan Mayen":"Jan Mayen", -"Norway_Northern":"Põhja-Norra", -"Norway_Oppland":"Oppland", -"Norway_Southern":"Lõuna-Norra", -"Norway_Svalbard":"Svalbard", -"Norway_Trondelag":"Trøndelag", -"Norway_Western":"Lääne-Norra", -"Ohio":"Ohio", -"Oklahoma":"Oklahoma", -"Oman":"Omaan", -"Oregon":"Oregon", -"Pakistan":"Pakistan", -"Palau":"Palau", -"Palestine":"Palestiina alad", -"Palestine Region":"Palestiina alad", -"Panama":"Panama", -"Papua New Guinea":"Paapua Uus-Guinea", -"Paraguay":"Paraguay", -"Pennsylvania":"Pennsylvania", -"People's Republic of China":"Hiina", -"Peru":"Peruu", -"Peru_North":"Peruu - Põhi", -"Peru_South":"Peruu - Lõuna", -"Philippines":"Filipiinid", -"Philippines_Luzon_Manila":"Metro Manila", -"Philippines_Luzon_North":"Luzon - Põhi", -"Philippines_Luzon_South":"Luzon - Lõuna", -"Philippines_Mindanao":"Mindanao", -"Philippines_Visayas":"Visayas", -"Pitcairn Islands":"Pitcairn", -"Poland":"Poola", -"Poland_Greater Poland Voivodeship":"Suur-Poola vojevoodkond", -"Poland_Kuyavian-Pomeranian Voivodeship":"Kuyavia-Pommeri vojevoodkond", -"Poland_Lesser Poland Voivodeship":"Väike-Poola vojevoodkond", -"Poland_Lodz Voivodeship":"Łódźi vojevoodkond", -"Poland_Lower Silesian Voivodeship":"Alam-Sileesia vojevoodkond", -"Poland_Lublin Voivodeship":"Lublini vojevoodkond", -"Poland_Lubusz Voivodeship":"Lubuszi vojevoodkond", -"Poland_Masovian Voivodeship":"Masoovia vojevoodkond", -"Poland_Opole Voivodeship":"Opole vojevoodkond", -"Poland_Podlaskie Voivodeship":"Podlaskie vojevoodkond", -"Poland_Pomeranian Voivodeship":"Pommeri vojevoodkond", -"Poland_Silesian Voivodeship":"Sileesia vojevoodkond", -"Poland_Subcarpathian Voivodeship":"Podkarpackie vojevoodkond", -"Poland_Swietokrzyskie Voivodeship":"Świętokrzyskie vojevoodkond", -"Poland_Warmian-Masurian Voivodeship":"Warmia-Masuuria vojevoodkond", -"Poland_West Pomeranian Voivodeship":"Lääne-Pommeri vojevoodkond", -"Portugal":"Portugal", -"Portugal_North":"Portugal - Põhi", -"Portugal_South":"Portugal - Põhi", -"Qatar":"Katar", -"Republic of Kosovo":"Kosovo", -"Romania":"Rumeenia", -"Romania_Centre":"Kesk-Rumeenia", -"Romania_North_East":"Kirde-Rumeenia", -"Romania_North_West":"Loode-Rumeenia", -"Romania_South":"Lõuna-Rumeenia", -"Romania_South_East":"Kagu-Rumeenia", -"Romania_South_West":"Edela-Rumeenia", -"Romania_West":"Lääne-Rumeenia", -"Russia_Altai Krai":"Altai krai", -"Russia_Altai Republic":"Altai Vabariik", -"Russia_Amur Oblast":"Amuuri oblast", -"Russia_Arkhangelsk Oblast_Central":"Arhangelski oblast - keskosa", -"Russia_Arkhangelsk Oblast_North":"Arhangelski oblast - Põhi", -"Russia_Astrakhan Oblast":"Astrahani oblast", -"Russia_Bashkortostan":"Baškortostani Vabariik", -"Russia_Belgorod Oblast":"Belgorodi oblast", -"Russia_Bryansk Oblast":"Brjanski oblast", -"Russia_Buryatia":"Burjaadi Vabariik", -"Russia_Chechen Republic":"Tšetšeenia Vabariik", -"Russia_Chelyabinsk Oblast":"Tšeljabinski oblast", -"Russia_Chukotka Autonomous Okrug":"Tšukotka autonoomne ringkond", -"Russia_Chuvashia":"Tšuvassi Vabariik", -"Russia_Ingushetia":"Inguššia Vabariik", -"Russia_Irkutsk Oblast":"Irkutski oblast", -"Russia_Ivanovo Oblast":"Ivanovo oblast", -"Russia_Jewish Autonomous Oblast":"Juudi autonoomne oblast", -"Russia_Kabardino-Balkaria":"Kabardino-Balkari Vabariik", -"Russia_Kaliningrad Oblast":"Kaliningradi oblast", -"Russia_Kaluga Oblast":"Kaluga oblast", -"Russia_Kamchatka Krai":"Kamtšatka krai", -"Russia_Karachay-Cherkessia":"Karatšai-Tšerkessi Vabariik", -"Russia_Kemerov Oblast":"Kemerovo oblast", -"Russia_Khabarovsk Krai":"Habarovski krai", -"Russia_Khakassia":"Hakassia Vabariik", -"Russia_Kirov Oblast":"Kirovi oblast", -"Russia_Komi Republic":"Komi Vabariik", -"Russia_Kostroma Oblast":"Kostroma oblast", -"Russia_Krasnodar Krai":"Krasnodari krai - Põhi", -"Russia_Krasnodar Krai_Adygeya":"Krasnodari krai, Adygea Vabariik", -"Russia_Krasnoyarsk Krai":"Krasnojarsk krai", -"Russia_Kurgan Oblast":"Kurgani oblast", -"Russia_Kursk Oblast":"Kurski oblast", -"Russia_Leningradskaya Oblast_Karelsky":"Leningradi oblast - Põhi", -"Russia_Leningradskaya Oblast_Southeast":"Leningradi oblast - Lõuna", -"Russia_Lipetsk Oblast":"Libetski oblast", -"Russia_Magadan Oblast":"Magadani oblast", -"Russia_Mari El":"Mari El Vabariik", -"Russia_Moscow":"Moskva", -"Russia_Moscow Oblast":"Moskva oblast", -"Russia_Murmansk Oblast":"Murmanski oblast", -"Russia_Nenets Autonomous Okrug":"Neenetsi autonoomne ringkond", -"Russia_Nizhny Novgorod Oblast":"Nižni Novgorodi oblast", -"Russia_North Ossetia-Alania":"Põhja-Osseetia-Alania Vabariik", -"Russia_Novgorod Oblast":"Novgorodi oblast", -"Russia_Novosibirsk Oblast":"Novosibirski oblast", -"Russia_Omsk Oblast":"Omski oblast", -"Russia_Orenburg Oblast":"Orenburgi oblast", -"Russia_Oryol Oblast":"Oryoli oblast", -"Russia_Penza Oblast":"Penza oblast", -"Russia_Perm Krai":"Permi krai", -"Russia_Primorsky Krai":"Primorski krai", -"Russia_Pskov Oblast":"Pihkva oblast", -"Russia_Republic of Dagestan":"Dagestani Vabariik", -"Russia_Republic of Kalmykia":"Kalmõkkia Vabariik", -"Russia_Republic of Karelia":"Karjala Vabariik", -"Russia_Republic of Mordovia":"Mordva Vabariik", -"Russia_Rostov Oblast":"Rostovi oblast", -"Russia_Ryazan Oblast":"Rjazani oblast", -"Russia_Saint Petersburg":"Peterburi", -"Russia_Sakha Republic":"Sakha Vabariik", -"Russia_Sakhalin Oblast":"Sahhalini oblast", -"Russia_Samara Oblast":"Samara oblast", -"Russia_Saratov Oblast":"Saratovi oblast", -"Russia_Smolensk Oblast":"Smolenski oblast", -"Russia_Stavropol Krai":"Stavropoli krai", -"Russia_Sverdlovsk Oblast":"Sverdlovski oblast", -"Russia_Tambov Oblast":"Tambovi oblast", -"Russia_Tatarstan":"Tatarstani Vabariik", -"Russia_Tomsk Oblast":"Tomski oblast", -"Russia_Tula Oblast":"Tula oblast", -"Russia_Tuva":"Tuva Vabariik", -"Russia_Tver Oblast":"Tveri oblast", -"Russia_Tyumen Oblast":"Tjumeni oblast", -"Russia_Udmurt Republic":"Udmurdi Vabariik", -"Russia_Ulyanovsk Oblast":"Uljanovski oblast", -"Russia_Vladimir Oblast":"Vladimiri oblast", -"Russia_Volgograd Oblast":"Volgogradi oblast", -"Russia_Vologda Oblast":"Vologda oblast", -"Russia_Voronezh Oblast":"Voroneži oblast", -"Russia_Yamalo-Nenets Autonomous Okrug":"Jamalo-Neenetsi autonoomne üksus", -"Russia_Yaroslavl Oblast":"Jaroslavli oblast", -"Russia_Yugra":"Hanti-Mansi autonoomne üksus", -"Russia_Zabaykalsky Krai":"Trans-Baikali krai", -"Russian Federation":"Venemaa", -"Rwanda":"Ruanda", -"Sahrawi Arab Democratic Republic":"Sahara Araabia Demokraatlik Vabariik", -"Saint Barthelemy":"Saint-Barthélemy", -"Saint Helena Ascension and Tristan da Cunha":"Santa Helena, Ascension ja Tristan da Cunha", -"Saint Kitts and Nevis":"Saint Kitts ja Nevis", -"Saint Lucia":"Santa Lucia", -"Saint Martin":"Saint-Martin", -"Saint Vincent and the Grenadines":"Saint Vincent ja Grenadiinid", -"Samoa":"Samoa", -"San Marino":"San Marino", -"Sao Tome and Principe":"São Tome ja Principe", -"Saudi Arabia":"Saudi Araabia", -"Senegal":"Senegal", -"Serbia":"Serbia", -"Seychelles":"Seišellid", -"Sierra Leone":"Sierra Leone", -"Singapore":"Singapur", -"Slovakia":"Slovakkia", -"Slovakia_Region of Banska Bystrica":"Banská Bystrica piirkond", -"Slovakia_Region of Bratislava":"Bratislava piirkond", -"Slovakia_Region of Kosice":"Košice piirkond", -"Slovakia_Region of Nitra":"Nitra piirkond", -"Slovakia_Region of Presov":"Prešovi piirkond", -"Slovakia_Region of Trencin":"Trenčíni piirkond", -"Slovakia_Region of Trnava":"Trnava piirkond", -"Slovakia_Region of Zilina":"Žilina piirkond", -"Slovenia":"Sloveenia", -"Solomon Islands":"Saalomoni saared", -"Somalia":"Somaalia", -"South Africa":"Lõuna-Aafrika", -"South Africa_Eastern Cape":"Eastern Cape", -"South Africa_Free State":"Free State", -"South Africa_Gauteng":"Gauteng", -"South Africa_KwaZulu-Natal":"KwaZulu-Natal", -"South Africa_Limpopo":"Limpopo", -"South Africa_Mpumalanga":"Mpumalanga", -"South Africa_North West":"North West", -"South Africa_Northern Cape":"Northern Cape", -"South Africa_Western Cape":"Western Cape", -"South Carolina":"Lõuna-Carolina", -"South Georgia and the South Sandwich Islands":"Lõuna-Georgia ja Lõuna-Sandwichi saared", -"South Korea":"Lõuna-Korea", -"South Korea_North":"Lõuna-Korea - Põhi", -"South Korea_South":"Lõuna-Korea - Lõuna", -"South Ossetia":"Lõuna-Osseetia", -"South Sudan":"Lõuna-Sudaan", -"Spain":"Hispaania", -"Spain_Andalusia":"Andaluusia", -"Spain_Aragon":"Aragon", -"Spain_Balearic Islands":"Baleaari saared", -"Spain_Basque Country":"Baskimaa", -"Spain_Canary Islands":"Kanaari saared", -"Spain_Cantabria":"Cantabria", -"Spain_Castile and Leon":"Kastiilia ja León", -"Spain_Castile-La Mancha":"Castile-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Kataloonia – Barcelona maakond", -"Spain_Catalonia_Provincia de Girona":"Kataloonia – Girona maakond", -"Spain_Catalonia_Provincia de Lleida":"Kataloonia – Lleida maakond", -"Spain_Catalonia_Provincia de Tarragona":"Kataloonia – Tarragona maakond", -"Spain_Ceuta":"Ceuta", -"Spain_Community of Madrid":"Madridi kogukond", -"Spain_Comunidad Foral de Navarra":"Navarra", -"Spain_Extremadura":"Extremadura", -"Spain_Galicia":"Galicia", -"Spain_La Rioja":"La Rioja", -"Spain_Melilla":"Melilla", -"Spain_Principado de Asturias":"Astuuria", -"Spain_Region de Murcia":"Murcia piirkond", -"Spain_Valencian Community":"Valencia", -"Sri Lanka":"Sri Lanka", -"Sudan":"Sudaan", -"Suriname":"Suriname", -"Swaziland":"Eswatini", -"Sweden":"Rootsi", -"Sweden_Bergslagen":"Bergslagen", -"Sweden_Malardalen":"Pealinna piirkond", -"Sweden_Mellannorrland":"Keskn-Norland", -"Sweden_Norra Sverige":"Põhja-Rootsi", -"Sweden_Ostra Gotaland":"Ida-Götaland", -"Sweden_Sodra Gotaland":"Lõuna-Götaland", -"Sweden_Vastra Gotaland":"Lääne-Götaland", -"Switzerland":"Šveits", -"Switzerland_Central":"Kesk-Šveits", -"Switzerland_Eastern":"Ida-Šveits", -"Switzerland_Espace Mittelland":"Espace Mittelland", -"Switzerland_Lake Geneva region":"Genfi järve piirkond", -"Switzerland_Northwestern":"Loode-Šveits", -"Switzerland_Ticino":"Ticino", -"Switzerland_Zurich":"Zürich", -"Syria":"Süüria", -"Taiwan":"Taiwan", -"Tajikistan":"Tadžikistan", -"Tanzania":"Tansaania", -"Tennessee":"Tennessee", -"Texas":"Texas", -"Thailand":"Tai", -"Thailand_North":"Tai - Põhi", -"Thailand_South":"Tai - Lõuna", -"The Bahamas":"Bahama saared", -"The Gambia":"Gambia", -"Togo":"Togo", -"Tokelau":"Tokelau", -"Tonga":"Tonga", -"Trinidad and Tobago":"Trinidad ja Tobago", -"Tunisia":"Tuneesia", -"Turkey":"Türgi", -"Turkey_Aegean Region":"Egeuse mere piirkond", -"Turkey_Black Sea Region":"Musta mere piirkond", -"Turkey_Eastern Anatolia Region":"Ida-Anatoolia piirkond", -"Turkey_Marmara Region":"Marmara piirkond", -"Turkey_Mediterranean Region":"Vahemere piirkond", -"Turkey_Southeastern Anatolia Region":"Kagu-Anatoolia piirkond", -"Turkmenistan":"Türkmenistan", -"Turks and Caicos Islands":"Turksi ja Caicose saared", -"Tuvalu":"Tuvalu", -"UK_England_East Midlands":"Ida-Midlands", -"UK_England_East of England_Essex":"Ida-Inglismaa - Essex", -"UK_England_East of England_Norfolk":"Ida-Inglismaa - Norfolk", -"UK_England_Greater London":"Suur-London", -"UK_England_North East England":"Kirde-Inglismaa", -"UK_England_North West England":"Loode-Inglismaa", -"UK_England_South East_Brighton":"Kagu-Inglismaa - Brighton", -"UK_England_South East_Oxford":"Kagu-Inglismaa - Oxford", -"UK_England_South West England_Bristol":"Edela-Inglismaa - Bristol", -"UK_England_South West England_Cornwall":"Edela-Inglismaa - Cornwall", -"UK_England_West Midlands":"Lääne-Midlands", -"UK_England_Yorkshire and the Humber":"Yorkshire ja Humber", -"UK_Northern Ireland":"Põhja-Iirimaa", -"UK_Scotland_North":"Šotimaa - Põhi", -"UK_Scotland_South":"Šotimaa - Lõuna", -"UK_Wales":"Wales", -"US_Alabama_Birmingham":"Birmingham", -"US_Alabama_Montgomery":"Montgomery", -"US_Alaska":"Alaska", -"US_Arizona_Flagstaff":"Flagstaff", -"US_Arizona_Phoenix":"Phoenix", -"US_Arizona_Tucson":"Tucson", -"US_Arkansas":"Arkansas", -"US_California_Bakersfield_Bakersfield":"Bakersfield", -"US_California_Bakersfield_Lancaster":"Lancaster", -"US_California_Chico":"Chico", -"US_California_LA":"Los Angeles", -"US_California_LA North":"Los Angeles — Põhi", -"US_California_Redding":"Redding", -"US_California_Sacramento_Fresno":"Fresno", -"US_California_Sacramento_Sacramento":"Sacramento", -"US_California_Sacramento_Stockton":"Stockton", -"US_California_San Diego":"San Diego", -"US_California_Santa_Clara_Palo Alto":"San Francisco", -"US_California_Santa_Clara_Santa Cruz":"Santa Cruz", -"US_Colorado_Aspen":"Aspen", -"US_Colorado_Denver":"Denver", -"US_Colorado_South":"Colorado — Lõuna", -"US_Connecticut":"Connecticut", -"US_Delaware":"Delaware", -"US_Florida_Jacksonville":"Jacksonville", -"US_Florida_Miami":"Miami", -"US_Florida_Orlando":"Orlando", -"US_Florida_Tampa":"Tampa", -"US_Georgia":"Georgia", -"US_Georgia_Atlanta":"Atlanta", -"US_Georgia_Macon":"Macon", -"US_Georgia_North":"Georgia - Põhi", -"US_Georgia_South":"Georgia - Lõuna", -"US_Guam":"Guam", -"US_Hawaii":"Hawaii", -"US_Idaho":"Idaho", -"US_Illinois_Chickago":"Chicago", -"US_Illinois_Elgin":"Elgin", -"US_Illinois_Rockford":"Rockford", -"US_Illinois_South":"Illinois - Lõuna", -"US_Illinois_Springfield":"Springfield", -"US_Indiana_North":"Indiana - Põhi", -"US_Indiana_South":"Indiana - Lõuna", -"US_Iowa_Des Moines":"Des Moines", -"US_Iowa_Waterloo":"Waterloo", -"US_Iowa_West":"Iowa - Lääs", -"US_Kansas_East":"Kansas - Ida", -"US_Kansas_West":"Kansas - Lääs", -"US_Kentucky_East":"Kentucky - Ida", -"US_Kentucky_West":"Kentucky - Lääs", -"US_Louisiana_Central":"Luisiana - Lääs", -"US_Louisiana_New Orleans":"New Orleans", -"US_Maine":"Maine", -"US_Maryland_Baltimore":"Baltimore", -"US_Maryland_and_DC":"Lääs, Washington D.C.", -"US_Massachusetts_Boston":"Boston", -"US_Massachusetts_Central":"Worcester", -"US_Massachusetts_Plymouth":"Plymouth", -"US_Massachusetts_Southeastern":"Barnstable", -"US_Massachusetts_West":"Springfield", -"US_Michigan_Detroit":"Detroit", -"US_Michigan_North":"Michigan — Põhi", -"US_Michigan_South":"Michigan — Lõuna", -"US_Minnesota_Minneapolis":"Minneapolis", -"US_Minnesota_North":"Minnesota — Põhi", -"US_Minnesota_Rochester":"Rochester", -"US_Minnesota_Saint Cloud":"St. Cloud", -"US_Mississippi":"Mississippi", -"US_Missouri_East":"Missouri — Ida", -"US_Missouri_West":"Missouri — Lääs", -"US_Montana":"Montana", -"US_Nebraska":"Nebraska", -"US_Nevada":"Nevada", -"US_New Hampshire":"New Hampshire", -"US_New Jersey_North":"New Jersey — Põhi", -"US_New Jersey_South":"New Jersey — Lõuna", -"US_New Mexico":"New Mexico", -"US_New York_East":"New York — Long Island", -"US_New York_New York":"New York — New York City", -"US_New York_North":"New York — Põhi", -"US_New York_West":"New York — Lääs", -"US_North Carolina_Asheville":"Asheville", -"US_North Carolina_Charlotte":"Charlotte", -"US_North Carolina_Greensboro":"Greensboro", -"US_North Carolina_Raleigh":"Raleigh", -"US_North Carolina_Wilmington":"Wilmington", -"US_North Carolina_Wilson":"Wilson", -"US_North Dakota_Bismarck":"Bismarck", -"US_North Dakota_East":"Fargo", -"US_North Dakota_Minot":"Minot", -"US_Ohio_Cleveland":"Cleveland", -"US_Ohio_Dayton":"Dayton", -"US_Oklahoma_East":"Oklahoma — Ida", -"US_Oklahoma_West":"Oklahoma - Lääs", -"US_Oregon_Eugene":"Eugene", -"US_Oregon_Portland":"Portland", -"US_Oregon_West":"Oregon - Ida", -"US_Pennsylvania_Central":"Altoona", -"US_Pennsylvania_Pittsburgh":"Pittsburgh", -"US_Pennsylvania_Reading":"Reading", -"US_Pennsylvania_Scranton":"Scranton", -"US_Puerto Rico":"Puerto Rico", -"US_Rhode Island":"Rhode Island", -"US_South Carolina_Columbia":"Columbia", -"US_South Carolina_Florence":"Florence", -"US_South Dakota":"Lõuna-Dakota", -"US_Tennessee_East":"Tennessee — Ida", -"US_Tennessee_West":"Tennessee — Lääs", -"US_Texas_Austin":"Austin", -"US_Texas_Dallas":"Dallas", -"US_Texas_Houston":"Houston", -"US_Texas_Northwest":"Amarillo", -"US_Texas_San Antonio":"San Antonio", -"US_Texas_Southwest":"Laredo", -"US_Texas_Tyler":"Tyler", -"US_Texas_Wako":"Waco", -"US_Texas_West":"Odessa", -"US_United States Minor Outlying Islands":"USA väikesed kõrvalsaared", -"US_Utah":"Utah", -"US_Vermont":"Vermont", -"US_Virginia_Chesapeake":"Chesapeake", -"US_Virginia_Lynchburg":"Lynchburg", -"US_Virginia_Richmond":"Richmond", -"US_Virginia_Roanoke":"Roanoke", -"US_Washington_Coast":"Tacoma", -"US_Washington_Seattle":"Seattle", -"US_Washington_Yakima":"Yakima", -"US_West Virginia":"Lääne-Virginia", -"US_Wisconsin_Milwaukee":"Milwaukee", -"US_Wisconsin_North":"Põhja-Wisconsin", -"US_Wyoming":"Wyoming", -"Uganda":"Uganda", -"Ukraine":"Ukraina", -"Ukraine_Cherkasy Oblast":"Tšerkassi oblast", -"Ukraine_Chernihiv Oblast":"Tšernihivi oblast", -"Ukraine_Chernivtsi Oblast":"Tšernivtsi oblast", -"Ukraine_Dnipropetrovsk Oblast":"Dnipropetrovski oblast", -"Ukraine_Donetsk Oblast":"Donetski oblast", -"Ukraine_Ivano-Frankivsk Oblast":"Ivano-Frankivski oblast", -"Ukraine_Kharkiv Oblast":"Harkivi oblast", -"Ukraine_Kherson Oblast":"Hersoni oblast", -"Ukraine_Khmelnytskyi Oblast":"Hmelnõtski oblast", -"Ukraine_Kirovohrad Oblast":"Kirovohradi oblast", -"Ukraine_Kyiv Oblast":"Kiievi oblast", -"Ukraine_Luhansk Oblast":"Luhanski oblast", -"Ukraine_Lviv Oblast":"Lvivi oblast", -"Ukraine_Mykolaiv Oblast":"Mykolaivi oblast", -"Ukraine_Odessa Oblast":"Odessa oblast", -"Ukraine_Poltava Oblast":"Poltava oblast", -"Ukraine_Rivne Oblast":"Rivne oblast", -"Ukraine_Sumy Oblast":"Sumy oblast", -"Ukraine_Ternopil Oblast":"Ternopili oblast", -"Ukraine_Vinnytsia Oblast":"Vinnõtsja oblast", -"Ukraine_Volyn Oblast":"Volõni oblast", -"Ukraine_Zakarpattia Oblast":"Zakarpattia oblast", -"Ukraine_Zaporizhia Oblast":"Zaporižžja oblast", -"Ukraine_Zhytomyr Oblast":"Žõtomõri oblast", -"United Arab Emirates":"Araabia Ühendemiraadid", -"United Kingdom":"Ühendkuningriik", -"United States Virgin Islands":"Ameerika Ühendriikide Neitsisaared", -"United States of America":"Ameerika Ühendriigid", -"Uruguay":"Uruguay", -"Uzbekistan":"Usbekistan", -"Vanuatu":"Vanuatu", -"Venezuela":"Venezuela", -"Vietnam":"Vietnam", -"Virginia":"Virginia", -"Wallis and Futuna":"Wallis ja Futuna", -"Washington":"Washington", -"Willis Island":"Willise saar", -"Wisconsin":"Wisconsin", -"Yemen":"Jeemen", -"Zambia":"Sambia", -"Zimbabwe":"Zimbabwe", -"Argentina_Santa Fe":"Santa Fe maakond", -"Australia_Brisbane":"Brisbane", -"Australia_Sydney":"Sydney", -"Austria_Styria_Graz":"Steiermark – Graz", -"Austria_Styria_Leoben":"Steiermark – Leoben", -"Austria_Upper Austria_Linz":"Ülem-Austria — Linz", -"Austria_Upper Austria_Wels":"Ülem-Austria - Wels", -"Brazil_Goias_Brasilia":"Goiás — Brasilia", -"Brazil_Goias_North":"Goiás - Põhi", -"Brazil_North Region_East":"Põhjapiirkond - Ida", -"Brazil_North Region_West":"Põhjapiirkond - Lääs", -"Brazil_Northeast Region_East":"Kirdepiirkond - Ida", -"Brazil_Northeast Region_West":"Kirdepiirkond - Lääs", -"Brazil_Parana_East":"Paraná - Ida", -"Brazil_Parana_West":"Paraná - Lääs", -"Brazil_South Region_East":"Lõunapiirkond - Ida", -"Brazil_South Region_West":"Lõunapiirkond - Lääs", -"Bulgaria_East":"Bulgaaria - Ida", -"Bulgaria_West":"Bulgaaria - Lääs", -"Canada_Ontario_Northeastern_W":"Wawa", -"Chile_Central":"Tšiili - Keskosa", -"Congo-Kinshasa_Kivu":"Kivu", -"Congo-Kinshasa_West":"Kongo - Lääs", -"Croatia_Central":"Horvaatia - Keskosa", -"Croatia_West":"Horvaatia - Lääs", -"Ecuador_East":"Ecuador - Ida", -"Ecuador_West":"Ecuador - Lääs", -"Finland_Eastern Finland_North":"Ida-Soome — Põhi", -"Finland_Eastern Finland_South":"Ida-Soome — Lõuna", -"Finland_Western Finland_Jyvaskyla":"Lääne-Soome - Jyväskylä", -"Finland_Western Finland_Tampere":"Lääne-Soome - Tampere", -"France_Free County_North":"Franche-Comté - Põhi", -"France_Free County_South":"Franche-Comté - Lõuna", -"France_Pays de la Loire_Loire-Atlantique_Nantes":"Loire-Atlantique — Nantes", -"France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire":"Loire-Atlantique — Saint-Nazaire", -"Germany_Free State of Bavaria_Upper Bavaria_South":"Ülem-Baieri - Lõuna", -"India_Karnataka_North":"Karnataka - Põhi", -"India_Karnataka_South":"Karnataka - Lõuna", -"Iran_East":"Iraan - Ida", -"Iraq_North":"Iraak - Põhi", -"Iraq_South":"Iraak - Lõuna", -"Japan_Chubu Region_Aichi_Nagoya":"Aichi — Nagoya", -"Japan_Chubu Region_Aichi_Toyohashi":"Aichi — Toyohashi", -"Japan_Hokkaido Region_Sapporo":"Sapporo", -"Japan_Kinki Region_Osaka_Osaka":"Osaka", -"Japan_Kinki Region_Osaka_West":"Osaka - Lääs", -"Kazakhstan_North":"Kasahstan - Põhi", -"Kazakhstan_South":"Kasahstan - Lõuna", -"Lithuania_East":"Leedu - Ida", -"Lithuania_West":"Leedu - Lääs", -"Mexico_Chihuahua":"Chihuahua", -"Mexico_Sonora":"Sonora", -"Nepal_Kathmandu":"Kathmandu", -"Nepal_Madhyamanchal":"Keskpiirkond", -"Nepal_Purwanchal":"Idapiirkond", -"Nigeria_North":"Nigeeria - Põhi", -"Nigeria_South":"Nigeeria - Lõuna", -"Norway_Hordaland":"Hordaland", -"Norway_Nordland":"Nordland", -"Norway_North Trondelag":"Põhja-Trøndelag", -"Norway_Rogaland":"Rogaland", -"Norway_South Trondelag":"Sør-Trøndelag", -"Peru_Lima":"Lima", -"Portugal_Islands":"Portugali saared", -"Portugal_Viseu":"Viseu", -"Russia_Krasnoyarsk Krai_North":"Krasnojarski krai - Põhi", -"Russia_Krasnoyarsk Krai_South":"Krasnojarski krai - Lõuna", -"Russia_Moscow Oblast_East":"Moskva oblast - Ida", -"Russia_Moscow Oblast_West":"Moskva oblast - Lääs", -"Russia_Perm Krai_North":"Permi krai - Põhi", -"Russia_Perm Krai_South":"Permi krai - Lõuna", -"Russia_Republic of Karelia_North":"Karjala Vabariik - Põhi", -"Russia_Republic of Karelia_South":"Karjala Vabariik - Lõuna", -"Russia_Sverdlovsk Oblast_North":"Sverdlovski oblast - Põhi", -"Russia_Sverdlovsk Oblast_Ekaterinburg":"Sverdlovski oblast - Jekaterinburg", -"Russia_Yugra_Khanty":"Yugra - Hantõ-Mansiiski", -"Russia_Yugra_Surgut":"Yugra — Surgut", -"Saudi Arabia_North":"Saudi Araabia - Põhi", -"Saudi Arabia_South":"Saudi Araabia - Lõuna", -"Slovenia_East":"Sloveenia - Ida", -"Slovenia_West":"Sloveenia - Lääs", -"Spain_Andalusia_Granada":"Andaluusia - Granada", -"Spain_Andalusia_Sevilla":"Andaluusia - Sevilla", -"Spain_Castile and Leon_East":"Kastiilia ja León – Ida", -"Spain_Castile and Leon_West":"Kastiilia ja León – Lääs", -"Spain_Galicia_North":"Galicia - Põhi", -"Spain_Galicia_South":"Galicia — Lõuna", -"Sudan_East":"Sudaan - Ida", -"Sudan_West":"Sudaan - Lääs", -"Sweden_Stockholm":"Stockholm", -"Switzerland_Espace Mittelland_Bern":"Espace Mittelland — Bern", -"Switzerland_Espace Mittelland_East":"Espace Mittelland — Ida", -"Taiwan_North":"Taiwan - Põhi", -"Taiwan_South":"Taiwan - Lõuna", -"Thailand_Central":"Tai - Keskosa", -"Turkey_Central Anatolia Region_Ankara":"Kesk-Anatoolia - Ankara", -"Turkey_Central Anatolia Region_Kayseri":"Kesk-Anatoolia - Kayseri", -"Turkey_Marmara Region_Bursa":"Marmara piirkond - Bursa", -"Turkey_Marmara Region_Istanbul":"Marmara piirkond - Istanbul", -"US_Arkansas_North":"Arkansas - Põhi", -"US_Arkansas_South":"Arkansas - Lõuna", -"US_Florida_Gainesvile":"Gainesville", -"US_Idaho_North":"Idaho - Põhi", -"US_Idaho_South":"Idaho - Lõuna", -"US_Indiana_Evansville":"Evansville", -"US_Indiana_Indianapolis":"Indianapolis", -"US_Kansas_Wichita":"Wichita", -"US_Kentucky_Louisville":"Louisville", -"US_Michigan_Grand Rapids":"Grand Rapids", -"US_Michigan_Lansing":"Lansing", -"US_Mississippi_Gulfport":"Gulfport", -"US_Mississippi_North":"Mississippi - Põhi", -"US_Missouri_Kansas":"Kansas City", -"US_Missouri_Springfield":"Springfield", -"US_Missouri_St Louis":"St. Louis", -"US_Montana_East":"Montana - Ida", -"US_Montana_West":"Montana - Lääs", -"US_Nebraska_East":"Nebraska - Ida", -"US_Nebraska_West":"Nebraska - Lääs", -"US_New Mexico_Albuquerque":"Albuquerque", -"US_New Mexico_Roswell":"Roswell", -"US_Ohio_Cincinnati":"Cincinnati", -"US_Ohio_Columbus":"Columbus", -"US_Ohio_Toledo":"Toledo", -"US_Oklahoma_Oklahoma":"Oklahoma City", -"US_Oklahoma_Tulsa":"Tulsa", -"US_South Carolina_Charleston":"Charleston", -"US_Texas_Amarillo":"Amarillo", -"US_Texas_Lubbock":"Lubbock", -"US_Utah_North":"Utah — Põhi", -"US_Utah_South":"Utah - Lõuna", -"US_Virginia_Alexandria":"Alexandria", -"US_Wisconsin_Eau Claire":"Eau Claire", -"US_Wisconsin_Madison":"Madison", -"Venezuela_North":"Venezuela - Põhi", -"Venezuela_South":"Venezuela - Lõuna", -"Argentina_Buenos Aires_Buenos Aires":"Buenos Aires", -"Canada_Quebek_Lachute":"Lachute", -"Canada_Saskatchewan_Regina":"Regina", -"Canada_Saskatchewan_Saskatoon":"Saskatoon", -"Germany_Lower Saxony_Braunschweig":"Braunschweig", -"Germany_Saxony-Anhalt_Halle":"Saksimaa-Anhalt - Halle", -"Germany_Saxony-Anhalt_Magdeburg":"Saksimaa-Anhalt - Magdeburg", -"Germany_Schleswig-Holstein_Flensburg":"Schleswig-Holstein — Flensburg", -"Germany_Schleswig-Holstein_Kiel":"Schleswig-Holstein — Kiel", -"Portugal_Porto":"Porto", -"UK_England_North West England_Lancaster":"Loode-Inglismaa – Lancaster", -"UK_England_North West England_Manchester":"Loode-Inglismaa – Manchester", -"US_Florida_Gainesville":"Gainesville", -"US_Texas_Victoria":"Victoria", -"US_Virginia_Norfolk":"Norfolk", -"Abkhazia Description":"Pitsunda, Gudauta, Sukhum", -"Afghanistan Description":"Kabul, Kandahar, Tokzar", -"Albania Description":"Tiranë, Kavaje, Shkoder", -"Algeria_Central Description":"Batna, Djelfa, Biskra", -"Algeria_Coast Description":"Alžiir, Oran, Constantine", -"Andorra Description":"Andorra la Vella, La Massana, Ordino", -"Angola Description":"Luanda, Lobito, Namibe", -"Anguilla Description":"The Valley, George Hill, Stoney Ground", -"Antarctica Description":"McMurdo jaam, Stația științifică Tšiili \"Villa Las Estrellas\", Rocky Cove", -"Antigua and Barbuda Description":"St. John's, Inglise sadam, Freetown", -"Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán", -"Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell", -"Argentina_Buenos Aires_South Description":"Bahía Blanca, Miramar, Tandil", -"Argentina_Cuyo Description":"San Juan, San Rafael, San Luis", -"Argentina_Mesopotamia Description":"Federación, Paraná, Alvear", -"Argentina_Northwest Description":"San Miguel de Tucumán, San Fernando del Valle de Catamarca, San Salvador de Jujuy", -"Argentina_Pampas Description":"Córdoba, Santa Rosa, Río Cuarto", -"Argentina_Patagonia Description":"Cutral Co, Viedma, Comodoro Rivadavia", -"Argentina_Santa Fe Description":"Rosario, Santa Fe, Las Parejas", -"Armenia Description":"Jerevan, Ashtarak, Gyumri", -"Australia_Brisbane Description":"Brisbane, Redcliffe, Gold Coast", -"Australia_Melbourne Description":"Melbourne, Geelong, Yering", -"Australia_New South Wales Description":"Barham, Tuncurry, Tocumwal", -"Australia_Northern Territory Description":"Darwin, Tennant Creek, Mutitjulu", -"Australia_Queensland Description":"Charleville, Winton, Townsville", -"Australia_South Australia Description":"Adelaide, Port Lincoln, Murray Bridge", -"Australia_Sydney Description":"Sydney, Canberra, Newcastle", -"Australia_Tasmania Description":"Hobart, Strahan, Huonville", -"Australia_Victoria Description":"Wangaratta, Bendigo, Ballarat", -"Australia_Western Australia Description":"Perth, Joondalup, Kalgoorlie", -"Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg", -"Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg", -"Austria_Lower Austria_West Description":"St. Pölten", -"Austria_Lower Austria_Wien Description":"Viin, Wiener Neustadt", -"Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau", -"Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg", -"Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld", -"Austria_Tyrol Description":"Innsbruck, Kufstein, Schwaz", -"Austria_Upper Austria_Linz Description":"Linz, Steyr, Ansfelden", -"Austria_Upper Austria_Wels Description":"Attnang-Puchheim, Wels, Schwanenstadt", -"Austria_Vorarlberg Description":"Dornbirn, Feldkirch, Bregenz", -"Azerbaijan Description":"Baku, Sumgayit, Ganja", -"Bahrain Description":"Manama, Riffa, Muharraq", -"Bangladesh Description":"Sylhet, Dhaka, Comilla", -"Barbados Description":"Bridgetown, Oistins, Speightstown", -"Belarus_Brest Region Description":"Brest, Pinsk, Baranovichi", -"Belarus_Homiel Region Description":"Homel, Mazyr, Zhlobin", -"Belarus_Hrodna Region Description":"Hrodna, Lida, Vawkavysk", -"Belarus_Maglieu Region Description":"Mahilyow, Babruysk, Čerykaŭ", -"Belarus_Minsk Region Description":"Minsk, Barysaw, Soligorsk", -"Belarus_Vitebsk Region Description":"Vitebsk, Orsha, Navapolatsk", -"Belgium_Antwerp Description":"Antwerpen, Zwijndrecht, Berchem", -"Belgium_East Flanders Description":"Ghent, Deinze, Sint-Martens-Latem", -"Belgium_Flemish Brabant Description":"Brüssel, Schaerbeek – Schaarbeek, Anderlecht", -"Belgium_Hainaut Description":"Mons, Charleroi, La Louvière", -"Belgium_Liege Description":"Liège, Seraing, Verviers", -"Belgium_Limburg Description":"Houthalen-Helchteren, Maasmechelen, Hasselt", -"Belgium_Luxembourg Description":"Arlon, Marche-en-Famenne, Bastogne", -"Belgium_Namur Description":"Namur, Mettet, Saint-Marc", -"Belgium_Walloon Brabant Description":"Braine-l'Alleud, Wavre, Ottignies-Louvain-la-Neuve", -"Belgium_West Flanders Description":"Bruges, Koksijde, Nieuwpoort", -"Belize Description":"Benque Viejo del Carmen, Belize City, Belmopan", -"Benin Description":"Natitingou, Abomey, Djougou", -"Bermuda Description":"St. George's, Hamilton, Somerset", -"Bhutan Description":"Thimphu, Ha, Mongar", -"Bolivia_North Description":"La Paz, Santa Cruz de la Sierra, El Alto", -"Bolivia_South Description":"Sucre, Cochabamba, Tupiza", -"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina Description":"Brčko, Dubrave, Rašljani", -"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina Description":"Sarajevo, Mostar", -"Bosnia and Herzegovina_Republic of Srpska Description":"Banja Luka, Bijeljina, Derventa", -"Botswana Description":"Gaborone, Tsabong, Mochudi", -"Brazil_Bahia Description":"Salvador, Feira de Santana, Vitória da Conquista", -"Brazil_Goias_Brasilia Description":"Brasília, Goiânia, Aparecida de Goiânia", -"Brazil_Goias_North Description":"Goianésia, Jaraguá, Porangatu", -"Brazil_Mato Grosso Description":"Cuiabá, Várzea Grande, Rondonopolis", -"Brazil_Mato Grosso Do Sul Description":"Campo Grande, Dourados, Três Lagoas", -"Brazil_North Region_East Description":"Belém, Ananindeua, Macapa", -"Brazil_North Region_West Description":"Manaus, Porto Velho, Rio Branco", -"Brazil_Northeast Region_East Description":"Recife, Maceió, Jaboatão dos Guararapes", -"Brazil_Northeast Region_West Description":"Fortaleza, São Luís, Teresina", -"Brazil_Paraiba Description":"João Pessoa, Campina Grande, Santa Rita", -"Brazil_Parana_East Description":"Curitiba, Ponta Grossa, São José dos Pinhais", -"Brazil_Parana_West Description":"Londrina, Maringa, Cascavel", -"Brazil_Rio Grande do Norte Description":"Natal, Mossoró, Parnamirim", -"Brazil_Santa Catarina Description":"Joinville, Florianópolis, Blumenau", -"Brazil_South Region_East Description":"Porto Alegre, Caxias do Sul, Canoas", -"Brazil_South Region_West Description":"Santa Maria, Passo Fundo, Uruguaiana", -"Brazil_Southeast Region_Espirito Santo Description":"Serra, Vila Velha, Cariacica", -"Brazil_Southeast Region_Minas Gerais_Contagem Description":"Belo Horizonte, Contagem, Juiz de Fora", -"Brazil_Southeast Region_Minas Gerais_North Description":"Uberlandia, Montes Claros, Uberaba", -"Brazil_Southeast Region_Rio de Janeiro Description":"Rio de Janeiro, São Gonçalo, Duque de Caxias", -"Brazil_Southeast Region_Sao Paulo_Campinas Description":"Campinas, Sorocaba, Jundiaí", -"Brazil_Southeast Region_Sao Paulo_City Description":"São Paulo, Guarulhos, São Bernardo do Campo", -"Brazil_Southeast Region_Sao Paulo_West Description":"Ribeirão Preto, São José do Rio Preto, Franca", -"British Indian Ocean Territory Description":"Seabreeze Village, Camp Justice", -"British Virgin Islands Description":"Spanish Town, Road Town, East End", -"Brunei Description":"Bandar Seri Begawan, Muara, Seria", -"Bulgaria_East Description":"Varna, Burgas, Dobrich", -"Bulgaria_West Description":"Sofia, Plovdiv, Pleven", -"Burkina Faso Description":"Ouagadougou, Bobo-Dioulasso", -"Burundi Description":"Bujumbura, Bubanza, Cibitoke", -"Cambodia Description":"Phnom Penh, Kampong Speu, Takeo", -"Cameroon_Central Description":"Yaounde, Kousséri, Kribi", -"Cameroon_West Description":"Douala, Buea, Bamenda", -"Canada_Alberta_Edmonton Description":"Edmonton, Lacombe, Wetaskiwin", -"Canada_Alberta_North Description":"Grande Prairie, Peace River, Fort McMurray", -"Canada_Alberta_South Description":"Calgary, Chestermere, Lethbridge", -"Canada_British Columbia_Central Description":"Williams Lake, Quesnel, Prince George", -"Canada_British Columbia_Far_North Description":"East Pine, Tumbler Ridge, Hudson's Hope", -"Canada_British Columbia_Islands Description":"Saanich, Nanaimo, Victoria", -"Canada_British Columbia_North Description":"Prince Rupert, Terrace, Kitimat", -"Canada_British Columbia_Northeast Description":"Muskwa, Fort Nelson, Fontas", -"Canada_British Columbia_Southeast Description":"Merritt, Revelstoke, Vernon", -"Canada_British Columbia_Vancouver Description":"Vancouver, Surrey, Powell River", -"Canada_Labrador_North Description":"Nain, Postville, Hopedale", -"Canada_Labrador_South Description":"L'Anse-au-Clair, L'Anse-au-Clair, Forteau", -"Canada_Labrador_West Description":"Churchill Falls, Happy Valley-Goose Bay, Happy Valley - Goose Bay", -"Canada_Manitoba_Northeast Description":"Caribou, Manigotagan, English Brook", -"Canada_Manitoba_Northwest Description":"Young Point, Cormorant, Pickerel Narrows", -"Canada_Manitoba_South Description":"Foxwarren, Shoal Lake, Brandon", -"Canada_Manitoba_Winnipeg Description":"Winnipeg, Portage La Prairie, Killarney", -"Canada_New Brunswick Description":"Edmundston, Fredericton, Campbellton", -"Canada_Newfoundland_East Description":"Mount Pearl, St John's, Badger", -"Canada_Newfoundland_North Description":"St. Anthony, Kippens, Gallants", -"Canada_Newfoundland_South Description":"Fortune, Lamaline, Seal Cove", -"Canada_Newfoundland_West Description":"Codroy Valley, Port Aux Basques, Margaree", -"Canada_Northwest Territories_East Description":"Łutselk’e, Rocher River, Fork Lake", -"Canada_Northwest Territories_North Description":"Norman Wells, Inuvik, Fort Simpson", -"Canada_Northwest Territories_Yellowknife Description":"Yellowknife, Hay River, Fort Smith", -"Canada_Nova Scotia_Halifax Description":"Halifax, Bedford, Yarmouth", -"Canada_Nova Scotia_Sydney Description":"Sydney, Inverness, Westville", -"Canada_Nunavut_North Description":"CFB Alert, Grise Fiord, Eureka", -"Canada_Nunavut_South Description":"Repulse Bay, Arctic Bay, Naujaat", -"Canada_Ontario_Bame Description":"Barrie, Wasaga Beach, Deep River", -"Canada_Ontario_Kingston Description":"Ottawa, Belleville, Peterborough", -"Canada_Ontario_London Description":"London, Welland, Woodstock", -"Canada_Ontario_Northeastern_Central Description":"Timmins, Timmins, Iroquois Falls", -"Canada_Ontario_Northeastern_North Description":"Moose Factory, Moosonee, Kashechewan", -"Canada_Ontario_Northeastern_S Description":"Sudbury, Onaping, Dowling", -"Canada_Ontario_Northeastern_SE Description":"Englehart, Temagami, Mattawa", -"Canada_Ontario_Northeastern_SW Description":"Sault Ste. Marie, Sault Ste. Marie, Bruce Mines", -"Canada_Ontario_Northeastern_W Description":"Wawa, Dubreuilville, White River", -"Canada_Ontario_Northern Description":"Thunder Bay, Geraldton, Longlac", -"Canada_Ontario_Northwestern Description":"Pikangikum, Peawanuck, Sandy Lake", -"Canada_Ontario_Toronto Description":"Toronto, Guelph, Mississauga", -"Canada_Prince Edward Island Description":"Summerside, Charlottetown, Borden", -"Canada_Quebec_Quebec Description":"Quebec, Sherbrooke, Drummondville", -"Canada_Quebek_Far North Description":"Radisson, Akulivik, Inukjuak", -"Canada_Quebek_Lachute Description":"Gatineau, Maniwaki, Mansfield-et-Pontefract", -"Canada_Quebek_Montreal Description":"Montreal, Granby, Laval", -"Canada_Quebek_North Description":"Sept-Îles, Port-Cartier, Fermont", -"Canada_Quebek_Southeast_Rimouski Description":"Gaspé, Rimouski, Saint-Pascal", -"Canada_Quebek_Southeast_Saguenay Description":"Baie-Comeau, Saguenay, Saint-Félicien", -"Canada_Quebek_West_Chibougamau Description":"Chapais, Chibougamau, La Tuque", -"Canada_Quebek_West_Rouyn-Noranda Description":"Rouyn-Noranda, Lebel-sur-Quévillon, Senneterre", -"Canada_Saskatchewan_North Description":"Meadow Lake, Blaine Lake, Saint Walburg", -"Canada_Saskatchewan_Regina Description":"Melfort, Melville, Regina", -"Canada_Saskatchewan_Saskatoon Description":"Saskatoon, Warman, Hague", -"Canada_Yukon_North Description":"Ross River, Mayo, Dawson City", -"Canada_Yukon_Whitehorse Description":"Watson Lake, Whitehorse, Haines Junction", -"Cape Verde Description":"Praia, Ribeira Grande, Cidade de Espargos", -"Caribisch Nederland Description":"San Nicolaas, Willemstad, Oranjestad", -"Cayman Islands Description":"George Town, West Bay, West End", -"Central African Republic Description":"Bangui, Bouar, Baoro", -"Chad Description":"N'Djamena, Mao, Bol", -"Chile_Central Description":"Santiago, Pichilemu, San Antonio", -"Chile_North Description":"Hanga Roa, Iquique, Coquimbo", -"Chile_South Description":"Valdivia, Talcahuano, Coronel", -"China_Anhui Description":"Hefei, 包河区, 蜀山区", -"China_Chongqing Description":"Chongqing, Changshou, Kai", -"China_Fujian Description":"Longyan, Sanming, Shaowu", -"China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan", -"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén", -"China_Guangxi Description":"Guigang, Dongxing, Wuzhou", -"China_Guizhou Description":"Guiyang, Liupanshui, Weining", -"China_Hebei Description":"Peking, Tianjin, Shijiazhuang", -"China_Heilongjiang Description":"Harbin, Jixi, Ning'an", -"China_Henan Description":"Zhengzhou, 水磨村, Wugang", -"China_Hubei Description":"Wuhan, Jīngzhōu City, Dangyang", -"China_Hunan Description":"Changsha, Lianyuan, Liling", -"China_Inner Mongolia Description":"Hohhot, Baotou, Erenhot", -"China_Jiangsu Description":"Nanjing, Taixing, Xinyi", -"China_Jiangxi Description":"Ganzhou, Shangrao, Yichun", -"China_Jilin Description":"Changchun, Jilin, Meihekou", -"China_Liaoning Description":"Shenyang, Lingyuan, Wafangdian", -"China_Ningxia Hui Description":"Zhongwei, Wuzhong, Qingtongxia", -"China_Qinghai Description":"Dulan, Delingha, Gyêgu", -"China_Shaanxi Description":"Xi'an, Baoji, Hanzhong", -"China_Shandong Description":"Jinan, Tai'an, Zibo", -"China_Shanghai Description":"Shanghai, Jinshan, Putuo", -"China_Shanxi Description":"Taiyuan, Changzhi, Huozhou", -"China_Sichuan Description":"Chengdu, Panzhihua, Yibin", -"China_Tibet Autonomous Region Description":"Gya'gya, Chabkha, Shelkar", -"China_Xinjiang Description":"Kashgar, Tumxuk, Hotan", -"China_Yunnan Description":"Kunming, Zhedao, Yongbei", -"China_Zhejiang Description":"Jiande, Hangzhou, Lin'an", -"Colombia_East Description":"Mocoa, Villavicencio, Florencia", -"Colombia_North Description":"Cúcuta, Medellín, Cartagena", -"Colombia_West Description":"Bogota, Cali, Soacha", -"Comoros Description":"Moroni, Mutsamudu, Bazimini", -"Congo-Brazzaville Description":"Brazzaville, Pointe-Noire, Impfondo", -"Congo-Kinshasa_Kivu Description":"Bukavu, Beni, Goma", -"Congo-Kinshasa_West Description":"Kinshasa, Mbuji-Mayi, Lubumbashi", -"Cook Islands Description":"Rarotonga Muri, Avarua, Kimiangatau", -"Costa Rica Description":"San José, Palmira, Alajuela", -"Cote dIvoire Description":"Abidjan, Abobo, Yopougon", -"Crimea Description":"Sevastopol, Simferopol, Kertš", -"Croatia_Central Description":"Zagreb, Osijek, Ozalj", -"Croatia_West Description":"Split, Rijeka, Opatija", -"Cuba Description":"Havana, Santiago de Cuba, Cienfuegos", -"Cyprus Description":"Nicosia, Nicosia, Limassol", -"Czech_Jihovychod_Jihomoravsky kraj Description":"Brno, Znojmo", -"Czech_Jihovychod_Kraj Vysocina Description":"Jihlava, Třebíč", -"Czech_Jihozapad_Jihocesky kraj Description":"Budweis, Tábor, Písek", -"Czech_Jihozapad_Plzensky kraj Description":"Pilsen, Klatovy, Rokycany", -"Czech_Karlovasky kraj Description":"Carlsbad, Cheb, Sokolov", -"Czech_Moravskoslezsko Description":"Ostrava, Havířov, Karviná", -"Czech_Olomoucky kraj Description":"Olomouc, Prostějov, Přerov", -"Czech_Praha Description":"Praha, Netluky", -"Czech_Severovychod_Kralovehradecky kraj Description":"Hradec Králové, Náchod, Trutnov", -"Czech_Severovychod_Liberecky kraj Description":"Liberec, Jablonec nad Nisou, Hejnice", -"Czech_Severovychod_Pardubicky kraj Description":"Pardubice, Chrudim, Svitavy", -"Czech_Stredni Cechy_West Description":"Kladno, Mladá Boleslav, Mělník", -"Czech_Ustecky kraj Description":"Ústí nad Labem, Most, Chomutov", -"Czech_Zlinsky Kraj Description":"Zlín, Vsetín, Kroměříž", -"Denmark_Capital Region of Denmark Description":"Kopenhaagen, Skovlunde, Virum", -"Denmark_Central Denmark Region Description":"Aarhus, Juelsminde, Brabrand", -"Denmark_North Denmark Region Description":"Aalborg, Hjørring, Frederikshavn", -"Denmark_Region Zealand Description":"Roskilde, Næstved, Greve Strand", -"Denmark_Region of Southern Denmark Description":"Odense, Morud, Korup", -"Djibouti Description":"Djibouti, Randa, Yoboki", -"Dominica Description":"Roseau, Salisbury, Grand Bay", -"Dominican Republic Description":"Santo Domingo, Barahona, Azua", -"East Timor Description":"Dili, Pante Macassar, Viqueque", -"Ecuador_East Description":"Quito, Cuenca, Tena", -"Ecuador_West Description":"Guayaquil, Manta, Machala", -"Egypt Description":"Kairo, Alexandria, Giza", -"El Salvador Description":"San Salvador, Ahuachapan, Sonsonate", -"Equatorial Guinea Description":"Malabo, Mongomo, Bata", -"Eritrea Description":"ኣስመራ, Keren, Omhajer", -"Estonia_East Description":"Põltsamaa linn, Võru, Tartu", -"Estonia_West Description":"Tallinn, Pärnu, Maardu", -"Ethiopia Description":"Addis Ababa, Asella, Bahir Dar", -"Falkland Islands Description":"Stanley, Falklandi saared, Dunnose Head, Port Edgar", -"Faroe Islands Description":"Tórshavn, Klaksvík, Norðdepil", -"Federated States of Micronesia Description":"Palikir, Colonia, Tamworohi", -"Fiji Description":"Suva, Nasinu, Nadi", -"Finland_Eastern Finland_North Description":"Alapitkä, Koli, Kajaani", -"Finland_Eastern Finland_South Description":"Kuopio, Joensuu, Mikkeli", -"Finland_Northern Finland Description":"Oulu, Rovaniemi, Kokkola", -"Finland_Southern Finland_Helsinki Description":"Helsingi, Espoo, Vantaa", -"Finland_Southern Finland_Lappeenranta Description":"Kouvola, Lappeenranta, Kotka", -"Finland_Southern Finland_West Description":"Turku, Hämeenlinna, Salo", -"Finland_Western Finland_Jyvaskyla Description":"Jyväskylä, Lehtimäki, Kuorevesi", -"Finland_Western Finland_Tampere Description":"Tampere, Pori, Vaasa", -"France_Alsace_Bas-Rhin Description":"Strasbourg, Haguenau, Schiltigheim", -"France_Alsace_Haut-Rhin Description":"Mulhouse, Colmar, Saint-Louis", -"France_Aquitaine_Dordogne Description":"Périgueux, Bergerac, Sarlat-la-Canéda", -"France_Aquitaine_Gironde Description":"Bordeaux, Mérignac, Pessac", -"France_Aquitaine_Landes Description":"Mont-de-Marsan, Dax, Saint-Paul-lès-Dax", -"France_Aquitaine_Lot-et-Garonne Description":"Agen, Villeneuve-sur-Lot, Marmande", -"France_Aquitaine_Pyrenees-Atlantiques Description":"Pau, Bayonne, Anglet", -"France_Auvergne_Allier Description":"Montluçon, Vichy, Moulins", -"France_Auvergne_Cantal Description":"Aurillac, Saint-Flour, Arpajon-sur-Cère", -"France_Auvergne_Haute-Loire Description":"Le Puy-en-Velay, Monistrol-sur-Loire, Yssingeaux", -"France_Auvergne_Puy-de-Dome Description":"Clermont-Ferrand, Cournon-d'Auvergne, Riom", -"France_Brittany_Cotes-dArmor Description":"Saint-Brieuc, Kerbrézellic, Lannion", -"France_Brittany_Finistere Description":"Brest, Quimper, Le Relecq-Kerhuon", -"France_Brittany_Ille-et-Vilaine Description":"Rennes, Saint-Malo, Fougères", -"France_Brittany_Morbihan Description":"Lorient, Vannes, Lanester", -"France_Burgundy_Cote-dOr Description":"Dijon, Beaune, Chenôve", -"France_Burgundy_Nievre Description":"Nevers, Cosne-Cours-sur-Loire, Varennes-Vauzelles", -"France_Burgundy_Saone-et-Loire Description":"Chalon-sur-Saône, Mâcon, Le Creusot", -"France_Burgundy_Yonne Description":"Auxerre, Sens, Joigny", -"France_Centre-Val de Loire_Cher Description":"Bourges, Vierzon, Saint-Amand-Montrond", -"France_Centre-Val de Loire_Eure-et-Loir Description":"Chartres, Dreux, Lucé", -"France_Centre-Val de Loire_Indre Description":"Châteauroux, Issoudun, Déols", -"France_Centre-Val de Loire_Indre-et-Loire Description":"Tours, Joué-lès-Tours, Saint-Cyr-sur-Loire", -"France_Centre-Val de Loire_Loir-et-Cher Description":"Blois, Romorantin-Lanthenay, Vendôme", -"France_Centre-Val de Loire_Loiret Description":"Orléans, Fleury-les-Aubrais, Olivet", -"France_Champagne-Ardenne Description":"Reims, Troyes, Charleville-Mézières", -"France_Corsica Description":"Ajaccio, Bastia, Porto-Vecchio", -"France_Free County_North Description":"Besançon, Belfort, Montbéliard", -"France_Free County_South Description":"Pontarlier, Lons-le-Saunier, Saint-Claude", -"France_French Guiana Description":"Cayenne, Saint-Laurent-du-Maroni, Matoury", -"France_Ile-de-France_Essonne Description":"Évry, Corbeil-Essonnes, Massy", -"France_Ile-de-France_Hauts-de-Seine Description":"Boulogne-Billancourt, Nanterre, Courbevoie", -"France_Ile-de-France_Paris Description":"Pariis, Campagne à Paris", -"France_Ile-de-France_Seine-Saint-Denis Description":"Saint-Denis, Montreuil, Aulnay-sous-Bois", -"France_Ile-de-France_Seine-et-Marne Description":"Chelles, Meaux, Jouarre", -"France_Ile-de-France_Val-dOise Description":"Argenteuil, Sarcelles, Cergy", -"France_Ile-de-France_Val-de-Marne Description":"Créteil, Vitry-sur-Seine, Champigny-sur-Marne", -"France_Ile-de-France_Yvelines Description":"Versailles, Sartrouville, Mantes-la-Jolie", -"France_Languedoc-Roussillon_Aude Description":"Narbonne, Carcassonne, ?", -"France_Languedoc-Roussillon_Gard Description":"Nîmes, Alès, Bagnols-sur-Cèze", -"France_Languedoc-Roussillon_Herault Description":"Montpellier, Béziers, Sète", -"France_Languedoc-Roussillon_Lozere Description":"Aumont-Aubrac, Mende, Marvejols", -"France_Languedoc-Roussillon_Pyrenees-Orientales Description":"Perpignan, Canet-en-Roussillon, Saint-Estève", -"France_Limousin Description":"Limoges, Brive-la-Gaillarde, Tulle", -"France_Lorraine_Meurthe-et-Moselle Description":"Nancy, Vandœuvre-lès-Nancy, Lunéville", -"France_Lorraine_Meuse Description":"Verdun, Bar-le-Duc, Commercy", -"France_Lorraine_Moselle Description":"Metz, Thionville, Montigny-lès-Metz", -"France_Lorraine_Vosges Description":"Épinal, Saint-Dié-des-Vosges, Gérardmer", -"France_Lower Normandy_Calvados Description":"Caen, Lisieux, Hérouville-Saint-Clair", -"France_Lower Normandy_Manche Description":"Cherbourg-Octeville, Cherbourg, Saint-Lô", -"France_Lower Normandy_Orne Description":"Alençon, Flers, Argentan", -"France_Midi-Pyrenees_Ariege Description":"Pamiers, Foix, Saint-Girons", -"France_Midi-Pyrenees_Aveyron Description":"Rodez, Millau, Villefranche-de-Rouergue", -"France_Midi-Pyrenees_Gers Description":"Auch, L'Isle-Jourdain, Condom", -"France_Midi-Pyrenees_Haute-Garonne Description":"Toulouse, Colomiers, Tournefeuille", -"France_Midi-Pyrenees_Hautes-Pyrenees Description":"Tarbes, Lourdes, Aureilhan", -"France_Midi-Pyrenees_Lot Description":"Cahors, Figeac, Gourdon", -"France_Midi-Pyrenees_Tarn Description":"Albi, Castres, Carmaux", -"France_Midi-Pyrenees_Tarn-et-Garonne Description":"Montauban, Castelsarrasin, Moissac", -"France_New Caledonia Description":"Poindimié, Nouméa, Ponérihouen", -"France_Nord-Pas-de-Calais_Lille Description":"Lille, Roubaix, Tourcoing", -"France_Nord-Pas-de-Calais_Nord Description":"Valenciennes, Douai, Cambrai", -"France_Nord-Pas-de-Calais_Pas-de-Calais Description":"Calais, Boulogne-sur-Mer, Arras", -"France_Pays de la Loire_Loire-Atlantique_Nantes Description":"Nantes, Saint-Herblain, Rezé", -"France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire Description":"Saint-Nazaire, Guérande, La Baule-Escoublac", -"France_Pays de la Loire_Maine-et-Loire Description":"Angers, Cholet, Chemillé", -"France_Pays de la Loire_Mayenne Description":"Laval, Mayenne, Château-Gontier", -"France_Pays de la Loire_Sarthe Description":"Le Mans, La Flèche, Sablé-sur-Sarthe", -"France_Pays de la Loire_Vendee Description":"La Roche-sur-Yon, Challans, Les Herbiers", -"France_Picardy_Aisne Description":"Saint-Quentin, Soissons, Laon", -"France_Picardy_Oise Description":"Beauvais, Compiègne, Creil", -"France_Picardy_Somme Description":"Amiens, Abbeville, Albert", -"France_Poitou-Charentes_Charente Description":"Angoulême, Roumazières, Cognac", -"France_Poitou-Charentes_Charente-Maritime Description":"La Rochelle, Saintes, Rochefort", -"France_Poitou-Charentes_Deux-Sevres Description":"Niort, Bressuire, Parthenay", -"France_Poitou-Charentes_Vienne Description":"Poitiers, Châtellerault, Buxerolles", -"France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence Description":"Manosque, Digne-les-Bains, Sisteron", -"France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone Description":"Marseille, Aix-en-Provence, Arles", -"France_Provence-Alpes-Cote dAzur_Hautes-Alpes Description":"Gap, Briançon, Embrun", -"France_Provence-Alpes-Cote dAzur_Maritime Alps Description":"Nizza, Antibes, Cannes", -"France_Provence-Alpes-Cote dAzur_Var Description":"Toulon, La Seyne-sur-Mer, Hyères", -"France_Provence-Alpes-Cote dAzur_Vaucluse Description":"Avignon, Carpentras, Orange", -"France_Rhone-Alpes_Ain Description":"Bourg-en-Bresse, Oyonnax, Ambérieu-en-Bugey", -"France_Rhone-Alpes_Ardeche Description":"Annonay, Aubenas, Guilherand-Granges", -"France_Rhone-Alpes_Drome Description":"Valence, Montélimar, Romans-sur-Isère", -"France_Rhone-Alpes_Haute-Savoie Description":"Annecy, Thonon-les-Bains, Annemasse", -"France_Rhone-Alpes_Isere Description":"Grenoble, Saint-Martin-d'Hères, Échirolles", -"France_Rhone-Alpes_Loire Description":"Saint-Étienne, Roanne, Saint-Chamond", -"France_Rhone-Alpes_Rhone Description":"Lyon, Villeurbanne, Vénissieux", -"France_Rhone-Alpes_Savoie Description":"Chambéry, Aix-les-Bains, Albertville", -"France_Southern Islands Description":"Le Port, Saint-Denis, Coconi", -"France_Upper Normandy Description":"Le Havre, Rouen, Évreux", -"French Polynesia Description":"Vaitape, Vaitahu, Tiputa", -"Gabon Description":"Libreville, Port-Gentil, Sangala", -"Georgia Description":"Tbilisi, Kutaisi, Batumi", -"Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg Description":"Freiburg im Breisgau, Villingen-Schwenningen, Constance", -"Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe Description":"Mannheim, Karlsruhe, Heidelberg", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn Description":"Heilbronn, Schwäbisch Hall, Crailsheim", -"Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart Description":"Stuttgart, Esslingen am Neckar, Ludwigsburg", -"Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen Description":"Ulm, Reutlingen, Tübingen", -"Germany_Berlin Description":"Berliin, Falkenberg, Siedlung Grüneck", -"Germany_Brandenburg_North Description":"Brandenburg an der Havel, Potsdam, Panketal", -"Germany_Brandenburg_South Description":"Frankfurt (Oder), Cottbus, Cottbus", -"Germany_Free State of Bavaria_Lower Bavaria Description":"Landshut, Passau, Straubing", -"Germany_Free State of Bavaria_Lower Franconia Description":"Würzburg, Aschaffenburg, Schweinfurt", -"Germany_Free State of Bavaria_Middle Franconia Description":"Nürnberg, Fürth, Erlangen", -"Germany_Free State of Bavaria_Swabia Description":"Augsburg, Kempten (Allgäu), Neu-Ulm", -"Germany_Free State of Bavaria_Upper Bavaria_East Description":"Rosenheim, Rosenheim", -"Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt Description":"Ingolstadt, Freising, Neuburg an der Donau", -"Germany_Free State of Bavaria_Upper Bavaria_Munchen Description":"München, Dachau", -"Germany_Free State of Bavaria_Upper Bavaria_South Description":"Pfistern, Schongau, Hohenpeißenberg", -"Germany_Free State of Bavaria_Upper Franconia Description":"Bayreuth, Bamberg, Hof", -"Germany_Free State of Bavaria_Upper Palatinate Description":"Regensburg, Amberg, Weiden in der Oberpfalz", -"Germany_Hamburg_main Description":"Hamburg, Nettelnburg, Fünfhausen", -"Germany_Hesse_Regierungsbezirk Darmstadt Description":"Frankfurt am Main, Wiesbaden, Darmstadt", -"Germany_Hesse_Regierungsbezirk Giessen Description":"Lauterbach, Gießen, Marburg", -"Germany_Hesse_Regierungsbezirk Kassel Description":"Kassel, Fulda, Vöhl", -"Germany_Lower Saxony_Braunschweig Description":"Brunswick, Göttingen, Wolfsburg", -"Germany_Lower Saxony_Bremen_Bremen Description":"Bremen, Bremerhaven, Uchte", -"Germany_Lower Saxony_Bremen_Munster Description":"Rotenburg (Wümme), Winsen (Luhe), Buxtehude", -"Germany_Lower Saxony_Hannover Description":"Hanover, Hildesheim, Bad Nenndorf", -"Germany_Lower Saxony_Oldenburg Description":"Osnabrück, Oldenburg, Nordhorn", -"Germany_Mecklenburg-Vorpommern Description":"Rostock, Schwerin, Wismar", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg Description":"Siegen, Arnsberg, Lüdenscheid", -"Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund Description":"Dortmund, Bochum, Hagen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Detmold Description":"Bielefeld, Paderborn, Gütersloh", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf Description":"Düsseldorf, Wuppertal, Mönchengladbach", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim Description":"Essen, Duisburg, Krefeld", -"Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel Description":"Wesel, Kleve, Geldern", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen Description":"Aachen, Düren, Simmerath", -"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln Description":"Köln, Bonn, Leverkusen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster Description":"Münster, Rheine, Ahlen", -"Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen Description":"Gelsenkirchen, Bottrop, Recklinghausen", -"Germany_Rhineland-Palatinate_Koblenz Description":"Koblenz, Trier, Neuwied", -"Germany_Rhineland-Palatinate_South Description":"Mainz, Ludwigshafen am Rhein, Kaiserslautern", -"Germany_Saarland Description":"Saarbruecken, Neunkirchen (Saar), Homburg", -"Germany_Saxony-Anhalt_Halle Description":"Halle (Saale), Dessau-Roßlau, Zerbst/Anhalt", -"Germany_Saxony-Anhalt_Magdeburg Description":"Magdeburg, Halberstadt, Aschersleben", -"Germany_Saxony_Dresden Description":"Dresden, Görlitz, Schirgiswalde-Kirschau", -"Germany_Saxony_Leipzig Description":"Leipzig, Chemnitz, Zwickau", -"Germany_Schleswig-Holstein_Flensburg Description":"Flensburg, Elmshorn, Pinneberg", -"Germany_Schleswig-Holstein_Kiel Description":"Kiel, Lübeck, Neumünster", -"Germany_Thuringia Description":"Erfurt, Jena, Gera", -"Ghana Description":"Accra, Kumasi, Wechiau", -"Gibraltar Description":"Gibraltar, Kataloonia laht", -"Greece_Decentralized Administration of Aegean Description":"Kos, Parikia, Naoussa", -"Greece_Decentralized Administration of Attica Description":"Ateena, Egaleo, Kamatero", -"Greece_Decentralized Administration of Crete Description":"Heraklion, Elounda, Chania", -"Greece_Decentralized Administration of Epirus - Western Macedonia Description":"Eani, Ioannina, Galatini", -"Greece_Decentralized Administration of Macedonia and Thrace Description":"Thessaloniki, Makrochori, Platy", -"Greece_Decentralized Administration of Thessaly - Central Greece Description":"Chalkida, Larissa, Volos", -"Greece_Decentralized Administration of West Greece Description":"Patras, Lefkas, Kalamata", -"Greenland Description":"Kangaatsiaq, Qaqortoq, Paamiut", -"Grenada Description":"St. George's, Gouyave, Calivigny", -"Guadeloupe Description":"Les Abymes, Baie-Mahault, Le Gosier", -"Guatemala Description":"Guatemala City, Quetzaltenango (Xela), Santo Tomas De Castilla", -"Guernsey Description":"Saint Peter Port, St Anne, The Bridge", -"Guinea Description":"Conakry, Coyah, Nzérékoré", -"Guinea-Bissau Description":"Bissau, Mansôa, Bubaque", -"Guyana Description":"Georgetown, New Amsterdam, Port Kaituma", -"Haiti Description":"Port-au-Prince, Carrefour, Tabarre", -"Honduras Description":"Tegucigalpa, San Pedro Sula, Santa Barbara", -"Hungary_Kozep-Magyarorszag Description":"Budapest, Érd, Dunakeszi", -"Hungary_Northern Great Plain Description":"Debrecen, Szeged, Miskolc", -"Hungary_Transdanubia Description":"Pécs, Győr, Székesfehérvár", -"Iceland Description":"Reykjavik, Patreksfjörður, Grundarfjörður", -"India_Andaman and Nicobar Islands Description":"Port Blair, Wandoor, Ferrargunj", -"India_Andhra Pradesh Description":"Vijayawada, Visakhapatnam, Guntur", -"India_Arunachal Pradesh Description":"Koloriang, Along", -"India_Assam Description":"Guwahati, Silchar, Jorhat", -"India_Bihar Description":"Buxar, Patna, Gaya", -"India_Chandigarh Description":"Chandigarh, Palsora, Kaheri", -"India_Chhattisgarh Description":"Bilaspur, Ambikapur, Bhilai", -"India_Delhi Description":"Delhi, New Delhi, Nankheri", -"India_Goa Description":"Panaji, Margao, Bicholim", -"India_Gujarat Description":"Ahmedabad, Jamnagar, Surat", -"India_Haryana Description":"Panchkula, Rewari, Rohtak", -"India_Himachal Pradesh Description":"Nurpur, Mandi, Bharmour", -"India_Jammu and Kashmir Description":"Srinagar, Jammu, Udhampur", -"India_Jharkhand Description":"Ranchi, Dhanbad, Jamshedpur", -"India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru", -"India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields", -"India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur", -"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center", -"India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior", -"India_Maharashtra Description":"Mumbai, Pune, Nagpur", -"India_Manipur Description":"Imphal, Imphal, Jiribam", -"India_Meghalaya Description":"Shillong, Garobandha, Betasing", -"India_Mizoram Description":"Aizawl, Lunglei, Mamit", -"India_Nagaland Description":"Kohima, Peren", -"India_Odisha Description":"Cuttack, Rourkela, Brahmapur", -"India_Punjab Description":"Jalandhar, Amritsar, Bathinda", -"India_Rajasthan Description":"Jaipur, Jodhpur, Kota", -"India_Sikkim Description":"Gangtok, Gayzing, Jorethang", -"India_Tamil Nadu Description":"Chennai, Kanyakumari, Namakkal", -"India_Telangana Description":"Hyderabad, Warangal, Khammam", -"India_Tripura Description":"Agartala, Bisramganj, Belonia", -"India_Uttar Pradesh Description":"Allahabad, Lucknow, Varanasi", -"India_Uttarakhand Description":"Dehradun, Roorkee, Haridwār", -"India_West Bengal Description":"Kolkata, Siliguri, Asansol", -"Indonesia_Central Description":"Makassar, Samarinda, Pontianak", -"Indonesia_East Description":"Sorong, Timika, Manokwari", -"Indonesia_Jawa Barat Description":"Jakarta, Bandung, Tangerang Selatan", -"Indonesia_Jawa Tengah Description":"Semarang, Yogyakarta, Surakarta", -"Indonesia_Jawa Timur Description":"Sumenep, Tulungagung, Batu", -"Indonesia_Nusa Tenggara Description":"Denpasar, Semarapura, Tambolaka", -"Indonesia_West Description":"Medan, SIak Sri Indrapura, Lampung Town", -"Iran_East Description":"Mashhad, Zahedan, Yazd", -"Iran_North Description":"Teheran, Karaj, Tabriz", -"Iran_South Description":"Isfahan, Shiraz, Ahvaz", -"Iraq_North Description":"Mosul, Erbil, Kirkuk", -"Iraq_South Description":"Bagdad, Karbala, Nasiriyah", -"Ireland_Connacht Description":"Galway City, Swinford, Mohill", -"Ireland_Leinster Description":"Dublin, Durrow, Prosperous", -"Ireland_Munster Description":"Cork, Caherciveen", -"Ireland_Northern Counties Description":"Glencolumbkille, Ardara, Glenties", -"Isle of Man Description":"Douglas, Onchan", -"Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut", -"Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto", -"Italy_Aosta Valley Description":"Quart, Aosta, Aosta", -"Italy_Apulia Description":"Bari, Taranto, Foggia", -"Italy_Basilicata Description":"Potenza, Matera, Melfi", -"Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza", -"Italy_Campania Description":"Napoli, Salerno, Torre del Greco", -"Italy_Emilia-Romagna_Bologna Description":"Bologna, Imola, Casalecchio di Reno", -"Italy_Emilia-Romagna_Ferrara Description":"Ferrara, Longastrino, Anita", -"Italy_Emilia-Romagna_Forli-Cesena Description":"Forlì, Cesena, Cesenatico", -"Italy_Emilia-Romagna_Modena Description":"Modena, Carpi, Sassuolo", -"Italy_Emilia-Romagna_Parma Description":"Parma, Fidenza, Salsomaggiore Terme", -"Italy_Emilia-Romagna_Piacenza Description":"Piacenza, San Nicolò a Trebbia, Ziano Piacentino", -"Italy_Emilia-Romagna_Ravenna Description":"Ravenna, Faenza, Lugo", -"Italy_Emilia-Romagna_Reggio Emilia Description":"Reggio nell'Emilia, Scandiano, Casalgrande", -"Italy_Emilia-Romagna_Rimini Description":"Rimini, Riccione, Santarcangelo di Romagna", -"Italy_Friuli-Venezia Giulia_Gorizia Description":"Gorizia, Monfalcone, Ronchi dei Legionari", -"Italy_Friuli-Venezia Giulia_Pordenone Description":"Pordenone, Sacile, San Vito al Tagliamento", -"Italy_Friuli-Venezia Giulia_Trieste Description":"Triest, Muggia / Milje, Aurisina / Nabrežina", -"Italy_Friuli-Venezia Giulia_Udine Description":"Udine, Codroipo, Cervignano del Friuli", -"Italy_Lazio Description":"Rooma, Latina, Fiumicino", -"Italy_Liguria Description":"Genoa, La Spezia, La Spezia", -"Italy_Lombardy_Bergamo Description":"Bergamo, Tagliuno, Treviglio", -"Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane", -"Italy_Lombardy_Como Description":"Como, Como, Cantù", -"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco", -"Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte", -"Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo", -"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara", -"Italy_Lombardy_Milan Description":"Milano, Sesto San Giovanni, Cinisello Balsamo", -"Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno", -"Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella", -"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno", -"Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate", -"Italy_Marche Description":"Ancona, Pesaro", -"Italy_Molise Description":"Campobasso, Termoli, Isernia", -"Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure", -"Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato", -"Italy_Piemont_Biella Description":"Biella, Biella, Cossato", -"Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo", -"Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate", -"Italy_Piemont_Torino Description":"Torino, Moncalieri, Rivoli", -"Italy_Piemont_Verbano-Cusio-Ossola Description":"Verbania, Domodossola, Omegna", -"Italy_Piemont_Vercelli Description":"Vercelli, Borgosesia, Santhià", -"Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena", -"Italy_Sicily Description":"Palermo, Catania, Messina", -"Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto", -"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto", -"Italy_Tuscany_Massa e Carrara Description":"Lucca, Florence, Prato", -"Italy_Umbria Description":"Perugia, Terni, Foligno", -"Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico", -"Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro", -"Italy_Veneto_Rovigo Description":"Rovigo, Badia Polesine, Adria", -"Italy_Veneto_Treviso Description":"Treviso, Conegliano, Castelfranco Veneto", -"Italy_Veneto_Venezia Description":"Veneetsia, Mestre, Chioggia", -"Italy_Veneto_Verona Description":"Verona, Villafranca di Verona, Legnago", -"Italy_Veneto_Vicenza Description":"Vicenza, Bassano del Grappa, Schio", -"Jamaica Description":"Kingston, Montego Bay, Spanish Town", -"Japan_Chubu Region_Aichi_Nagoya Description":"Nagoya, Tsushima, Kiyosu", -"Japan_Chubu Region_Aichi_Toyohashi Description":"Tahara, Gamagori, Nishio", -"Japan_Chubu Region_Fukui Description":"Obama, Fukui, Sakai", -"Japan_Chubu Region_Gifu Description":"Gifu, Hida, Ena", -"Japan_Chubu Region_Ishikawa Description":"Kanazawa, Komatsu, Hakusan", -"Japan_Chubu Region_Nagano Description":"Okaya, Omachi, Nagano", -"Japan_Chubu Region_Niigata Description":"Niigata, Myoko, Sado", -"Japan_Chubu Region_Shizuoka Description":"Hamamatsu, Kosai, Fukuroi", -"Japan_Chubu Region_Toyama Description":"Toyama, Takaoka, Imizu", -"Japan_Chubu Region_Yamanashi Description":"Hokuto, Kofu, Nirasaki", -"Japan_Chugoku Region_Hiroshima Description":"Hiroshima, Ōtake, Kure", -"Japan_Chugoku Region_Okayama Description":"Okayama, Niimi, Kasaoka", -"Japan_Chugoku Region_Shimane Description":"Masuda, Gotsu, Hamada", -"Japan_Chugoku Region_Tottori Description":"Sakai-Minato, Kurayoshi, Yonago", -"Japan_Chugoku Region_Yamaguchi Description":"Nagato, Sanyo-Onoda, Shimonoseki", -"Japan_Hokkaido Region_East Description":"Kushiro, Nemuro, Obihiro", -"Japan_Hokkaido Region_North Description":"Asahikawa, Furano, Shibetsu", -"Japan_Hokkaido Region_Sapporo Description":"Sapporo, Ishikari, Iwamizawa", -"Japan_Hokkaido Region_West Description":"Hokuto, Date, Noboribetsu", -"Japan_Kanto_Chiba Description":"Tateyama, Kamagaya, Minamiboso", -"Japan_Kanto_Gunma Description":"Fujioka, Midori, Numata", -"Japan_Kanto_Ibaraki Description":"Inashiki, Hokota, Ishioka", -"Japan_Kanto_Kanagawa Description":"Yokohama, Sagamihara, Fujisawa", -"Japan_Kanto_Saitama Description":"Saitama, Kawaguchi, Hannō", -"Japan_Kanto_Tochigi Description":"Ashikaga, Kanuma, Sano", -"Japan_Kanto_Tokyo Description":"Tokyo, Setagaya, Hachiōji", -"Japan_Kinki Region_Mie Description":"Kumano, Tsu, Kameyama", -"Japan_Kinki Region_Nara Description":"Nara, Kashihara, Ikoma", -"Japan_Kinki Region_Osaka_Osaka Description":"Osaka, Ashiya, Sennan", -"Japan_Kinki Region_Osaka_West Description":"Kobe, Himeji, Ako", -"Japan_Kinki Region_Wakayama Description":"Wakayama, Tanabe, Kinokawa", -"Japan_Kyushu Region_Fukuoka Description":"Fukuoka, Kitakyūshū, Itoshima", -"Japan_Kyushu Region_Kagoshima Description":"Kagoshima, Satsumasendai, Minamisatsuma", -"Japan_Kyushu Region_Kumamoto Description":"Kumamoto, Amakusa, Kamiamakusa", -"Japan_Kyushu Region_Miyazaki Description":"Ebino, Kushima, Miyakonojo", -"Japan_Kyushu Region_Nagasaki Description":"Nagasaki, Goshima, Hirado", -"Japan_Kyushu Region_Oita Description":"Ōita, Yufu, Taketa", -"Japan_Kyushu Region_Okinawa Description":"Naha, Okinawa, Uruma", -"Japan_Kyushu Region_Saga Description":"Imari, Karatsu, Takeo", -"Japan_Shikoku Region_Ehime Description":"Matsuyama, Yawatahama, Uwajima", -"Japan_Shikoku Region_Kagawa Description":"Takamatsu, Tadotsu, Sakaide", -"Japan_Shikoku Region_Kochi Description":"Sukumo, Shimanto, Tosa-Shimizu", -"Japan_Shikoku Region_Kyoto Description":"Kyoto, Kyotango, Fukuchiyama", -"Japan_Shikoku Region_Tokushima Description":"Miyoshi, Awa, Yoshinogawa", -"Japan_Tohoku_Akita Description":"Oga, Nikaho, Daisen", -"Japan_Tohoku_Aomori Description":"Hirakawa, Towada, Aomori", -"Japan_Tohoku_Fukushima Description":"Kitakata, Sukagawa, Shirakawa", -"Japan_Tohoku_Iwate Description":"Morioka, Hachimantai, Ninohe", -"Japan_Tohoku_Miyagi Description":"Sendai, Higashimatsushima, Tome", -"Japan_Tohoku_Yamagata Description":"Nanyo, Higashine, Obanazawa", -"Jersey Description":"Saint Helier, St. Saviour, St. John", -"Jerusalem Description":"Jerusalemm, 'Anata, Al-Walaja", -"Jordan Description":"Amman, Zarqa, Irbid", -"Kazakhstan_North Description":"Astana, Karaganda, Pavlodar", -"Kazakhstan_South Description":"Almatõ, Shymkent, Aktobe", -"Kenya Description":"Nairobi, Kisumu, Kitale", -"Kingdom of Lesotho Description":"Maseru, Butha-Buthe, Mohale's Hoek", -"Kiribati Description":"Betio, Kabuna, Bairiki", -"Kuwait Description":"Kuwait City, Al Ahmadi, Jahra", -"Kyrgyzstan Description":"Bishkek, Osh, Balykchy", -"Laos Description":"Vientiane, Pakxan, Oudomxay", -"Latvia Description":"Riia, Daugavpils, Liepāja", -"Lebanon Description":"Beirut, Zahle, Sidon", -"Liberia Description":"Monrovia, Sanniquellie, Fish Town City", -"Libya Description":"Tripoli, Benghazi, Misrata", -"Liechtenstein Description":"Vaduz, Schaan, Triesen", -"Lithuania_East Description":"Vilnius, Kaunas, Alytus", -"Lithuania_West Description":"Klaipėda, Šiauliai, Panevėžys", -"Luxembourg Description":"Luksemburg, Mondorf-les-Bains, Esch-sur-Alzette", -"Macedonia Description":"Skopje, Ohrid, Kavadarci", -"Madagascar Description":"Antananarivo, Toamasina, Fianarantsoa", -"Malawi Description":"Lilongwe, Blantyre, Mzuzu", -"Malaysia Description":"Kuala Lumpur, Petaling Jaya, Kota Kinabalu", -"Maldives Description":"Feridhoo, Malé, Dhiggiri", -"Mali Description":"Bamako, Koulikoro, Ségou", -"Malta Description":"Valletta, Victoria, Zebbug", -"Marshall Islands Description":"Majuro, Jelter, Ebeye", -"Martinique Description":"Fort-de-France, Saint-Esprit, Schœlcher", -"Mauritania Description":"Nouakchott, Aleg, Ayoun el Atrous", -"Mauritius Description":"Port Louis, Flic en Flac, Rose Hill", -"Mexico_California Description":"Tijuana, Mexicali, La Paz", -"Mexico_Central_East Description":"Monterrey, Saltillo, Torreón", -"Mexico_Central_West Description":"Guadalajara, Aguascalientes, Zapopan", -"Mexico_Chihuahua Description":"Ciudad Juárez, Chihuahua, Ciudad Acuña", -"Mexico_East Description":"Mérida, Villahermosa, Cancún", -"Mexico_Mexico Description":"Mexico City, Puebla, Cuautitlán Izcalli", -"Mexico_Sonora Description":"Hermosillo, Ciudad Obregon, Heroica Nogales", -"Mexico_South Description":"León, Querétaro, Acapulco", -"Moldova Description":"Chișinău, Tiraspol, Bălți", -"Monaco Description":"Monaco, Monaco", -"Mongolia Description":"Ulaanbaatar, Khovd, Erdenet", -"Montenegro Description":"Podgorica, Niksic, Tuzi", -"Montserrat Description":"Brades, Salem", -"Morocco_Doukkala-Abda Description":"Casablanca, Marrakesh, Safi ⴰⵙⴼⵉ آسفي", -"Morocco_Rabat-Sale-Zemmour-Zaer Description":"Fez, Rabat, Salé ⵙⵍⴰ سلا", -"Morocco_Southern Description":"Meknès ⴰⵎⴽⵏⴰⵙ مكناس, Agadir, Oujda", -"Morocco_Western Sahara Description":"Laayoune, Guelmim, Assa ⴰⵙⵙⴰ آسـا", -"Mozambique Description":"Maputo, Matola, Praia de Bilene", -"Myanmar Description":"Yangon, Naypyidaw, Mandalay", -"Nagorno-Karabakh Description":"Stepanakert, Stepanakert, Hadrut", -"Namibia Description":"Windhoek, Opuwo, Eenhana", -"Nauru Description":"Yaren, Buada, Orro", -"Nepal_Kathmandu Description":"Kathmandu, Kathmandu, Patan", -"Nepal_Madhyamanchal Description":"Bharatpur, Birganj", -"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar", -"Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City", -"Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen", -"Netherlands_Flevoland Description":"Almere, Lelystad, Dronten", -"Netherlands_Friesland Description":"Leeuwarden, Drachten, Sneek", -"Netherlands_Gelderland_Nijmegen Description":"Nijmegen, Groesbeek, Tiel", -"Netherlands_Gelderland_North Description":"Apeldoorn, Arnhem, Ede", -"Netherlands_Gelderland_Zutphen Description":"Doetinchem, Zutphen, Winterswijk", -"Netherlands_Groningen Description":"Groningen, Leek, Bedum", -"Netherlands_Limburg Description":"Maastricht, Venlo, Heerlen", -"Netherlands_North Brabant_Eindhoven Description":"'s-Hertogenbosch, Eindhoven, Helmond", -"Netherlands_North Brabant_Roosendaal Description":"Steenbergen, Roosendaal, Bergen op Zoom", -"Netherlands_North Brabant_Tiburg Description":"Tilburg, Breda, Baarle-Hertog", -"Netherlands_North Brabant_Uden Description":"Oss, Uden, Deurne", -"Netherlands_North Holland_Alkmaar Description":"Alkmaar, Hoorn, Den Helder", -"Netherlands_North Holland_Amsterdam Description":"Amsterdam, Haarlem, Hilversum", -"Netherlands_North Holland_Zaandam Description":"Purmerend, Zaandam, Beverwijk", -"Netherlands_Overijssel_Enschede Description":"Enschede, Hengelo, Almelo", -"Netherlands_Overijssel_Zwolle Description":"Zwolle, Deventer, Kampen", -"Netherlands_South Holland_Brielle Description":"Spijkenisse, Hellevoetsluis, Oud-Beijerland", -"Netherlands_South Holland_Den Haag Description":"Haag, Zoetermeer, Delft", -"Netherlands_South Holland_Leiden Description":"Leiden, Alphen aan den Rijn, Leiderdorp", -"Netherlands_South Holland_Rotterdam Description":"Rotterdam, Dordrecht, Schiedam", -"Netherlands_Utrecht_Amersfoort Description":"Amersfoort, Veenendaal, Zeist", -"Netherlands_Utrecht_Utrecht Description":"Utrecht, Nieuwegein, Houten", -"Netherlands_Zeeland Description":"Middelburg, Vlissingen, Goes", -"New Zealand North_Auckland Description":"Auckland, Hamilton, Tauranga", -"New Zealand North_Wellington Description":"Wellington, Lower Hutt, Palmerston North", -"New Zealand South_Canterbury Description":"Christchurch, Nelson, Waimate", -"New Zealand South_Southland Description":"Dunedin, Invercargill, Tuatapere", -"Nicaragua Description":"Managua, Matagalpa, Bluefields", -"Niger Description":"Niamey, Maradi, Zinder", -"Nigeria_North Description":"Kano, Maiduguri, Sokoto", -"Nigeria_South Description":"Lagos, Ibadan, Abuja", -"Niue Description":"Alofi, Liku, Lakepa", -"North Korea Description":"Pyongyang, Hamhung, Nampo", -"Norway_Central Description":"Oslo, Sandvika, Drammen", -"Norway_Hedmark Description":"Brumunddal, Hamar, Elverum", -"Norway_Hordaland Description":"Bergen, Leirvik, Vossevangen", -"Norway_Jan Mayen Description":"Olonkin City", -"Norway_Nordland Description":"Bodø, Brønnøysund, Mosjøen", -"Norway_North Trondelag Description":"Kolvereid, Stjørdal, Steinkjer", -"Norway_Northern Description":"Tromsø, Finnsnes, Hammerfest", -"Norway_Oppland Description":"Lom, Raufoss, Gjøvik", -"Norway_Rogaland Description":"Stavanger, Sandnes, Haugesund", -"Norway_South Trondelag Description":"Trondheim, Røros, Titran", -"Norway_Southern Description":"Fredrikstad, Kristiansand, Sarpsborg", -"Norway_Svalbard Description":"Grumantbyen, Pyramiden, Longyearbyen", -"Norway_Western Description":"Ålesund, Molde", -"Oman Description":"Muscat, Al Khasal, As Suwaiq", -"Pakistan Description":"Karachi, Lahore, Faisalabad", -"Palau Description":"Melekeok, Palau, Koror", -"Palestine Description":"Gaza, Modi'in Illit, Nablus", -"Panama Description":"Panama, Santiago de Veraguas, Colón", -"Papua New Guinea Description":"Port Moresby, Lae, Vanimo", -"Paraguay Description":"Asuncion, San Lorenzo, Ciudad del Este", -"Peru_Lima Description":"Lima, Ica, Nazca", -"Peru_North Description":"Chiclayo, Iquitos, Piura", -"Peru_South Description":"Arequipa, Abancay, Moquegua", -"Philippines_Luzon_Manila Description":"Manila, Quezon City, Pasig", -"Philippines_Luzon_North Description":"Angeles, Palayan, Malolos", -"Philippines_Luzon_South Description":"Puerto Princesa, Masbate, Calapan", -"Philippines_Mindanao Description":"Zamboanga City, General Santos, Koronadal", -"Philippines_Visayas Description":"Bacolod, Cebu City, Tagbilaran", -"Pitcairn Islands Description":"Adamstown", -"Poland_Greater Poland Voivodeship Description":"Poznan, Kalisz, Jaraczewo", -"Poland_Kuyavian-Pomeranian Voivodeship Description":"Bydgoszcz, Toruń, Włocławek", -"Poland_Lesser Poland Voivodeship Description":"Krakow, Tarnów, Nowy Sącz", -"Poland_Lodz Voivodeship Description":"Łódź, Piotrków Trybunalski, Pabianice", -"Poland_Lower Silesian Voivodeship Description":"Wrocław, Wałbrzych, Legnica", -"Poland_Lublin Voivodeship Description":"Lublin, Chełm, Zamość", -"Poland_Lubusz Voivodeship Description":"Gorzów Wielkopolski, Zielona Góra, Lubniewice", -"Poland_Masovian Voivodeship Description":"Varssavi, Radom, Płock", -"Poland_Opole Voivodeship Description":"Opole, Biała, Baborów", -"Poland_Podlaskie Voivodeship Description":"Białystok, Czyżew, Suwałki", -"Poland_Pomeranian Voivodeship Description":"Gdańsk, Gdynia, Słupsk", -"Poland_Silesian Voivodeship Description":"Katowice, Częstochowa, Sosnowiec", -"Poland_Subcarpathian Voivodeship Description":"Rzeszów, Jedlicze, Dynów", -"Poland_Swietokrzyskie Voivodeship Description":"Kielce, Ostrowiec Świętokrzyski, Starachowice", -"Poland_Warmian-Masurian Voivodeship Description":"Olsztyn, Elbląg, Elk", -"Poland_West Pomeranian Voivodeship Description":"Szczecin, Koszalin, Redło", -"Portugal_Islands Description":"Funchal, Madalena, Calheta", -"Portugal_Porto Description":"Vila Nova de Gaia, Porto, Braga", -"Portugal_South Description":"Lissabon, Odivelas, Setúbal", -"Portugal_Viseu Description":"Viseu, Santo Adrião de Vizela, Felgueiras", -"Qatar Description":"Doha, Al-Rayyan, Barwa City", -"Republic of Kosovo Description":"Pristina, Mitrovica e Veriut, Ferizaj", -"Romania_Centre Description":"Brasov, Sibiu, Târgu Mureș", -"Romania_North_East Description":"Iași, Bacău, Botoșani", -"Romania_North_West Description":"Cluj-Napoca, Dej, Oradea", -"Romania_South Description":"Bukarest, Ploiești, Pitești", -"Romania_South_East Description":"Constanța, Galați, Brăila", -"Romania_South_West Description":"Craiova, Slatina, Râmnicu Vâlcea", -"Romania_West Description":"Timișoara, Arad, Reșița", -"Russia_Altai Krai Description":"Barnaul, Biysk, Rubtsovsk", -"Russia_Altai Republic Description":"Gorno-Altaysk, Mayma, Kosh-Agach", -"Russia_Amur Oblast Description":"Blagoveshchensk, Belogorsk, Svobodny", -"Russia_Arkhangelsk Oblast_Central Description":"Arhangelsk, Severodvinsk, Novodvinsk", -"Russia_Arkhangelsk Oblast_North Description":"Kotlas, Koryazhma, Vychegodskiy", -"Russia_Astrakhan Oblast Description":"Astrahan, Gospitomnika, Akhtubinsk", -"Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat", -"Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin", -"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы", -"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида", -"Russia_Chechen Republic Description":"Groznõi, Urus-Martan, Shali", -"Russia_Chelyabinsk Oblast Description":"Tšeljabinsk, Magnitogorsk, Zlatoust", -"Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek", -"Russia_Chuvashia Description":"Cheboksary, Novocheboksarsk, Kanash", -"Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak", -"Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk", -"Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya", -"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Облучье, Николаевка", -"Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan", -"Russia_Kaliningrad Oblast Description":"Kaliningrad, Sovetsk, Tšernjahhovski", -"Russia_Kaluga Oblast Description":"Kaluga, Obninsk, Babynino", -"Russia_Kamchatka Krai Description":"Petropavlovsk-Kamchatsky, Yelizovo, Vilyuchinsk", -"Russia_Karachay-Cherkessia Description":"Tšerkessk, Pregradnaja, Ust-Džeguta", -"Russia_Kemerov Oblast Description":"Kemerovo, Novokuznetsk, Prokopyevsk", -"Russia_Khabarovsk Krai Description":"Habarovsk, Komsomolsk Amuuri ääres, Amursk", -"Russia_Khakassia Description":"Abakan, Tšernogorsk, Sayanogorsk", -"Russia_Kirov Oblast Description":"Kirov, Kirovo-Tšepetsk, Slobodskoi", -"Russia_Komi Republic Description":"Syktyvkar, Ukhta, Vorkuta", -"Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya", -"Russia_Krasnodar Krai Description":"Krasnodar, Novorossiysk, Armavir", -"Russia_Krasnodar Krai_Adygeya Description":"Sotši, Maikop, Gelendžik", -"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский", -"Russia_Krasnoyarsk Krai_South Description":"Krasnojarsk, Atšinsk, Kansk", -"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши", -"Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov", -"Russia_Leningradskaya Oblast_Karelsky Description":"Viiburi, Vsevoložski, Sertolovo", -"Russia_Leningradskaya Oblast_Southeast Description":"Gatšina, Sosnovi Bor, Tihvin", -"Russia_Lipetsk Oblast Description":"Lipetsk, Yelets, Gryazi", -"Russia_Magadan Oblast Description":"Magadan, Ola, Susuman", -"Russia_Mari El Description":"Yoshkar-Ola, Volzhsk, Kozmodemyansk", -"Russia_Moscow Description":"Moskva, Himki, Troitsk", -"Russia_Moscow Oblast_East Description":"Balašiha, Podolsk, Koroljov", -"Russia_Moscow Oblast_West Description":"Zelenograd, Odintsovo, Krasnogorsk", -"Russia_Murmansk Oblast Description":"Murmansk, Apatity, Severomorsk", -"Russia_Nenets Autonomous Okrug Description":"Красное, Nar'yan-Mar, Искателей", -"Russia_Nizhny Novgorod Oblast Description":"Nizhny Novgorod, Dzerzhinsk, Arzamas", -"Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok, Beslan", -"Russia_Novgorod Oblast Description":"Veliky Novgorod, Borovichi, Staraya Russa", -"Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim", -"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль", -"Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk", -"Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk", -"Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy", -"Russia_Perm Krai_North Description":"Berezniki, Solikamsk, Lysva", -"Russia_Perm Krai_South Description":"Perm, Chaikovsky, Kungur", -"Russia_Primorsky Krai Description":"Vladivostok, Ussurijsk, Nahodka", -"Russia_Pskov Oblast Description":"Pihkva, Velikije Luki, Ostrov", -"Russia_Republic of Dagestan Description":"Makhachkala, Khasavyurt, Derbent", -"Russia_Republic of Kalmykia Description":"Elista, Lagan, Tsagan Aman", -"Russia_Republic of Karelia_North Description":"Kostomuksha, Segezha, Kem", -"Russia_Republic of Karelia_South Description":"Petrozavodsk, Kondopoga, Sortavala", -"Russia_Republic of Mordovia Description":"Saransk, Рузаевка, Kovylkino", -"Russia_Rostov Oblast Description":"Rostov-on-Don, Taganrog, Shakhty", -"Russia_Ryazan Oblast Description":"Ryazan, Kasimov, Skopin", -"Russia_Saint Petersburg Description":"Peterburi, Kolpino, Puškin", -"Russia_Sakha Republic Description":"Yakutsk, Neryungri, Mirny", -"Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk", -"Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran", -"Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo", -"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl", -"Russia_Stavropol Krai Description":"Stavropol, Pyatigorsk, Kislovodsk", -"Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Jekaterinburg, Kamensk-Uralski, Pervouralsk", -"Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk", -"Russia_Tambov Oblast Description":"Tambov, Michurinsk, Rasskazovo", -"Russia_Tatarstan Description":"Kazan, Naberezhnye Chelny, Nizhnekamsk", -"Russia_Tomsk Oblast Description":"Tomsk, Seversk, Strezhevoy", -"Russia_Tula Oblast Description":"Tula, Novomoskovsk, Donskoj", -"Russia_Tuva Description":"Kyzyl, Kaa-Khem, Ak-Dovurak", -"Russia_Tver Oblast Description":"Tver, Rzhev, Vysnij Volocek", -"Russia_Tyumen Oblast Description":"Tyumen, Tobolsk, Ishim", -"Russia_Udmurt Republic Description":"Izhevsk, Sarapul, Votkinsk", -"Russia_Ulyanovsk Oblast Description":"Uljanovsk, Dimitrovgrad, Inza", -"Russia_Vladimir Oblast Description":"Vladimir, Kovrov, Murom", -"Russia_Volgograd Oblast Description":"Volgograd, Volzhskiy, Kamyshin", -"Russia_Vologda Oblast Description":"Vologda, Cherepovets, Сокол", -"Russia_Voronezh Oblast Description":"Voronež, Borisoglebsk, Rossosh", -"Russia_Yamalo-Nenets Autonomous Okrug Description":"Novy Urengoy, Noyabrsk, Salekhard", -"Russia_Yaroslavl Oblast Description":"Jaroslavl, Rybinsk, Pereslavl-Zalessky", -"Russia_Yugra_Khanty Description":"Hantõ-Mansiysk, Nyagan, Uray", -"Russia_Yugra_Surgut Description":"Surgut, Nizhnevartovsk, Nefteyugansk", -"Russia_Zabaykalsky Krai Description":"Chita, Krasnokamensk, Borzya", -"Rwanda Description":"Kigali, Gisenyi, Huye", -"Sahrawi Arab Democratic Republic Description":"Lagouira ⵍⴳⵡⵉⵔⴰ الكويرة, Tifariti ⵜⵉⴼⴰⵔⵉⵜⵉ تيفاريتي, Mijik", -"Saint Barthelemy Description":"Gustavia", -"Saint Helena Ascension and Tristan da Cunha Description":"Jamestown, Half Tree Hollow, Georgetown", -"Saint Kitts and Nevis Description":"Basseterre, Charlestown, Newcastle", -"Saint Lucia Description":"Castries, Castries, Soufriere", -"Saint Martin Description":"Philipsburg, Cul-de-Sac, Cole Bay", -"Saint Vincent and the Grenadines Description":"Kingstown, Clifton, Ashton", -"Samoa Description":"Āpia, Sālelologa, Asau", -"San Marino Description":"San Marino, Chita, Krasnokamensk, Borzya", -"Sao Tome and Principe Description":"São Tomé, Neves, São João dos Angolares", -"Saudi Arabia_North Description":"Jeddah, Mecca, Medina", -"Saudi Arabia_South Description":"Riyadh, Hofuf, Dammam", -"Senegal Description":"Dakar, Pikine, Fatick", -"Serbia Description":"Belgrad, Novi Sad, Nis", -"Seychelles Description":"Victoria, Port Launay, Bel Ombre", -"Sierra Leone Description":"Freetown, Bo, Kambia", -"Singapore Description":"Singapur, Ladang, Rocky Hill", -"Slovakia_Region of Banska Bystrica Description":"Banská Bystrica, Zvolen, Lučenec", -"Slovakia_Region of Bratislava Description":"Bratislava, Petržalka, Ružinov", -"Slovakia_Region of Kosice Description":"Košice, gelnica, Michalovce", -"Slovakia_Region of Nitra Description":"Nitra, Nové Zámky", -"Slovakia_Region of Presov Description":"Prešov, Poprad, Humenné", -"Slovakia_Region of Trencin Description":"Trenčín, Prievidza, Považská Bystrica", -"Slovakia_Region of Trnava Description":"Trnava, Trnava, Piešťany", -"Slovakia_Region of Zilina Description":"Žilina, Martin, Liptovský Mikuláš", -"Slovenia_East Description":"Maribor, Dobova, Kisovec", -"Slovenia_West Description":"Ljubljana, Jagodje, Naklo", -"Solomon Islands Description":"Buala, Lata, Honiara", -"Somalia Description":"Mogadishu, Baardheere, Baidoa", -"South Africa_Eastern Cape Description":"Port Elizabeth, Grahamstown, Mthatha", -"South Africa_Free State Description":"Botshabelo, Thaba Nchu, Welkom", -"South Africa_Gauteng Description":"Johannesburg, Pretoria, Soweto", -"South Africa_KwaZulu-Natal Description":"Durban, Ladysmith, Pietermaritzburg", -"South Africa_Limpopo Description":"Mokopane, Louis Trichardt, Polokwane", -"South Africa_Mpumalanga Description":"Emalahleni, Nelspruit, Secunda", -"South Africa_North West Description":"Mafikeng, Rustenburg, Klerksdorp", -"South Africa_Northern Cape Description":"Upington, Kimberley, Pofadder", -"South Africa_Western Cape Description":"Kaplinn, Mitchells Plain, Khayelitsha", -"South Georgia and the South Sandwich Islands Description":"Husvik, King Edward Point, Grytviken", -"South Korea_North Description":"Seoul, Incheon, Daejeon", -"South Korea_South Description":"Busan, Daegu, Changwon", -"South Ossetia Description":"Tskhinval, Khumisarta, Chitiani", -"South Sudan Description":"Juba, Yambio, Leer", -"Spain_Andalusia_Granada Description":"Granada, Almeria, Jaén", -"Spain_Andalusia_Sevilla Description":"Málaga, Sevilla, Córdoba", -"Spain_Aragon Description":"Zaragoza, Teruel, Huesca", -"Spain_Balearic Islands Description":"Palma de Mallorca, Ibiza city, Santa Eulària des Riu", -"Spain_Basque Country Description":"Bilbao, Vitoria-Gasteiz, Donostia-San Sebastián", -"Spain_Canary Islands Description":"Las Palmas de Gran Canaria, Santa Cruz de Tenerife, Arrecife", -"Spain_Cantabria Description":"Santander, Tanos, San Román de la Llanilla", -"Spain_Castile and Leon_East Description":"Burgos, Valladolid, Palencia", -"Spain_Castile and Leon_West Description":"Salamanca, León, Zamora", -"Spain_Castile-La Mancha Description":"Albacete, Guadalajara, Cuenca", -"Spain_Catalonia_Provincia de Barcelona Description":"Barcelona, l'Hospitalet de Llobregat, Badalona", -"Spain_Catalonia_Provincia de Girona Description":"Sant Antoni, Girona, Figueres", -"Spain_Catalonia_Provincia de Lleida Description":"Lleida, Mollerussa, Balaguer", -"Spain_Catalonia_Provincia de Tarragona Description":"Tarragona, Reus, el Vendrell", -"Spain_Ceuta Description":"Ceuta, Fronteriza", -"Spain_Community of Madrid Description":"Madrid, Móstoles, Alcalá de Henares", -"Spain_Comunidad Foral de Navarra Description":"Pamplona, Tudela, Barañáin", -"Spain_Extremadura Description":"Badajoz, Mérida, Cáceres", -"Spain_Galicia_North Description":"A Coruña, Lugo, Santiago de Compostela", -"Spain_Galicia_South Description":"Vigo, Ourense, Pontevedra", -"Spain_La Rioja Description":"Logroño, Arnedo, Calahorra", -"Spain_Melilla Description":"Melilla", -"Spain_Principado de Asturias Description":"Oviedo / Uviéu, Xixón, Avilés", -"Spain_Region de Murcia Description":"Murcia, Cartagena, Lorca", -"Spain_Valencian Community Description":"Valencia, Alacant/Alicante, Castellón de la Plana", -"Sri Lanka Description":"Colombo, Kandy, Rambukkana", -"Sudan_East Description":"Port Sudan, Kassala, El Hawata", -"Sudan_West Description":"Khartoum, Omdurman, Nyala", -"Suriname Description":"Paramaribo, Groningen, Brokopondo", -"Swaziland Description":"Mbabane, Sidvokodvo, Bulembu", -"Sweden_Bergslagen Description":"Örebro, Gävle, Karlstad", -"Sweden_Malardalen Description":"Uppsala, Västerås, Eskilstuna", -"Sweden_Mellannorrland Description":"Sundsvall, Östersund, Örnsköldsvik", -"Sweden_Norra Sverige Description":"Umeå, Luleå, Piteå", -"Sweden_Ostra Gotaland Description":"Linköping, Norrköping, Jönköping", -"Sweden_Sodra Gotaland Description":"Malmö, Helsingborg, Lund", -"Sweden_Stockholm Description":"Stockholm, Huddinge, Nacka", -"Sweden_Vastra Gotaland Description":"Gothenburg, Borås, Mölndal", -"Switzerland_Central Description":"Luzern, Oberarth, Emmen", -"Switzerland_Eastern Description":"St. Gallen, Schaffhausen, Chur", -"Switzerland_Espace Mittelland_Bern Description":"Bern, Biel/Bienne, Köniz", -"Switzerland_Espace Mittelland_East Description":"Thun, Langenthal, Steffisburg", -"Switzerland_Lake Geneva region Description":"Genf, Lausanne, Vernier", -"Switzerland_Northwestern Description":"Basel, Lenzburg, Riehen", -"Switzerland_Ticino Description":"Lugano, Bellinzona, Locarno", -"Switzerland_Zurich Description":"Zürich, Winterthur, Illnau", -"Syria Description":"Damaskus, Aleppo, Homs", -"Taiwan_North Description":"Taipei City, Taoyuan District, Taichung City", -"Taiwan_South Description":"Kaohsiung City, Tainan City, Chiayi City", -"Tajikistan Description":"Dušanbe, Hudžand, Šahrinav", -"Tanzania Description":"Dar es Salaam, Dodoma, Kigoma", -"Thailand_Central Description":"Nam Som, Nakhon Ratchasima, Udon Thani", -"Thailand_North Description":"Chiang Mai, Santi Suk District, Mae Ai", -"Thailand_South Description":"Bangkok, Nonthaburi, Chaophraya Surasak", -"The Bahamas Description":"Nassau, Freeport, Tarpum Bay", -"The Gambia Description":"Banjul, Serrekunda, Wassu", -"Togo Description":"Lomé, Dapaong, Niamtougou", -"Tokelau Description":"Tokelau", -"Tonga Description":"Nuku'alofa, Ma'ufanga, Neiafu", -"Trinidad and Tobago Description":"Port of Spain, San Fernando, Chaguanas", -"Tunisia Description":"Tunis, Sfax, Ariana", -"Turkey_Aegean Region Description":"Izmir, Denizli, Muğla", -"Turkey_Black Sea Region Description":"Bolu, Samsun, Trabzon", -"Turkey_Central Anatolia Region_Ankara Description":"Ankara, Eskişehir, Konya", -"Turkey_Central Anatolia Region_Kayseri Description":"Kırşehir, Sivas, Nevşehir", -"Turkey_Eastern Anatolia Region Description":"Muş, Ağrı, Van", -"Turkey_Marmara Region_Bursa Description":"Bursa, Çanakkale, Yalova", -"Turkey_Marmara Region_Istanbul Description":"Istanbul, Edirne, Tekirdağ", -"Turkey_Mediterranean Region Description":"Antalya, Burdur, Antakya", -"Turkey_Southeastern Anatolia Region Description":"Gaziantep, Şanlıurfa, Adıyaman", -"Turkmenistan Description":"Ashgabat, Dashoguz, Türkmenabat", -"Turks and Caicos Islands Description":"Cockburn Town, Providenciales, Cockburn Harbor", -"Tuvalu Description":"Funafuti, Vaiaku, Tokelau", -"UK_England_East Midlands Description":"Nottingham, Leicester, Derby", -"UK_England_East of England_Essex Description":"Luton, Colchester, Southend-on-Sea", -"UK_England_East of England_Norfolk Description":"Norwich, Peterborough, Cambridge", -"UK_England_Greater London Description":"London, Croydon, Ilford", -"UK_England_North East England Description":"Sunderland, Newcastle upon Tyne", -"UK_England_North West England_Lancaster Description":"Blackpool, Whitehaven, Egremont", -"UK_England_North West England_Manchester Description":"Manchester, Liverpool, Salford", -"UK_England_South East_Brighton Description":"Brighton, Royal Tunbridge Wells, Maidstone", -"UK_England_South East_Oxford Description":"Southampton, Milton Keynes, Portsmouth", -"UK_England_South West England_Bristol Description":"Bristol, City of Bath, Bournemouth", -"UK_England_South West England_Cornwall Description":"Plymouth, Exeter, St Ives", -"UK_England_West Midlands Description":"Birmingham, Coventry, Wolverhampton", -"UK_England_Yorkshire and the Humber Description":"Sheffield, Wakefield, Bradford", -"UK_Northern Ireland Description":"Newry, Belfast, Londonderry/Derry", -"UK_Scotland_North Description":"Aberdeen, Dundee, Tobermory", -"UK_Scotland_South Description":"Glasgow, Edinburgh, Millport", -"UK_Wales Description":"Cardiff, Swansea, Newport", -"US_Alabama_Birmingham Description":"Warrior, Vestavia Hills, Scottsboro", -"US_Alabama_Montgomery Description":"Creola, Centreville, Valley", -"US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright", -"US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low", -"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa", -"US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee", -"US_Arkansas_North Description":"Ward, Cabot, Des Arc", -"US_Arkansas_South Description":"Stamps, Rockport, Rockport", -"US_California_Bakersfield_Bakersfield Description":"Arroyo Grande, Pismo Beach, Maricopa", -"US_California_Bakersfield_Lancaster Description":"Hesperia, Big Bear Lake, Holtville", -"US_California_Chico Description":"Tehama, Cloverdale, Cloverdale", -"US_California_LA Description":"Los Angeles, Long Beach, Rosemead", -"US_California_LA North Description":"Santa Barbara, Ojai, Avalon", -"US_California_Redding Description":"Ferndale, Rio Dell, Arcata", -"US_California_Sacramento_Fresno Description":"Fresno, Selma, Bishop", -"US_California_Sacramento_Sacramento Description":"Sacramento, West Sacramento, Placerville", -"US_California_Sacramento_Stockton Description":"Ceres, Ione, Tracy", -"US_California_San Diego Description":"San Diego, San Marcos, Banning", -"US_California_Santa_Clara_Palo Alto Description":"San José, San Francisco, Los Altos", -"US_California_Santa_Clara_Santa Cruz Description":"Seaside, Gonzales, Gonzales", -"US_Colorado_Aspen Description":"Central City, Black Hawk, Woodland Park", -"US_Colorado_Denver Description":"Denver, Colorado Springs, Commerce City", -"US_Colorado_South Description":"Salida, Walsenburg, Las Animas", -"US_Connecticut Description":"East Haven, Groton, Thomaston", -"US_Delaware Description":"City of Seaford, Rehoboth Beach, Milford", -"US_Florida_Gainesville Description":"Gainesville, Palm Bay, Melbourne", -"US_Florida_Jacksonville Description":"Jacksonville, Panama City Beach, Lynn Haven", -"US_Florida_Miami Description":"Miami, Marco Island, Fort Lauderdale", -"US_Florida_Orlando Description":"Orlando, Deltona, Kissimmee", -"US_Florida_Tampa Description":"Oldsmar, Tampa, Saint Petersburg", -"US_Georgia_Atlanta Description":"Atlanta, Chamblee, Walnut Grove", -"US_Georgia_Macon Description":"Grovetown, Perry, Byron", -"US_Georgia_North Description":"Emerson, Jefferson, Cartersville", -"US_Georgia_South Description":"De Soto, Santa Claus, Pearson", -"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José", -"US_Hawaii Description":"Hilo, Kailua-Kona, Kahului", -"US_Idaho_North Description":"Huetter, Peck, Hayden", -"US_Idaho_South Description":"Arco, Middleton, Greenleaf", -"US_Illinois_Chickago Description":"Chicago, Palos Hills, Park City", -"US_Illinois_Elgin Description":"Geneva, Country Club Hills, Wheaton", -"US_Illinois_Rockford Description":"Princeton, Prophetstown, Moline", -"US_Illinois_South Description":"Casey, Wamac, Mount Vernon", -"US_Illinois_Springfield Description":"Mount Pulaski, Lacon, Kewanee", -"US_Indiana_Evansville Description":"Rockport, New Albany, Princeton", -"US_Indiana_Indianapolis Description":"Indianapolis, Connersville, Greensburg", -"US_Indiana_North Description":"Elwood, Kokomo, Whiting", -"US_Iowa_Des Moines Description":"Indianola, Slater, Martensdale", -"US_Iowa_Waterloo Description":"Dixon, Floyd, Elma", -"US_Iowa_West Description":"Churdan, Orange City, Paton", -"US_Kansas_East Description":"Benedict, Coffeyville, Severance", -"US_Kansas_West Description":"Burr Oak, Hunter, Randolph", -"US_Kansas_Wichita Description":"Whitewater, Cedar Point, Sublette", -"US_Kentucky_East Description":"Hyden, Stanton, Pineville", -"US_Kentucky_Louisville Description":"Louisville, Fordsville, Meadowview Estates", -"US_Kentucky_West Description":"Marion, Corydon, Barlow", -"US_Louisiana_Central Description":"Pineville, Marksville, Bunkie", -"US_Louisiana_New Orleans Description":"Bogalusa, Gonzales, Plaquemine", -"US_Maine Description":"Westbrook, Brewer, South Portland", -"US_Maryland_Baltimore Description":"Baltimore, Pocomoke City, Crisfield", -"US_Maryland_and_DC Description":"Washington, D.C., Gaithersburg, Bowie", -"US_Massachusetts_Boston Description":"Boston, Lowell, Cambridge", -"US_Massachusetts_Central Description":"Fitchburg, Southbridge, Leominster", -"US_Massachusetts_Plymouth Description":"Brockton, New Bedford, Fall River", -"US_Massachusetts_Southeastern Description":"Barnstable, Falmouth, Yarmouth", -"US_Massachusetts_West Description":"Greenfield, Springfield", -"US_Michigan_Detroit Description":"Detroit, Hamtramck, Keego Harbor", -"US_Michigan_Grand Rapids Description":"Manton, Whitehall, Muskegon", -"US_Michigan_Lansing Description":"City of Burton, Lapeer, Tawas City", -"US_Michigan_North Description":"Caspian, Iron Mountain, Gaastra", -"US_Minnesota_Minneapolis Description":"Lindstrom, Forest Lake, Greenfield", -"US_Minnesota_North Description":"Erskine, Gully, Hackensack", -"US_Minnesota_Rochester Description":"Arco, New Auburn, Welcome", -"US_Minnesota_Saint Cloud Description":"Brooten, St. Rosa, Genola", -"US_Mississippi_Gulfport Description":"D'Iberville, Ocean Springs, Lucedale", -"US_Mississippi_North Description":"Rolling Fork, Leland, Collins", -"US_Missouri_East Description":"Scott City, Ellington, Viburnum", -"US_Missouri_Kansas Description":"Kansas City, Belton, Gallatin", -"US_Missouri_Springfield Description":"Conway, Osceola, Battlefield", -"US_Missouri_St Louis Description":"Queen City, La Grange, Fulton", -"US_Montana_East Description":"Harlem, Hobson, Colstrip", -"US_Montana_West Description":"Cut Bank, Kalispell, Shelby", -"US_Nebraska_East Description":"Omaha, Stanton, Pawnee City", -"US_Nebraska_West Description":"Bassett, Long Pine, Bloomfield", -"US_Nevada Description":"Las Vegas, Winnemucca, Caliente", -"US_New Hampshire Description":"Somersworth, Laconia, Franklin", -"US_New Jersey_North Description":"Hackensack, Garfield, Lambertville", -"US_New Jersey_South Description":"Absecon, Long Branch, Margate City", -"US_New Mexico_Albuquerque Description":"Albuquerque, Raton, Bloomfield", -"US_New Mexico_Roswell Description":"Eunice, Socorro, Jal", -"US_New York_East Description":"Brookhaven, New Rochelle, Mount Vernon", -"US_New York_New York Description":"New York, New York City, Inwood", -"US_New York_North Description":"City of Cohoes, City of Schenectady, Beacon", -"US_New York_West Description":"Oswego, Jamestown, North Tonawanda", -"US_North Carolina_Asheville Description":"Morganton, Brevard, Marion", -"US_North Carolina_Charlotte Description":"Charlotte, Shelby, Statesville", -"US_North Carolina_Greensboro Description":"Thomasville, Hamlet, Albemarle", -"US_North Carolina_Raleigh Description":"Raleigh, Roxboro, Graham", -"US_North Carolina_Wilmington Description":"Clinton, Boiling Spring Lakes, Laurinburg", -"US_North Carolina_Wilson Description":"New Bern, Havelock, Elizabeth City", -"US_North Dakota_Bismarck Description":"Zap, Reeder, Stanton", -"US_North Dakota_East Description":"Harwood, Cavalier, Lakota", -"US_North Dakota_Minot Description":"Makoti, Bowdon, Kramer", -"US_Ohio_Cincinnati Description":"St. Bernard, Centerville, Madeira", -"US_Ohio_Cleveland Description":"Streetsboro, Willoughby Hills, Avon Lake", -"US_Ohio_Columbus Description":"Columbus, Pickerington, Reynoldsburg", -"US_Ohio_Toledo Description":"Bucyrus, Crestline, Maumee", -"US_Oklahoma_East Description":"Ada, Coalgate, Konawa", -"US_Oklahoma_Oklahoma Description":"Oklahoma City, Noble, Del City", -"US_Oklahoma_Tulsa Description":"Shidler, Prague, Beggs", -"US_Oklahoma_West Description":"Cherokee, Thomas, Perry", -"US_Oregon_Eugene Description":"Albany, Medford, Coos Bay", -"US_Oregon_Portland Description":"Salem, Newport, Government Camp", -"US_Oregon_West Description":"Bend, The Dalles, Klamath Falls", -"US_Pennsylvania_Central Description":"DuBois, St. Marys, Latrobe", -"US_Pennsylvania_Pittsburgh Description":"New Kensington, Uniontown, Monongahela", -"US_Pennsylvania_Reading Description":"Philadelphia, Coatesville, Reading", -"US_Pennsylvania_Scranton Description":"Carbondale, Pittston, Williamsport", -"US_Puerto Rico Description":"San Juan, Mayaguez, Ponce", -"US_Rhode Island Description":"Narragansett, Providence, Warwick", -"US_South Carolina_Charleston Description":"Barnwell, Goose Creek, Folly Beach", -"US_South Carolina_Columbia Description":"Belton, Travelers Rest, Walhalla", -"US_South Carolina_Florence Description":"Tega Cay, Bishopville, Johnsonville", -"US_South Dakota Description":"Irene, Centerville, Baltic", -"US_Tennessee_East Description":"Pigeon Forge, Celina, Friendsville", -"US_Tennessee_West Description":"Memphis, Nashville, Medina", -"US_Texas_Amarillo Description":"Pampa, Jolly, Howardwick", -"US_Texas_Austin Description":"Austin, Hutto, Belton", -"US_Texas_Dallas Description":"Dallas, Fort Worth, Rowlett", -"US_Texas_Houston Description":"Houston, Seabrook, Plum Grove", -"US_Texas_Lubbock Description":"Sudan, Ralls, Goree", -"US_Texas_San Antonio Description":"San Antonio, Rockport, Mathis", -"US_Texas_Southwest Description":"Leakey, Camp Wood, Carrizo Springs", -"US_Texas_Tyler Description":"Troup, Cottonwood, Fate", -"US_Texas_Victoria Description":"Niederwald, Lockhart, Palacios", -"US_Texas_Wako Description":"Calvert, Golinda, Bruceville-Eddy", -"US_Texas_West Description":"El Paso, Westbrook, Stanton", -"US_United States Minor Outlying Islands Description":"Lulu Town, Millersville", -"US_Utah_North Description":"Holladay, South Ogden, Murray", -"US_Utah_South Description":"Parowan, Hildale, Enoch", -"US_Vermont Description":"Saint Albans, Barre, South Burlington", -"US_Virginia_Alexandria Description":"Fairfax, Fredericksburg, Falls Church", -"US_Virginia_Lynchburg Description":"Lynchburg City, Bedford, Staunton", -"US_Virginia_Norfolk Description":"Virginia Beach, Poquoson City, Franklin City", -"US_Virginia_Richmond Description":"Emporia, Colonial Heights, Richmond", -"US_Virginia_Roanoke Description":"Galax, Norton, Radford City", -"US_Washington_Coast Description":"Raymond, Camas, Port Townsend", -"US_Washington_Seattle Description":"Seattle, Edmonds, Sultan", -"US_Washington_Yakima Description":"Pullman, Grand Coulee, White Salmon", -"US_West Virginia Description":"Stonewood, Bluefield, Mullens", -"US_Wisconsin_Eau Claire Description":"Durand, Fountain City, River Falls", -"US_Wisconsin_Madison Description":"Edgerton, Mineral Point, Brodhead", -"US_Wisconsin_Milwaukee Description":"Milwaukee, Lake Mills, Brillion", -"US_Wisconsin_North Description":"Montreal, Tomahawk, Marinette", -"US_Wyoming Description":"Worland, Rawlins, Kemmerer", -"Uganda Description":"Kampala, Yumbe, Kanoni", -"Ukraine_Cherkasy Oblast Description":"Tšerkasõ, Uman, Smila", -"Ukraine_Chernihiv Oblast Description":"Tšernihiv, Nižõn, Pryluky", -"Ukraine_Chernivtsi Oblast Description":"Tšernivtsi, Storožinets, Zastavna", -"Ukraine_Dnipropetrovsk Oblast Description":"Dnipropetrovsk, Krivoy Rog, Dniprodzerzhynsk", -"Ukraine_Donetsk Oblast Description":"Donetsk, Mariupol, Makiivka", -"Ukraine_Ivano-Frankivsk Oblast Description":"Ivano-Frankivsk, Kalush, Kolomyia", -"Ukraine_Kharkiv Oblast Description":"Harkiv, Lozova, Kupiansk", -"Ukraine_Kherson Oblast Description":"Herson, Nova Kahhovka, Наддніпрянське", -"Ukraine_Khmelnytskyi Oblast Description":"Hmelnõtski, Kamianets-Podilski, Šepetivka", -"Ukraine_Kirovohrad Oblast Description":"Kirovohrad, Oleksandriia, Svitlovodsk", -"Ukraine_Kyiv Oblast Description":"Kiiev, Bila Tserkva, Brovary", -"Ukraine_Luhansk Oblast Description":"Luhansk, Alchevsk, Sievierodonetsk", -"Ukraine_Lviv Oblast Description":"Lviv, Sambiri linnavolikogu, Drohobych", -"Ukraine_Mykolaiv Oblast Description":"Mykolaiv, Pervomaisk, Yuzhnoukrainsk", -"Ukraine_Odessa Oblast Description":"Odessa, Izmail, Chornomorsk", -"Ukraine_Poltava Oblast Description":"Poltava, Krementšuk, Komsomolsk", -"Ukraine_Rivne Oblast Description":"Rivne, Kuznetsovsk, Dubno", -"Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka", -"Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets", -"Ukraine_Vinnytsia Oblast Description":"Vinnõtsja, Ворошиловка, Zhmerynka", -"Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk", -"Ukraine_Zakarpattia Oblast Description":"Uzhhorod, Mukacheve, Khust", -"Ukraine_Zaporizhia Oblast Description":"Zaporižži, Melitopol, Berdiansk", -"Ukraine_Zhytomyr Oblast Description":"Žõtomõr, Berdõtšiv, Korosten", -"United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman", -"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted", -"Uruguay Description":"Montevideo, Ciudad de la Costa, Salto", -"Uzbekistan Description":"Taškent, Kokand, Namangan", -"Vanuatu Description":"Port Vila, Vao Mainland, Saratamata", -"Venezuela_North Description":"Valencia, Barquisimeto, Maracay", -"Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal", -"Vietnam Description":"Hanoi, Ho Chi Minh City, Vung Tau", -"Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai", -"Yemen Description":"Sana'a, Sanʿaʾ, Aden", -"Zambia Description":"Lusaka, Kitwe, Ndola", -"Zimbabwe Description":"Harare, Hwange, Masvingo", -"United States of America Short":"USA", -"Bosnia and Herzegovina Short":"B&H", -"Palestine Region Short":"Palestiina", -"United Kingdom Short":"UK", -"Czech Republic Short":"Tšehhi", -"Argentina_Buenos Aires_North Short":"Buenos Aires", -"Argentina_Buenos Aires_South Short":"Buenos Aires", -"Austria_Lower Austria_West Short":"Alam-Austria", -"Brazil_Southeast Region_Minas Gerais_North Short":"Minas Gerais", -"Brazil_Southeast Region_Sao Paulo_West Short":"São Paulo", -"Czech_Stredni Cechy_East Short":"Kesk-Böömimaa piirkond", -"Czech_Stredni Cechy_West Short":"Kesk-Böömimaa piirkond", -"Finland_Southern Finland_West Short":"Edela-Soome", -"Germany_Brandenburg_North Short":"Brandenburg", -"Germany_Brandenburg_South Short":"Brandenburg", -"Germany_Rhineland-Palatinate_South Short":"Rheinland-Pfalz", -"Mexico_Central_East Short":"Nuevo León", -"Mexico_Central_West Short":"Nayarit", -"Netherlands_Gelderland_North Short":"Gelderland", -"Norway_Central Short":"Oslo", -"Philippines_Luzon_North Short":"Luzon", -"Philippines_Luzon_South Short":"Luzon", -"Romania_North_East Short":"Kirde-Rumeenia", -"Romania_North_West Short":"Loode-Rumeenia", -"Romania_South Short":"Lõuna-Rumeenia", -"Romania_South_East Short":"Edela-Rumeenia", -"Romania_South_West Short":"Edel", -"Romania_West Short":"Lääs", -"Russia_Arkhangelsk Oblast_Central Short":"Arhangelski oblast", -"Russia_Arkhangelsk Oblast_North Short":"Arhangelski oblast", -"Switzerland_Central Short":"Kesk-Šveits", -"UK_Scotland_North Short":"Šotimaa", -"UK_Scotland_South Short":"Šotimaa", -"Brazil_Goias_North Short":"Goiás", -"Brazil_North Region_East Short":"Põhjapiirkond", -"Brazil_North Region_West Short":"Põhjapiirkond", -"Brazil_Northeast Region_East Short":"Kirdepiirkond", -"Brazil_Northeast Region_West Short":"Kirdepiirkond", -"Brazil_Parana_East Short":"Paraná", -"Brazil_Parana_West Short":"Paraná", -"Brazil_South Region_East Short":"Lõunapiirkond", -"Brazil_South Region_West Short":"Lõunapiirkond", -"Congo-Kinshasa Short":"Kongo", -"Finland_Eastern Finland_North Short":"Ida-Soome", -"Finland_Eastern Finland_South Short":"Ida-Soome", -"France_Free County_North Short":"Franche-Comté", -"France_Free County_South Short":"Franche-Comté", -"India_Karnataka_North Short":"Karnataka", -"India_Karnataka_South Short":"Karnataka", -"Russia_Krasnoyarsk Krai_North Short":"Krasnojarski krai", -"Russia_Krasnoyarsk Krai_South Short":"Krasnojarski krai", -"Russia_Moscow Oblast_East Short":"Moskva oblast", -"Russia_Moscow Oblast_West Short":"Moskva oblast", -"Russia_Perm Krai_North Short":"Permi krai", -"Russia_Perm Krai_South Short":"Permi krai", -"Russia_Republic of Karelia_North Short":"Karjala Vabariik", -"Russia_Republic of Karelia_South Short":"Karjala Vabariik", -"Russia_Sverdlovsk Oblast_North Short":"Sverdlovski oblast", -"Spain_Castile and Leon_East Short":"Kastiilia ja León", -"Spain_Castile and Leon_West Short":"Kastiilia ja León", -"Spain_Galicia_North Short":"Galicia", -"Spain_Galicia_South Short":"Galicia", -"Switzerland_Espace Mittelland_East Short":"Espace Mittelland" -} diff --git a/data/countries-strings/eu.json/localize.json b/data/countries-strings/eu.json/localize.json index 0cd28e7b3e..be0305ee60 100644 --- a/data/countries-strings/eu.json/localize.json +++ b/data/countries-strings/eu.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabria", "Spain_Castile and Leon":"Gaztela eta Leon", "Spain_Castile-La Mancha":"Gaztela-Mantxa", -"Spain_Catalonia_Provincia de Barcelona":"Katalunia – Bartzelonako probintzia", -"Spain_Catalonia_Provincia de Girona":"Katalunia – Gironako probintzia", -"Spain_Catalonia_Provincia de Lleida":"Katalunia – Lleidako probintzia", -"Spain_Catalonia_Provincia de Tarragona":"Katalunia – Tarragonako probintzia", +"Spain_Catalonia_Provincia de Barcelona":"Bartzelonako probintzia", +"Spain_Catalonia_Provincia de Girona":"Gironako probintzia", +"Spain_Catalonia_Provincia de Lleida":"Lleidako probintzia", +"Spain_Catalonia_Provincia de Tarragona":"Tarragonako probintzia", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrilgo Erkidegoa", "Spain_Comunidad Foral de Navarra":"Nafarroa", diff --git a/data/countries-strings/fi.json/localize.json b/data/countries-strings/fi.json/localize.json index 32868b0509..31074ebe23 100644 --- a/data/countries-strings/fi.json/localize.json +++ b/data/countries-strings/fi.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabria", "Spain_Castile and Leon":"Kastilia ja León", "Spain_Castile-La Mancha":"Kastilia- La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalonia – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Katalonia – Girona", -"Spain_Catalonia_Provincia de Lleida":"Katalonia – leida", -"Spain_Catalonia_Provincia de Tarragona":"Katalonia – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/fr.json/localize.json b/data/countries-strings/fr.json/localize.json index ee9fff14c6..2caa992ee8 100644 --- a/data/countries-strings/fr.json/localize.json +++ b/data/countries-strings/fr.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabrie", "Spain_Castile and Leon":"Castille-et-León", "Spain_Castile-La Mancha":"Castille-La Manche", -"Spain_Catalonia_Provincia de Barcelona":"Catalogne – Province de Barcelone", -"Spain_Catalonia_Provincia de Girona":"Catalogne – Province de Gérone", -"Spain_Catalonia_Provincia de Lleida":"Catalogne – Province de Lérida", -"Spain_Catalonia_Provincia de Tarragona":"Catalogne – Province de Tarragone", +"Spain_Catalonia_Provincia de Barcelona":"Province de Barcelone", +"Spain_Catalonia_Provincia de Girona":"Province de Gérone", +"Spain_Catalonia_Provincia de Lleida":"province de Lérida", +"Spain_Catalonia_Provincia de Tarragona":"Province de Tarragone", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"communauté de Madrid", "Spain_Comunidad Foral de Navarra":"communauté forale de Navarre", diff --git a/data/countries-strings/he.json/localize.json b/data/countries-strings/he.json/localize.json index 015a7dc4a5..3bd6f64336 100644 --- a/data/countries-strings/he.json/localize.json +++ b/data/countries-strings/he.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"קנטבריה", "Spain_Castile and Leon":"קסטיליה ולאון", "Spain_Castile-La Mancha":"קסטיליה-לה מנצ'ה", -"Spain_Catalonia_Provincia de Barcelona":"קטלוניה – מחוז ברצלונה", -"Spain_Catalonia_Provincia de Girona":"קטלוניה – מחוז ז'ירונה", -"Spain_Catalonia_Provincia de Lleida":"קטלוניה – מחוז ג'ירונה", -"Spain_Catalonia_Provincia de Tarragona":"קטלוניה – מחוז טרגונה", +"Spain_Catalonia_Provincia de Barcelona":"", +"Spain_Catalonia_Provincia de Girona":"מחוז ז'ירונה", +"Spain_Catalonia_Provincia de Lleida":"", +"Spain_Catalonia_Provincia de Tarragona":"מחוז טרגונה", "Spain_Ceuta":"סאוטה", "Spain_Community of Madrid":"מדריד", "Spain_Comunidad Foral de Navarra":"נווארה", diff --git a/data/countries-strings/hu.json/localize.json b/data/countries-strings/hu.json/localize.json index 7eb726b67b..66d9a21c55 100644 --- a/data/countries-strings/hu.json/localize.json +++ b/data/countries-strings/hu.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantábria", "Spain_Castile and Leon":"Kasztília és León", "Spain_Castile-La Mancha":"Kasztília-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalónia – Barcelona tartomány", -"Spain_Catalonia_Provincia de Girona":"Katalónia – Girona", -"Spain_Catalonia_Provincia de Lleida":"Katalónia – Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Katalónia – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona tartomány", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid tartomány", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/id.json/localize.json b/data/countries-strings/id.json/localize.json index d8832603d0..c001035604 100644 --- a/data/countries-strings/id.json/localize.json +++ b/data/countries-strings/id.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castilla y León", "Spain_Castile-La Mancha":"Castilla-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalunya – Provinsi Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalunya – Provinsi Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalunya – Provinsi Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Catalunya – Provinsi Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Provinsi Barcelona", +"Spain_Catalonia_Provincia de Girona":"Provinsi Girona", +"Spain_Catalonia_Provincia de Lleida":"Provinsi Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Provinsi Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/it.json/localize.json b/data/countries-strings/it.json/localize.json index e94f43a682..c7010847f3 100644 --- a/data/countries-strings/it.json/localize.json +++ b/data/countries-strings/it.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castiglia e León", "Spain_Castile-La Mancha":"Castiglia-La Mancia", -"Spain_Catalonia_Provincia de Barcelona":"Catalogna – Provincia di Barcellona", -"Spain_Catalonia_Provincia de Girona":"Catalogna – Provincia di Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalogna – Provincia di Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Catalogna – Provincia di Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Provincia di Barcellona", +"Spain_Catalonia_Provincia de Girona":"Provincia di Girona", +"Spain_Catalonia_Provincia de Lleida":"Provincia di Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Provincia di Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"comunità di Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/ja.json/localize.json b/data/countries-strings/ja.json/localize.json index d086c7baee..2d10de60ab 100644 --- a/data/countries-strings/ja.json/localize.json +++ b/data/countries-strings/ja.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"カンタブリア州", "Spain_Castile and Leon":"カスティーリャ・レオン州", "Spain_Castile-La Mancha":"カスティーリャ・ラ・マンチャ州", -"Spain_Catalonia_Provincia de Barcelona":"カタロニア – バルセロナ県", -"Spain_Catalonia_Provincia de Girona":"カタロニア – ジローナ県", -"Spain_Catalonia_Provincia de Lleida":"カタロニア – リェイダ県", -"Spain_Catalonia_Provincia de Tarragona":"カタロニア – タラゴナ県", +"Spain_Catalonia_Provincia de Barcelona":"バルセロナ県", +"Spain_Catalonia_Provincia de Girona":"ジローナ県", +"Spain_Catalonia_Provincia de Lleida":"リェイダ県", +"Spain_Catalonia_Provincia de Tarragona":"タラゴナ県", "Spain_Ceuta":"セウタ", "Spain_Community of Madrid":"マドリード州", "Spain_Comunidad Foral de Navarra":"ナバラ州", diff --git a/data/countries-strings/ko.json/localize.json b/data/countries-strings/ko.json/localize.json index a23a99c8fb..fa89640d8f 100644 --- a/data/countries-strings/ko.json/localize.json +++ b/data/countries-strings/ko.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"칸타브리아 지방", "Spain_Castile and Leon":"카스티야이레온 지방", "Spain_Castile-La Mancha":"카스티야라만차 지방", -"Spain_Catalonia_Provincia de Barcelona":"카탈로니아 – 바르셀로나 주", -"Spain_Catalonia_Provincia de Girona":"카탈로니아 – 지로나 주", -"Spain_Catalonia_Provincia de Lleida":"카탈로니아 – 예이다 주", -"Spain_Catalonia_Provincia de Tarragona":"카탈로니아 – 타라고나 주", +"Spain_Catalonia_Provincia de Barcelona":"바르셀로나 주", +"Spain_Catalonia_Provincia de Girona":"지로나 주", +"Spain_Catalonia_Provincia de Lleida":"예이다 주", +"Spain_Catalonia_Provincia de Tarragona":"타라고나 주", "Spain_Ceuta":"세우타", "Spain_Community of Madrid":"마드리드 지방", "Spain_Comunidad Foral de Navarra":"나바라 지방", diff --git a/data/countries-strings/mr.json/localize.json b/data/countries-strings/mr.json/localize.json index 526d518144..10b9cd97cb 100644 --- a/data/countries-strings/mr.json/localize.json +++ b/data/countries-strings/mr.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castile and León", "Spain_Castile-La Mancha":"Castile-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonia – Barcelona Province", -"Spain_Catalonia_Provincia de Girona":"Catalonia – Girona Province", -"Spain_Catalonia_Provincia de Lleida":"Catalonia – Lleida Province", -"Spain_Catalonia_Provincia de Tarragona":"Catalonia – Tarragona Province", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona Province", +"Spain_Catalonia_Provincia de Girona":"Girona Province", +"Spain_Catalonia_Provincia de Lleida":"Lleida Province", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona Province", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Community of Madrid", "Spain_Comunidad Foral de Navarra":"Navarre", diff --git a/data/countries-strings/nb.json/localize.json b/data/countries-strings/nb.json/localize.json index 69b9c1190a..8d25cfade8 100644 --- a/data/countries-strings/nb.json/localize.json +++ b/data/countries-strings/nb.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castilla y León", "Spain_Castile-La Mancha":"Castilla-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonia – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalonia – Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalonia – Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Catalonia – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/nl.json/localize.json b/data/countries-strings/nl.json/localize.json index de97566c03..6042786c6b 100644 --- a/data/countries-strings/nl.json/localize.json +++ b/data/countries-strings/nl.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabrië", "Spain_Castile and Leon":"Castilië en León", "Spain_Castile-La Mancha":"Castilië-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonië – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalonië – Gerona", -"Spain_Catalonia_Provincia de Lleida":"Catalonië – Lerida", -"Spain_Catalonia_Provincia de Tarragona":"Catalonië – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Gerona", +"Spain_Catalonia_Provincia de Lleida":"Lerida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/pl.json/localize.json b/data/countries-strings/pl.json/localize.json index b33d4a5d3a..c5640de199 100644 --- a/data/countries-strings/pl.json/localize.json +++ b/data/countries-strings/pl.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabria", "Spain_Castile and Leon":"Kastylia i León", "Spain_Castile-La Mancha":"Kastylia-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalonia – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Katalonia – Girona", -"Spain_Catalonia_Provincia de Lleida":"Katalonia – Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Katalonia – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madryt", "Spain_Comunidad Foral de Navarra":"Nawarra", diff --git a/data/countries-strings/pt.json/localize.json b/data/countries-strings/pt.json/localize.json index 1da7c98403..64a2867610 100644 --- a/data/countries-strings/pt.json/localize.json +++ b/data/countries-strings/pt.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantábria", "Spain_Castile and Leon":"Castela e Leão", "Spain_Castile-La Mancha":"Castela-Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalunha – Província de Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalunha – Província de Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalunha – Província de Lérida", -"Spain_Catalonia_Provincia de Tarragona":"Catalunha – Província de Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Província de Lérida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Comunidade autónoma de Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/ro.json/localize.json b/data/countries-strings/ro.json/localize.json index dc3ef02a94..da931acdeb 100644 --- a/data/countries-strings/ro.json/localize.json +++ b/data/countries-strings/ro.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castilia și León", "Spain_Castile-La Mancha":"Castilia-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonia – Provincia Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalonia – Provincia Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalonia – Provincia Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Catalonia – Provincia Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Provincia Barcelona", +"Spain_Catalonia_Provincia de Girona":"Provincia Girona", +"Spain_Catalonia_Provincia de Lleida":"Provincia Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Provincia Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/ru.json/localize.json b/data/countries-strings/ru.json/localize.json index 9e9e004ff4..2b767158d2 100644 --- a/data/countries-strings/ru.json/localize.json +++ b/data/countries-strings/ru.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Кантабрия", "Spain_Castile and Leon":"Кастилия и Леон", "Spain_Castile-La Mancha":"Кастилия — Ла-Манча", -"Spain_Catalonia_Provincia de Barcelona":"Каталония – Барселона", -"Spain_Catalonia_Provincia de Girona":"Каталония – Херона", -"Spain_Catalonia_Provincia de Lleida":"Каталония – Лерида", -"Spain_Catalonia_Provincia de Tarragona":"Каталония – Таррагона", +"Spain_Catalonia_Provincia de Barcelona":"Барселона", +"Spain_Catalonia_Provincia de Girona":"Херона", +"Spain_Catalonia_Provincia de Lleida":"Лерида", +"Spain_Catalonia_Provincia de Tarragona":"Таррагона", "Spain_Ceuta":"Сеута", "Spain_Community of Madrid":"Мадрид", "Spain_Comunidad Foral de Navarra":"Наварра", diff --git a/data/countries-strings/sk.json/localize.json b/data/countries-strings/sk.json/localize.json index e501da128e..6b15d61b26 100644 --- a/data/countries-strings/sk.json/localize.json +++ b/data/countries-strings/sk.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantábria", "Spain_Castile and Leon":"Castile and León", "Spain_Castile-La Mancha":"Castile-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalánsko – Barcelona Province", -"Spain_Catalonia_Provincia de Girona":"Katalánsko – Girona Province", -"Spain_Catalonia_Provincia de Lleida":"Katalánsko – Lleida Province", -"Spain_Catalonia_Provincia de Tarragona":"Katalánsko – Tarragona Province", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona Province", +"Spain_Catalonia_Provincia de Girona":"Girona Province", +"Spain_Catalonia_Provincia de Lleida":"Lleida Province", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona Province", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madridské spoločenstvo", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/sv.json/localize.json b/data/countries-strings/sv.json/localize.json index 739e2695c5..68926cfa9b 100644 --- a/data/countries-strings/sv.json/localize.json +++ b/data/countries-strings/sv.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabrien", "Spain_Castile and Leon":"Kastilien och León", "Spain_Castile-La Mancha":"Kastilien-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalonien – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Katalonien – Girona", -"Spain_Catalonia_Provincia de Lleida":"Katalonien – Lleida", -"Spain_Catalonia_Provincia de Tarragona":"Katalonien – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Lleida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/th.json/localize.json b/data/countries-strings/th.json/localize.json index dfab5f95c6..9fdd266b5b 100644 --- a/data/countries-strings/th.json/localize.json +++ b/data/countries-strings/th.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"แคว้นกันตาเบรีย", "Spain_Castile and Leon":"แคว้นคาสตีลและเลออน", "Spain_Castile-La Mancha":"แคว้นคาสตีล-ลามันชา", -"Spain_Catalonia_Provincia de Barcelona":"คาตาโลเนีย – จังหวัดบาร์เซโลนา", -"Spain_Catalonia_Provincia de Girona":"คาตาโลเนีย – จังหวัดกิโรนา", -"Spain_Catalonia_Provincia de Lleida":"คาตาโลเนีย – จังหวัดเลดา", -"Spain_Catalonia_Provincia de Tarragona":"คาตาโลเนีย – จังหวัดทาร์ราโกนา", +"Spain_Catalonia_Provincia de Barcelona":"จังหวัดบาร์เซโลนา", +"Spain_Catalonia_Provincia de Girona":"จังหวัดกิโรนา", +"Spain_Catalonia_Provincia de Lleida":"จังหวัดเลดา", +"Spain_Catalonia_Provincia de Tarragona":"จังหวัดทาร์ราโกนา", "Spain_Ceuta":"เซวตา", "Spain_Community of Madrid":"แคว้นมาดริด", "Spain_Comunidad Foral de Navarra":"แคว้นนาวาร์", diff --git a/data/countries-strings/tr.json/localize.json b/data/countries-strings/tr.json/localize.json index 8753646ef4..6d3080ee22 100644 --- a/data/countries-strings/tr.json/localize.json +++ b/data/countries-strings/tr.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Kantabria", "Spain_Castile and Leon":"Kastilya ve Leon", "Spain_Castile-La Mancha":"Kastilya-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Katalonya – Barselona ili", -"Spain_Catalonia_Provincia de Girona":"Katalonya – Gerona ili", -"Spain_Catalonia_Provincia de Lleida":"Katalonya – Lérida ili", -"Spain_Catalonia_Provincia de Tarragona":"Katalonya – Tarragona İli", +"Spain_Catalonia_Provincia de Barcelona":"Barselona ili", +"Spain_Catalonia_Provincia de Girona":"Gerona ili", +"Spain_Catalonia_Provincia de Lleida":"Lérida ili", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona İli", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/uk.json/localize.json b/data/countries-strings/uk.json/localize.json index b757380c65..3c512590f3 100644 --- a/data/countries-strings/uk.json/localize.json +++ b/data/countries-strings/uk.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Кантабрія", "Spain_Castile and Leon":"Кастилія-і-Леон", "Spain_Castile-La Mancha":"Кастилія — Ла-Манча", -"Spain_Catalonia_Provincia de Barcelona":"Каталонія – Барселона", -"Spain_Catalonia_Provincia de Girona":"Каталонія – Жирона", -"Spain_Catalonia_Provincia de Lleida":"Каталонія – Льєйда", -"Spain_Catalonia_Provincia de Tarragona":"Каталонія – Таррагона", +"Spain_Catalonia_Provincia de Barcelona":"Барселона", +"Spain_Catalonia_Provincia de Girona":"Жирона", +"Spain_Catalonia_Provincia de Lleida":"Льєйда", +"Spain_Catalonia_Provincia de Tarragona":"Таррагона", "Spain_Ceuta":"Сеута", "Spain_Community of Madrid":"Мадрид", "Spain_Comunidad Foral de Navarra":"Наварра", diff --git a/data/countries-strings/vi.json/localize.json b/data/countries-strings/vi.json/localize.json index 50ac88c203..be31800810 100644 --- a/data/countries-strings/vi.json/localize.json +++ b/data/countries-strings/vi.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"Cantabria", "Spain_Castile and Leon":"Castilla và León", "Spain_Castile-La Mancha":"Castile-La Mancha", -"Spain_Catalonia_Provincia de Barcelona":"Catalonia – Barcelona", -"Spain_Catalonia_Provincia de Girona":"Catalonia – Girona", -"Spain_Catalonia_Provincia de Lleida":"Catalonia – Lérida", -"Spain_Catalonia_Provincia de Tarragona":"Catalonia – Tarragona", +"Spain_Catalonia_Provincia de Barcelona":"Barcelona", +"Spain_Catalonia_Provincia de Girona":"Girona", +"Spain_Catalonia_Provincia de Lleida":"Lérida", +"Spain_Catalonia_Provincia de Tarragona":"Tarragona", "Spain_Ceuta":"Ceuta", "Spain_Community of Madrid":"Cộng đồng Madrid", "Spain_Comunidad Foral de Navarra":"Navarra", diff --git a/data/countries-strings/zh-Hans.json/localize.json b/data/countries-strings/zh-Hans.json/localize.json index a2a387c67b..09284e7f79 100644 --- a/data/countries-strings/zh-Hans.json/localize.json +++ b/data/countries-strings/zh-Hans.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"坎塔布里亚", "Spain_Castile and Leon":"卡斯蒂利亚-莱昂", "Spain_Castile-La Mancha":"卡斯蒂利亚-拉曼恰", -"Spain_Catalonia_Provincia de Barcelona":"加泰罗尼亚 – 巴塞罗那省", -"Spain_Catalonia_Provincia de Girona":"加泰罗尼亚 – 赫罗纳省", -"Spain_Catalonia_Provincia de Lleida":"加泰罗尼亚 – 莱里达省", -"Spain_Catalonia_Provincia de Tarragona":"加泰罗尼亚 – 塔拉戈纳省", +"Spain_Catalonia_Provincia de Barcelona":"巴塞罗那省", +"Spain_Catalonia_Provincia de Girona":"赫罗纳省", +"Spain_Catalonia_Provincia de Lleida":"莱里达省", +"Spain_Catalonia_Provincia de Tarragona":"塔拉戈纳省", "Spain_Ceuta":"休达", "Spain_Community of Madrid":"马德里自治区", "Spain_Comunidad Foral de Navarra":"纳瓦拉", diff --git a/data/countries-strings/zh-Hant.json/localize.json b/data/countries-strings/zh-Hant.json/localize.json index 0d16a1b5a6..b9d4ac2536 100644 --- a/data/countries-strings/zh-Hant.json/localize.json +++ b/data/countries-strings/zh-Hant.json/localize.json @@ -942,10 +942,10 @@ "Spain_Cantabria":"坎塔布里亞", "Spain_Castile and Leon":"卡斯蒂利亞-萊昂", "Spain_Castile-La Mancha":"卡斯蒂利亞-拉曼恰", -"Spain_Catalonia_Provincia de Barcelona":"加泰羅尼亞 – 巴塞羅那省", -"Spain_Catalonia_Provincia de Girona":"加泰羅尼亞 – 赫羅納省", -"Spain_Catalonia_Provincia de Lleida":"加泰羅尼亞 – 萊里達省", -"Spain_Catalonia_Provincia de Tarragona":"加泰羅尼亞 – 塔拉戈納省", +"Spain_Catalonia_Provincia de Barcelona":"巴塞羅那省", +"Spain_Catalonia_Provincia de Girona":"赫羅納省", +"Spain_Catalonia_Provincia de Lleida":"萊里達省", +"Spain_Catalonia_Provincia de Tarragona":"塔拉戈納省", "Spain_Ceuta":"休達", "Spain_Community of Madrid":"馬德里自治區", "Spain_Comunidad Foral de Navarra":"納瓦拉", diff --git a/data/countries.txt b/data/countries.txt index e200da218c..de57278d86 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -1,16 +1,16 @@ { - "v": 230210, + "v": 221029, "id": "Countries", "g": [ { "id": "World", - "s": 44169458, - "sha1_base64": "QE1C+/+BFqULgqEuvPHjK6gKg9o=" + "s": 40185789, + "sha1_base64": "FE6VkZQDMz7B7V5DHlfPIPg2bRI=" }, { "id": "WorldCoasts", - "s": 8749582, - "sha1_base64": "o7zpPStCRucC90zoJQ7+FAfuNNw=" + "s": 8748723, + "sha1_base64": "mAFgtKZwKozRvUYDV7kVRqJGx1A=" }, { "id": "Abkhazia", @@ -22,8 +22,8 @@ "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" ], - "s": 12146029, - "sha1_base64": "HGIXXib69GpBc4NWkL7+2joK3pA=" + "s": 12072493, + "sha1_base64": "S1DHscDxVS2VE/GocvVJ2OOtfEY=" }, { "id": "Afghanistan", @@ -67,8 +67,8 @@ "\u0648\u0644\u0627\u06cc\u062a \u063a\u0648\u0631", "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" ], - "s": 107489958, - "sha1_base64": "Chk95yZ4rLhV3vSXRqi8LuZVTkI=" + "s": 106775894, + "sha1_base64": "CKeXbryhKATOnfVZB0UsUl/X2KM=" }, { "id": "Albania", @@ -78,8 +78,8 @@ "affiliations": [ "Shqip\u00ebria" ], - "s": 46738357, - "sha1_base64": "rANnbk1FoMsteLHRRFeql0qvjMw=" + "s": 46266469, + "sha1_base64": "AzMrW2/B/FZthz5PVWXv95CTm+o=" }, { "id": "Algeria", @@ -109,8 +109,8 @@ "Tindouf \u2d5c\u2d49\u2d4f\u2d37\u2d53\u2d3c \u062a\u0646\u062f\u0648\u0641", "T\u00e9bessa - \u062a\u0628\u0633\u0629" ], - "s": 42867621, - "sha1_base64": "WcyiRzBfJiUF8VM3DVf+pU6svxg=" + "s": 41210013, + "sha1_base64": "C1diWdvKmh4j2RYUuY0HIxZ9i/g=" }, { "id": "Algeria_Coast", @@ -151,8 +151,8 @@ "Tizi Ouzou - \u2d5c\u2d49\u2d63\u2d49 \u2d53\u2d63\u2d63\u2d53 - \u062a\u064a\u0632\u064a \u0648\u0632\u0648", "Tlemcen - \u062a\u0644\u0645\u0633\u0627\u0646" ], - "s": 95007905, - "sha1_base64": "vb6e7bekrUTOOCdurAE/bO3+Klc=" + "s": 94296953, + "sha1_base64": "BMbLHYpWobHfBq6CoC8OozQOr24=" } ] }, @@ -164,8 +164,8 @@ "affiliations": [ "Andorra" ], - "s": 3645729, - "sha1_base64": "J//L9vxFZN5CkUe1SOocnFbw18U=" + "s": 3498457, + "sha1_base64": "8f6qO/ZcvPGLRnww3qrqkIAjge8=" }, { "id": "Angola", @@ -193,8 +193,8 @@ "Namibe", "Zaire" ], - "s": 56464909, - "sha1_base64": "sUZ6vNaQdlRR722LFlIwYyb4e+c=" + "s": 54024933, + "sha1_base64": "quG5bZ4jsYmba7qFs2bIcjytlz0=" }, { "id": "Anguilla", @@ -204,8 +204,8 @@ "affiliations": [ "Anguilla" ], - "s": 735348, - "sha1_base64": "jt5HgTCsC6BIbXW51LX7U2e+ErQ=" + "s": 734276, + "sha1_base64": "Q0hk6omvUhLhmzPmNcf56MW3+kg=" }, { "id": "Antigua and Barbuda", @@ -216,8 +216,8 @@ "Antigua and Barbuda", "Montserrat" ], - "s": 2503844, - "sha1_base64": "VlmPCVicHlT39fH8clLicENXWN4=" + "s": 2502317, + "sha1_base64": "IaaEXadseWD9AY/q+BvGtA0otKw=" }, { "id": "Barbados", @@ -227,8 +227,8 @@ "affiliations": [ "Barbados" ], - "s": 6122560, - "sha1_base64": "U1qJgwzHRJRXwy/B5nXGQAhatm8=" + "s": 6028712, + "sha1_base64": "IYwKgbaqH2U3AeCzeHGPPgUoSHw=" }, { "id": "British Virgin Islands", @@ -238,8 +238,8 @@ "affiliations": [ "British Virgin Islands" ], - "s": 1246118, - "sha1_base64": "0wnAxXNtxhB9M7ukDztEqgA/oYM=" + "s": 1245918, + "sha1_base64": "/1nElEd7SHMCrOAmIFG5Fn6vngg=" }, { "id": "Caribisch Nederland", @@ -257,8 +257,8 @@ "Aruba", "Curacao" ], - "s": 7810970, - "sha1_base64": "nkCmKjh9wc+Cv9/1Phv0SIrNeII=" + "s": 7796386, + "sha1_base64": "HBVssfKXNSBy7lAXvGu9dM+2FyM=" }, { "id": "Dominica", @@ -278,8 +278,8 @@ "Saint Joseph Parish", "Saint Peter Parish" ], - "s": 3759750, - "sha1_base64": "ZXQBev9CjAMuihBn6EVsLK621hE=" + "s": 3750941, + "sha1_base64": "9yD+hzyqspjLt1+WOSKlXcMnbi0=" }, { "id": "Grenada", @@ -289,8 +289,8 @@ "affiliations": [ "Grenada" ], - "s": 2506981, - "sha1_base64": "OWfWYRP/uLJ29N40LtNtJv1ktBo=" + "s": 2502324, + "sha1_base64": "6WEM4NDROMJG3KlL2vLYLysYgzM=" }, { "id": "Guadeloupe", @@ -302,8 +302,8 @@ "Guadeloupe", "Montserrat" ], - "s": 16332556, - "sha1_base64": "IjHpRXW4B8ez178D208kG/XrT4Y=" + "s": 16120460, + "sha1_base64": "o1dzMn7cJwuMMiNXd2E0IzLvIdA=" }, { "id": "Martinique", @@ -315,8 +315,8 @@ "Martinique", "Saint Lucia" ], - "s": 13196852, - "sha1_base64": "TRPZwVd1puy129rPXUNs1NPA4nU=" + "s": 13035979, + "sha1_base64": "sunIXU1NZmNKdphAGe9cB3us5kM=" }, { "id": "Montserrat", @@ -326,8 +326,8 @@ "affiliations": [ "Montserrat" ], - "s": 573548, - "sha1_base64": "PRjU7yLKUnKFXjB9zJ9VlYKY6Fo=" + "s": 572068, + "sha1_base64": "eHUoPzr+d59RTB1I5CRoch0DtZY=" }, { "id": "Saint Barthelemy", @@ -337,8 +337,8 @@ "affiliations": [ "France" ], - "s": 613043, - "sha1_base64": "4sGt+7aTaz6wzAu+s9/yqGxEcy0=" + "s": 606259, + "sha1_base64": "TGKHoBXRjGc1u3b3uRtpYEM1pTc=" }, { "id": "Saint Kitts and Nevis", @@ -348,8 +348,8 @@ "affiliations": [ "Saint Kitts and Nevis" ], - "s": 1662873, - "sha1_base64": "H8PyiCMnDXUuAovH6vFJ8mZHehE=" + "s": 1634841, + "sha1_base64": "OJQ+NPx+sxsGdz1VgqTIKN9iy4g=" }, { "id": "Saint Lucia", @@ -360,8 +360,8 @@ "Saint Lucia", "Saint Vincent and the Grenadines" ], - "s": 3803062, - "sha1_base64": "iT+vnp2bTdcvdeX76NnHm3hPquA=" + "s": 3569878, + "sha1_base64": "BeCDzVN65YC2ILIGlU1/clcid+E=" }, { "id": "Saint Martin", @@ -378,8 +378,8 @@ "Saint Martin (Dutch part)", "Sint Maarten (Netherlands)" ], - "s": 2361776, - "sha1_base64": "FMAPPj7IFwPKFRl3cKsPhQavwNA=" + "s": 2331120, + "sha1_base64": "r4Tx1gaQwMJDt1zuwvZnNykvaqg=" }, { "id": "Saint Vincent and the Grenadines", @@ -389,8 +389,8 @@ "affiliations": [ "Saint Vincent and the Grenadines" ], - "s": 2620912, - "sha1_base64": "Ze24T7UwqnpgL8cxPsUaXbAUxXc=" + "s": 2605592, + "sha1_base64": "GJy1Sye15WoNeNuSIFjTqh539IA=" }, { "id": "Trinidad and Tobago", @@ -400,8 +400,8 @@ "affiliations": [ "Trinidad and Tobago" ], - "s": 16635781, - "sha1_base64": "lV131FpDZWjHjM7g6xynvigQMKk=" + "s": 16620277, + "sha1_base64": "1H+5ll18xet6G6JejS9fFF7QlKE=" }, { "id": "United States Virgin Islands", @@ -416,8 +416,8 @@ "VI", "United States of America" ], - "s": 3363597, - "sha1_base64": "cgiczPMCBnviqbtZH8Ao/QCDZZ4=" + "s": 3364293, + "sha1_base64": "srguq7a61j5cwhrBZqVXTUZaIzI=" }, { "id": "Argentina", @@ -427,8 +427,8 @@ "affiliations": [ "Acuerdo de Campos de Hielo" ], - "s": 7565696, - "sha1_base64": "fkV3+HqFFrGQtj4aYXON3YsKMm4=" + "s": 7563656, + "sha1_base64": "d0XxBR648p7D3M3uOkmZ2UIy9Xw=" }, { "id": "Argentina_Buenos Aires_Buenos Aires", @@ -440,8 +440,8 @@ "Ciudad Aut\u00f3noma de Buenos Aires", "Buenos Aires" ], - "s": 49863269, - "sha1_base64": "zba8PrXzBwe9HZYKIJf4b9KJZYM=" + "s": 49391085, + "sha1_base64": "/GS5OsH5dMmm9bTaIY3mUYdZA1Y=" }, { "id": "Argentina_Buenos Aires_North", @@ -452,8 +452,8 @@ "Argentina", "Buenos Aires" ], - "s": 31449597, - "sha1_base64": "8zu99uA8ITQHyIjYf7l2kW+/l/8=" + "s": 31028132, + "sha1_base64": "JK4QlA5tX4S0TdZjYLFxwWGuHSY=" }, { "id": "Argentina_Buenos Aires_South", @@ -464,8 +464,8 @@ "Argentina", "Buenos Aires" ], - "s": 47232976, - "sha1_base64": "rMFlJXa/6QXXXMOm1xuPAaphZs0=" + "s": 46539591, + "sha1_base64": "rB/1fxFDzZT1nV00QEFzNyIHJE4=" }, { "id": "Argentina_Patagonia", @@ -480,8 +480,8 @@ "Santa Cruz", "Tierra del Fuego" ], - "s": 73964018, - "sha1_base64": "FGdNw5DDO+DUqrk345EE8L5lx60=" + "s": 73068074, + "sha1_base64": "0CQ/a+aBjCTG+Wthe2Hn3xBiAP4=" }, { "id": "Argentina_Cuyo", @@ -495,8 +495,8 @@ "San Juan", "San Luis" ], - "s": 39178805, - "sha1_base64": "1EG8juY40cFZz4be7fH+ht6MDGg=" + "s": 38733733, + "sha1_base64": "eFzEv1XyFg81EbdTyp1og+yghUg=" }, { "id": "Argentina_Mesopotamia", @@ -517,8 +517,8 @@ "Itap\u00faa", "Misiones" ], - "s": 71110481, - "sha1_base64": "AqH9F/56U3S8vigqMjzQ4E2C2bs=" + "s": 69721193, + "sha1_base64": "6r2eY1n9Tps1kU3JYxDveFEl3e4=" }, { "id": "Argentina_Northwest", @@ -535,8 +535,8 @@ "Santiago del Estero", "Tucum\u00e1n" ], - "s": 53546191, - "sha1_base64": "Zm3c8iOYKvOH0WRNY4BlL5p1Lzw=" + "s": 51199063, + "sha1_base64": "t9ghTknXNS3SyWx+Jhhe00oMH1E=" }, { "id": "Argentina_Pampas", @@ -548,8 +548,8 @@ "C\u00f3rdoba", "La Pampa" ], - "s": 55319770, - "sha1_base64": "bLIDgXOGmV0T6pKyGF3e+v0PaDg=" + "s": 52557858, + "sha1_base64": "SdD7BaqIj9E4QYfh85JPBqgwL2Q=" }, { "id": "Argentina_Santa Fe", @@ -560,8 +560,8 @@ "Argentina", "Santa Fe" ], - "s": 32180238, - "sha1_base64": "STLdPgtvkCIMqY4O96tL0g+Zl+M=" + "s": 31886494, + "sha1_base64": "wyCXsO+A9i4w2iRW54hVOu6jA8I=" } ] }, @@ -586,8 +586,8 @@ "\u0531\u0580\u0561\u0563\u0561\u056e\u0578\u057f\u0576\u056b \u0574\u0561\u0580\u0566", "\u0533\u0565\u0572\u0561\u0580\u0584\u0578\u0582\u0576\u056b\u0584" ], - "s": 48991540, - "sha1_base64": "DPHdk+uWUtN26bqqDnsHkSafPBA=" + "s": 47436492, + "sha1_base64": "h9kY13Ssjx2Td62luEGuvwruuHw=" }, { "id": "Austria", @@ -601,8 +601,8 @@ "Burgenland", "\u00d6sterreich" ], - "s": 38129627, - "sha1_base64": "oI00B3Gr6Ouw4bmo+ZMZMjiT4Hc=" + "s": 37836835, + "sha1_base64": "+TaOjmbACDXyF6M6hgXck8ygYBI=" }, { "id": "Austria_Carinthia", @@ -613,8 +613,8 @@ "K\u00e4rnten", "\u00d6sterreich" ], - "s": 61199616, - "sha1_base64": "+G0nFUIY0FZqOeqM9xlQouZzZBY=" + "s": 60908616, + "sha1_base64": "SnEYw7sIyHpJv3SVrO2qikv2Fx0=" }, { "id": "Austria_Lower Austria_Wien", @@ -626,8 +626,8 @@ "Nieder\u00f6sterreich", "Wien" ], - "s": 120498936, - "sha1_base64": "DuEhQy3k0gvxOPlTsiVUGNmZDL4=" + "s": 120185191, + "sha1_base64": "BqH01REO4S2MncsankFPEoOXIJU=" }, { "id": "Austria_Styria_Graz", @@ -638,8 +638,8 @@ "\u00d6sterreich", "Steiermark" ], - "s": 83693555, - "sha1_base64": "30XzenwtIAClMPdIHE4zD7qUxFE=" + "s": 82782956, + "sha1_base64": "9/I0bVleYpVjDCBvR4za10QTNrs=" }, { "id": "Austria_Styria_Leoben", @@ -650,8 +650,8 @@ "\u00d6sterreich", "Steiermark" ], - "s": 51780783, - "sha1_base64": "RvQo4sgRt1m4K1P4zYEEOhhXrS8=" + "s": 51334959, + "sha1_base64": "MtkRfehStlWeXQfbshATUR/3ltQ=" }, { "id": "Austria_Upper Austria_Linz", @@ -662,8 +662,8 @@ "\u00d6sterreich", "Ober\u00f6sterreich" ], - "s": 49939863, - "sha1_base64": "XRigpMIpqPpLMx5xWaMDd12oTMU=" + "s": 49128343, + "sha1_base64": "afkniKIHepI/D/Z2VSXO5g9o2ms=" }, { "id": "Austria_Upper Austria_Wels", @@ -674,8 +674,8 @@ "\u00d6sterreich", "Ober\u00f6sterreich" ], - "s": 62041864, - "sha1_base64": "xkaAyzDIyJNrrV6fzmISfx4ZZ7A=" + "s": 61590816, + "sha1_base64": "H7FbU9D4TX6GykGLxaOBb7VXxeU=" }, { "id": "Austria_Lower Austria_West", @@ -686,8 +686,8 @@ "\u00d6sterreich", "Nieder\u00f6sterreich" ], - "s": 112635249, - "sha1_base64": "ittNpPY48WCtDQXa32WC3lM7610=" + "s": 110657593, + "sha1_base64": "8+8E4AObNAp8BtBOdHdt9MhNM7E=" }, { "id": "Austria_Tyrol", @@ -698,8 +698,8 @@ "\u00d6sterreich", "Tirol" ], - "s": 76134739, - "sha1_base64": "gVxLy1thEEnVkjqsemaZVkQe+uk=" + "s": 75612323, + "sha1_base64": "NMYrrEAPPnFbNJ/vawA0lXCOyTM=" }, { "id": "Austria_Salzburg", @@ -710,8 +710,8 @@ "\u00d6sterreich", "Salzburg" ], - "s": 57102367, - "sha1_base64": "tfAZWz7FTxbKuiKoeHn4qZ9bZRA=" + "s": 56321879, + "sha1_base64": "vDVFB7SCWCdPnN1EN5UHwP0rDNc=" }, { "id": "Austria_Vorarlberg", @@ -722,8 +722,8 @@ "\u00d6sterreich", "Vorarlberg" ], - "s": 33682685, - "sha1_base64": "+sbM6KDJrNVfVdLo4eJ5flLbqHQ=" + "s": 32696718, + "sha1_base64": "DFKssQC1lp9v7XzN+HHhn1bWoyg=" } ] }, @@ -737,8 +737,8 @@ "Coral Sea Islands Territory", "Willis Island" ], - "s": 348212, - "sha1_base64": "TF8VqigSmcvdJzxEIJy/HX2JMGI=" + "s": 348132, + "sha1_base64": "NR4Mqz4twDcjLtzYnymZg4k5ZVw=" }, { "id": "Australia_Melbourne", @@ -749,8 +749,8 @@ "Australia", "Victoria" ], - "s": 78095588, - "sha1_base64": "Ah5fqMck7Iv6JCH3/h/B85fxANE=" + "s": 74676276, + "sha1_base64": "B8EKNYUruJsMsicX0Tb1NoRx3rg=" }, { "id": "Australia_New South Wales", @@ -764,8 +764,8 @@ "New South Wales", "Norfolk Island" ], - "s": 74125474, - "sha1_base64": "xrHBqTuzQfFlihsE+H/Av/bOxn0=" + "s": 72568074, + "sha1_base64": "zNXXaERru5YkIKBoMikdOiUZQ/Q=" }, { "id": "Australia_Northern Territory", @@ -776,8 +776,8 @@ "Australia", "Northern Territory" ], - "s": 14961644, - "sha1_base64": "WnQZZMXnuWoZ44aU6Nyqepc71cU=" + "s": 14840180, + "sha1_base64": "OUjF375DoVOicWdImluU84fRHQs=" }, { "id": "Australia_Queensland", @@ -789,8 +789,8 @@ "Coral Sea Islands Territory", "Queensland" ], - "s": 38943029, - "sha1_base64": "jxZS7lsXz1Znej10O+3HlUoZD74=" + "s": 38647044, + "sha1_base64": "WYg/ilfLCNHCTksiOSMo4Aiu12Y=" }, { "id": "Australia_South Australia", @@ -801,8 +801,8 @@ "Australia", "South Australia" ], - "s": 58723779, - "sha1_base64": "Dw7NvsGkquujG0fbLXNuuiysUdo=" + "s": 58023923, + "sha1_base64": "T5WT3rC9XNyBVzLanaMDemUb2aU=" }, { "id": "Australia_Tasmania", @@ -813,8 +813,8 @@ "Australia", "Tasmania" ], - "s": 48421332, - "sha1_base64": "Qpx09XICpN1817h1xc6HaB/hrs8=" + "s": 47339036, + "sha1_base64": "R/7ysO1ALuiD6Ihu5mMrhV6bReg=" }, { "id": "Australia_Victoria", @@ -825,8 +825,8 @@ "Australia", "Victoria" ], - "s": 84278540, - "sha1_base64": "Ra0V3aUDouz221c5Qe2i35sxcI4=" + "s": 83540596, + "sha1_base64": "XJSIlQPOZ2ZkRq4yT0avKJx1QKY=" }, { "id": "Australia_Western Australia", @@ -842,8 +842,8 @@ "Cocos (Keeling) Islands", "Western Australia" ], - "s": 80431024, - "sha1_base64": "Ndk9mVQgD4t4X2fHGy2EFMgkQhw=" + "s": 79001352, + "sha1_base64": "+LY1BNcy9gIBo4aA9eSJYpULSQM=" }, { "id": "Australia_Brisbane", @@ -856,8 +856,8 @@ "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de Bellone (eaux territoriales)", "Queensland" ], - "s": 93756100, - "sha1_base64": "PojzPUPrJVGCKwyvDXbrOIeC81M=" + "s": 91991628, + "sha1_base64": "kN6Z9KFiA7BWG9uHNsZrCqDGqBY=" }, { "id": "Australia_Sydney", @@ -870,8 +870,8 @@ "Jervis Bay Territory", "New South Wales" ], - "s": 132078830, - "sha1_base64": "5MOa/duWpAjVQWaJaxw4MM4CQaw=" + "s": 126051413, + "sha1_base64": "EODApLSEDFpeJWnvqv6WgKhdU9I=" } ] }, @@ -894,8 +894,8 @@ "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)", "\u054d\u057f\u0565\u0583\u0561\u0576\u0561\u056f\u0565\u0580\u057f (Stepanakert - Khankendi)" ], - "s": 9983142, - "sha1_base64": "6yXcDc8xfKl3T7lDK3sk0gnCoD4=" + "s": 9956102, + "sha1_base64": "NabJy2EpAFZTsjrKm6F/ul2NRYY=" }, { "id": "Azerbaijan", @@ -975,8 +975,8 @@ "\u015e\u0259mkir rayonu", "\u015e\u0259rur rayonu" ], - "s": 42970629, - "sha1_base64": "F8oiZj59zn3JGkH9bJIOSU59sMs=" + "s": 42010821, + "sha1_base64": "b0XOcq6az+H83oE4/XiSiyL0yP0=" } ] }, @@ -993,8 +993,8 @@ "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u062c\u0646\u0648\u0628\u064a\u0629", "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0634\u0645\u0627\u0644\u064a\u0629" ], - "s": 7379511, - "sha1_base64": "nOgLqisL3JtT6pdBC31Q1XtQCnA=" + "s": 7226413, + "sha1_base64": "2Lp4sp3xvsrukcg/2o0EFO3xnrw=" }, { "id": "Bangladesh", @@ -1012,8 +1012,8 @@ "\u09ac\u09be\u0982\u09b2\u09be\u09a6\u09c7\u09b6", "\u099a\u099f\u09cd\u099f\u0997\u09cd\u09b0\u09be\u09ae \u09ac\u09bf\u09ad\u09be\u0997" ], - "s": 305130870, - "sha1_base64": "Bc6XAdIgv9Pdz2GG+UUL3oWMLyE=" + "s": 300058582, + "sha1_base64": "fAlpN3NANQbW+SnmD+L8teTFlA4=" }, { "id": "Belarus", @@ -1030,8 +1030,8 @@ "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0412\u0438\u0442\u0435\u0431\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 61887489, - "sha1_base64": "0sxrhdb7nJ0MxFVB/+Hdr3bsAHE=" + "s": 61940769, + "sha1_base64": "e1gWrAA2mnvVG5W/6tm4QhXQSEQ=" }, { "id": "Belarus_Hrodna Region", @@ -1042,8 +1042,8 @@ "\u0413\u0440\u043e\u0434\u043d\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" ], - "s": 50134449, - "sha1_base64": "lb6gbLsgOphbgrw6F0pdv+SGDsk=" + "s": 50370746, + "sha1_base64": "jwJ11EP5qERFkDZ6cVz/lzQRgHc=" }, { "id": "Belarus_Brest Region", @@ -1054,8 +1054,8 @@ "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0411\u0440\u0435\u0441\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 49605129, - "sha1_base64": "kDEBMjFaldKohJBxN4tsG1XiUrw=" + "s": 48875769, + "sha1_base64": "/m6YU1fc2cb9odmjnP4z5Cwy0Ts=" }, { "id": "Belarus_Homiel Region", @@ -1066,8 +1066,8 @@ "\u0413\u043e\u043c\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" ], - "s": 45225439, - "sha1_base64": "t1j9/i9j89+qw7nSsbjpxSzq+yo=" + "s": 46021392, + "sha1_base64": "4dbVH/7ju/I+x95Os/YmxtP3PkI=" }, { "id": "Belarus_Maglieu Region", @@ -1078,8 +1078,8 @@ "\u041c\u043e\u0433\u0438\u043b\u0451\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" ], - "s": 36358996, - "sha1_base64": "RdRaTWyeE8oCpNiUjh7kwmlIpN4=" + "s": 36486420, + "sha1_base64": "pITpJ1Fs2p5eOpbeMkfhwXQ3AKM=" }, { "id": "Belarus_Minsk Region", @@ -1094,8 +1094,8 @@ "\u041a\u043e\u043b\u043e\u0434\u0438\u0449\u0438", "\u041d\u0430\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0430\u044d\u0440\u043e\u043f\u043e\u0440\u0442 \"\u041c\u0438\u043d\u0441\u043a\"" ], - "s": 80792617, - "sha1_base64": "Cje3pB5uhjda6W5BbFiKWelIYiw=" + "s": 80413113, + "sha1_base64": "Jn4LJ8z7RotvifW9dKrL2N4WWnI=" } ] }, @@ -1112,8 +1112,8 @@ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" ], - "s": 62255856, - "sha1_base64": "jf4EIgZweZbL2wRf3McBhtG/p5g=" + "s": 60433936, + "sha1_base64": "ROU314XRlKLJlEcqJw1I5YpRSiI=" }, { "id": "Belgium_Antwerp", @@ -1125,8 +1125,8 @@ "Nederland - Belgique / Belgi\u00eb / Belgien", "Vlaanderen" ], - "s": 68266336, - "sha1_base64": "5A32IPAez/+s9kb47BHTRqlzqJ4=" + "s": 67999352, + "sha1_base64": "Cnp5nq1dSUmv6nTGg+Xt1vQk9EA=" }, { "id": "Belgium_East Flanders", @@ -1137,8 +1137,8 @@ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" ], - "s": 62055057, - "sha1_base64": "ydfO1T6hh2Dv+m0QF2CZeQj3GtY=" + "s": 59654648, + "sha1_base64": "728jPDwg/dMJUPHJ47VU+RfKwQg=" }, { "id": "Belgium_Hainaut", @@ -1149,8 +1149,8 @@ "Belgi\u00eb - Belgique - Belgien", "Wallonie" ], - "s": 50293111, - "sha1_base64": "x5KzxXAzEmxDOnm5iFqmoighQec=" + "s": 48032087, + "sha1_base64": "/kJ4FszRDUYet7Tdkxlm7Zj9qHo=" }, { "id": "Belgium_Walloon Brabant", @@ -1161,8 +1161,8 @@ "Belgi\u00eb - Belgique - Belgien", "Wallonie" ], - "s": 15665329, - "sha1_base64": "THrcfFStftm23IUs7trJhVrjHRc=" + "s": 15430152, + "sha1_base64": "zIs/ESM16sja4MNciqfpedKidow=" }, { "id": "Belgium_Namur", @@ -1173,8 +1173,8 @@ "Belgi\u00eb - Belgique - Belgien", "Wallonie" ], - "s": 26906356, - "sha1_base64": "TfColxUH0Sha4FsbCxVeqOGUgNI=" + "s": 26445683, + "sha1_base64": "FeazK9hgiocEAGmqOFDbrpAn7R4=" }, { "id": "Belgium_Limburg", @@ -1185,8 +1185,8 @@ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" ], - "s": 48424262, - "sha1_base64": "7YCh4NabH5gQ1KZq8ZzW2wuEbms=" + "s": 47945294, + "sha1_base64": "pxgFNxWUtlm2Lw4jv5Sh4qY1b5k=" }, { "id": "Belgium_Luxembourg", @@ -1197,8 +1197,8 @@ "Belgi\u00eb - Belgique - Belgien", "Wallonie" ], - "s": 32979038, - "sha1_base64": "jB6Y6Kpp3dz7NAc0iJa49iqoWVU=" + "s": 32589804, + "sha1_base64": "x14W2WmjV8N5z+ykXTN5ptxU0v8=" }, { "id": "Belgium_Flemish Brabant", @@ -1210,8 +1210,8 @@ "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest", "Vlaanderen" ], - "s": 71457768, - "sha1_base64": "fkemSt7ujLr1r7bYwe7vOiVqVGw=" + "s": 70416880, + "sha1_base64": "2AxQ0J+E0UBcJhWyN+mqtU6mQqU=" }, { "id": "Belgium_Liege", @@ -1222,8 +1222,8 @@ "Belgi\u00eb - Belgique - Belgien", "Wallonie" ], - "s": 55983043, - "sha1_base64": "aalqi8eyBpwz13+XbHtgf70iJ2E=" + "s": 55262523, + "sha1_base64": "UfjjxAEoKiHeoDMprXeDXbbvCJY=" } ] }, @@ -1243,8 +1243,8 @@ "Stann Creek", "Toledo" ], - "s": 23069702, - "sha1_base64": "IFnZrZxjPm2qfKBgTw4zYs8dfBw=" + "s": 21318318, + "sha1_base64": "H8etBM+3SDEZo1isVW87qTfPESk=" }, { "id": "Benin", @@ -1266,8 +1266,8 @@ "Plateau", "Zou" ], - "s": 46307866, - "sha1_base64": "CZvp1zm9mZNbymJ+0Z0hNDBQR/4=" + "s": 46144762, + "sha1_base64": "CnYjSORV44kyLDUpCY79+oMz5XA=" }, { "id": "Bermuda", @@ -1277,8 +1277,8 @@ "affiliations": [ "Bermuda" ], - "s": 1811432, - "sha1_base64": "x1r8F2PDjjg39z/rvpE1DyOlyX0=" + "s": 1811776, + "sha1_base64": "RQW+ho4sh7rw3rr6Pj8J71DN/VA=" }, { "id": "Bhutan", @@ -1308,8 +1308,8 @@ "\u0f51\u0f56\u0f44\u0f0b\u0f60\u0f51\u0f74\u0f66\u0f0b\u0f55\u0f7c\u0f0b\u0f56\u0fb2\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", "\u0f56\u0f66\u0f58\u0f0b\u0f42\u0fb2\u0f74\u0f56\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b\u0f58\u0f41\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b" ], - "s": 32500801, - "sha1_base64": "7Z8DWvAjwM6a5QmahQ3vJCMSs8s=" + "s": 31665793, + "sha1_base64": "RvY5TngbQTd9C7XP1K/sOzCTjvU=" }, { "id": "Bolivia", @@ -1326,8 +1326,8 @@ "Pando", "Santa Cruz" ], - "s": 62849754, - "sha1_base64": "VN7pTH9GIXzXk+ymvjlXPVGyRwQ=" + "s": 61889410, + "sha1_base64": "GtzfcvJ7qpXkzH/Toin07JMrdF4=" }, { "id": "Bolivia_South", @@ -1342,8 +1342,8 @@ "Potos\u00ed", "Tarija" ], - "s": 72261345, - "sha1_base64": "K/X8G46dUrZSVs2kYM7oUYGJpys=" + "s": 69868104, + "sha1_base64": "KX8daxL2zlxITUfuZMluCFJ21S4=" } ] }, @@ -1359,8 +1359,8 @@ "Bosna i Hercegovina", "Federacija Bosne i Hercegovine" ], - "s": 66274823, - "sha1_base64": "9uJsqelFdymVF7XNsWaUBSAqRkY=" + "s": 65345623, + "sha1_base64": "zcJQd4rhfsvY0VUyU0XMMt5MfdI=" }, { "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina", @@ -1372,8 +1372,8 @@ "Bosna i Hercegovina", "Republika Srpska" ], - "s": 2462959, - "sha1_base64": "4oap6JT9y9L8ZzJVT2/wpWKKV5A=" + "s": 2361572, + "sha1_base64": "qW1a0qtjgiD36E04Y4BtQIsoGrM=" }, { "id": "Bosnia and Herzegovina_Republic of Srpska", @@ -1384,8 +1384,8 @@ "Bosna i Hercegovina", "Republika Srpska" ], - "s": 70812600, - "sha1_base64": "o0ikWKadU1uGG/VbAHhFn57Wb5I=" + "s": 69126262, + "sha1_base64": "+RkH70YW1rk60aZcBl5PB9qMnBg=" } ] }, @@ -1406,8 +1406,8 @@ "South-East District", "Southern District" ], - "s": 80540948, - "sha1_base64": "pgYem67CibJFAzMvL9efMFyz1BQ=" + "s": 80398892, + "sha1_base64": "/IhpNjWAcnLmvpauBkSwelPpsLw=" }, { "id": "Brazil", @@ -1421,8 +1421,8 @@ "Bahia", "Brasil" ], - "s": 87371891, - "sha1_base64": "q+IOqvyGl+rULtBjAOP/Vu6rNxA=" + "s": 84381523, + "sha1_base64": "6U+eCc4WxBfcWq3Q0qGMzctatog=" }, { "id": "Brazil_Goias_North", @@ -1433,8 +1433,8 @@ "Brasil", "Goi\u00e1s" ], - "s": 30075492, - "sha1_base64": "T2yiNhgw8XHxJqS/rNT1+l8yapY=" + "s": 29854708, + "sha1_base64": "jU4zeqahnnwgRRVzNLvNwt6Z2jc=" }, { "id": "Brazil_Goias_Brasilia", @@ -1446,8 +1446,8 @@ "Distrito Federal", "Goi\u00e1s" ], - "s": 51193662, - "sha1_base64": "TiU96+Yzi4dbydXUmEjaRqQJb7o=" + "s": 50470309, + "sha1_base64": "V8ghSLKUnjxBqRdm/n1Cw2uDXT0=" }, { "id": "Brazil_Mato Grosso Do Sul", @@ -1458,8 +1458,8 @@ "Brasil", "Mato Grosso do Sul" ], - "s": 26786859, - "sha1_base64": "hMqMqFwWSXPMFqLGhdRLp6J5Az4=" + "s": 26403595, + "sha1_base64": "uWyVCBQn6qfubfcKVz5jyJgn8rI=" }, { "id": "Brazil_Mato Grosso", @@ -1470,8 +1470,8 @@ "Brasil", "Mato Grosso" ], - "s": 35654635, - "sha1_base64": "wHtiORPBL+j9Q6rKDE3R54utp1g=" + "s": 34594834, + "sha1_base64": "Xfo7ijVI5jl4WEU1PpqGLtbxgJ8=" }, { "id": "Brazil_North Region_East", @@ -1484,8 +1484,8 @@ "Par\u00e1", "Tocantins" ], - "s": 58140622, - "sha1_base64": "lmLHPiXD2CSralchJYQIRW6Ofz4=" + "s": 57735006, + "sha1_base64": "FpKzWMMwOrthXqrnLARhPpbAs+0=" }, { "id": "Brazil_North Region_West", @@ -1499,8 +1499,8 @@ "Rond\u00f4nia", "Roraima" ], - "s": 57804901, - "sha1_base64": "FLv+0WCdGTGMP1VDWsIun4N8oq4=" + "s": 54315188, + "sha1_base64": "+zXs2hkXJkJH4kijTIUlqJ2+kag=" }, { "id": "Brazil_Northeast Region_East", @@ -1513,8 +1513,8 @@ "Pernambuco", "Sergipe" ], - "s": 78091913, - "sha1_base64": "xwMJgxwiLvg3Kp4aTchZivrKHqQ=" + "s": 75936457, + "sha1_base64": "7FcY3c1I1/qURpUDHfjhs72sH18=" }, { "id": "Brazil_Northeast Region_West", @@ -1528,8 +1528,8 @@ "Pernambuco", "Piau\u00ed" ], - "s": 144091607, - "sha1_base64": "h5oqaOjIPzhrHhH4evun9FzmoJk=" + "s": 135578054, + "sha1_base64": "vIYoigh9UVpnKvvyoOeI/vMu/nU=" }, { "id": "Brazil_Paraiba", @@ -1540,8 +1540,8 @@ "Brasil", "Para\u00edba" ], - "s": 42862254, - "sha1_base64": "a20cUKV54HEgk02O5JXB5YT550Y=" + "s": 42560326, + "sha1_base64": "wpcg2gnBw8GfOYEZIGRBhShRqgc=" }, { "id": "Brazil_Parana_East", @@ -1552,8 +1552,8 @@ "Brasil", "Paran\u00e1" ], - "s": 58896873, - "sha1_base64": "Uc5uF7RSilYdOpBlmy77AhwWE+Q=" + "s": 57584737, + "sha1_base64": "tXFf8SnR2sWEYvBGb05RKG2xPho=" }, { "id": "Brazil_Parana_West", @@ -1564,8 +1564,8 @@ "Brasil", "Paran\u00e1" ], - "s": 80044427, - "sha1_base64": "HoyIriWz00cRgDpVEVvdhT+l1jI=" + "s": 78549147, + "sha1_base64": "s42ZhR2pGQuv0TpNnC3OnrWO2ZM=" }, { "id": "Brazil_Rio Grande do Norte", @@ -1577,8 +1577,8 @@ "Pernambuco", "Rio Grande do Norte" ], - "s": 25677959, - "sha1_base64": "84r/WnXq/k59o/CawMr+AJiNSRE=" + "s": 25378871, + "sha1_base64": "WqdsWu1qP7MyIUzrmJ+xpZUf+1Y=" }, { "id": "Brazil_Santa Catarina", @@ -1589,8 +1589,8 @@ "Brasil", "Santa Catarina" ], - "s": 115857276, - "sha1_base64": "X5P/N3vm5tGCbmd8xt7/nvAehAg=" + "s": 111973588, + "sha1_base64": "2sd6txiW8hm5Egfy23lx9a2JDTQ=" }, { "id": "Brazil_South Region_East", @@ -1601,8 +1601,8 @@ "Brasil", "Rio Grande do Sul" ], - "s": 78525585, - "sha1_base64": "obNcWzmWKWLpIckdsiO3ybzw79A=" + "s": 77564281, + "sha1_base64": "t7xFvzr4rm1ZQ8dJzvQxVJUSNDE=" }, { "id": "Brazil_South Region_West", @@ -1613,8 +1613,8 @@ "Brasil", "Rio Grande do Sul" ], - "s": 68535450, - "sha1_base64": "GTsxJ1Z/ptg9IbsCn57eJ9FxTjI=" + "s": 68034202, + "sha1_base64": "q8Ax/iNrryTboVtKw3VI1NaT5G4=" }, { "id": "Brazil_Southeast Region_Espirito Santo", @@ -1625,8 +1625,8 @@ "Brasil", "Esp\u00edrito Santo" ], - "s": 206936740, - "sha1_base64": "XDImUxy6xiGDwsV1Wa6RkYF9HRQ=" + "s": 206946924, + "sha1_base64": "gtPiLakm+wNw8Rfyt3qL0dX5eAU=" }, { "id": "Brazil_Southeast Region_Minas Gerais_Contagem", @@ -1637,8 +1637,8 @@ "Brasil", "Minas Gerais" ], - "s": 139278708, - "sha1_base64": "ZLOZI2TIkSnwv7LT72Qfy8YOdag=" + "s": 138268868, + "sha1_base64": "phGXwG5tBV5m8LCPsvJDYIt0zJI=" }, { "id": "Brazil_Southeast Region_Minas Gerais_North", @@ -1649,8 +1649,8 @@ "Brasil", "Minas Gerais" ], - "s": 97964027, - "sha1_base64": "bgwJFjLeCM17Rs9PU8dBEeL1GkY=" + "s": 95044754, + "sha1_base64": "MWybei9EqWTNzrAcrwGbFpO17p0=" }, { "id": "Brazil_Southeast Region_Rio de Janeiro", @@ -1661,8 +1661,8 @@ "Brasil", "Rio de Janeiro" ], - "s": 73770211, - "sha1_base64": "B2VMWElPMmbFZVY1MqW+IleRaG0=" + "s": 72519442, + "sha1_base64": "8zSqgTHq4wFaDeb3cWqkeumNSF0=" }, { "id": "Brazil_Southeast Region_Sao Paulo_Campinas", @@ -1673,8 +1673,8 @@ "Brasil", "S\u00e3o Paulo" ], - "s": 91825290, - "sha1_base64": "AttgZ0oKbv0jMdHgtNJ4ekjFhMU=" + "s": 90428834, + "sha1_base64": "3qwJ0IQeIfWezharjbTewOzXx6k=" }, { "id": "Brazil_Southeast Region_Sao Paulo_City", @@ -1685,8 +1685,8 @@ "Brasil", "S\u00e3o Paulo" ], - "s": 153977034, - "sha1_base64": "+VVN99nfCOAbUIIf6BpAxvC3HmA=" + "s": 152876466, + "sha1_base64": "3PB02/yVM2y+7cyYZzjzEdbmu64=" }, { "id": "Brazil_Southeast Region_Sao Paulo_West", @@ -1697,8 +1697,8 @@ "Brasil", "S\u00e3o Paulo" ], - "s": 62403643, - "sha1_base64": "qKHMQmixJZLEEkgGwJ7JifQt+qo=" + "s": 60560851, + "sha1_base64": "T+RbWtnzNm87i2hpc+j8KASVXrs=" } ] }, @@ -1710,8 +1710,8 @@ "affiliations": [ "Brunei Darussalam" ], - "s": 9709477, - "sha1_base64": "BGms3DaZiaqxHw3mT4Yr3mLrSOY=" + "s": 9603901, + "sha1_base64": "V/ulfGGEq3qzybMj7UYt6uc8wAw=" }, { "id": "Bulgaria", @@ -1724,8 +1724,8 @@ "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" ], - "s": 52143008, - "sha1_base64": "Bot6iNyCDg8fa96qjyUP7XvN8JE=" + "s": 50590960, + "sha1_base64": "d9m3GFlpuTXvXf2Q+gvN9Qcgvlw=" }, { "id": "Bulgaria_West", @@ -1735,8 +1735,8 @@ "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" ], - "s": 96021115, - "sha1_base64": "zntOmPlZmj+uHQ/ev01AgziiQY4=" + "s": 92455739, + "sha1_base64": "YtcOej/u9MJ6MuD+hgW/UJU/QZY=" } ] }, @@ -1761,8 +1761,8 @@ "Sahel", "Sud-Ouest" ], - "s": 73798180, - "sha1_base64": "Z60Baxs4x6O9zwfMBX9dle9G6N0=" + "s": 73621436, + "sha1_base64": "yz4XH+P5S4y36NdTffOX0IHC+6k=" }, { "id": "Burundi", @@ -1789,8 +1789,8 @@ "Rutana", "Ruyigi" ], - "s": 43228068, - "sha1_base64": "ptIb7o5lE8uWYB+87GL6gSAQb9c=" + "s": 43038306, + "sha1_base64": "0rg3vbkbHGCCwp/3KrbRzbrl2i0=" }, { "id": "Cambodia", @@ -1825,8 +1825,8 @@ "Tbong Khmum", "\u1796\u17d2\u179a\u17c7\u179a\u17b6\u1787\u17b6\u178e\u17b6\u1785\u1780\u17d2\u179a\u1780\u1798\u17d2\u1796\u17bb\u1787\u17b6 (Cambodia)" ], - "s": 46129627, - "sha1_base64": "9LDGqx1cQbnm7NA14Vp2l/bHyJM=" + "s": 45722803, + "sha1_base64": "rjO4qCkGTLQOcbCsZdOEl6ygKEo=" }, { "id": "Cameroon", @@ -1845,8 +1845,8 @@ "Nord", "Sud" ], - "s": 141028635, - "sha1_base64": "4PCCUmmAn2j/62wpJzGOXnBT3VE=" + "s": 140351851, + "sha1_base64": "F8l6E17Rx3zr/E+RRbCL6oY3bRk=" }, { "id": "Cameroon_West", @@ -1860,8 +1860,8 @@ "Ouest", "Sud-Ouest" ], - "s": 90851228, - "sha1_base64": "QlCccCZbouzThUgdBvm9m/S+A1g=" + "s": 90110779, + "sha1_base64": "Uw5bf0ZQqCzwgTJmsrO6Jkm5Auw=" } ] }, @@ -1880,8 +1880,8 @@ "Alberta", "Canada" ], - "s": 88477929, - "sha1_base64": "9IaFXvvfIM0IQskTnI5tiVo/mog=" + "s": 87496913, + "sha1_base64": "4I+/cUrsXi49JTHUhkM1jT4nxWI=" }, { "id": "Canada_Alberta_North", @@ -1892,8 +1892,8 @@ "Alberta", "Canada" ], - "s": 47945435, - "sha1_base64": "4U3L04AmAEk1a0CUQVUahFXKyJw=" + "s": 47539267, + "sha1_base64": "S2apwt1eHxydR+QtQGFJiC3TPuQ=" }, { "id": "Canada_Alberta_South", @@ -1904,8 +1904,8 @@ "Alberta", "Canada" ], - "s": 65884442, - "sha1_base64": "zghMqnXyrBCHwIXZd/SK1T+E5/U=" + "s": 65125690, + "sha1_base64": "rLSqQ0akABdo5eJENVn9kLREpHw=" } ] }, @@ -1921,8 +1921,8 @@ "British Columbia", "Canada" ], - "s": 83558262, - "sha1_base64": "drde83ckOnZcPKjj9zset6IQd0Y=" + "s": 71179133, + "sha1_base64": "9a3ALvbYVHaxnRebReJmCxFuXt0=" }, { "id": "Canada_British Columbia_Far_North", @@ -1933,8 +1933,8 @@ "British Columbia", "Canada" ], - "s": 36130584, - "sha1_base64": "boDJ9MxDCkofsVkXOdBVOjFkdXA=" + "s": 36090496, + "sha1_base64": "NMhjtVdVX7MAYET121oPMar9PtE=" }, { "id": "Canada_British Columbia_Islands", @@ -1945,8 +1945,8 @@ "British Columbia", "Canada" ], - "s": 69148430, - "sha1_base64": "+31Zri/C1Gptj3H0lvC7xPiAA8g=" + "s": 68695229, + "sha1_base64": "zt82/OHZPlrTYJi8sPB7FHps6QM=" }, { "id": "Canada_British Columbia_North", @@ -1957,8 +1957,8 @@ "British Columbia", "Canada" ], - "s": 64494244, - "sha1_base64": "dRp3MpLxcBfMc2xudY+EG7volzQ=" + "s": 60253036, + "sha1_base64": "r2ip/kmphyDPdREPlb5W7BxhIEg=" }, { "id": "Canada_British Columbia_Northeast", @@ -1969,8 +1969,8 @@ "British Columbia", "Canada" ], - "s": 52649720, - "sha1_base64": "dZ8hrzZ2lsaTP81C8n+/24aBRE8=" + "s": 50250304, + "sha1_base64": "bs7zHXYMad5m4tk28W0j2+GC5ig=" }, { "id": "Canada_British Columbia_Southeast", @@ -1981,8 +1981,8 @@ "British Columbia", "Canada" ], - "s": 82683744, - "sha1_base64": "mY2x+BLCyKiC1Ty2ROf2Z7EF91Q=" + "s": 76188158, + "sha1_base64": "cVpYP0cHEsuw4jaa+BkKVOMQ7D4=" }, { "id": "Canada_British Columbia_Vancouver", @@ -1993,8 +1993,8 @@ "British Columbia", "Canada" ], - "s": 95802015, - "sha1_base64": "Zj7M4JhhAHWIPJahGGMB5ADgp6M=" + "s": 94578656, + "sha1_base64": "i3eW78p4XOrafbdDMcmu0z3Qmiw=" } ] }, @@ -2011,8 +2011,8 @@ "Newfoundland and Labrador", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 62490941, - "sha1_base64": "RGM1+wwTvN4H1XLhEqdDWeidCZI=" + "s": 62451325, + "sha1_base64": "ixdT6Z2O1qZ+vimreKMe7b7Bc4I=" }, { "id": "Canada_Labrador_South", @@ -2023,8 +2023,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 49211611, - "sha1_base64": "K/kFvoIuGDrKB/ylg4bRl0AiZ4c=" + "s": 49065579, + "sha1_base64": "0mIcRHu4dfJ066sZN8SyAayl5CU=" }, { "id": "Canada_Labrador_West", @@ -2035,8 +2035,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 57718871, - "sha1_base64": "4A0ETj13l+v9ADP6OAtEfD/d2mo=" + "s": 57614815, + "sha1_base64": "FYLpbdLDPZI9OxJotwSuSL9vUrE=" } ] }, @@ -2054,8 +2054,8 @@ "Manitoba", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 62384085, - "sha1_base64": "2RTtVAQXlXU5QeGKZangkO+uLJA=" + "s": 62163285, + "sha1_base64": "J7Tr4X9pwcJ0wy81gYL8Ocp7N48=" }, { "id": "Canada_Manitoba_Northwest", @@ -2066,8 +2066,8 @@ "Canada", "Manitoba" ], - "s": 52041897, - "sha1_base64": "/DgDp1SnqF04WTZ0GthOnzT2iHs=" + "s": 51947681, + "sha1_base64": "sVSO2vzMbjG/kQ/frJZiuWwFzrA=" }, { "id": "Canada_Manitoba_South", @@ -2078,8 +2078,8 @@ "Canada", "Manitoba" ], - "s": 49645604, - "sha1_base64": "Q5Lcg385DkgMwyB13qakwMww44w=" + "s": 49498666, + "sha1_base64": "l4VnfGvJBvxIeXP0g9DYWgJ/In4=" }, { "id": "Canada_Manitoba_Winnipeg", @@ -2090,8 +2090,8 @@ "Canada", "Manitoba" ], - "s": 44686821, - "sha1_base64": "H6vfSRbfu7C1N+NrarVGrDP5ENY=" + "s": 43229876, + "sha1_base64": "j4TtwiqKwy8AgesHsNRPLnXACTI=" } ] }, @@ -2106,8 +2106,8 @@ "New Brunswick", "Oromocto Indian Reserve NO. 26" ], - "s": 63547134, - "sha1_base64": "rYrDzwvbShq80Shqm08HjZ2TXTQ=" + "s": 63776957, + "sha1_base64": "2O/jsrL1a8CMhwInqqXthKbcbKg=" }, { "id": "Canada_Newfoundland", @@ -2121,8 +2121,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 26602977, - "sha1_base64": "h/TiO4kYZKc8fZevIvmt5V62zb8=" + "s": 26448177, + "sha1_base64": "Xyuav615ScM0Zux4Aboa6zz5pPU=" }, { "id": "Canada_Newfoundland_North", @@ -2133,8 +2133,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 32823015, - "sha1_base64": "qyAt671QhPYYjZw75hxS469N8qE=" + "s": 33422543, + "sha1_base64": "wn+n6N1cX7Qpz7852WaPfExCkaQ=" }, { "id": "Canada_Newfoundland_South", @@ -2148,8 +2148,8 @@ "Newfoundland and Labrador", "\u00cele Verte" ], - "s": 26062111, - "sha1_base64": "PKz/ce8UJK+iNqnaARKsOzmbU8M=" + "s": 25776125, + "sha1_base64": "NWmctU1daaw2VGYGY8RsbPzSHsg=" }, { "id": "Canada_Newfoundland_West", @@ -2160,8 +2160,8 @@ "Canada", "Newfoundland and Labrador" ], - "s": 25755822, - "sha1_base64": "YZp4gyaLNwYIqsQLC91oE6/2w7k=" + "s": 26577662, + "sha1_base64": "9SSyCk6nc3lWd3xFrAP3mSi0yGA=" } ] }, @@ -2177,8 +2177,8 @@ "Canada", "Northwest Territories" ], - "s": 21073055, - "sha1_base64": "Evj9MvzQFZABlu0VjBdEQbvRP5s=" + "s": 20914215, + "sha1_base64": "XVsVwM5zAOB+svXx3Orh0LFt/nM=" }, { "id": "Canada_Northwest Territories_North", @@ -2189,8 +2189,8 @@ "Canada", "Northwest Territories" ], - "s": 40341888, - "sha1_base64": "mZMtZggWums66Y1pr+R0NMwTLcg=" + "s": 40264320, + "sha1_base64": "hQQahcCyX3ZVSd1InIVrYKN6txc=" }, { "id": "Canada_Northwest Territories_Yellowknife", @@ -2201,8 +2201,8 @@ "Canada", "Northwest Territories" ], - "s": 63627962, - "sha1_base64": "+yACgSYd/M1s8X8VajPvptSVVak=" + "s": 63563226, + "sha1_base64": "k5hHCUBIgtfzU5/PgHlPKvdP81o=" } ] }, @@ -2218,8 +2218,8 @@ "Canada", "Nova Scotia" ], - "s": 62941643, - "sha1_base64": "xiOXZyiXRDYtp3Ho8nTm+snpnXI=" + "s": 61502587, + "sha1_base64": "8kjmg39DUlnARCap0bYjzcA57pI=" }, { "id": "Canada_Nova Scotia_Sydney", @@ -2231,8 +2231,8 @@ "Nova Scotia", "Prince Edward Island" ], - "s": 28863536, - "sha1_base64": "yxRLymqbWDJjUZpjD4zouY831SY=" + "s": 29506280, + "sha1_base64": "SIkkDSsG60Lj6NG6Ox3qRwD6hN0=" } ] }, @@ -2248,8 +2248,8 @@ "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 39109025, - "sha1_base64": "R3BjkY9jGHignEx198V7DNkGmb8=" + "s": 39089329, + "sha1_base64": "YJeuboYhExPGbuBOOxB5Xi+i6Ks=" }, { "id": "Canada_Nunavut_South", @@ -2260,8 +2260,8 @@ "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 85422563, - "sha1_base64": "bROHY//oKBJc14fYl2qemVIbzhk=" + "s": 84492907, + "sha1_base64": "qjksoILjCJEV4kxzoZPaaPNLt58=" } ] }, @@ -2277,8 +2277,8 @@ "Canada", "Ontario" ], - "s": 64897956, - "sha1_base64": "n0qrMBCRPQ0gqeflRYYUXO+hzdg=" + "s": 64740404, + "sha1_base64": "bxKsq+V2tOKp6Pq54nDPkNn2faA=" }, { "id": "Canada_Ontario_Kingston", @@ -2289,8 +2289,8 @@ "Canada", "Ontario" ], - "s": 109367209, - "sha1_base64": "q5moNQq55flfhX4Rv9DDWcKWFiI=" + "s": 108899465, + "sha1_base64": "gSMT2auddHb/NxIU9ehtK2KNlSM=" }, { "id": "Canada_Ontario_London", @@ -2301,8 +2301,8 @@ "Canada", "Ontario" ], - "s": 81361023, - "sha1_base64": "sdVvD5NuYFXcKvH8QxvqBhtCFk4=" + "s": 81037736, + "sha1_base64": "vNmPGI4EvhZzsdmIe2RXN1sllag=" }, { "id": "Canada_Ontario_Northeastern_Central", @@ -2313,8 +2313,8 @@ "Canada", "Ontario" ], - "s": 36889105, - "sha1_base64": "vCVv4/cTunV9PQAuOaRCK4OSrXk=" + "s": 36743041, + "sha1_base64": "INTzEevMAYXsp3BKBto9dsPxxL4=" }, { "id": "Canada_Ontario_Northeastern_North", @@ -2327,8 +2327,8 @@ "Ontario", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 47400821, - "sha1_base64": "ZYZE5VU+b7uHx+JYZ63SIHPckXc=" + "s": 47210500, + "sha1_base64": "TGmoWyd+jA5zWjq/9XCQXiA63MM=" }, { "id": "Canada_Ontario_Northeastern_S", @@ -2339,8 +2339,8 @@ "Canada", "Ontario" ], - "s": 43746544, - "sha1_base64": "qqCYsvPdWj5LktZueDkc2XASgwg=" + "s": 43684832, + "sha1_base64": "p2jH5k35R1ivMvwvuzC8750v4jc=" }, { "id": "Canada_Ontario_Northeastern_SE", @@ -2351,8 +2351,8 @@ "Canada", "Ontario" ], - "s": 29790336, - "sha1_base64": "ak1S3Gy6NzJQwJ3n0nyI8sExtHA=" + "s": 29733408, + "sha1_base64": "leIz5lldWFePJd0SxfDBJ7+DUeY=" }, { "id": "Canada_Ontario_Northeastern_SW", @@ -2363,8 +2363,8 @@ "Canada", "Ontario" ], - "s": 48931840, - "sha1_base64": "G2jKqmPuZFFr8CyqKPiqVMFCD7Y=" + "s": 48876512, + "sha1_base64": "xc/ir0kXw4NdGwgRCYlwYSh/dI4=" }, { "id": "Canada_Ontario_Northeastern_Wawa", @@ -2375,8 +2375,8 @@ "Canada", "Ontario" ], - "s": 33073110, - "sha1_base64": "CZ2PqgRd6YuMFTE2PPvF2bx0xng=" + "s": 33052014, + "sha1_base64": "wXYcnKCb3zjNaLIMr5uLEm0/p9s=" }, { "id": "Canada_Ontario_Northern", @@ -2387,8 +2387,8 @@ "Canada", "Ontario" ], - "s": 49395521, - "sha1_base64": "1JiRjOZrIlM1QSVWr93KToImp9Q=" + "s": 49230729, + "sha1_base64": "Baf6gAvlLjN9891qEhyfo/rPlGc=" }, { "id": "Canada_Ontario_Northwestern", @@ -2402,8 +2402,8 @@ "Ontario", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 129376949, - "sha1_base64": "7dtL+Az+andfgMh+zUxEzHwO8CA=" + "s": 128538781, + "sha1_base64": "04i3S1tiqwQEu1Hq6G+W09PNzUs=" }, { "id": "Canada_Ontario_Toronto", @@ -2414,8 +2414,8 @@ "Canada", "Ontario" ], - "s": 108999154, - "sha1_base64": "SumSXwghzog1OTLBellwLw+iubw=" + "s": 106234906, + "sha1_base64": "cOm44w5M48GM83tt9/OIDAdzBDk=" } ] }, @@ -2428,8 +2428,8 @@ "Canada", "Prince Edward Island" ], - "s": 10661526, - "sha1_base64": "40e/fBZpXcTq570vE03lphcJ+7o=" + "s": 11391526, + "sha1_base64": "daqZsYL1LTAA2pgMJqKFgzpBixs=" }, { "id": "Canada_Quebec", @@ -2443,8 +2443,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 73007580, - "sha1_base64": "GCSiek12u6x1hfmr77yO4/zmwDk=" + "s": 72602244, + "sha1_base64": "5B2HDAUoIhOqf2B8l81f6lwXeh8=" }, { "id": "Canada_Quebek_Far North", @@ -2458,8 +2458,8 @@ "Qu\u00e9bec", "\u14c4\u14c7\u1557\u1466 Nunavut" ], - "s": 70779663, - "sha1_base64": "uEBHaye1qT64cAXhOfKHR8U5UZc=" + "s": 70000343, + "sha1_base64": "onVFkQxiNrNSV53O6oEQw7Y4EU4=" }, { "id": "Canada_Quebek_Montreal", @@ -2470,8 +2470,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 71782884, - "sha1_base64": "8nmXSoUEV0mKHh8RVqYS4/4N5Vw=" + "s": 69465219, + "sha1_base64": "ei22JgBrEsXrz05NWlUTOYmzFN4=" }, { "id": "Canada_Quebek_Lachute", @@ -2482,8 +2482,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 52931198, - "sha1_base64": "rG2V7SbolCp7pNBjOgk6XF9OO34=" + "s": 52729846, + "sha1_base64": "+BuBBlZqFn4Kf24mgN8nyEmkSJU=" }, { "id": "Canada_Quebek_North", @@ -2494,8 +2494,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 87553475, - "sha1_base64": "vP3RKPdYsqPKPJqqaVh01erGWEw=" + "s": 88001651, + "sha1_base64": "NVCh69D0vWS5jmf8s07/etvYuaw=" }, { "id": "Canada_Quebek_Southeast_Rimouski", @@ -2506,8 +2506,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 32067090, - "sha1_base64": "ienoeO9dGJ5Nhk2NR61TnTk4MpI=" + "s": 32639050, + "sha1_base64": "SR4tDL528L2BUpTNMntidVMVXb0=" }, { "id": "Canada_Quebek_Southeast_Saguenay", @@ -2518,8 +2518,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 65065483, - "sha1_base64": "dR8B2Jwwv0yZay/f3hyM1dzR4qs=" + "s": 64977315, + "sha1_base64": "1m3Opo+dNO5qhLB6wYdsaGqDhLg=" }, { "id": "Canada_Quebek_West_Chibougamau", @@ -2530,8 +2530,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 63979121, - "sha1_base64": "A6S2MTGAlP/DKqato5gZz3XHCWM=" + "s": 63970969, + "sha1_base64": "M2IJGIc1a+8tMBGFcCwexmbIKM8=" }, { "id": "Canada_Quebek_West_Rouyn-Noranda", @@ -2542,8 +2542,8 @@ "Canada", "Qu\u00e9bec" ], - "s": 57650859, - "sha1_base64": "5yFNofDFd+RyN/DsVydlFZA4RB8=" + "s": 57479867, + "sha1_base64": "BTb44TjFPKC5rC+vy8UrTed+YqE=" } ] }, @@ -2559,8 +2559,8 @@ "Canada", "Saskatchewan" ], - "s": 65950388, - "sha1_base64": "ExQvn39T4wQ4nqU3ULMn0uKWnNM=" + "s": 65441812, + "sha1_base64": "VFq4yDawowhllL/W6M4ikVaicrc=" }, { "id": "Canada_Saskatchewan_Saskatoon", @@ -2571,8 +2571,8 @@ "Canada", "Saskatchewan" ], - "s": 41452876, - "sha1_base64": "soYSXCqWFiP+TtxUBA+wcgldxmI=" + "s": 41020443, + "sha1_base64": "SZvYBYkVxPHhChGfPSHMJCvfATY=" }, { "id": "Canada_Saskatchewan_Regina", @@ -2583,8 +2583,8 @@ "Canada", "Saskatchewan" ], - "s": 53490119, - "sha1_base64": "rk6YizmOoazHpETH9d2sRb36S7o=" + "s": 53048143, + "sha1_base64": "QNmNlU9a3BXMIJjcpeQcwtWaN5k=" } ] }, @@ -2600,8 +2600,8 @@ "Canada", "Yukon" ], - "s": 49520870, - "sha1_base64": "+zw3R3WwxsIQVc8OVnOPn4M2Lko=" + "s": 49288838, + "sha1_base64": "xCkMD8mSqaf4EctVjsd5mSTTBzs=" }, { "id": "Canada_Yukon_Whitehorse", @@ -2612,8 +2612,8 @@ "Canada", "Yukon" ], - "s": 54127225, - "sha1_base64": "kUm4fXEddke6/88WqjKu2BAKmYg=" + "s": 54050553, + "sha1_base64": "S+ABVYxvmaS2s+yoZXjbBxtTY7o=" } ] } @@ -2630,8 +2630,8 @@ "country_name_synonyms": [ "Cabo Verde" ], - "s": 14003395, - "sha1_base64": "W1w53b8h5TsCy1b13Tt0WVh5cS0=" + "s": 13859611, + "sha1_base64": "0skhOwThQUb1pz+CsDZp6jPNHJw=" }, { "id": "Cayman Islands", @@ -2641,8 +2641,8 @@ "affiliations": [ "Cayman Islands" ], - "s": 1113896, - "sha1_base64": "/pAl0zaVKbgxkNUKN6hz6pDJcs4=" + "s": 1100816, + "sha1_base64": "KoMAIB1Rc3+SsJkH4+USrJ50U0s=" }, { "id": "Central African Republic", @@ -2668,8 +2668,8 @@ "Sangha-Mba\u00e9r\u00e9", "Vakaga" ], - "s": 115144146, - "sha1_base64": "7WbD+hcTSACwZjrT2DTFZy20lN0=" + "s": 117178377, + "sha1_base64": "9zIE2wwcN7L3f8ezodA5EBZzUEY=" }, { "id": "Chad", @@ -2701,8 +2701,8 @@ "Tibesti Region", "Wadi Fira Region" ], - "s": 71321203, - "sha1_base64": "CZgVz6/aD5YQVdOeqQ+GL7Krf9I=" + "s": 70584307, + "sha1_base64": "JBvXFF8nQ6Fu+XTHgHHCPdL3enM=" }, { "id": "Colombia", @@ -2727,8 +2727,8 @@ "Santander", "Sucre" ], - "s": 104452106, - "sha1_base64": "sFowyYHr+P49cxTL5jp4jxxMufU=" + "s": 103478946, + "sha1_base64": "H7S1nSNm7krK16u0S9yOvruY+nI=" }, { "id": "Colombia_West", @@ -2751,8 +2751,8 @@ "Tolima", "Valle del Cauca" ], - "s": 111067037, - "sha1_base64": "XcUn/jap9omCW5H0OzQe6zszvUo=" + "s": 109378421, + "sha1_base64": "ibLK2x7xtT0OuHZHGKnZJKti5os=" }, { "id": "Colombia_East", @@ -2772,8 +2772,8 @@ "Vaup\u00e9s", "Vichada" ], - "s": 35541559, - "sha1_base64": "5GWjyrGVjr5QI4QqbNEWFdWZ388=" + "s": 34319414, + "sha1_base64": "AQJzZ97uL0Uup8pouuH26yKf2HI=" } ] }, @@ -2788,8 +2788,8 @@ "Mwali", "Nzwani / \u0623\u0646\u062c\u0648\u0627\u0646" ], - "s": 5191383, - "sha1_base64": "y5RX+7o4RVxSPCA22fcnMjb7jNs=" + "s": 4904190, + "sha1_base64": "cSBtRG8ZsIis22VSAOCSFgrnMZM=" }, { "id": "Congo-Brazzaville", @@ -2814,8 +2814,8 @@ "country_name_synonyms": [ "Republic of the Congo" ], - "s": 28745304, - "sha1_base64": "+90E8hcwec51JuCu85nDtyYcYjc=" + "s": 28289560, + "sha1_base64": "xBu9nwAcriDHmpdCs/4E+WxN0GA=" }, { "id": "Congo-Kinshasa", @@ -2855,8 +2855,8 @@ "Tshuapa", "\u00c9quateur" ], - "s": 208647247, - "sha1_base64": "waFsszX60xNFgtSCUidKLaVcVys=" + "s": 203366015, + "sha1_base64": "ufwpLN0JhIdzuyJQt7bidZCX6Kg=" }, { "id": "Congo-Kinshasa_Kivu", @@ -2868,8 +2868,8 @@ "Nord-Kivu", "Sud-Kivu" ], - "s": 161700868, - "sha1_base64": "O3h2WCPFXJK9KVlIY2Ep66tKDCw=" + "s": 149585923, + "sha1_base64": "qWpKO2YfvFfNdxAwTCpp+qD4eN4=" } ] }, @@ -2881,8 +2881,8 @@ "affiliations": [ "Cook Islands" ], - "s": 1391877, - "sha1_base64": "so0s4J7P02aKoJ6r6zLGcxJ1VA8=" + "s": 1399845, + "sha1_base64": "wgaojovBwrvd5IhCuMLdwFSdnc8=" }, { "id": "Costa Rica", @@ -2901,8 +2901,8 @@ "Puntarenas", "San Jos\u00e9" ], - "s": 45780255, - "sha1_base64": "WyYECE9DH27iWT61Cob1TkVTzmY=" + "s": 44497551, + "sha1_base64": "7WHjz1uJl3h96RHoj3ydE+raHbw=" }, { "id": "Croatia", @@ -2915,8 +2915,8 @@ "affiliations": [ "Hrvatska" ], - "s": 79557354, - "sha1_base64": "wRG+I6mibB/+26QyQO2CKKgr5lw=" + "s": 77775202, + "sha1_base64": "kQUH3NQSonRd41zCLrnIBlW7utM=" }, { "id": "Croatia_West", @@ -2927,8 +2927,8 @@ "Hrvatska", "Italia" ], - "s": 80192564, - "sha1_base64": "3Jtvgi3ory1sifA7KQJiBEGigK0=" + "s": 77467964, + "sha1_base64": "FtDAwmSVZyJFXuPsC6bTmHLtMQQ=" } ] }, @@ -2954,8 +2954,8 @@ "Santiago de Cuba", "Villa Clara" ], - "s": 64668040, - "sha1_base64": "6hC7BeYJmmdsFhvCA+uFYGvDyrM=" + "s": 63975704, + "sha1_base64": "Ipm0JsxgqJXBBUs/H1JBxNxtGiI=" }, { "id": "Cyprus", @@ -2966,8 +2966,8 @@ "British Sovereign Base Areas", "\u039a\u03cd\u03c0\u03c1\u03bf\u03c2 - K\u0131br\u0131s" ], - "s": 33010018, - "sha1_base64": "+s6q8mJswwvywvJI6Y7QWahbLWI=" + "s": 31143410, + "sha1_base64": "M/hxdMc/G3vd4PXWWJVBaAmkYCw=" }, { "id": "Czech Republic", @@ -2984,8 +2984,8 @@ "Praha", "\u010cesko" ], - "s": 31276610, - "sha1_base64": "wF4BRtbXyg9d82+U7ZtzreqEyvQ=" + "s": 30710858, + "sha1_base64": "Inzu9yFCcapYgYJbwpSGENSavMA=" }, { "id": "Czech_Severovychod_Pardubicky kraj", @@ -2996,8 +2996,8 @@ "Severov\u00fdchod", "\u010cesko" ], - "s": 41565869, - "sha1_base64": "tzgcyGj6FD/pVSVk/hXRmkk5r2E=" + "s": 41175637, + "sha1_base64": "dIECepr57Ka0DNylVOIfZBI4Ooo=" }, { "id": "Czech_Karlovasky kraj", @@ -3008,8 +3008,8 @@ "Severoz\u00e1pad", "\u010cesko" ], - "s": 23388737, - "sha1_base64": "a0nuv7onNjkoFfLp0PKjX8PQITM=" + "s": 23326768, + "sha1_base64": "K9UK1zD4QBPfKBDCQw9lPXy8MvE=" }, { "id": "Czech_Ustecky kraj", @@ -3020,8 +3020,8 @@ "Severoz\u00e1pad", "\u010cesko" ], - "s": 52533880, - "sha1_base64": "mYndFnjrAw8yEmPsQSllk7+6Wps=" + "s": 52067088, + "sha1_base64": "rgcYeA/gVUtdAh/hkK+XjBLKEK4=" }, { "id": "Czech_Jihozapad_Plzensky kraj", @@ -3032,8 +3032,8 @@ "Jihoz\u00e1pad", "\u010cesko" ], - "s": 55310439, - "sha1_base64": "1UXxS/nG5K89SyzEbZCq78bl1CE=" + "s": 54515519, + "sha1_base64": "De+MD9crCJ19eUlK0c2wZZQ73z0=" }, { "id": "Czech_Severovychod_Kralovehradecky kraj", @@ -3044,8 +3044,8 @@ "Severov\u00fdchod", "\u010cesko" ], - "s": 44427374, - "sha1_base64": "co9bNnHgSLv7rtViYd8NwvgOwlk=" + "s": 44106021, + "sha1_base64": "4iMXnqtEwtq1jOOnlwEzMX9wsCk=" }, { "id": "Czech_Olomoucky kraj", @@ -3056,8 +3056,8 @@ "St\u0159edn\u00ed Morava", "\u010cesko" ], - "s": 48007525, - "sha1_base64": "yZPaibN+zeud8RArWUmw2CCmTzg=" + "s": 47392965, + "sha1_base64": "I1OccFDfdawz8V3mhkuDv+947nY=" }, { "id": "Czech_Zlinsky Kraj", @@ -3068,8 +3068,8 @@ "St\u0159edn\u00ed Morava", "\u010cesko" ], - "s": 41008813, - "sha1_base64": "1CndcGnyz280FQnM5FdjkLE9qXg=" + "s": 40652101, + "sha1_base64": "zJhMKOyT/EHGqwUSy3j/UcGS/HU=" }, { "id": "Czech_Stredni Cechy_East", @@ -3080,8 +3080,8 @@ "St\u0159edn\u00ed \u010cechy", "\u010cesko" ], - "s": 59119673, - "sha1_base64": "8NsVg6rid84aBn99zsqk//K2KS8=" + "s": 58721801, + "sha1_base64": "pYunYgMHDMBnlxqbwcYGBSLz5/c=" }, { "id": "Czech_Jihozapad_Jihocesky kraj", @@ -3092,8 +3092,8 @@ "Jihoz\u00e1pad", "\u010cesko" ], - "s": 75122393, - "sha1_base64": "5Z9LQhF5s2cnBTMPWc4TaMWimgY=" + "s": 74195209, + "sha1_base64": "l19fmfs02Yte+qhnf/gwGZw7lqo=" }, { "id": "Czech_Jihovychod_Kraj Vysocina", @@ -3104,8 +3104,8 @@ "Jihov\u00fdchod", "\u010cesko" ], - "s": 55422638, - "sha1_base64": "Cle87VlN24nhw1iLkenosAQ6j4g=" + "s": 54905670, + "sha1_base64": "h4fnl82umYVPLxarTEpX25abGhM=" }, { "id": "Czech_Severovychod_Liberecky kraj", @@ -3116,8 +3116,8 @@ "Severov\u00fdchod", "\u010cesko" ], - "s": 35801037, - "sha1_base64": "F4nVVjVKQJZzJhBT9T6Zi6CXn88=" + "s": 35490517, + "sha1_base64": "PwQBTdB3fwLwqUPZumj9jFKJBMc=" }, { "id": "Czech_Stredni Cechy_West", @@ -3128,8 +3128,8 @@ "St\u0159edn\u00ed \u010cechy", "\u010cesko" ], - "s": 52329350, - "sha1_base64": "bm8e80GyyNEs9VorODEj9dACZOE=" + "s": 51587510, + "sha1_base64": "Eno66gkAgdpaYAwhic/1M9+4lKg=" }, { "id": "Czech_Moravskoslezsko", @@ -3140,8 +3140,8 @@ "Moravskoslezsko", "\u010cesko" ], - "s": 62108650, - "sha1_base64": "Ikt7mgZmJFd94Pjc8tOH0Zcqvgs=" + "s": 61773978, + "sha1_base64": "ExBqLWvezJs8P2ojHlx8IUWOEQU=" }, { "id": "Czech_Jihovychod_Jihomoravsky kraj", @@ -3152,8 +3152,8 @@ "Jihov\u00fdchod", "\u010cesko" ], - "s": 76614194, - "sha1_base64": "T8yEE878e3bW0KplrKtuz9XAeqk=" + "s": 76176170, + "sha1_base64": "+AAZPkmP2dQLdkSwrXBu0o1gZq0=" } ] }, @@ -3183,8 +3183,8 @@ "C\u00f4te d'Ivoire", "Ivory Coast" ], - "s": 49719413, - "sha1_base64": "wntUfa96ZP8Ky1Vmisgg8AmlrqY=" + "s": 48716837, + "sha1_base64": "EZZUCPFp1Yx+zX1kAK97PWB4/S0=" }, { "id": "Denmark", @@ -3198,8 +3198,8 @@ "Danmark", "Region Nordjylland" ], - "s": 51865862, - "sha1_base64": "5IjzF9dlxh/oY9evF6qz7YhzJAs=" + "s": 51642742, + "sha1_base64": "4lNtPSf4T+58If0Ba2zN+jb461U=" }, { "id": "Denmark_Central Denmark Region", @@ -3210,8 +3210,8 @@ "Danmark", "Region Midtjylland" ], - "s": 96615977, - "sha1_base64": "DMWincW0is2WMt4d2bksxCKS+j8=" + "s": 95594881, + "sha1_base64": "8uUodi1+UcvBusmJHNHSOxeRuVg=" }, { "id": "Denmark_Capital Region of Denmark", @@ -3223,8 +3223,8 @@ "Region Hovedstaden", "Territorial waters of Bornholm" ], - "s": 65548564, - "sha1_base64": "czGuTHFtMae2U1uDv4X70QEQStc=" + "s": 64860924, + "sha1_base64": "Cj4PCLqM6REgnS7po7NrN/cL1Ng=" }, { "id": "Denmark_Region Zealand", @@ -3235,8 +3235,8 @@ "Danmark", "Region Sj\u00e6lland" ], - "s": 65896328, - "sha1_base64": "bG1w4q166s/EFxMxByMz0Nby0K8=" + "s": 64543840, + "sha1_base64": "YY5f6y2Tq5L1CcytWhw/8ehiNq0=" }, { "id": "Denmark_Region of Southern Denmark", @@ -3247,8 +3247,8 @@ "Danmark", "Region Syddanmark" ], - "s": 96759913, - "sha1_base64": "fimAvIgH130kCJ/SgW6GLrFjKOE=" + "s": 95966769, + "sha1_base64": "koDxvY3x/J9DOvevumFe+prxr5A=" } ] }, @@ -3266,8 +3266,8 @@ "Obock", "Tadjourah" ], - "s": 12074411, - "sha1_base64": "/tZUNVOZKikEfrp8lY0TyrYoydw=" + "s": 12013843, + "sha1_base64": "gCIag5Ynq6U7FcibLtNML4dR12M=" }, { "id": "Dominican Republic", @@ -3309,8 +3309,8 @@ "S\u00e1nchez Ram\u00edrez", "Valverde" ], - "s": 33749041, - "sha1_base64": "XiyqN91WipLN4pnGDldcK3O9OMY=" + "s": 33451097, + "sha1_base64": "/x8YyiiMSdpS3GXhCDHAu5NwDGc=" }, { "id": "East Timor", @@ -3336,8 +3336,8 @@ "Tim\u00f3r Loro Sa'e", "Viqueque" ], - "s": 14367980, - "sha1_base64": "Dj/c8L2us/AkIy57hFJE7AnGPgQ=" + "s": 13759796, + "sha1_base64": "pQmspJoLAEgXQMFxwWG7M/ID8Qc=" }, { "id": "Chile", @@ -3347,8 +3347,8 @@ "affiliations": [ "Acuerdo de Campos de Hielo" ], - "s": 7565696, - "sha1_base64": "fkV3+HqFFrGQtj4aYXON3YsKMm4=" + "s": 7563656, + "sha1_base64": "d0XxBR648p7D3M3uOkmZ2UIy9Xw=" }, { "id": "Chile_Central", @@ -3365,8 +3365,8 @@ "VI Regi\u00f3n del Libertador General Bernardo O'Higgins", "VII Regi\u00f3n del Maule" ], - "s": 93933178, - "sha1_base64": "N9Pfne7OuoORRjrm0Lf4awVTgt8=" + "s": 92589994, + "sha1_base64": "YijHpZhTVsY1LrauOwwcEzWOV3g=" }, { "id": "Chile_North", @@ -3382,8 +3382,8 @@ "V Regi\u00f3n de Valpara\u00edso", "XV Regi\u00f3n de Arica y Parinacota" ], - "s": 41784199, - "sha1_base64": "2jg1/GukjMs9IbE4EhlSZsLTz/M=" + "s": 40881543, + "sha1_base64": "j93xJ5l8trCZ0gxGlCLmOrgNXAE=" }, { "id": "Chile_South", @@ -3399,8 +3399,8 @@ "XII Regi\u00f3n de Magallanes y de la Ant\u00e1rtica Chilena", "XIV Regi\u00f3n de Los R\u00edos" ], - "s": 155753353, - "sha1_base64": "zCgl5c7Kc/JOcdeeXhMxkKvhK/s=" + "s": 153372777, + "sha1_base64": "mPHgNP8w5H1VQ2JWeJME1xVhBtg=" } ] }, @@ -3430,8 +3430,8 @@ "Tungurahua", "Zamora Chinchipe" ], - "s": 48713121, - "sha1_base64": "68boGreZyUyezeQtds7tzcMZLaA=" + "s": 47996793, + "sha1_base64": "JHzI3tRDQDtPNrDAO/MqjI60KSg=" }, { "id": "Ecuador_West", @@ -3458,8 +3458,8 @@ "Santa Elena", "Santo Domingo de los Ts\u00e1chilas" ], - "s": 65435776, - "sha1_base64": "Xco2iomDI25eVzaac2lOm56zRfg=" + "s": 65137800, + "sha1_base64": "k6Y8RzSa6dxsG4IxzDX3yEGO97k=" } ] }, @@ -3497,8 +3497,8 @@ "\u200f\u0627\u0644\u0628\u062d\u064a\u0631\u0629\u200e", "\u0627\u0644\u0625\u0633\u0643\u0646\u062f\u0631\u064a\u0629" ], - "s": 223847745, - "sha1_base64": "b6EbpNDPUYl26h6ZhCp9aEJjNIc=" + "s": 225816585, + "sha1_base64": "lN1IlE+2+Nk5CSPIZ28VOIwZSqw=" }, { "id": "El Salvador", @@ -3522,8 +3522,8 @@ "Departemento de Chalatenango", "El Salvador" ], - "s": 29564202, - "sha1_base64": "hYmVc8jcyY4LJRmA7lqgG0WWuEA=" + "s": 23343946, + "sha1_base64": "T/mOoP9TA2wIuISIox323mqzXaQ=" }, { "id": "Equatorial Guinea", @@ -3540,8 +3540,8 @@ "Litoral", "Wele-Nzas" ], - "s": 10391291, - "sha1_base64": "yD6ZuDLJ0mUrRSjs2jrXiGeai6c=" + "s": 10381891, + "sha1_base64": "Cg8uh3h4LFmQ63RevMpWWYeQJpQ=" }, { "id": "Eritrea", @@ -3557,8 +3557,8 @@ "\u12de\u1263 \u12d3\u1295\u1230\u1263", "\u130b\u123d-\u1263\u122d\u12ab" ], - "s": 25692816, - "sha1_base64": "+PNEmdFWi0r9B08ReFaajl58P0s=" + "s": 24585926, + "sha1_base64": "WCJbnzNFe1xb0JibI00JPSGhZlg=" }, { "id": "Estonia", @@ -3571,8 +3571,8 @@ "affiliations": [ "Eesti" ], - "s": 53740337, - "sha1_base64": "OM+ePUuFgGUI2Oq8zFHtfmvE5ic=" + "s": 52626121, + "sha1_base64": "SYoLapH9G2j6x94hjcxTpJRyIOY=" }, { "id": "Estonia_East", @@ -3582,8 +3582,8 @@ "affiliations": [ "Eesti" ], - "s": 63611592, - "sha1_base64": "Ui8gEiYmpugOLaHlybE6MUE4+NU=" + "s": 63019847, + "sha1_base64": "5JnGq2S8ETBFFTTj34tmQTKDhhc=" } ] }, @@ -3608,8 +3608,8 @@ "Tigray", "\u12a2\u1275\u12ee\u1335\u12eb Ethiopia" ], - "s": 95697630, - "sha1_base64": "dWTTFgbrUP7Y2WDkd4FLTfsQXp0=" + "s": 93854166, + "sha1_base64": "wyg1SnBsyU6Kv/edK6PymufVX9M=" }, { "id": "Faroe Islands", @@ -3626,8 +3626,8 @@ "Territorial waters of Faroe Islands", "V\u00e1ga s\u00fdsla" ], - "s": 9601517, - "sha1_base64": "w8huQUoOwJ3wNioBBq4xgEHSoJY=" + "s": 9315245, + "sha1_base64": "B3HEcx2I2ep4CRKaEeT+RAHRKRw=" }, { "id": "Federated States of Micronesia", @@ -3642,8 +3642,8 @@ "Pohnpei", "Yap" ], - "s": 2263228, - "sha1_base64": "iTMA4wQt4in0zQpQNw2st56kuFY=" + "s": 2257124, + "sha1_base64": "xHsETTWaLJJLZ9JWfOlinOkED7E=" }, { "id": "Fiji", @@ -3656,8 +3656,8 @@ "Northern", "Viti" ], - "s": 19635028, - "sha1_base64": "rSkk1JAdckRUWOv4GvAYgRlYXF0=" + "s": 18618691, + "sha1_base64": "tbOrYHcLCCDw2s6utOtGY/ueARo=" }, { "id": "Finland", @@ -3671,8 +3671,8 @@ "L\u00e4nsi-Suomi", "Suomi" ], - "s": 46810907, - "sha1_base64": "9HcZnOpZlklcEP+UHHUedS6CQoY=" + "s": 47612284, + "sha1_base64": "ZxYvkcBDmqp0Worc4+Ix2+J9M0w=" }, { "id": "Finland_Western Finland_Tampere", @@ -3683,8 +3683,8 @@ "L\u00e4nsi-Suomi", "Suomi" ], - "s": 79113779, - "sha1_base64": "z4y37l9akMgAF9OuJt0PH8mb670=" + "s": 78113347, + "sha1_base64": "tQtBbkrPbAgmBBPQbcBgpH8KjfQ=" }, { "id": "Finland_Northern Finland", @@ -3695,8 +3695,8 @@ "Pohjois-Suomi", "Suomi" ], - "s": 105026596, - "sha1_base64": "NsTLEzX7YZpe2QC67HfLtjJymrY=" + "s": 102745628, + "sha1_base64": "oR8cNS69yZJ7uOTY/3+US4KKohk=" }, { "id": "Finland_Eastern Finland_North", @@ -3707,8 +3707,8 @@ "It\u00e4-Suomi", "Suomi" ], - "s": 113932816, - "sha1_base64": "8GAGQXRJ3+MnRHOElQFVA30YKgA=" + "s": 109407767, + "sha1_base64": "tqRC0mqNrwASLLCgxwi2gZw9N6A=" }, { "id": "Finland_Eastern Finland_South", @@ -3719,8 +3719,8 @@ "It\u00e4-Suomi", "Suomi" ], - "s": 79368505, - "sha1_base64": "lVTzo6N6bIvnTrUTOpRT7sQmkRs=" + "s": 79340968, + "sha1_base64": "cE7fHDer6lJ068R+6eu8wTUomB0=" }, { "id": "Finland_Southern Finland_West", @@ -3732,8 +3732,8 @@ "Suomi", "\u00c5land" ], - "s": 81341572, - "sha1_base64": "Lkuw/agMZrbwQn4T77vfK5VvoFk=" + "s": 80074156, + "sha1_base64": "1H2aQjb6aTYUKgz4/uAvuHBmkv4=" }, { "id": "Finland_Southern Finland_Helsinki", @@ -3744,8 +3744,8 @@ "Etel\u00e4-Suomi", "Suomi" ], - "s": 109138928, - "sha1_base64": "HahOXbOqJO2/sx/Y6QesnXs+xgI=" + "s": 106579960, + "sha1_base64": "UAVJ/G0BnAT1XDD0AE7ulyBjIUU=" }, { "id": "Finland_Southern Finland_Lappeenranta", @@ -3756,8 +3756,8 @@ "Etel\u00e4-Suomi", "Suomi" ], - "s": 58949503, - "sha1_base64": "V3efsLFVrVnG5atFUWx31feIJcM=" + "s": 58847662, + "sha1_base64": "HZTd3jPA5Gw8AK4977dLpowm6YY=" } ] }, @@ -3776,8 +3776,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 61690033, - "sha1_base64": "JegV8T/02KzEdska2NMclK4ews0=" + "s": 60194305, + "sha1_base64": "Shtr77GUkv1oW95SDuTs/XeY9Sc=" }, { "id": "France_Alsace_Haut-Rhin", @@ -3788,8 +3788,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 44379230, - "sha1_base64": "rkiQOVEfqZUVnGnULG4motedWDI=" + "s": 43947717, + "sha1_base64": "HR0J4ytt7ceYLDw8MBM4tPDlCbA=" } ] }, @@ -3805,8 +3805,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 48321247, - "sha1_base64": "FJwZ5Sk05byPQihS5dXWPsTKfv4=" + "s": 47459862, + "sha1_base64": "0OKb3tBA6r/xwzWKd9jryQxdhqY=" }, { "id": "France_Aquitaine_Gironde", @@ -3817,8 +3817,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 72195896, - "sha1_base64": "nQPEF9EKUUFGZLdK6JdMhSASS80=" + "s": 70728632, + "sha1_base64": "TxYSvaVzemB/KnqNpnMkpu1camM=" }, { "id": "France_Aquitaine_Landes", @@ -3829,8 +3829,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 39329293, - "sha1_base64": "L4zKVNbIRzBYYsXucvn0tjjoZCY=" + "s": 38235676, + "sha1_base64": "lzyGtC000hT+0b5E5i/a4klC71E=" }, { "id": "France_Aquitaine_Lot-et-Garonne", @@ -3841,8 +3841,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 33859052, - "sha1_base64": "/V8uPBSshXIgMjrZXNx4BMgFBVQ=" + "s": 33184251, + "sha1_base64": "PaptrtzihfSqRGPFLAEJRZYG8Gs=" }, { "id": "France_Aquitaine_Pyrenees-Atlantiques", @@ -3853,8 +3853,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 60027232, - "sha1_base64": "qyIuq70QU2ORKyNU5nB3G0OBrbg=" + "s": 59175519, + "sha1_base64": "98vfRlPEX4R8pY+IwjdTu2TLpKM=" } ] }, @@ -3870,8 +3870,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 37633804, - "sha1_base64": "91Abyv/rTgbDA5sdLXPYif6rfGs=" + "s": 37191435, + "sha1_base64": "3xwiRsFrVrfRGyGGYI2glZ3fxKk=" }, { "id": "France_Auvergne_Cantal", @@ -3882,8 +3882,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 24109146, - "sha1_base64": "CkivkhVL0DpkbIKRM5L58jhukRk=" + "s": 23996440, + "sha1_base64": "6yx7+/DCZ/lMUBHITNQDlwU1hb8=" }, { "id": "France_Auvergne_Haute-Loire", @@ -3894,8 +3894,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 32363571, - "sha1_base64": "Kc+nMskWNXS2r1svYl+FpRbum1Q=" + "s": 32010298, + "sha1_base64": "AxuEERu4s9PiwEeFzjAGHzXRYVI=" }, { "id": "France_Auvergne_Puy-de-Dome", @@ -3906,8 +3906,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 52315319, - "sha1_base64": "LFThgNNp3pmvnLbiZb5T7EwLfFc=" + "s": 52031150, + "sha1_base64": "BLmC7puPuOveQW3/Q1ynKc/Ey1g=" } ] }, @@ -3925,8 +3925,8 @@ "Guernsey", "Jersey" ], - "s": 50053287, - "sha1_base64": "GmssiXoT6AVydbm13x8x5FY9Jko=" + "s": 48831479, + "sha1_base64": "PwvloplFHEJJm1FQyoJqqwhDrKI=" }, { "id": "France_Brittany_Finistere", @@ -3937,8 +3937,8 @@ "Bretagne", "France" ], - "s": 67267313, - "sha1_base64": "mogiigh+nkYrQdZrT7lybvJBHeA=" + "s": 66647193, + "sha1_base64": "zHc2xNklaaY0f3gs43V+qFWj+Do=" }, { "id": "France_Brittany_Ille-et-Vilaine", @@ -3950,8 +3950,8 @@ "France", "Jersey" ], - "s": 62033464, - "sha1_base64": "GWheg4rHGH9Zb9H+8KkjedqiZPM=" + "s": 60624688, + "sha1_base64": "GU1Z784o8l5D450coxNBii8wBdg=" }, { "id": "France_Brittany_Morbihan", @@ -3962,8 +3962,8 @@ "Bretagne", "France" ], - "s": 53717321, - "sha1_base64": "696YIbL9d0G7MordxJ3JoMHI9u4=" + "s": 53255297, + "sha1_base64": "dq+Z7S4iEzjSLWS8bb4ZanPQS6A=" } ] }, @@ -3979,8 +3979,8 @@ "Bourgogne-Franche-Comt\u00e9", "France" ], - "s": 41717197, - "sha1_base64": "cn3O1sg6jttMfIePzs/5rM5B+f8=" + "s": 41076301, + "sha1_base64": "clgsFYsiHhWXmFJsOO6YUXYNlak=" }, { "id": "France_Burgundy_Nievre", @@ -3991,8 +3991,8 @@ "Bourgogne-Franche-Comt\u00e9", "France" ], - "s": 26521122, - "sha1_base64": "NYKXQjRNN+Iag8ZO2E+fsmBShYc=" + "s": 25877321, + "sha1_base64": "xcX5NxFaSRikdGzQoC8A51gQOa8=" }, { "id": "France_Burgundy_Saone-et-Loire", @@ -4003,8 +4003,8 @@ "Bourgogne-Franche-Comt\u00e9", "France" ], - "s": 90656481, - "sha1_base64": "gavTfD2bBXrjyN7tYw+no242nHk=" + "s": 88339145, + "sha1_base64": "TPiJ43/U6sKynzyabLC0/pON9yM=" }, { "id": "France_Burgundy_Yonne", @@ -4015,8 +4015,8 @@ "Bourgogne-Franche-Comt\u00e9", "France" ], - "s": 41433782, - "sha1_base64": "XUBo1qAsjUHdV8QnAWorrJzBIGk=" + "s": 40525310, + "sha1_base64": "4lqt1Bg0kwp1z58IO0TLqG8nEkU=" } ] }, @@ -4032,8 +4032,8 @@ "Centre-Val de Loire", "France" ], - "s": 27678211, - "sha1_base64": "BfpO6+C0oprMo/GipxBF/ByXwO4=" + "s": 27261178, + "sha1_base64": "60mQd69VmkbQhsyfEVALQFk8aG8=" }, { "id": "France_Centre-Val de Loire_Eure-et-Loir", @@ -4044,8 +4044,8 @@ "Centre-Val de Loire", "France" ], - "s": 29053090, - "sha1_base64": "VHcXDckbLD2BsFuHLvznx8mhyDU=" + "s": 27999618, + "sha1_base64": "ntQWT830Zv/zx1183AEf0kJSEHI=" }, { "id": "France_Centre-Val de Loire_Indre", @@ -4056,8 +4056,8 @@ "Centre-Val de Loire", "France" ], - "s": 39596765, - "sha1_base64": "zCB+1BtlMWCOHlWP1IWWY4oGAhs=" + "s": 39180004, + "sha1_base64": "qNZMvDioKje/AI2pZTEEoJoQG4A=" }, { "id": "France_Centre-Val de Loire_Indre-et-Loire", @@ -4068,8 +4068,8 @@ "Centre-Val de Loire", "France" ], - "s": 52790719, - "sha1_base64": "5+7Y/Y1zW6vzaqvrT4CfZ4wAilI=" + "s": 50677518, + "sha1_base64": "UA/RgzEe+wzVcadouvA5w1kl5XU=" }, { "id": "France_Centre-Val de Loire_Loir-et-Cher", @@ -4080,8 +4080,8 @@ "Centre-Val de Loire", "France" ], - "s": 34035948, - "sha1_base64": "KBeRzikNglSFFbEyfgcs7gkwe+M=" + "s": 33623595, + "sha1_base64": "hV/qQmfmMlzh4rSm0HCKZIxjNsQ=" }, { "id": "France_Centre-Val de Loire_Loiret", @@ -4092,8 +4092,8 @@ "Centre-Val de Loire", "France" ], - "s": 49555262, - "sha1_base64": "gUOhtUYCwhCfUK72KNWsctcR1Xw=" + "s": 48897189, + "sha1_base64": "7fdbWLe38nlQLcpBIX9ggWS3zJA=" } ] }, @@ -4106,8 +4106,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 113294323, - "sha1_base64": "360HNueiHTExVQ6Ng5borl3cIJg=" + "s": 111228810, + "sha1_base64": "huOafkoCuG121Jw/hm0NhZZiewQ=" }, { "id": "France_Corsica", @@ -4121,8 +4121,8 @@ "Italia", "Monaco" ], - "s": 29023923, - "sha1_base64": "IJe7MLkiAoXLym5+R44N1k05asc=" + "s": 28920386, + "sha1_base64": "ZC6bOxGsRBfZQKIptJHxs961rgg=" }, { "id": "France_Free County_North", @@ -4133,8 +4133,8 @@ "Bourgogne-Franche-Comt\u00e9", "France" ], - "s": 62369777, - "sha1_base64": "l2RxT0eiAJS631/PfaIwLMcjaCA=" + "s": 61703424, + "sha1_base64": "vXphVoEKWqlSMRZIXPHbWfTJnSg=" }, { "id": "France_Free County_South", @@ -4145,8 +4145,8 @@ "Bourgogne-Franche-Comt\u00e9", "France" ], - "s": 52576016, - "sha1_base64": "zh57ecpi2Ot6kbXIaLl5rp3dnts=" + "s": 52121535, + "sha1_base64": "nzi56+MdGPVX60nahnbLZKLazWo=" }, { "id": "France_French Guiana", @@ -4157,8 +4157,8 @@ "France", "Guyane" ], - "s": 28299400, - "sha1_base64": "cZ+anapR/Hc0pE72OLkb4827TK4=" + "s": 28129264, + "sha1_base64": "t+ABGfI/+9DcDx09oaJl6iu2C+A=" }, { "id": "France_Ile-de-France", @@ -4172,8 +4172,8 @@ "France", "\u00cele-de-France" ], - "s": 39217908, - "sha1_base64": "Jdasld1AsHcd2EOG2e0F4aY3RZQ=" + "s": 38611019, + "sha1_base64": "GBTtUhMUSIHxQR4CCMIMqMCtjlc=" }, { "id": "France_Ile-de-France_Hauts-de-Seine", @@ -4184,8 +4184,8 @@ "France", "\u00cele-de-France" ], - "s": 21131025, - "sha1_base64": "EaruNa71zKRbgKck1euiCYIUSH8=" + "s": 20389809, + "sha1_base64": "Py/DamhbC99daFUOapvRd9PB6A8=" }, { "id": "France_Ile-de-France_Paris", @@ -4196,8 +4196,8 @@ "France", "\u00cele-de-France" ], - "s": 43738387, - "sha1_base64": "DMewzm5tUG2qaBAMJa535bPHgBk=" + "s": 43695719, + "sha1_base64": "PCoorPsgC2VnXUNSshz5uL2EOw8=" }, { "id": "France_Ile-de-France_Seine-Saint-Denis", @@ -4208,8 +4208,8 @@ "France", "\u00cele-de-France" ], - "s": 23001626, - "sha1_base64": "7AXC9XcMPLMAzGDHRu3QQqrJvKc=" + "s": 22413643, + "sha1_base64": "2iuwKoriJU9+kGkPSGwMgMIwUiM=" }, { "id": "France_Ile-de-France_Seine-et-Marne", @@ -4220,8 +4220,8 @@ "France", "\u00cele-de-France" ], - "s": 55564063, - "sha1_base64": "5nmp00A2fftV3i3PIIbLVfvC3zU=" + "s": 54153630, + "sha1_base64": "k7XGi+Py1Eyprl0K0gqKoQ6wYWo=" }, { "id": "France_Ile-de-France_Val-dOise", @@ -4232,8 +4232,8 @@ "France", "\u00cele-de-France" ], - "s": 29295805, - "sha1_base64": "OP29i9EyrHDSbuA085G2kyd9gK4=" + "s": 28717389, + "sha1_base64": "VeUxKawVRH1wkC/rjGfNaDYZPfQ=" }, { "id": "France_Ile-de-France_Val-de-Marne", @@ -4244,8 +4244,8 @@ "France", "\u00cele-de-France" ], - "s": 22832851, - "sha1_base64": "R2VSe4pai7mec8nwRRRRrZDUTdQ=" + "s": 22330973, + "sha1_base64": "KgU9NuXD894/bMsp2GxFWoS3qsQ=" }, { "id": "France_Ile-de-France_Yvelines", @@ -4256,8 +4256,8 @@ "France", "\u00cele-de-France" ], - "s": 44098690, - "sha1_base64": "OnAHfrt5eFYp6aDlPCvuj/nbD28=" + "s": 43274001, + "sha1_base64": "jNP9KlcEyH2xOGagCS24XWr8UQI=" } ] }, @@ -4273,8 +4273,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 42858940, - "sha1_base64": "XAvSqtNr3QLA5A9JQOTeOP71E4s=" + "s": 42315795, + "sha1_base64": "2q5JTc6WE93ChMb3GhPAwmGE4qs=" }, { "id": "France_Languedoc-Roussillon_Gard", @@ -4285,8 +4285,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 49364510, - "sha1_base64": "TUY9/TFtdG76vEWB+EupbRjBGu0=" + "s": 48428029, + "sha1_base64": "sRDj57OqEjeQoTmg2YSTCPxpq8w=" }, { "id": "France_Languedoc-Roussillon_Herault", @@ -4297,8 +4297,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 72032921, - "sha1_base64": "yFyETE2ZTxzL7Zo41XNVk2xYTfE=" + "s": 68950896, + "sha1_base64": "JSpURbFd4Kc66W5EHcRSPEwGLS0=" }, { "id": "France_Languedoc-Roussillon_Lozere", @@ -4309,8 +4309,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 21674048, - "sha1_base64": "VJkE0kBiZSw/2fVmEsD8V4k0DPE=" + "s": 21489303, + "sha1_base64": "ZlTSLKV+htUODZk/BY+biAPi8+c=" }, { "id": "France_Languedoc-Roussillon_Pyrenees-Orientales", @@ -4321,8 +4321,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 38725316, - "sha1_base64": "RUDcX452M6rOrNazGdDQsXIs0nc=" + "s": 37654716, + "sha1_base64": "vIarKEIz96dDRUdzVe39XJofQP0=" } ] }, @@ -4335,8 +4335,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 90864644, - "sha1_base64": "/+yu8aWeJWOmPHNmtZ/U4JPAGY4=" + "s": 89465396, + "sha1_base64": "dQu+o9QtxGxx2K/jYB2F2FyihT8=" }, { "id": "France_Lorraine", @@ -4350,8 +4350,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 44358231, - "sha1_base64": "0HB38F11Nv1ZVvc6XwdNIG6aMtM=" + "s": 42183093, + "sha1_base64": "iXFQaMi/WyuZ+2HyvCfCVYuuttk=" }, { "id": "France_Lorraine_Meuse", @@ -4362,8 +4362,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 22883139, - "sha1_base64": "Zue0oYyr5ALkteLpp5wduUHDhv0=" + "s": 22338385, + "sha1_base64": "l5A6J3JUtdwD3CAw3ZVm6lVrLtk=" }, { "id": "France_Lorraine_Moselle", @@ -4374,8 +4374,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 60868752, - "sha1_base64": "xZasa8Jy8rgLib3HgFvgrggPO+o=" + "s": 59333430, + "sha1_base64": "nBF85o0xnVwCwoG174vuCk7ITx4=" }, { "id": "France_Lorraine_Vosges", @@ -4386,8 +4386,8 @@ "Alsace-Champagne-Ardenne-Lorraine", "France" ], - "s": 39728014, - "sha1_base64": "tyn+2jtB+Pi/R1WxVaYaTuqE5c8=" + "s": 38997340, + "sha1_base64": "oMLQb4E9uQlTEaH9UIJq8edtFfU=" } ] }, @@ -4403,8 +4403,8 @@ "France", "Normandie" ], - "s": 47495609, - "sha1_base64": "NdCt9mY9/ZNEducGdnNyfZEWtLQ=" + "s": 45152904, + "sha1_base64": "6JDTrua1E9ypj0wX1txI2xP9LDc=" }, { "id": "France_Lower Normandy_Manche", @@ -4416,8 +4416,8 @@ "Jersey", "Normandie" ], - "s": 38380390, - "sha1_base64": "ktaOnO6JWAIlzdyNXDlcNWOdQ4k=" + "s": 37996662, + "sha1_base64": "f5e42b8TghiM81u/z7NEOmMsk/w=" }, { "id": "France_Lower Normandy_Orne", @@ -4428,8 +4428,8 @@ "France", "Normandie" ], - "s": 29713627, - "sha1_base64": "QBfnTVBBa2PZuWhZban24v2VwO0=" + "s": 29009795, + "sha1_base64": "Ob2YRaxu78lrH+v9eBzN3oNRDcU=" } ] }, @@ -4445,8 +4445,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 27642601, - "sha1_base64": "hquDaS+ZeiOPnyBhDCF/DNuSPUY=" + "s": 27183960, + "sha1_base64": "Jw3+JzXf1ptx1frOPZCicnmwr68=" }, { "id": "France_Midi-Pyrenees_Aveyron", @@ -4457,8 +4457,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 51801878, - "sha1_base64": "rOIqExDaxJyed8nM/on6huk71xY=" + "s": 51067036, + "sha1_base64": "x+Vi69dKMs+Hqmz4+gXLwTO3b1Y=" }, { "id": "France_Midi-Pyrenees_Gers", @@ -4469,8 +4469,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 31536187, - "sha1_base64": "92VT1kxQqWzEiUpBB8IN3JibaOY=" + "s": 30958842, + "sha1_base64": "JoGOODKeqOz1yeRfFPvKh+OIuK8=" }, { "id": "France_Midi-Pyrenees_Haute-Garonne", @@ -4481,8 +4481,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 75326176, - "sha1_base64": "VVvIf4y0zP5ll1anb1VA0IeQJdg=" + "s": 70798640, + "sha1_base64": "7QU2qn1loqIEBn3RGFVqQQTeKzQ=" }, { "id": "France_Midi-Pyrenees_Hautes-Pyrenees", @@ -4493,8 +4493,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 45766757, - "sha1_base64": "UeoLRmBu84FEPlRNM+xm9FzPxJU=" + "s": 45569444, + "sha1_base64": "4qIuSJMegd9X8Tqt5LfyWGqMVRE=" }, { "id": "France_Midi-Pyrenees_Lot", @@ -4505,8 +4505,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 30033244, - "sha1_base64": "dFkcbkzSYxYp6209GFlHkl70P7M=" + "s": 27938347, + "sha1_base64": "pl6NY4pdO1ozb6anVaIIuG6Pp38=" }, { "id": "France_Midi-Pyrenees_Tarn", @@ -4517,8 +4517,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 33596012, - "sha1_base64": "P56E6CN25e5BB0b3yfwtJBszw3I=" + "s": 32965619, + "sha1_base64": "VPicsgqK1K7AU7swmy1gyYkscSU=" }, { "id": "France_Midi-Pyrenees_Tarn-et-Garonne", @@ -4529,8 +4529,8 @@ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" ], - "s": 25707732, - "sha1_base64": "InoYrA5EeRcPiCTO+eCUW06oLYA=" + "s": 25036618, + "sha1_base64": "k9w//XiJcAjXGl4G9cIHjyebp4k=" } ] }, @@ -4551,8 +4551,8 @@ "France, Nouvelle-Cal\u00e9donie, \u00cele de Walpole (eaux territoriales)", "France, Nouvelle-Cal\u00e9donie, \u00celes Loyaut\u00e9 (eaux territoriales)" ], - "s": 16970413, - "sha1_base64": "KRSYeHoI4FRTIGStArsXYC1Hc3o=" + "s": 16640445, + "sha1_base64": "h/t8DW2KUNQ3BKBW61pbckqPwMs=" }, { "id": "France_Nord-Pas-de-Calais", @@ -4566,8 +4566,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 42704421, - "sha1_base64": "eEfUPycPi53bV7vESaalDAXgG0o=" + "s": 42194372, + "sha1_base64": "sQAgzrkmiqBqn365K7kGoorBoEM=" }, { "id": "France_Nord-Pas-de-Calais_Lille", @@ -4578,8 +4578,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 54935791, - "sha1_base64": "KV5ZeVaXSPBejj4FHztg+ArIGRA=" + "s": 52444942, + "sha1_base64": "flNGb8I/4Iovs/WHApDk+ZQ1e6g=" }, { "id": "France_Nord-Pas-de-Calais_Pas-de-Calais", @@ -4592,8 +4592,8 @@ "Nord-Pas-de-Calais-Picardie", "United Kingdom" ], - "s": 69658321, - "sha1_base64": "OZZ6u5Wp3Kk4SiBvseVDAq54fDs=" + "s": 68427816, + "sha1_base64": "TwDwJa33v/LSHlSClBPQ3NisiHA=" } ] }, @@ -4609,8 +4609,8 @@ "France", "Pays de la Loire" ], - "s": 49390246, - "sha1_base64": "xpBt8jxVr7bZxDwI0qMBnfguGs8=" + "s": 48477750, + "sha1_base64": "YD7PiuVhGSHZ4oFsd06UT2ADolY=" }, { "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire", @@ -4621,8 +4621,8 @@ "France", "Pays de la Loire" ], - "s": 27665986, - "sha1_base64": "1DdRx4BF4UIac5FcDCBcN2hWqUs=" + "s": 27219424, + "sha1_base64": "QWVV2mL6KvcFlKSgMWllp48Soss=" }, { "id": "France_Pays de la Loire_Maine-et-Loire", @@ -4633,8 +4633,8 @@ "France", "Pays de la Loire" ], - "s": 56529848, - "sha1_base64": "nHgAmiyHB2rHSc5dYaYmWG0ypNI=" + "s": 55240592, + "sha1_base64": "oGM+DArKiXcOSkrpMhh4WeOguRs=" }, { "id": "France_Pays de la Loire_Mayenne", @@ -4645,8 +4645,8 @@ "France", "Pays de la Loire" ], - "s": 26409954, - "sha1_base64": "N68ys/GW1LyvR+z98YRYvAAsZro=" + "s": 26125386, + "sha1_base64": "GgBZ+kx20fU9Q0Fj575qjwC2ggM=" }, { "id": "France_Pays de la Loire_Sarthe", @@ -4657,8 +4657,8 @@ "France", "Pays de la Loire" ], - "s": 43897256, - "sha1_base64": "UCbfrgsuO4PF6WjOLh8eLRdezPE=" + "s": 43206784, + "sha1_base64": "FmUYZN37KrII/IeJ3V/7x+nOuxE=" }, { "id": "France_Pays de la Loire_Vendee", @@ -4669,8 +4669,8 @@ "France", "Pays de la Loire" ], - "s": 67149137, - "sha1_base64": "rPzkUQ3AT3nLDKasS7XIeLXp3Hk=" + "s": 65173961, + "sha1_base64": "9nJgn8fYMW84rb//GHkDYvg7C9A=" } ] }, @@ -4686,8 +4686,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 43931645, - "sha1_base64": "V2k/8pmIPuicfJjNcy+IUx7pIyQ=" + "s": 43180309, + "sha1_base64": "1Q23PrY2AX7doGmuDL2Pi7JqfLo=" }, { "id": "France_Picardy_Oise", @@ -4698,8 +4698,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 53230655, - "sha1_base64": "n8Gp8NaE+8DarCfPTl1sRbAO0r0=" + "s": 52395807, + "sha1_base64": "EilYkJty4H7pDixSBdgnmZUJRDI=" }, { "id": "France_Picardy_Somme", @@ -4710,8 +4710,8 @@ "France", "Nord-Pas-de-Calais-Picardie" ], - "s": 40956645, - "sha1_base64": "x07VNmbtP0EAQtG9JGu3k3nwFVI=" + "s": 40342860, + "sha1_base64": "8yKoLb24ADccCscpZJHdJJbAzJg=" } ] }, @@ -4727,8 +4727,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 38655820, - "sha1_base64": "dfd0aqn8WNAmbop79tUTQtLQONM=" + "s": 38012724, + "sha1_base64": "UBpU96wjI7gdFpnLanBw71Y7Ny4=" }, { "id": "France_Poitou-Charentes_Charente-Maritime", @@ -4739,8 +4739,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 62701648, - "sha1_base64": "+t2hD4Lc5DNOV9N7KFgkz+Fpl1E=" + "s": 61951343, + "sha1_base64": "Q3P8r5n6l1jlyEUG+2/y2xGEeoU=" }, { "id": "France_Poitou-Charentes_Deux-Sevres", @@ -4751,8 +4751,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 50050717, - "sha1_base64": "Ct4No7XoTkfHAHof0pufXThQNaI=" + "s": 49950572, + "sha1_base64": "DBt+ubPwXUKyARUy/MqC5OQZCKY=" }, { "id": "France_Poitou-Charentes_Vienne", @@ -4763,8 +4763,8 @@ "Aquitaine-Limousin-Poitou-Charentes", "France" ], - "s": 46857878, - "sha1_base64": "0zmGtIzwwC0ICT2KQ4kWwHvFdig=" + "s": 46537598, + "sha1_base64": "rvuNJ1nxy+0BhQKlY0lX9Sw4SBE=" } ] }, @@ -4780,8 +4780,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 25151043, - "sha1_base64": "NPfr+LNiynk/DHRtvzgfHOpEKrs=" + "s": 24656426, + "sha1_base64": "IWjPlERCFYhdpZZ9lkU2tig70NA=" }, { "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone", @@ -4792,8 +4792,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 68367591, - "sha1_base64": "oCr9oFH5CY/kA3M8F5wSqnvQfbs=" + "s": 66502958, + "sha1_base64": "209Sknf/hxrLxzo/Gh/50mqICFg=" }, { "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes", @@ -4804,8 +4804,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 22594107, - "sha1_base64": "jlDRveW8+kLyhSoK658Po0UJzQs=" + "s": 22297714, + "sha1_base64": "8xO9GOjtPtL7o30lhEvbzPVHbMw=" }, { "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps", @@ -4817,8 +4817,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 47828263, - "sha1_base64": "7i0G92tSouUBjBjK09Gs2ERp2RU=" + "s": 46763478, + "sha1_base64": "tl8PAhU3NFjtqcgwSM6TUr+ieGE=" }, { "id": "France_Provence-Alpes-Cote dAzur_Var", @@ -4829,8 +4829,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 55491607, - "sha1_base64": "eNmy/j/RWluCvOm04Q0Hd9gQDM8=" + "s": 54878814, + "sha1_base64": "yBw4YM+LvDlRIbbZzmiRH3I+W1g=" }, { "id": "France_Provence-Alpes-Cote dAzur_Vaucluse", @@ -4841,8 +4841,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 40939902, - "sha1_base64": "8XlTk+UIaaPCtD22j62ps/POHSk=" + "s": 40332965, + "sha1_base64": "9pJqB5tcCY9UT5zREF/0jHgG4Rw=" } ] }, @@ -4858,8 +4858,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 51096702, - "sha1_base64": "XoEzGiKvQvGpLSdgessi9KTv608=" + "s": 50593341, + "sha1_base64": "sMSVJq/o6D2Sh52gva7bWRumCMg=" }, { "id": "France_Rhone-Alpes_Ardeche", @@ -4870,8 +4870,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 42728901, - "sha1_base64": "Zm4aooPNHOtZlKQgqAWR4gxB0Hw=" + "s": 42058459, + "sha1_base64": "fUdK/FpLLez40NTSj3EeVklELTQ=" }, { "id": "France_Rhone-Alpes_Drome", @@ -4883,8 +4883,8 @@ "France", "Provence-Alpes-C\u00f4te d'Azur" ], - "s": 47620797, - "sha1_base64": "qPRkCwyAvaqabqypm5yQ9RB6IQ4=" + "s": 46575148, + "sha1_base64": "+QWc5ZZFCQECK9OTNjjrME4x/yE=" }, { "id": "France_Rhone-Alpes_Haute-Savoie", @@ -4895,8 +4895,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 57694183, - "sha1_base64": "wvYK9nv7bueBRV27fF+woKpyzHQ=" + "s": 56230871, + "sha1_base64": "Kjkp5/rwFmMPZw1hUygRrPRDH7s=" }, { "id": "France_Rhone-Alpes_Isere", @@ -4907,8 +4907,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 72971705, - "sha1_base64": "chLzgS9LoBjwrwgE1zQ2tgCph5A=" + "s": 71782481, + "sha1_base64": "F3eutN9maCMSHFCnoRqJagol5mE=" }, { "id": "France_Rhone-Alpes_Loire", @@ -4919,8 +4919,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 55254558, - "sha1_base64": "td6a6ZbEFGRnKHetMHFJe7ueUJI=" + "s": 54629422, + "sha1_base64": "t6sw3zXprY0XmlieuLtVJ/Mp2WM=" }, { "id": "France_Rhone-Alpes_Rhone", @@ -4931,8 +4931,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 69638641, - "sha1_base64": "5EFDT2Q15m3dRKNF5D2oSB++uEk=" + "s": 68541465, + "sha1_base64": "JJRcroNbRgaerf9vhbocNyc3R9s=" }, { "id": "France_Rhone-Alpes_Savoie", @@ -4943,8 +4943,8 @@ "Auvergne-Rh\u00f4ne-Alpes", "France" ], - "s": 43518188, - "sha1_base64": "lQlZvAqpK5mBhQHYlmOs1fptj3o=" + "s": 42715091, + "sha1_base64": "1HUW/DVtalMTg0b6ZqiLdICiRNk=" } ] }, @@ -4968,8 +4968,8 @@ "La R\u00e9union", "Mayotte" ], - "s": 38386554, - "sha1_base64": "u+wWmOPIfzSJHUyMhKBAhXyPt48=" + "s": 37708879, + "sha1_base64": "WZ/ZD7NBNnOi/lx15B5G/eUx+6o=" }, { "id": "France_Upper Normandy", @@ -4980,8 +4980,8 @@ "France", "Normandie" ], - "s": 84962795, - "sha1_base64": "PiXGJSCZiMHAMdvcDm3SWgzSkhQ=" + "s": 83145283, + "sha1_base64": "G1tqgkLbj/HvAJwfzc+milH3gA8=" }, { "id": "French Polynesia", @@ -4999,8 +4999,8 @@ "France, Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)", "Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)" ], - "s": 17350076, - "sha1_base64": "NWqOb/cmA8JC8Mni7hJ0I0aXVh4=" + "s": 17185917, + "sha1_base64": "zrifUoUdg//I3IwXhN6fWrZaZ24=" }, { "id": "Wallis and Futuna", @@ -5011,8 +5011,8 @@ "France", "France, Wallis-et-Futuna (eaux territoriales)" ], - "s": 984459, - "sha1_base64": "UQOGzioRFGLaMJW4OZ1n+3zSONo=" + "s": 981459, + "sha1_base64": "VNCyqxneH7P0/twtFdEfpc5KPk4=" } ] }, @@ -5033,8 +5033,8 @@ "Ogoou\u00e9-Lolo", "Woleu-Ntem" ], - "s": 19646576, - "sha1_base64": "6E0SO8Tcl59QZguN8FrIZu6jmYI=" + "s": 18002576, + "sha1_base64": "ZyFFLL7phL9hL62+rDgeiyHrIbU=" }, { "id": "Georgia Region", @@ -5058,8 +5058,8 @@ "\u10d0\u10ed\u10d0\u10e0\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" ], - "s": 73958880, - "sha1_base64": "ofOVqmK3tMVFR4zldUjhexEZ5xc=" + "s": 71464591, + "sha1_base64": "OWudHfpFZ02uynrCr2FHMKbL7U4=" }, { "id": "Abkhazia", @@ -5071,8 +5071,8 @@ "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" ], - "s": 12146029, - "sha1_base64": "HGIXXib69GpBc4NWkL7+2joK3pA=" + "s": 12072493, + "sha1_base64": "S1DHscDxVS2VE/GocvVJ2OOtfEY=" }, { "id": "South Ossetia", @@ -5084,8 +5084,8 @@ "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" ], - "s": 12209192, - "sha1_base64": "XQ5df6w+siwxODMocxE4ikZzZis=" + "s": 12201992, + "sha1_base64": "ccOAWhS6mGZi/VsVRCxEzdEPXbA=" } ] }, @@ -5106,8 +5106,8 @@ "Schaffhausen", "Z\u00fcrich" ], - "s": 129613955, - "sha1_base64": "H0OeFWBSsZsDgJE3U/N05gWj4/w=" + "s": 128401443, + "sha1_base64": "z5cf0juX39E+Jo/D3N7jZIyKy+E=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe", @@ -5118,8 +5118,8 @@ "Baden-W\u00fcrttemberg", "Deutschland" ], - "s": 118878748, - "sha1_base64": "E2IjLVr6prDOKW+uxjo5q3yJPIY=" + "s": 117420876, + "sha1_base64": "cLOB9ESSUe4xC96IfR5Qxwl2hGE=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn", @@ -5130,8 +5130,8 @@ "Baden-W\u00fcrttemberg", "Deutschland" ], - "s": 54121170, - "sha1_base64": "4Y83xoX+7+2YtKiBCX2Gl2oA34A=" + "s": 53884194, + "sha1_base64": "MRaxk5LeKAs+fpJEfvye6t4cD/0=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart", @@ -5142,8 +5142,8 @@ "Baden-W\u00fcrttemberg", "Deutschland" ], - "s": 116302259, - "sha1_base64": "z7Npy2p0TmbIYtLotD39D1yVLhQ=" + "s": 115160459, + "sha1_base64": "liveUfG1+sztF5uX0kj+S8jqla8=" }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen", @@ -5154,8 +5154,8 @@ "Baden-W\u00fcrttemberg", "Deutschland" ], - "s": 95140636, - "sha1_base64": "SQx+yRDoOd4HFtAUK8Ee4iis/t0=" + "s": 93923540, + "sha1_base64": "c5YSeW5fc+My+M/e6C+AC0p3Nok=" } ] }, @@ -5168,8 +5168,8 @@ "Berlin", "Deutschland" ], - "s": 71995659, - "sha1_base64": "1Q5KplWcoePbr9dBeEYER/gJiTk=" + "s": 69934387, + "sha1_base64": "H00tCmHf6Gt/c4SRKW1mWB9J2YU=" }, { "id": "Germany_Brandenburg_North", @@ -5180,8 +5180,8 @@ "Brandenburg", "Deutschland" ], - "s": 85498057, - "sha1_base64": "gk0WnwszTTCo3407Fcum8qOaPRM=" + "s": 84420185, + "sha1_base64": "sa0u4ANlXHK3esfTCo2k3q/O7AE=" }, { "id": "Germany_Brandenburg_South", @@ -5192,8 +5192,8 @@ "Brandenburg", "Deutschland" ], - "s": 80968374, - "sha1_base64": "R0bXkg9tA4UK2sYenM9g3QVSW44=" + "s": 79466136, + "sha1_base64": "dl3yPbJFhSW6RPlnGI8ZTdfyUz8=" }, { "id": "Germany_Free State of Bavaria", @@ -5207,8 +5207,8 @@ "Bayern", "Deutschland" ], - "s": 72966744, - "sha1_base64": "rDpOE+/koDrydPgaGIGjfrI3C1U=" + "s": 71925520, + "sha1_base64": "QWUG9MW5UDm23AwfBzJ2+dv+Skk=" }, { "id": "Germany_Free State of Bavaria_Lower Franconia", @@ -5219,8 +5219,8 @@ "Bayern", "Deutschland" ], - "s": 81639115, - "sha1_base64": "9+pNeGsvSvvsHSa4oUyy2gK9hQM=" + "s": 80181435, + "sha1_base64": "XvSpVMrIuiFY16SOxQmb8GLD8V0=" }, { "id": "Germany_Free State of Bavaria_Middle Franconia", @@ -5231,8 +5231,8 @@ "Bayern", "Deutschland" ], - "s": 73487357, - "sha1_base64": "3YQfViGWDgUpYyqY0kZEqNGs6Wo=" + "s": 72734629, + "sha1_base64": "QAmDI9o0ckam4fjJlZBzYZirVzw=" }, { "id": "Germany_Free State of Bavaria_Swabia", @@ -5243,8 +5243,8 @@ "Bayern", "Deutschland" ], - "s": 102462069, - "sha1_base64": "CXUCm4mAlknbowNxrOrUky+ud+s=" + "s": 101294853, + "sha1_base64": "YJZHcC3C7ilr1MoNczG4UqA451c=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_East", @@ -5255,8 +5255,8 @@ "Bayern", "Deutschland" ], - "s": 73128325, - "sha1_base64": "KD0ekOHTw/JjX8z/onmgMVRZTH0=" + "s": 72267253, + "sha1_base64": "lsyfkCy1/Gb6k1HhmD2v6/Gf7oQ=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt", @@ -5267,8 +5267,8 @@ "Bayern", "Deutschland" ], - "s": 34245002, - "sha1_base64": "TymxJdmpaIAIQ8pXQMjfHGePqZg=" + "s": 33948522, + "sha1_base64": "lE+4DPiEZujkNNBpctqMSwxCGXI=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen", @@ -5279,8 +5279,8 @@ "Bayern", "Deutschland" ], - "s": 58596573, - "sha1_base64": "KyDsuGWVRKIuIhRb3sQTim8H0NU=" + "s": 58011325, + "sha1_base64": "r1/UL57eSTDIcmKJdkYdi6AwQYE=" }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_South", @@ -5291,8 +5291,8 @@ "Bayern", "Deutschland" ], - "s": 31436878, - "sha1_base64": "xRxEDx8+p8dYHU0JYkFvChX9dAs=" + "s": 31092830, + "sha1_base64": "R9V/aQExYsCruHEO49W2wkUKX5g=" }, { "id": "Germany_Free State of Bavaria_Upper Franconia", @@ -5303,8 +5303,8 @@ "Bayern", "Deutschland" ], - "s": 70611531, - "sha1_base64": "MjZK9Y1VZHAFZjxk7ed1fGl0bGs=" + "s": 69973963, + "sha1_base64": "yB2VbYPhSwberA/t40UBdz/9lR4=" }, { "id": "Germany_Free State of Bavaria_Upper Palatinate", @@ -5315,8 +5315,8 @@ "Bayern", "Deutschland" ], - "s": 67510519, - "sha1_base64": "77dA350h6ftIrz4Yf9Wpb2wEqGw=" + "s": 66743647, + "sha1_base64": "FJ1Szg86B9jOI5th6Key/e6Q+6k=" } ] }, @@ -5329,8 +5329,8 @@ "Deutschland", "Hamburg" ], - "s": 35677216, - "sha1_base64": "3DRazNC3L4bp+C1xxF4N0XvtDKk=" + "s": 35459103, + "sha1_base64": "pu9fRjSk8NN9k8o7QxQan7dAlQk=" }, { "id": "Germany_Hesse", @@ -5344,8 +5344,8 @@ "Deutschland", "Hessen" ], - "s": 127108374, - "sha1_base64": "5k8n3AhF2PZHLgXVMUMZ4DU3XbY=" + "s": 125269206, + "sha1_base64": "4hAMyazQhu9+m+KKzw9EXA8PfFg=" }, { "id": "Germany_Hesse_Regierungsbezirk Giessen", @@ -5356,8 +5356,8 @@ "Deutschland", "Hessen" ], - "s": 55197841, - "sha1_base64": "7mwaj/+AZCgw6Gupii1cHcyolSw=" + "s": 53641960, + "sha1_base64": "B3BCNng+m24GVuUE0ckuz2rUcTw=" }, { "id": "Germany_Hesse_Regierungsbezirk Kassel", @@ -5368,8 +5368,8 @@ "Deutschland", "Hessen" ], - "s": 81559820, - "sha1_base64": "9IhgjaJX3gLTce4qisKKL/XHGsw=" + "s": 79934588, + "sha1_base64": "qBi27Urw0jwGCxtRibDWrZhwGCQ=" } ] }, @@ -5388,8 +5388,8 @@ "Hamburg", "Niedersachsen" ], - "s": 63819808, - "sha1_base64": "LC76xW++uTC/Epd0ewPFLvRqX3M=" + "s": 63347336, + "sha1_base64": "dqwzlbG/zkL0yonW2h2kE1I/X/4=" }, { "id": "Germany_Lower Saxony_Bremen_Munster", @@ -5400,8 +5400,8 @@ "Deutschland", "Niedersachsen" ], - "s": 71201238, - "sha1_base64": "MRPZ+jo6DnlOz5CQX15SsqqghMs=" + "s": 70580446, + "sha1_base64": "yJ8zzZ0XcMiwCeELHddrhPjTRio=" }, { "id": "Germany_Lower Saxony_Hannover", @@ -5412,8 +5412,8 @@ "Deutschland", "Niedersachsen" ], - "s": 66189006, - "sha1_base64": "mRsXSXcTW4xGjdhp0KfelBYQ6oY=" + "s": 64916334, + "sha1_base64": "wfWBjaFjsnEN83umS+QbPSOZn3A=" }, { "id": "Germany_Lower Saxony_Braunschweig", @@ -5424,8 +5424,8 @@ "Deutschland", "Niedersachsen" ], - "s": 74904370, - "sha1_base64": "Dy/l/tum+MBh8eFD5fwJ+/j62ko=" + "s": 74032946, + "sha1_base64": "wy6jU5C8Z84GnTVVuqeKnpbow9Y=" }, { "id": "Germany_Lower Saxony_Oldenburg", @@ -5437,8 +5437,8 @@ "Deutschland", "Niedersachsen" ], - "s": 119756848, - "sha1_base64": "1ewxf6T9iAzMeWJsY20FfiMAdcY=" + "s": 116723063, + "sha1_base64": "3LnNADj2hlsde4ZNEuZfGPzDDzE=" } ] }, @@ -5451,8 +5451,8 @@ "Deutschland", "Mecklenburg-Vorpommern" ], - "s": 113137258, - "sha1_base64": "nXRtj3qd/n9xpVtYEcI/aO45zRs=" + "s": 112158756, + "sha1_base64": "/Rr14a5MyzO+XWRxBaiyPr5ciG8=" }, { "id": "Germany_North Rhine-Westphalia", @@ -5466,8 +5466,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 59226497, - "sha1_base64": "bZUb3qaXgYvemIF+WCs7YEc8NbU=" + "s": 58743304, + "sha1_base64": "DYVGRtDxoZV+pm3dyImgVi9Zl9A=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund", @@ -5478,8 +5478,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 86712607, - "sha1_base64": "ZF5+08ywSE6KyNI24fM/PSb6GwE=" + "s": 85612943, + "sha1_base64": "JSD4uSgp/gfVXProOtkBNOrYmZk=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold", @@ -5490,8 +5490,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 100651937, - "sha1_base64": "fwOV7vIWv7bLnHyMtn+e5cYIyqU=" + "s": 99446801, + "sha1_base64": "CnGax4tqdJDBBkB2ESatYN8Z/Os=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf", @@ -5502,8 +5502,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 75466774, - "sha1_base64": "9iQ+RhaKtlShPkhhhCR1/HNNfgM=" + "s": 74473622, + "sha1_base64": "aePIivsHKsn33PLsnTME/UNz2uc=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim", @@ -5514,8 +5514,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 62090832, - "sha1_base64": "epWmknQm1UsHnUvJjC6iS2p3/CA=" + "s": 61630760, + "sha1_base64": "vV/Wb14lvV+ClX8z03AqCbmUHEE=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel", @@ -5526,8 +5526,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 22305307, - "sha1_base64": "XihhozJpkxiodUW87CqpxEpD2TA=" + "s": 22003899, + "sha1_base64": "vkR80OmdV05DnmVuMDIaOHS+OyI=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", @@ -5539,8 +5539,8 @@ "Deutschland - Belgique / Belgi\u00eb / Belgien", "Nordrhein-Westfalen" ], - "s": 79618274, - "sha1_base64": "WLG+kwlHqp8SY4aQ2Pyce+VV3JA=" + "s": 79277066, + "sha1_base64": "Tcmlwbz+n5C1M4Rd/jGMYZUJuWM=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln", @@ -5551,8 +5551,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 96457521, - "sha1_base64": "oDlF9Y/jqxXGiOIrgVchchTLEJE=" + "s": 95846089, + "sha1_base64": "DaRJuQwRYJ2unbHXzrw31OvJX80=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster", @@ -5563,8 +5563,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 52501231, - "sha1_base64": "BquwX+mOiSYRJcZY0DhqWtLYjOc=" + "s": 51958894, + "sha1_base64": "nNzz3Aikh3xb8VGMOAN4y1GvB7I=" }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen", @@ -5575,8 +5575,8 @@ "Deutschland", "Nordrhein-Westfalen" ], - "s": 58189400, - "sha1_base64": "tTvZUzZFvMgHwdy+uXdGAdUtepk=" + "s": 57713792, + "sha1_base64": "xLYO/bVdw+xQdsm5Un6314kZR1o=" } ] }, @@ -5589,8 +5589,8 @@ "Deutschland", "Rheinland-Pfalz" ], - "s": 115181717, - "sha1_base64": "qLF/zaVDK2+ZXp8XjFCtbHmqqmw=" + "s": 113257357, + "sha1_base64": "goSe/AFEGzfW3pd9DkHnfwyivIs=" }, { "id": "Germany_Rhineland-Palatinate_South", @@ -5601,8 +5601,8 @@ "Deutschland", "Rheinland-Pfalz" ], - "s": 93088066, - "sha1_base64": "3gYPZn6u4y2u56w60IHb7oy8EsQ=" + "s": 91617690, + "sha1_base64": "J7aS1glHMQZU3NoShmb69nZwfYE=" }, { "id": "Germany_Saarland", @@ -5613,8 +5613,8 @@ "Deutschland", "Saarland" ], - "s": 43015640, - "sha1_base64": "/Hf9B09IRVR4iJVj6LRlAN4jehM=" + "s": 42860480, + "sha1_base64": "XcHjfKKMVti82cx+aAFl6UYff6s=" }, { "id": "Germany_Saxony-Anhalt_Magdeburg", @@ -5625,8 +5625,8 @@ "Deutschland", "Sachsen-Anhalt" ], - "s": 64924995, - "sha1_base64": "8OPN8DRyC43xodw6XRUFHOFhCXA=" + "s": 63497962, + "sha1_base64": "VLFTuEb+7zdqbL2xyEXIsfNMZ6o=" }, { "id": "Germany_Saxony-Anhalt_Halle", @@ -5637,8 +5637,8 @@ "Deutschland", "Sachsen-Anhalt" ], - "s": 59122690, - "sha1_base64": "N2XHu82+IME4y6i+hMh6p2ax+IY=" + "s": 57533490, + "sha1_base64": "CITMceTdBUFXO5zJ3U/j6mtLeHA=" }, { "id": "Germany_Saxony_Dresden", @@ -5649,8 +5649,8 @@ "Deutschland", "Sachsen" ], - "s": 78681478, - "sha1_base64": "W3YHIhu9WxTaHPj0CZs6OzYy3+Y=" + "s": 78511032, + "sha1_base64": "f0qGNMIXkdlcQq7Jd2lfm5/A3F8=" }, { "id": "Germany_Saxony_Leipzig", @@ -5661,8 +5661,8 @@ "Deutschland", "Sachsen" ], - "s": 127736102, - "sha1_base64": "7JJB+7OAeQMAdp0vwAU3zEAi8Io=" + "s": 127052210, + "sha1_base64": "BHcGuOohqMwzNOcuP8EZeiFImFw=" }, { "id": "Germany_Schleswig-Holstein_Kiel", @@ -5674,8 +5674,8 @@ "Deutschland", "Schleswig-Holstein" ], - "s": 64836779, - "sha1_base64": "EBgpAhz/CW/HNjEw62yE10LT/V8=" + "s": 64526291, + "sha1_base64": "AuMEJ8wyhrnsOUsYP7SCvueHw+8=" }, { "id": "Germany_Schleswig-Holstein_Flensburg", @@ -5686,8 +5686,8 @@ "Deutschland", "Schleswig-Holstein" ], - "s": 62271609, - "sha1_base64": "cMplJ321hnBgcrP2AjMpI8lx7Hw=" + "s": 61875609, + "sha1_base64": "zZj/5Z2FKz5r6WJqBQ0Ji88wEHY=" }, { "id": "Germany_Thuringia", @@ -5698,8 +5698,8 @@ "Deutschland", "Th\u00fcringen" ], - "s": 133025561, - "sha1_base64": "/8/fFubtpX2T+5+jWkseReKzfM0=" + "s": 130409873, + "sha1_base64": "j3IFi2qhaLLown99/UvLqJKXU80=" } ] }, @@ -5721,8 +5721,8 @@ "Volta Region", "Western Region" ], - "s": 80947734, - "sha1_base64": "jIdDSkjubbTFvUolt+w9Cdz7aUs=" + "s": 78517174, + "sha1_base64": "s4e5jtueAITNgV9PJiHiyZ3dorc=" }, { "id": "Gibraltar", @@ -5734,8 +5734,8 @@ "Espa\u00f1a", "Gibraltar" ], - "s": 1030300, - "sha1_base64": "OegSrp7kLRH4N28b48wWJ8Xdo+g=" + "s": 1027236, + "sha1_base64": "dNumS0Msg2VUobBhxdOiHkfLdjY=" }, { "id": "Greece", @@ -5750,8 +5750,8 @@ "Territorial waters of Greece - Gavdos and Gavdopoula", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039a\u03c1\u03ae\u03c4\u03b7\u03c2" ], - "s": 20597568, - "sha1_base64": "YHr1lxHYfQICQK19csxckOQ5UdA=" + "s": 20370392, + "sha1_base64": "1vkdj/MuPSC1hr4HxvfKLJA/KvU=" }, { "id": "Greece_Decentralized Administration of West Greece", @@ -5764,8 +5764,8 @@ "Shqip\u00ebria", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u03a0\u03b5\u03bb\u03bf\u03c0\u03bf\u03bd\u03bd\u03ae\u03c3\u03bf\u03c5, \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u0395\u03bb\u03bb\u03ac\u03b4\u03b1\u03c2 \u03ba\u03b1\u03b9 \u0399\u03bf\u03bd\u03af\u03bf\u03c5" ], - "s": 60344497, - "sha1_base64": "FC7N196NVBUxXDOArxdxpTOGxaQ=" + "s": 59980305, + "sha1_base64": "gqZ6h1F+s4N3TgPefpYKzWJgZjU=" }, { "id": "Greece_Decentralized Administration of Aegean", @@ -5776,8 +5776,8 @@ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03b9\u03b3\u03b1\u03af\u03bf\u03c5" ], - "s": 28393338, - "sha1_base64": "SAq8WJ+B7fEcdebKAFMMuKTx3BY=" + "s": 28242153, + "sha1_base64": "aDIaCnzK/uPOnHfe433knoUOixk=" }, { "id": "Greece_Decentralized Administration of Epirus - Western Macedonia", @@ -5788,8 +5788,8 @@ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0397\u03c0\u03b5\u03af\u03c1\u03bf\u03c5 - \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2" ], - "s": 29874837, - "sha1_base64": "4Ox1vKP2zH6aFghgM6fIwN0Bh2g=" + "s": 30805637, + "sha1_base64": "wFtFu7l4EPSZYdSyGqjk7cA6fvs=" }, { "id": "Greece_Decentralized Administration of Macedonia and Thrace", @@ -5800,8 +5800,8 @@ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2 - \u0398\u03c1\u03ac\u03ba\u03b7\u03c2" ], - "s": 58170155, - "sha1_base64": "HNU94GxuZcTH/j0wOn9vaA05UvQ=" + "s": 58734218, + "sha1_base64": "DutmNcwkqq6Gc4rVkzru5uFYKSw=" }, { "id": "Greece_Decentralized Administration of Thessaly - Central Greece", @@ -5813,8 +5813,8 @@ "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0398\u03b5\u03c3\u03c3\u03b1\u03bb\u03af\u03b1\u03c2 - \u03a3\u03c4\u03b5\u03c1\u03b5\u03ac\u03c2 \u0395\u03bb\u03bb\u03ac\u03b4\u03b1\u03c2" ], - "s": 51400161, - "sha1_base64": "jPIBCJH2hSiDp2Ea7htFK+0W9Vk=" + "s": 51286073, + "sha1_base64": "JlK8BWU4zg4cxTogPYkggyrdz0U=" }, { "id": "Greece_Decentralized Administration of Attica", @@ -5825,8 +5825,8 @@ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2" ], - "s": 41778422, - "sha1_base64": "KJkqa0RaRx9K14eeYwMzBerqfjA=" + "s": 41302758, + "sha1_base64": "iJhNv0HxzsstS7bUtPWCww2VVpU=" } ] }, @@ -5838,8 +5838,8 @@ "affiliations": [ "Kalaallit Nunaat" ], - "s": 50185898, - "sha1_base64": "S9sP3FjUb6ZKwUaqlXS34uPuGxw=" + "s": 50137834, + "sha1_base64": "cj9LzERKPlPYpwg7ghuLgBntwsY=" }, { "id": "Guatemala", @@ -5871,8 +5871,8 @@ "Totonicap\u00e1n", "Zacapa" ], - "s": 118334619, - "sha1_base64": "LErsH7jdrKMMhhFcDcll42+mj6c=" + "s": 111914906, + "sha1_base64": "35Au6mZ1w1WqWtMvLI+DNhOFUzY=" }, { "id": "Guernsey", @@ -5905,8 +5905,8 @@ "Selle Rocque", "Sark" ], - "s": 1945499, - "sha1_base64": "as4gdNQwcY/P3Nw34UzzaL0C+Wg=" + "s": 1931627, + "sha1_base64": "OEvKSJKe1fxC+DAJMfFq6CZO1MY=" }, { "id": "Guinea", @@ -5924,8 +5924,8 @@ "R\u00e9gion de Mamou", "R\u00e9gion de Nz\u00e9r\u00e9kor\u00e9" ], - "s": 99193756, - "sha1_base64": "pYPMqP1fgHAjpWrvkW/IMXfV9uo=" + "s": 98649532, + "sha1_base64": "eOW+WvoGGfSBFk5ED1wEXyT9WLI=" }, { "id": "Guinea-Bissau", @@ -5943,8 +5943,8 @@ "Regi\u00e3o de Quinara", "Regi\u00e3o de Tombali" ], - "s": 17638118, - "sha1_base64": "55WmvOCzbBqt++YaJeku77MjyM4=" + "s": 17565510, + "sha1_base64": "qNTB5OpVBft6jBCVPD31jhtFfHk=" }, { "id": "Guyana", @@ -5954,8 +5954,8 @@ "affiliations": [ "Guyana" ], - "s": 28646182, - "sha1_base64": "kkKe7Ol6/akxhIqkOZiDoi4iikg=" + "s": 28571294, + "sha1_base64": "D1Xa6J+/kzcXgr2eyvf5U15JIlw=" }, { "id": "Haiti", @@ -5975,8 +5975,8 @@ "D\u00e9partement du Sud", "D\u00e9partement du Sud-Est" ], - "s": 54131363, - "sha1_base64": "DHv61YjmdBVLV/hldp6+cmELAZs=" + "s": 54093083, + "sha1_base64": "4l0iF9axXn06DVlqfQgtqqtT8X4=" }, { "id": "Honduras", @@ -6005,8 +6005,8 @@ "Valle", "Yoro" ], - "s": 52946789, - "sha1_base64": "XuOqnBHUq2MvqBKuRG46YyR0yIs=" + "s": 52629477, + "sha1_base64": "YSRWRFA6NDhPTFdC2CL2QsArH/c=" }, { "id": "Hungary", @@ -6020,8 +6020,8 @@ "Alf\u00f6ld \u00e9s \u00c9szak", "Magyarorsz\u00e1g" ], - "s": 99961854, - "sha1_base64": "4IjEOVYbhJXGxVboMibyKZs49qE=" + "s": 97877998, + "sha1_base64": "pXMterOCNWLxMUkOV6TByfz2uVs=" }, { "id": "Hungary_Transdanubia", @@ -6032,8 +6032,8 @@ "Dun\u00e1nt\u00fal", "Magyarorsz\u00e1g" ], - "s": 100993077, - "sha1_base64": "3U6LYJ/nvYiviSJx4ZjOQlJ1p+w=" + "s": 99005261, + "sha1_base64": "dQ6WM9/xAlouiKjJpmO12yyWnvE=" }, { "id": "Hungary_Kozep-Magyarorszag", @@ -6044,8 +6044,8 @@ "K\u00f6z\u00e9p-Magyarorsz\u00e1g", "Magyarorsz\u00e1g" ], - "s": 58177648, - "sha1_base64": "Cv5J8wbxmXHfxIpuFFRRzy1wVn0=" + "s": 57151232, + "sha1_base64": "514Qy1PTxDm4zytwVlN2FGuWlYg=" } ] }, @@ -6057,8 +6057,8 @@ "affiliations": [ "\u00cdsland" ], - "s": 93410904, - "sha1_base64": "poQFMfY/avdA4vGrRie/nXIdT6s=" + "s": 92055040, + "sha1_base64": "gwnefga4qL4mLw2pExtF0hbZugM=" }, { "id": "India", @@ -6072,8 +6072,8 @@ "Andaman and Nicobar Islands", "India" ], - "s": 9694231, - "sha1_base64": "TpcAHuPEyq/ZNtMgXvtDgo1+j8E=" + "s": 9668726, + "sha1_base64": "OvOulrVdFx2wkjMv/ulVOqbnQxM=" }, { "id": "India_Lakshadweep", @@ -6084,8 +6084,8 @@ "India", "Lakshadweep" ], - "s": 525304, - "sha1_base64": "RVR1cBkpkonQL0FtvCG9eM+C2CA=" + "s": 524440, + "sha1_base64": "/dymFnkUrHbPL73/P0A+mP2vUko=" }, { "id": "India_Andhra Pradesh", @@ -6097,8 +6097,8 @@ "India", "Puducherry" ], - "s": 67601878, - "sha1_base64": "xbfrENVfNLNSthyhMXiPWyjy3Kw=" + "s": 67291134, + "sha1_base64": "f9HIXWh7TDcGfQKNUK1jIWVMfIc=" }, { "id": "India_Gujarat", @@ -6111,8 +6111,8 @@ "Union Territory of Dadra & Nagar Haveli", "Union Territory of Damman & Diu" ], - "s": 71953252, - "sha1_base64": "C7JLG8sfJYjG+uWsZy5V+8txsVc=" + "s": 71618660, + "sha1_base64": "ZO4fgG7CvP6TFMtlUYKv34MO+DQ=" }, { "id": "India_Kerala", @@ -6123,8 +6123,8 @@ "India", "Kerala" ], - "s": 115969161, - "sha1_base64": "9S1Nl6v6EUOqQprEVB/XTVwhzCc=" + "s": 111368529, + "sha1_base64": "hpOoBE0IoujScyxuNMyHE2xTbhU=" }, { "id": "India_Madhya Pradesh", @@ -6135,8 +6135,8 @@ "India", "Madhya Pradesh" ], - "s": 97266639, - "sha1_base64": "wDyIQxu2ychJsGTKHfz5JSKGk74=" + "s": 97002071, + "sha1_base64": "+AfWrJnd4LZJJD8XTq3V1Y+YvAQ=" }, { "id": "India_Rajasthan", @@ -6147,8 +6147,8 @@ "India", "Rajasthan" ], - "s": 65793918, - "sha1_base64": "RkNZKAdyGnP7gSX1rYGxLHwd4f4=" + "s": 63479222, + "sha1_base64": "SABD1q7WdomM9tYLRWiR888rp7w=" }, { "id": "India_Tamil Nadu", @@ -6165,8 +6165,8 @@ "Sorapattu", "Tamil Nadu" ], - "s": 91726424, - "sha1_base64": "X7rEDxpTV0x4FoRm3ig8+L5npxY=" + "s": 90464808, + "sha1_base64": "PbvEFGHbggtWhegcpCkpqVRqjls=" }, { "id": "India_Haryana", @@ -6177,8 +6177,8 @@ "Haryana", "India" ], - "s": 47701602, - "sha1_base64": "Ffo35EURlCp1A92OCCaHh83RcxY=" + "s": 47039985, + "sha1_base64": "Hrau/KsYPLaAfHxK8WOOMlzrAKQ=" }, { "id": "India_Goa", @@ -6189,8 +6189,8 @@ "Goa", "India" ], - "s": 7162994, - "sha1_base64": "GQwq8+12Tgw8QjrxcC5JHm7oCUA=" + "s": 7069738, + "sha1_base64": "G8uyuV67LUHYOeqSbp6IbJp5RSc=" }, { "id": "India_Karnataka_North", @@ -6201,8 +6201,8 @@ "India", "Karnataka" ], - "s": 48038772, - "sha1_base64": "TIYOLcHYIk/KuMy3U4cuRyI8+yw=" + "s": 47572109, + "sha1_base64": "OxuaMxEVeBcv8Nv+2kb2dR9qZ54=" }, { "id": "India_Karnataka_South", @@ -6213,8 +6213,8 @@ "India", "Karnataka" ], - "s": 52212030, - "sha1_base64": "W7OSiGxZ60RkfasZv8XwT+dQkPQ=" + "s": 51305061, + "sha1_base64": "+OljzCrS/uPD6h2D3B8pjL6YXZY=" }, { "id": "India_Maharashtra", @@ -6230,8 +6230,8 @@ "Maharashtra", "Rangadhampetha" ], - "s": 115408322, - "sha1_base64": "SBFEXHrdDorWw7kpLMEPylq4n8A=" + "s": 113272498, + "sha1_base64": "X56RQ3GfcTIP4BTnekygWoOG3nM=" }, { "id": "India_Telangana", @@ -6242,8 +6242,8 @@ "India", "Telangana" ], - "s": 83949638, - "sha1_base64": "Y8UFOPio80JFejpPjKwNeBnfey8=" + "s": 83373093, + "sha1_base64": "TihjJyS9yqLRtck3WTGAarbBQvo=" }, { "id": "India_Delhi", @@ -6254,8 +6254,8 @@ "Delhi", "India" ], - "s": 16872167, - "sha1_base64": "ihE7HrqytAXbSverBblaKhGu8h4=" + "s": 16377791, + "sha1_base64": "vtHSxpszkFBOWGtfrmwj9n02sOs=" }, { "id": "India_Uttar Pradesh", @@ -6266,8 +6266,8 @@ "Uttar Pradesh", "India" ], - "s": 161666245, - "sha1_base64": "dq/++llCWv81YktTIS3MqgoT2Bg=" + "s": 160623301, + "sha1_base64": "MitkGAWTdTEIekoy4t+a+j9ITOs=" }, { "id": "India_Odisha", @@ -6278,8 +6278,8 @@ "India", "Odisha" ], - "s": 36002009, - "sha1_base64": "VvsYhQdZMhZCZGTOJ1aTiXBhH+4=" + "s": 35810097, + "sha1_base64": "rIyg30MmmMNGST9/dlQi5rYHFrI=" }, { "id": "India_Chhattisgarh", @@ -6290,8 +6290,8 @@ "Chhattisgarh", "India" ], - "s": 38033113, - "sha1_base64": "MTxRLv47Oqz1Gj8CndRaq1cPrZw=" + "s": 37863769, + "sha1_base64": "609UcV+Wdnkxcz3EF1W9mgjc3gc=" }, { "id": "India_Jharkhand", @@ -6302,8 +6302,8 @@ "Jharkhand", "India" ], - "s": 34761217, - "sha1_base64": "lRXEz6FE3HMgJuV1rtHP1o5iF7I=" + "s": 34308945, + "sha1_base64": "rDclyVBNb0L3PFc7eeu56R9oAmQ=" }, { "id": "India_Bihar", @@ -6314,8 +6314,8 @@ "Bihar", "India" ], - "s": 72754749, - "sha1_base64": "9uLTIL8ASw+BBpgxpzJUEVm5uPk=" + "s": 72130525, + "sha1_base64": "ga7PceaP+NgJiTBn5Plu3MBO7WM=" }, { "id": "India_Tripura", @@ -6326,8 +6326,8 @@ "India", "Tripura" ], - "s": 13191084, - "sha1_base64": "W9rqvxpZI0ytLo0cUVhtzNSUt6U=" + "s": 12438147, + "sha1_base64": "F1BZHF7OS/wrIj+IxmLl45hxX7Y=" }, { "id": "India_West Bengal", @@ -6340,8 +6340,8 @@ "India", "West Bengal" ], - "s": 96173951, - "sha1_base64": "0Fr2hDz46wOBeeazjKpOze+LpEI=" + "s": 91179285, + "sha1_base64": "zu0Kid7yA9nz8tQXFMe3W3v7jqo=" }, { "id": "India_Sikkim", @@ -6352,8 +6352,8 @@ "India", "Sikkim" ], - "s": 6561124, - "sha1_base64": "gT4m2McfVCJQR+etKq/1ekRmEes=" + "s": 6546516, + "sha1_base64": "5SJ9OWOqA2ma8SdWonlpB4rfyIM=" }, { "id": "India_Uttarakhand", @@ -6364,8 +6364,8 @@ "Uttarakhand", "India" ], - "s": 36618121, - "sha1_base64": "tO3MrXRztHB7cYfvuD1mhk9hTH0=" + "s": 35373614, + "sha1_base64": "MX0YqCIPxoKi3TB444en4nNErwI=" }, { "id": "India_Mizoram", @@ -6376,8 +6376,8 @@ "India", "Mizoram" ], - "s": 14555864, - "sha1_base64": "y4BQ8vgiw9UwV9T7yYVYfCZnjFE=" + "s": 14300660, + "sha1_base64": "5uUpQsuGhSi8vQHaHGamL4RqU6s=" }, { "id": "India_Meghalaya", @@ -6388,8 +6388,8 @@ "India", "Meghalaya" ], - "s": 11942421, - "sha1_base64": "l/NqoeCZiZQ8fd3bv1ZaMgtjV6I=" + "s": 11856837, + "sha1_base64": "elQhYII0ywLct4s/2mRWEUs4M78=" }, { "id": "India_Manipur", @@ -6400,8 +6400,8 @@ "India", "Manipur" ], - "s": 12995589, - "sha1_base64": "bYEcD48juh6ZT+4/Sf7Yk1ln540=" + "s": 12400293, + "sha1_base64": "//YQootIE9rsOghTxOV22rdOc3I=" }, { "id": "India_Nagaland", @@ -6412,8 +6412,8 @@ "India", "Nagaland" ], - "s": 11009472, - "sha1_base64": "EwdjLyvgcvbM6w+DiRRwYKRE1yo=" + "s": 11006480, + "sha1_base64": "EK5/B4ROqkCcEPbvXrcABT+k3oU=" }, { "id": "India_Assam", @@ -6424,8 +6424,8 @@ "Assam", "India" ], - "s": 33378209, - "sha1_base64": "0LZGHDjFm82vimv4WY8seAZOUYA=" + "s": 29281967, + "sha1_base64": "GG6z9z1GLl9nSL7rmrgpk7tKOSU=" }, { "id": "India_Arunachal Pradesh", @@ -6436,8 +6436,8 @@ "Arunachal Pradesh", "India" ], - "s": 10159715, - "sha1_base64": "qwqA94nzI9Tp30kmYsR7nATzNs0=" + "s": 9796194, + "sha1_base64": "ap1YWZ2yNmqNOVooM2BEk0ZJiUg=" }, { "id": "India_Himachal Pradesh", @@ -6448,8 +6448,8 @@ "Himachal Pradesh", "India" ], - "s": 34006176, - "sha1_base64": "yzFdXUpiRy+MbHzlE87RFTKw6BM=" + "s": 30511064, + "sha1_base64": "IsFSuIK+GAOGy1PIZllxgaqpca0=" }, { "id": "India_Jammu and Kashmir", @@ -6460,8 +6460,8 @@ "India", "Jammu and Kashmir" ], - "s": 27125561, - "sha1_base64": "DIQKWu5oSY0N7h9vs9RLVIx/Yes=" + "s": 23879672, + "sha1_base64": "X4LlI0O5aMIxC9dmj75+ivGiCeE=" }, { "id": "India_Chandigarh", @@ -6472,8 +6472,8 @@ "India", "Union Territory of Chand\u012bgarh" ], - "s": 1163361, - "sha1_base64": "Irp2+yMqFfDVBLLOLolUDGouum8=" + "s": 1150929, + "sha1_base64": "9IZFxQsL3XDPid491icaTQoOshs=" }, { "id": "India_Punjab", @@ -6484,8 +6484,8 @@ "India", "Punjab" ], - "s": 44981291, - "sha1_base64": "9E9OYeL4iSu12W9NAkyr6FX84GU=" + "s": 28273400, + "sha1_base64": "0y0nRuGj9XZzsLMqdTFUB27DjIo=" } ] }, @@ -6511,8 +6511,8 @@ "Sulawesi Tengah", "Sulawesi Utara" ], - "s": 248234680, - "sha1_base64": "ySjjQSiFD9Zzp0EwubRxhFZKWTM=" + "s": 246838256, + "sha1_base64": "ue8iefk4cN+iXFofoLCHMHcPb4g=" }, { "id": "Indonesia_West", @@ -6534,8 +6534,8 @@ "Sumatera Selatan", "Sumatera Utara" ], - "s": 214728277, - "sha1_base64": "Uxm2teFpCVfU5/DN1Cc9uRbpzWE=" + "s": 208429373, + "sha1_base64": "eAOoENd4288EwlaZBc0LIvqAFP8=" }, { "id": "Indonesia_Jawa Tengah", @@ -6547,8 +6547,8 @@ "Indonesia", "Jawa Tengah" ], - "s": 212807114, - "sha1_base64": "n3tZ4Ln7fgtkMsceVCC8JYKM/sk=" + "s": 212057474, + "sha1_base64": "K+XM0ci79F/f4rrMJI/AR8iSgDM=" }, { "id": "Indonesia_Jawa Barat", @@ -6561,8 +6561,8 @@ "Indonesia", "Jawa Barat" ], - "s": 335554108, - "sha1_base64": "RuPFiORt9iCP6fgu6ahaqlPp5js=" + "s": 327927802, + "sha1_base64": "P+Q02nSHmSBSBlO6mblgZ5HBJBo=" }, { "id": "Indonesia_Nusa Tenggara", @@ -6577,8 +6577,8 @@ "Nusa Tenggara Barat", "Nusa Tenggara Timur" ], - "s": 150148424, - "sha1_base64": "BPPc0Kp0My91KyGKv9qKpnWEQ34=" + "s": 148426888, + "sha1_base64": "pI9SHEr3EBkDkQmHYV89xC/NObk=" }, { "id": "Indonesia_Jawa Timur", @@ -6589,8 +6589,8 @@ "Indonesia", "Jawa Timur" ], - "s": 195340354, - "sha1_base64": "EpDVJ56WcwwUJ+pK3Tttlbcuv68=" + "s": 194436546, + "sha1_base64": "hv/dDgGRz2KnoJx7sFUxki75mIQ=" }, { "id": "Indonesia_East", @@ -6604,8 +6604,8 @@ "Papua Barat", "Papua" ], - "s": 56822660, - "sha1_base64": "PefJ8KaJKMHkPfwY5EJxwWbRfhs=" + "s": 54354818, + "sha1_base64": "vN2eU0bFhd7s5wKpc6vpFZzMLi8=" } ] }, @@ -6626,8 +6626,8 @@ "\u062e\u0631\u0627\u0633\u0627\u0646 \u0634\u0645\u0627\u0644\u06cc\u200e", "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e" ], - "s": 45464402, - "sha1_base64": "X43MkCsnzidL9yOSy4H5WmtDBeE=" + "s": 43940866, + "sha1_base64": "3NcMVR+JzooXlsnf7tCtLxJVQL8=" }, { "id": "Iran_South", @@ -6650,8 +6650,8 @@ "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e", "\u200f\u0647\u0631\u0645\u0632\u06af\u0627\u0646\u200e" ], - "s": 99313452, - "sha1_base64": "F/TJJroOU9h2dZM4xkHhaWHJ5g4=" + "s": 97979172, + "sha1_base64": "TH+klL6maOS1Q677CrfPV9bF+ww=" }, { "id": "Iran_North", @@ -6675,8 +6675,8 @@ "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e", "\u0622\u0630\u0631\u0628\u0627\u06cc\u062c\u0627\u0646 \u0634\u0631\u0642\u06cc" ], - "s": 99804403, - "sha1_base64": "e03I0KNI9eQshptxVIAlAMPQ4G4=" + "s": 98506539, + "sha1_base64": "03qexJ66odkTFKBh1E8SBm11Nn0=" } ] }, @@ -6701,8 +6701,8 @@ "\u0627\u0644\u0623\u0646\u0628\u0627\u0631", "\u0627\u0644\u0633\u0644\u064a\u0645\u0627\u0646\u064a\u0629" ], - "s": 68668264, - "sha1_base64": "uLTN2qGyovS9q+2Vzmounfq663g=" + "s": 67992943, + "sha1_base64": "8393rRwvUrc998wHdwW1dT8wsCY=" }, { "id": "Iraq_South", @@ -6725,8 +6725,8 @@ "\u0627\u0644\u0623\u0646\u0628\u0627\u0631", "\u0627\u0644\u0642\u0627\u062f\u0633\u064a\u0629" ], - "s": 54481292, - "sha1_base64": "wPmc6sJ3cVCxzFh1BL8MQ1RReBA=" + "s": 53293692, + "sha1_base64": "J+SJF61TIyKpoikJRFTjN052Yeo=" } ] }, @@ -6740,8 +6740,8 @@ "Scotland", "United Kingdom" ], - "s": 5171119, - "sha1_base64": "2wu1l4Zfu0kf0FCgNgLZoe+YUV8=" + "s": 5074567, + "sha1_base64": "e5TqMwSOj/oqIXbnvAj2/G9414k=" }, { "id": "Israel Region", @@ -6756,8 +6756,8 @@ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" ], - "s": 8445947, - "sha1_base64": "YxY8U6UkXAAK4iijY+/vYbosgsQ=" + "s": 8260147, + "sha1_base64": "KL9Nye9XnMIt1QJdMQPRTxpOgrA=" }, { "id": "Israel", @@ -6774,8 +6774,8 @@ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" ], - "s": 88776643, - "sha1_base64": "f7/dQMjmUkI2Xzi/Eo9vf4fgihI=" + "s": 87544107, + "sha1_base64": "pG3Y/F7hKLdHf8uV5egmmTI0mLE=" } ] }, @@ -6791,8 +6791,8 @@ "Abruzzo", "Italia" ], - "s": 48896462, - "sha1_base64": "5sWtPZctSbwzfvrRP3j3qlpGDmQ=" + "s": 44381599, + "sha1_base64": "rLowwPOJRpexE+FVOgNiaBeVqpY=" }, { "id": "Italy_Aosta Valley", @@ -6803,8 +6803,8 @@ "Italia", "Valle d'Aosta/Vall\u00e9e d'Aoste" ], - "s": 20023449, - "sha1_base64": "YQ0+oUX5KX4ksisFIElUAMYt2nQ=" + "s": 19977512, + "sha1_base64": "ZEYC1MVx8HpT8sYoRm86uMMSGrE=" }, { "id": "Italy_Apulia", @@ -6820,8 +6820,8 @@ "Italia", "Puglia" ], - "s": 96638681, - "sha1_base64": "uNZM31jAY7BKt90uqSMdxAWT3lw=" + "s": 96189881, + "sha1_base64": "1w8tp+kIWlKg4OoZoA70fO1+L3U=" }, { "id": "Italy_Basilicata", @@ -6832,8 +6832,8 @@ "Basilicata", "Italia" ], - "s": 34875025, - "sha1_base64": "wQi1HdbinwCNuFG2hAgbov+Pf/s=" + "s": 34228841, + "sha1_base64": "P/h+P550HAzAjP1ST8kHD8dStuI=" }, { "id": "Italy_Calabria", @@ -6846,8 +6846,8 @@ "Isola di Dino", "Italia" ], - "s": 34711147, - "sha1_base64": "xRNkTgZuKl8mpweWxWfou9G0ops=" + "s": 34318915, + "sha1_base64": "OnK3VmZEkz9TDr/pNolKDIiZy7c=" }, { "id": "Italy_Campania", @@ -6864,8 +6864,8 @@ "La Castelluccia", "Scoglio Rovigliano" ], - "s": 72417209, - "sha1_base64": "WrTuYOtcruw9GD+MHARYbi2syN4=" + "s": 70917617, + "sha1_base64": "luERAx+8zSNZKG0SkPx+CkbTT10=" }, { "id": "Italy_Emilia", @@ -6879,8 +6879,8 @@ "Emilia-Romagna", "Italia" ], - "s": 32437948, - "sha1_base64": "ZjywiIe9Q/IbcJBwCbua0lnsvgw=" + "s": 31114460, + "sha1_base64": "VEey/hj47X/HONr5vy48EEYYK9w=" }, { "id": "Italy_Emilia-Romagna_Ferrara", @@ -6891,8 +6891,8 @@ "Emilia-Romagna", "Italia" ], - "s": 13344512, - "sha1_base64": "QEqsTBJ3JK+Ojf/5/Ozcsz1idFI=" + "s": 13123063, + "sha1_base64": "GLTHssmo3Pnlj9vmoGjyqJxxp0k=" }, { "id": "Italy_Emilia-Romagna_Forli-Cesena", @@ -6903,8 +6903,8 @@ "Emilia-Romagna", "Italia" ], - "s": 18073536, - "sha1_base64": "FH+IULJjOjQWFiyDkiDrluuK/nk=" + "s": 17904320, + "sha1_base64": "PrOfamBEiYUwArGxBGY1B20oT50=" }, { "id": "Italy_Emilia-Romagna_Modena", @@ -6915,8 +6915,8 @@ "Emilia-Romagna", "Italia" ], - "s": 26397339, - "sha1_base64": "ADA5UXrrAacsaBcqQzAYCvjEv3k=" + "s": 26423779, + "sha1_base64": "qf9+1tpK9Rz9aZralZEoo9jcURs=" }, { "id": "Italy_Emilia-Romagna_Parma", @@ -6927,8 +6927,8 @@ "Emilia-Romagna", "Italia" ], - "s": 21674506, - "sha1_base64": "V8aNiaHYhFM3J56rhbJdY2BwBP4=" + "s": 21655025, + "sha1_base64": "TPn8HD27q/7WJ6gLzCnaIfR4xBE=" }, { "id": "Italy_Emilia-Romagna_Piacenza", @@ -6939,8 +6939,8 @@ "Emilia-Romagna", "Italia" ], - "s": 14458536, - "sha1_base64": "8vqCnz5lRNbDJzqYSp7Wn1klalU=" + "s": 14410423, + "sha1_base64": "9bdwgdPXSQukOsPV4KH/aIzZrVU=" }, { "id": "Italy_Emilia-Romagna_Ravenna", @@ -6951,8 +6951,8 @@ "Emilia-Romagna", "Italia" ], - "s": 15204279, - "sha1_base64": "bUwDa7/mWcI2jouN1Slrf4pje0k=" + "s": 14089047, + "sha1_base64": "pKGviZkLkFGd+AIz9kBgljSY0hI=" }, { "id": "Italy_Emilia-Romagna_Reggio Emilia", @@ -6963,8 +6963,8 @@ "Emilia-Romagna", "Italia" ], - "s": 19321354, - "sha1_base64": "vRV2fHBjCkS0KSUNkLrWVj4Osyw=" + "s": 19271730, + "sha1_base64": "j/IQd1vo2u7IEzFWmtqbSljtWpQ=" }, { "id": "Italy_Emilia-Romagna_Rimini", @@ -6975,8 +6975,8 @@ "Emilia-Romagna", "Italia" ], - "s": 10302710, - "sha1_base64": "/cT0nX7/SK7EPV/837lLAiy8Yyc=" + "s": 10143462, + "sha1_base64": "P/DVea7YItcCBOQ3Rwr2gV3aIRg=" } ] }, @@ -6992,8 +6992,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 7196076, - "sha1_base64": "HsqSVOuAn/XJ9JEkhn9UqHUNtZE=" + "s": 7209244, + "sha1_base64": "FEUoqqDH+VGusi26O5T3Y64lh7E=" }, { "id": "Italy_Friuli-Venezia Giulia_Pordenone", @@ -7004,8 +7004,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 22007976, - "sha1_base64": "nAI5e3XguHhu2gcIcOIrQoI2ERE=" + "s": 21820752, + "sha1_base64": "oKavfjaDyYC8CfaYcmgHWvmTSY0=" }, { "id": "Italy_Friuli-Venezia Giulia_Trieste", @@ -7016,8 +7016,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 7522597, - "sha1_base64": "f7iS/k6w9WFstEtHtzvzTypjHuA=" + "s": 7428349, + "sha1_base64": "ppJZnPvt4MwtSMKObAoXUh49CI0=" }, { "id": "Italy_Friuli-Venezia Giulia_Udine", @@ -7028,8 +7028,8 @@ "Friuli Venezia Giulia", "Italia" ], - "s": 47846726, - "sha1_base64": "TS9UXlAJn6jg/efHQIWxNwiD0TM=" + "s": 47459518, + "sha1_base64": "fwVQlLCtMcLfICvsp2UcJmel3nA=" } ] }, @@ -7051,8 +7051,8 @@ "country_name_synonyms": [ "Vatican City" ], - "s": 96689826, - "sha1_base64": "+ax7lgagX9/ekuIcIdAb61PdvwA=" + "s": 95171834, + "sha1_base64": "DFNXTRC1ljtiOX5CHJ/599aWXRk=" }, { "id": "Italy_Liguria", @@ -7063,8 +7063,8 @@ "Italia", "Liguria" ], - "s": 64182510, - "sha1_base64": "HqhzFWc2t18ZuYpf6Xm+MdbL96E=" + "s": 63851558, + "sha1_base64": "bSc5msiZ5GXdIwfM9tmlra3SA+M=" }, { "id": "Italy_Lombardy", @@ -7078,8 +7078,8 @@ "Italia", "Lombardia" ], - "s": 27486147, - "sha1_base64": "Np3KLVX/DKhsykk0tjlacwS05T0=" + "s": 27142667, + "sha1_base64": "p0ZXxnAcbK70qRJHdULXUzI4myM=" }, { "id": "Italy_Lombardy_Brescia", @@ -7090,8 +7090,8 @@ "Italia", "Lombardia" ], - "s": 38483147, - "sha1_base64": "IRTGHesR5mZyS9M2cGXArnI70W8=" + "s": 37568075, + "sha1_base64": "sewC9vhd6EyawR/7qFxrDLFcp9s=" }, { "id": "Italy_Lombardy_Como", @@ -7102,8 +7102,8 @@ "Italia", "Lombardia" ], - "s": 16119891, - "sha1_base64": "zCTO9/imlDLYHsUB1uL79rDMzQ4=" + "s": 15984659, + "sha1_base64": "bh6d4iYmpvduCOd6fwaFZo4Q4aI=" }, { "id": "Italy_Lombardy_Cremona", @@ -7114,8 +7114,8 @@ "Italia", "Lombardia" ], - "s": 7881910, - "sha1_base64": "em8/XiDqWVttMSRRWxJxsLykmXM=" + "s": 7578173, + "sha1_base64": "h2oj3amU5dLjRL23Z43g7NxM8lc=" }, { "id": "Italy_Lombardy_Lecco", @@ -7126,8 +7126,8 @@ "Italia", "Lombardia" ], - "s": 11730785, - "sha1_base64": "nDbfo78A/TbVDGT4aJv8fGRXpJo=" + "s": 11658039, + "sha1_base64": "x8SviKieO7PF+M+F6PvyXu5GTaA=" }, { "id": "Italy_Lombardy_Lodi", @@ -7138,8 +7138,8 @@ "Italia", "Lombardia" ], - "s": 7185947, - "sha1_base64": "eomdJVTLfMk3a6nABsAUQySFjbI=" + "s": 7163099, + "sha1_base64": "4UgSf6bjh6ufpiaN4ClYvZHpGxQ=" }, { "id": "Italy_Lombardy_Mantua", @@ -7150,8 +7150,8 @@ "Italia", "Lombardia" ], - "s": 8986542, - "sha1_base64": "1p+G77GYqQg+0k5Ne8WVfudACzo=" + "s": 8799022, + "sha1_base64": "MXVW6Ofq3nUANSiGIRoKSAP2PTE=" }, { "id": "Italy_Lombardy_Milan", @@ -7162,8 +7162,8 @@ "Italia", "Lombardia" ], - "s": 37848476, - "sha1_base64": "1JJ+8sAH80hVXq1C+tqPVjfjZoc=" + "s": 37051892, + "sha1_base64": "5t/hq+6sYIpdexeOiseBeLS6lm0=" }, { "id": "Italy_Lombardy_Monza and Brianza", @@ -7174,8 +7174,8 @@ "Italia", "Lombardia" ], - "s": 11773727, - "sha1_base64": "pfcqezrtJsvwCMKzdi9zMqQE6QQ=" + "s": 11626215, + "sha1_base64": "M3XX70KIgLDZ0zQUKclummL+nh4=" }, { "id": "Italy_Lombardy_Pavia", @@ -7186,8 +7186,8 @@ "Italia", "Lombardia" ], - "s": 30588068, - "sha1_base64": "jzJ30FVfyqbMEMq71q5gb0lltlA=" + "s": 30145100, + "sha1_base64": "iYTzCSo06dDNmMI5AH8wlS1euvk=" }, { "id": "Italy_Lombardy_Sondrio", @@ -7198,8 +7198,8 @@ "Italia", "Lombardia" ], - "s": 18314833, - "sha1_base64": "qOZ5+/fl1ySaGAdI3GM9t8yU/Uc=" + "s": 18172041, + "sha1_base64": "jfQ7sT5GgSWu8rhP2BSN2gu8Sek=" }, { "id": "Italy_Lombardy_Varese", @@ -7210,8 +7210,8 @@ "Italia", "Lombardia" ], - "s": 17208265, - "sha1_base64": "ygtcZg/MjaykHfRURANX9Fgm3UA=" + "s": 16975905, + "sha1_base64": "Y/fvcs5Kvft1l2MBMPkFsEl5znk=" } ] }, @@ -7224,8 +7224,8 @@ "Italia", "Marche" ], - "s": 42679277, - "sha1_base64": "2gA/xDgZ0d3CvpTu5OvGr7Puqzw=" + "s": 42198805, + "sha1_base64": "l+jJBaBYnnZU2nF/i94t1qlfsmQ=" }, { "id": "Italy_Molise", @@ -7236,8 +7236,8 @@ "Italia", "Molise" ], - "s": 13928894, - "sha1_base64": "TmygzOgcw6xMkqNsJLe+BOCa9q8=" + "s": 13868893, + "sha1_base64": "e3dNUPeECbKvdVv3bws85FDOj6o=" }, { "id": "Italy_Piemont", @@ -7251,8 +7251,8 @@ "Italia", "Piemonte" ], - "s": 24744563, - "sha1_base64": "eSAohcTWW5C0VQUhbd4Ly0Q71Pc=" + "s": 24639914, + "sha1_base64": "llVY1T2Rqo5gQc/QLmI3ynZa/fI=" }, { "id": "Italy_Piemont_Asti", @@ -7263,8 +7263,8 @@ "Italia", "Piemonte" ], - "s": 13182510, - "sha1_base64": "sbhPTmjj/igLVJIZqSAvgRKIGBY=" + "s": 12989670, + "sha1_base64": "c1b4rDe41Lc+je/z9rXYMYfystQ=" }, { "id": "Italy_Piemont_Biella", @@ -7275,8 +7275,8 @@ "Italia", "Piemonte" ], - "s": 12808212, - "sha1_base64": "UTUX6wpwyAGW2hy0r8NPQ2rN54M=" + "s": 12787972, + "sha1_base64": "70sbe9YdGwsSkrCykQeGhtFiuWY=" }, { "id": "Italy_Piemont_Cuneo", @@ -7287,8 +7287,8 @@ "Italia", "Piemonte" ], - "s": 51657036, - "sha1_base64": "Ng0kVa/TqC/3enV2k6qSnPBaeYc=" + "s": 51256548, + "sha1_base64": "ca10Qcd3VpQbiiDcwfB4tgg04CM=" }, { "id": "Italy_Piemont_Novara", @@ -7299,8 +7299,8 @@ "Italia", "Piemonte" ], - "s": 12335529, - "sha1_base64": "uOlAXJnq4zmgDtn9dJTEGc78Vuo=" + "s": 11782153, + "sha1_base64": "auC6dUYgvjxK8X2haaCf6hjkLy8=" }, { "id": "Italy_Piemont_Torino", @@ -7311,8 +7311,8 @@ "Italia", "Piemonte" ], - "s": 59241878, - "sha1_base64": "ZOJdYMuWCdkp3KhoSk4XhAIR/+k=" + "s": 58314140, + "sha1_base64": "hcMmxWG7jfN8S7hCPA5GAwlzEOo=" }, { "id": "Italy_Piemont_Verbano-Cusio-Ossola", @@ -7323,8 +7323,8 @@ "Italia", "Piemonte" ], - "s": 17852265, - "sha1_base64": "PNKTXLDG9vnVVO9ostqEuakJmPY=" + "s": 17706936, + "sha1_base64": "9FfaNMrJmdexWil28qBnc+DtNds=" }, { "id": "Italy_Piemont_Vercelli", @@ -7335,8 +7335,8 @@ "Italia", "Piemonte" ], - "s": 15173912, - "sha1_base64": "pfpFGstsb2LMzQmLX6z767OJyTQ=" + "s": 15010448, + "sha1_base64": "3cRuSXv9nfN0CPtFIOOshtQA0gM=" } ] }, @@ -7359,8 +7359,8 @@ "Sardigna/Sardegna", "Scoglio Il Catalano" ], - "s": 80102971, - "sha1_base64": "BzgRaiGYCXqlJ85qn/cdyhQwH4k=" + "s": 77628130, + "sha1_base64": "IinixYv7cK5MVNUrDyUCE8uQG5w=" }, { "id": "Italy_Sicily", @@ -7408,8 +7408,8 @@ "Scoglio Palumbo", "Sicilia" ], - "s": 90271736, - "sha1_base64": "7f78QmLdnWZSQTGTvBeUQvdHZac=" + "s": 82365568, + "sha1_base64": "LCRnwtV5gd66W9gz22cFMrObtnw=" }, { "id": "Italy_Trentino-Alto Adige Sudtirol", @@ -7420,8 +7420,8 @@ "Italia", "Trentino-Alto Adige/S\u00fcdtirol" ], - "s": 88939052, - "sha1_base64": "x9GSKolD/FYSb//X9KXO8cW3eKY=" + "s": 87971100, + "sha1_base64": "2iMOLnGIxeiTFfoEA6DRGi553ak=" }, { "id": "Italy_Tuscany_Grosseto", @@ -7438,8 +7438,8 @@ "Le Scole", "Toscana" ], - "s": 56925918, - "sha1_base64": "8n7pzLOaKaB813BoizUnKduJYPM=" + "s": 56293926, + "sha1_base64": "+xv1n1S/azmRdcPIyY08FjQknv4=" }, { "id": "Italy_Tuscany_Massa e Carrara", @@ -7457,8 +7457,8 @@ "Scoglio d'Africa", "Toscana" ], - "s": 106735749, - "sha1_base64": "3Vw38/dOCU1EPaQTJEc6lKZifV4=" + "s": 106041749, + "sha1_base64": "qJJT9VDEgzXCe6ppnvBkHNp+uEo=" }, { "id": "Italy_Umbria", @@ -7469,8 +7469,8 @@ "Italia", "Umbria" ], - "s": 33911116, - "sha1_base64": "tFU/8jfUeovNLiusb6EM8gPuSII=" + "s": 33482315, + "sha1_base64": "Gu9/Iv7ALn08/X4w8dceLScnfqc=" }, { "id": "Italy_Veneto", @@ -7484,8 +7484,8 @@ "Italia", "Veneto" ], - "s": 25006042, - "sha1_base64": "FLKevCVmKHutE5r8KQ/++8BnlBo=" + "s": 24702857, + "sha1_base64": "s0pZPsDNpX9Jm3ZphHatNouuykE=" }, { "id": "Italy_Veneto_Padova", @@ -7496,8 +7496,8 @@ "Italia", "Veneto" ], - "s": 26994425, - "sha1_base64": "k9mIYNCSztbMnHbCSMnHVicNsWk=" + "s": 26769009, + "sha1_base64": "LEnldYfxTpJEqGtt9GuUM9zV+YE=" }, { "id": "Italy_Veneto_Rovigo", @@ -7508,8 +7508,8 @@ "Italia", "Veneto" ], - "s": 9586246, - "sha1_base64": "Og+5Vz/j/yBeZP1ujMqISaYfEHA=" + "s": 9522662, + "sha1_base64": "AxvwiF+XdbwjbUhm5FIEAvh68hI=" }, { "id": "Italy_Veneto_Treviso", @@ -7520,8 +7520,8 @@ "Italia", "Veneto" ], - "s": 34605140, - "sha1_base64": "JEmWpc9GvwigJD5ZjtUFEV9IP3U=" + "s": 34338580, + "sha1_base64": "BD/rqbyrfn/Twx/CT5M4fLB0qao=" }, { "id": "Italy_Veneto_Venezia", @@ -7532,8 +7532,8 @@ "Italia", "Veneto" ], - "s": 26576507, - "sha1_base64": "u4hxlgpPQIz2ZnhRgM8B0+cWLAg=" + "s": 26255907, + "sha1_base64": "OZNGaWTfMECWZuEXCCompxQVMro=" }, { "id": "Italy_Veneto_Verona", @@ -7544,8 +7544,8 @@ "Italia", "Veneto" ], - "s": 32339483, - "sha1_base64": "1RgEEMXOGIoEtiyYT8FbP0HEaM0=" + "s": 32212387, + "sha1_base64": "3ZQMggz3gmEZTt1OdwkZQ/6qP20=" }, { "id": "Italy_Veneto_Vicenza", @@ -7556,8 +7556,8 @@ "Italia", "Veneto" ], - "s": 34788308, - "sha1_base64": "tdXMdMjGOGC5WlkQsDqSZC+CoZ8=" + "s": 34569260, + "sha1_base64": "STOOvFxBsajBpj9tPmb1v1IsCQk=" } ] } @@ -7571,8 +7571,8 @@ "affiliations": [ "Jamaica" ], - "s": 34446263, - "sha1_base64": "KWPJbvvrCsN72SF3HCN1Q8YCQx8=" + "s": 34406926, + "sha1_base64": "EJtvzk3tzK++G7IXnKEHWv5ZH0s=" }, { "id": "Japan", @@ -7590,8 +7590,8 @@ "\u4e09\u91cd\u770c", "\u611b\u77e5\u770c" ], - "s": 49468890, - "sha1_base64": "DaXD4GB4wvTjK/6OnNPUrRE5wBk=" + "s": 48582281, + "sha1_base64": "6wBnjuxFHNxOnSv8oL1laCrhlrg=" }, { "id": "Japan_Chubu Region_Aichi_Toyohashi", @@ -7602,8 +7602,8 @@ "\u65e5\u672c", "\u611b\u77e5\u770c" ], - "s": 19766016, - "sha1_base64": "HttnKnlpR4p1vsVfehmZ8gCY/DU=" + "s": 19706376, + "sha1_base64": "bBNtI4fkbA2/iXsG5qScJMt5OwA=" }, { "id": "Japan_Chubu Region_Fukui", @@ -7614,8 +7614,8 @@ "\u65e5\u672c", "\u798f\u4e95\u770c" ], - "s": 23168897, - "sha1_base64": "qiY7Np2uiZJkKEs4jcuqxpj+UM4=" + "s": 22838544, + "sha1_base64": "kXT6RFSHMcBAMy32m5ocnI7+wZM=" }, { "id": "Japan_Chubu Region_Gifu", @@ -7626,8 +7626,8 @@ "\u65e5\u672c", "\u5c90\u961c\u770c" ], - "s": 27877745, - "sha1_base64": "YloXRlIa0TD0yT50/rUCYzx7XR8=" + "s": 27279673, + "sha1_base64": "xqbRQhQzqj9nP6cIHMNH9kCZ/jE=" }, { "id": "Japan_Chubu Region_Ishikawa", @@ -7638,8 +7638,8 @@ "\u65e5\u672c", "\u77f3\u5ddd\u770c" ], - "s": 19793895, - "sha1_base64": "3lutcvTMD58aohFNzyOGMJleH3Y=" + "s": 19611991, + "sha1_base64": "1Dpz/S7SbHZMEu+CQZrXfHi7kKQ=" }, { "id": "Japan_Chubu Region_Nagano", @@ -7650,8 +7650,8 @@ "\u9577\u91ce\u770c", "\u65e5\u672c" ], - "s": 42072388, - "sha1_base64": "usd41qoAUmwN48Z45HDf5HvjY4E=" + "s": 41840524, + "sha1_base64": "lT+VKxfvt3urMrLty7yiivnP/Y4=" }, { "id": "Japan_Chubu Region_Niigata", @@ -7663,8 +7663,8 @@ "\u65b0\u6f5f\u770c", "\u77f3\u5ddd\u770c" ], - "s": 36270026, - "sha1_base64": "NyUYujBEKcIHcOe+IwZ2aN0KFuM=" + "s": 36035986, + "sha1_base64": "cDVFLkpLlcTWNDvYWKCaJmWWbP8=" }, { "id": "Japan_Chubu Region_Shizuoka", @@ -7675,8 +7675,8 @@ "\u9759\u5ca1\u770c", "\u65e5\u672c" ], - "s": 90092222, - "sha1_base64": "ZI9KfCD5w2s4S7XkANLy0bxFTy8=" + "s": 89625190, + "sha1_base64": "hThGJ9jd65B9GveniplfV5vMjdE=" }, { "id": "Japan_Chubu Region_Toyama", @@ -7688,8 +7688,8 @@ "\u5bcc\u5c71\u770c", "\u77f3\u5ddd\u770c" ], - "s": 22320583, - "sha1_base64": "ZEoal9Cu2Urf6OzV03oOoSCsVgo=" + "s": 22205007, + "sha1_base64": "CzALZ76bAm1uT1X053+ZV5aKwEg=" }, { "id": "Japan_Chubu Region_Yamanashi", @@ -7700,8 +7700,8 @@ "\u65e5\u672c", "\u5c71\u68a8\u770c" ], - "s": 22755096, - "sha1_base64": "RtLd7Y9PJOrkHlGsKGKE3j9NjoI=" + "s": 22690328, + "sha1_base64": "XV53H7w0q4av8QkaThYaWLMIkZk=" } ] }, @@ -7717,8 +7717,8 @@ "\u65e5\u672c", "\u5e83\u5cf6\u770c" ], - "s": 51437146, - "sha1_base64": "iSrim6+JSX7DhbVMkpRn/vKshmA=" + "s": 51402282, + "sha1_base64": "TsDWR4bhHkUVs46xSGj35WFsn0U=" }, { "id": "Japan_Chugoku Region_Okayama", @@ -7729,8 +7729,8 @@ "\u65e5\u672c", "\u5ca1\u5c71\u770c" ], - "s": 35268442, - "sha1_base64": "awsKobXMvwuerVF9tUqpPUnWwDM=" + "s": 35237194, + "sha1_base64": "Dx3zH9c/OPnzark/BDFl+HtpQjo=" }, { "id": "Japan_Chugoku Region_Shimane", @@ -7741,8 +7741,8 @@ "\u65e5\u672c", "\u5cf6\u6839\u770c" ], - "s": 24049137, - "sha1_base64": "pQmp53XIhCM74qvxEcHYxF/L5KM=" + "s": 23716977, + "sha1_base64": "v7B8f4f5YWsbbgc7sqlEPJljKmg=" }, { "id": "Japan_Chugoku Region_Tottori", @@ -7753,8 +7753,8 @@ "\u9ce5\u53d6\u770c", "\u65e5\u672c" ], - "s": 24621416, - "sha1_base64": "kDepEUmh0Uqs4Oh2t2ri9FS3ae8=" + "s": 23094096, + "sha1_base64": "2W2SZ+jXJwFqNfv3MrkrcbCtQNo=" }, { "id": "Japan_Chugoku Region_Yamaguchi", @@ -7765,8 +7765,8 @@ "\u65e5\u672c", "\u5c71\u53e3\u770c" ], - "s": 28405978, - "sha1_base64": "9LooaM5hHxhBIMgMDRu2Nmughmc=" + "s": 28049674, + "sha1_base64": "ZSwsIhAkjRGPoKwoWHPwVrW4sJE=" } ] }, @@ -7782,8 +7782,8 @@ "\u65e5\u672c", "\u5317\u6d77\u9053" ], - "s": 34492745, - "sha1_base64": "nSbnWPxtgFhWTL1YKw3iqF58meI=" + "s": 33409593, + "sha1_base64": "P8rXsPu+rTmOxThlKvmCPLujlHo=" }, { "id": "Japan_Hokkaido Region_North", @@ -7794,8 +7794,8 @@ "\u65e5\u672c", "\u5317\u6d77\u9053" ], - "s": 46775278, - "sha1_base64": "8BKS2gzNx8mDoa8s2RujhRiZEhQ=" + "s": 46570686, + "sha1_base64": "Plq5cWcHMEnRg03n1v1fIwJtH88=" }, { "id": "Japan_Hokkaido Region_West", @@ -7806,8 +7806,8 @@ "\u65e5\u672c", "\u5317\u6d77\u9053" ], - "s": 31921600, - "sha1_base64": "xN9ETySvfpSTANyZypdU6RV8zIw=" + "s": 31538312, + "sha1_base64": "4XAdVeKrODNZ8SK7nd84/y09GyM=" }, { "id": "Japan_Hokkaido Region_Sapporo", @@ -7818,8 +7818,8 @@ "\u65e5\u672c", "\u5317\u6d77\u9053" ], - "s": 61510621, - "sha1_base64": "criNJRTqRe2T4wNTWXe18A4pp8o=" + "s": 59379109, + "sha1_base64": "sioTQwSoosN6GHSNz1O1gupq1nw=" } ] }, @@ -7837,8 +7837,8 @@ "\u6771\u4eac\u90fd", "\u795e\u5948\u5ddd\u770c" ], - "s": 50330399, - "sha1_base64": "RX1xW2EFIT552kWD54oqR//wfm0=" + "s": 49436759, + "sha1_base64": "YG4f7BL1cZieS8ztZs/AzlbYMec=" }, { "id": "Japan_Kanto_Gunma", @@ -7849,8 +7849,8 @@ "\u65e5\u672c", "\u7fa4\u99ac\u770c" ], - "s": 28145889, - "sha1_base64": "g8AmpH3Y4vHg4WK/naNgWm07p9A=" + "s": 28051689, + "sha1_base64": "36QeBLOmSKEKL37TY7JkF+6nkRc=" }, { "id": "Japan_Kanto_Ibaraki", @@ -7863,8 +7863,8 @@ "\u5343\u8449\u770c", "\u798f\u5cf6\u770c" ], - "s": 30128751, - "sha1_base64": "ss9qvRHmJXG0G/3N/Yhmx6B8lN4=" + "s": 29221047, + "sha1_base64": "JnEaGWkstTlcdtkGpMYxiuA4/SU=" }, { "id": "Japan_Kanto_Kanagawa", @@ -7878,8 +7878,8 @@ "\u6771\u4eac\u90fd", "\u795e\u5948\u5ddd\u770c" ], - "s": 72460347, - "sha1_base64": "cygulfJzWq3znYvNADida3SuMrQ=" + "s": 70002867, + "sha1_base64": "mVdtf1hVSbgDxJCLRcQk6IcBvhk=" }, { "id": "Japan_Kanto_Saitama", @@ -7890,8 +7890,8 @@ "\u65e5\u672c", "\u57fc\u7389\u770c" ], - "s": 51965627, - "sha1_base64": "dGUd5cxTVE9tqJ8nMFnqzgx5PWc=" + "s": 50518586, + "sha1_base64": "v5VKpT8BR5EACo8xBkVHog80Op0=" }, { "id": "Japan_Kanto_Tochigi", @@ -7902,8 +7902,8 @@ "\u65e5\u672c", "\u6803\u6728\u770c" ], - "s": 33628250, - "sha1_base64": "dlzKcyteAbVTq0revZqWp+e4nDA=" + "s": 33422490, + "sha1_base64": "tYQE9HEaJeZyYVPowVj+bhci/gM=" }, { "id": "Japan_Kanto_Tokyo", @@ -7915,8 +7915,8 @@ "\u65e5\u672c", "\u6771\u4eac\u90fd" ], - "s": 97393908, - "sha1_base64": "QlpaBmcS1avi4W18+gXoZDgzRqI=" + "s": 93944747, + "sha1_base64": "ngpqaVLRNfMbs1YZpGsYi8Eb9iw=" } ] }, @@ -7933,8 +7933,8 @@ "\u4eac\u90fd\u5e9c", "\u6ecb\u8cc0\u770c" ], - "s": 67014822, - "sha1_base64": "NdOE2+DONOetpGVgYjiLl7eJMDA=" + "s": 65297750, + "sha1_base64": "7T6uf9ErZteknJrEbmh1ugIGVlk=" }, { "id": "Japan_Kinki Region_Mie", @@ -7946,8 +7946,8 @@ "\u4e09\u91cd\u770c", "\u611b\u77e5\u770c" ], - "s": 29245762, - "sha1_base64": "OoSXcwAfQ3jKnRWLwihTFt9Sd5g=" + "s": 28690906, + "sha1_base64": "Xr2Rv8+VvESkAefgc1pNinJZWZc=" }, { "id": "Japan_Kinki Region_Nara", @@ -7959,8 +7959,8 @@ "\u5948\u826f\u770c", "\u548c\u6b4c\u5c71\u770c" ], - "s": 24436351, - "sha1_base64": "cyXG3y1E65YTc35fmCtycsXvZpY=" + "s": 24036814, + "sha1_base64": "BtMRab32W0RxQizEOXR9IOyhjJM=" }, { "id": "Japan_Kinki Region_Osaka_Osaka", @@ -7972,8 +7972,8 @@ "\u5175\u5eab\u770c", "\u5927\u962a\u5e9c" ], - "s": 66810738, - "sha1_base64": "V0j2T4jQmtWK0OgAGIBmL9b1cow=" + "s": 62823570, + "sha1_base64": "c1/8UtOhVj50BhBGUn2qFdc2OrE=" }, { "id": "Japan_Kinki Region_Osaka_West", @@ -7984,8 +7984,8 @@ "\u65e5\u672c", "\u5175\u5eab\u770c" ], - "s": 52140021, - "sha1_base64": "glTMunsHYMy+2SVjyT0ZJunnExc=" + "s": 51035301, + "sha1_base64": "1yhIajcPvQOTP9gKg9Wt0cxMDd0=" }, { "id": "Japan_Kinki Region_Wakayama", @@ -7996,8 +7996,8 @@ "\u65e5\u672c", "\u548c\u6b4c\u5c71\u770c" ], - "s": 18927192, - "sha1_base64": "rng2clPhostiv4pk9Zf6Gpm8BYg=" + "s": 18383232, + "sha1_base64": "iMhl/pVAJRxPZtPSRTpbcJ6mvBk=" } ] }, @@ -8013,8 +8013,8 @@ "\u65e5\u672c", "\u798f\u5ca1\u770c" ], - "s": 44501643, - "sha1_base64": "6rSuBcbg4+O4KQ4RhUegCH4GcoA=" + "s": 44231875, + "sha1_base64": "sZWh/vwM7pAnkaw9In9mywv5I+w=" }, { "id": "Japan_Kyushu Region_Kagoshima", @@ -8025,8 +8025,8 @@ "\u65e5\u672c", "\u9e7f\u5150\u5cf6\u770c" ], - "s": 28041754, - "sha1_base64": "27NNJV75gm1jzwEdTZeQgZWCAec=" + "s": 27708602, + "sha1_base64": "2O+Y3io7sFL9G9ouzQcvTpMpuW4=" }, { "id": "Japan_Kyushu Region_Kumamoto", @@ -8037,8 +8037,8 @@ "\u65e5\u672c", "\u718a\u672c\u770c" ], - "s": 35638210, - "sha1_base64": "34Bn02ETHXeylgY32fiYxQXOavw=" + "s": 35375994, + "sha1_base64": "0WHkTjLeSq9t/hNLyQ4Y22oBU5A=" }, { "id": "Japan_Kyushu Region_Miyazaki", @@ -8049,8 +8049,8 @@ "\u65e5\u672c", "\u5bae\u5d0e\u770c" ], - "s": 18434777, - "sha1_base64": "1sDu85RCwxsJIIcaORYCFnbmRUk=" + "s": 18145713, + "sha1_base64": "jAt1LGF3xapSTkDuYWxHB7Oe68w=" }, { "id": "Japan_Kyushu Region_Nagasaki", @@ -8061,8 +8061,8 @@ "\u9577\u5d0e\u770c", "\u65e5\u672c" ], - "s": 27884249, - "sha1_base64": "0Rbk8jAsEuYa5cVWoBOW/RmoA3Q=" + "s": 27471809, + "sha1_base64": "wpIXbI40rV8ugPLaxkbeWcE5Y5w=" }, { "id": "Japan_Kyushu Region_Oita", @@ -8073,8 +8073,8 @@ "\u65e5\u672c", "\u5927\u5206\u770c" ], - "s": 25533450, - "sha1_base64": "D6R6nhjOPRpCREr5S7PNcG8wDdo=" + "s": 25374906, + "sha1_base64": "5c3UnaYtRGerKkIdk3o30pvs0Bw=" }, { "id": "Japan_Kyushu Region_Okinawa", @@ -8085,8 +8085,8 @@ "\u65e5\u672c", "\u6c96\u7e04\u770c" ], - "s": 18499396, - "sha1_base64": "pgCx3UEIKOE67/5JeG2RSAuZu7I=" + "s": 17853691, + "sha1_base64": "v+apTTK9ttWXOHcaYb8JCrusmrI=" }, { "id": "Japan_Kyushu Region_Saga", @@ -8097,8 +8097,8 @@ "\u65e5\u672c", "\u4f50\u8cc0\u770c" ], - "s": 23743136, - "sha1_base64": "TE9re04v4V/nwIOheswEDwMIn+Q=" + "s": 23339824, + "sha1_base64": "dc3mCTiiTvYqZjxj+mMYGmTO9eQ=" } ] }, @@ -8114,8 +8114,8 @@ "\u65e5\u672c", "\u611b\u5a9b\u770c" ], - "s": 31380888, - "sha1_base64": "0d+Jr+gwtbOhZtGOWjjsqZvD9OI=" + "s": 30574216, + "sha1_base64": "pIElKqCp/RXgdF0PyNQB7FfBtws=" }, { "id": "Japan_Shikoku Region_Kagawa", @@ -8126,8 +8126,8 @@ "\u9999\u5ddd\u770c", "\u65e5\u672c" ], - "s": 13102047, - "sha1_base64": "Ul6US8yj3l2K+q3TyDuQqOiWZvo=" + "s": 11933431, + "sha1_base64": "13Y/EyS5zpsamqDUxo0IlyHZgzM=" }, { "id": "Japan_Shikoku Region_Kochi", @@ -8138,8 +8138,8 @@ "\u9ad8\u77e5\u770c", "\u65e5\u672c" ], - "s": 19547730, - "sha1_base64": "i73g3E6BjvZfcfla3GzZczpzTF4=" + "s": 19306226, + "sha1_base64": "kLmpJMT6CePy+aeDZM7O+Fx+TWA=" }, { "id": "Japan_Shikoku Region_Tokushima", @@ -8150,8 +8150,8 @@ "\u65e5\u672c", "\u5fb3\u5cf6\u770c" ], - "s": 21224848, - "sha1_base64": "nWhhafKzgR45ntxMPhlikZSTEKw=" + "s": 21091048, + "sha1_base64": "G67gqCg+SRDdUMIECGw6L68xSUk=" } ] }, @@ -8167,8 +8167,8 @@ "\u65e5\u672c", "\u79cb\u7530\u770c" ], - "s": 40632067, - "sha1_base64": "bMcmR2oaP7xcNwnJ6beCT+KQVJE=" + "s": 39979883, + "sha1_base64": "CLLoBp5R9QwZVTu/fXwCLOU83JA=" }, { "id": "Japan_Tohoku_Aomori", @@ -8179,8 +8179,8 @@ "\u9752\u68ee\u770c", "\u65e5\u672c" ], - "s": 25123970, - "sha1_base64": "BEPURNDib0UKqEnTYf7PirBSM9A=" + "s": 24646898, + "sha1_base64": "PTsEJUcOa/WqQ2r6o8hl7vfbEUY=" }, { "id": "Japan_Tohoku_Fukushima", @@ -8191,8 +8191,8 @@ "\u65e5\u672c", "\u798f\u5cf6\u770c" ], - "s": 50927492, - "sha1_base64": "HVcBwoqsmi3z4eI3rQvBuKtG7cY=" + "s": 50120780, + "sha1_base64": "4LxXLbsKgaH580YHScOAAJtffbQ=" }, { "id": "Japan_Tohoku_Iwate", @@ -8203,8 +8203,8 @@ "\u65e5\u672c", "\u5ca9\u624b\u770c" ], - "s": 32522219, - "sha1_base64": "g9AF8hPXtY9uyQnGIp/eE8gSgNA=" + "s": 32336123, + "sha1_base64": "7Bck81hd61DfSbQ3z2uVAYja6MI=" }, { "id": "Japan_Tohoku_Miyagi", @@ -8216,8 +8216,8 @@ "\u5bae\u57ce\u770c", "\u798f\u5cf6\u770c" ], - "s": 59356035, - "sha1_base64": "V274rjbN7A62195pvy/t7+ltFDg=" + "s": 58649547, + "sha1_base64": "EfV+y8cYxZbtGLkyb3MgADNW9Ok=" }, { "id": "Japan_Tohoku_Yamagata", @@ -8228,8 +8228,8 @@ "\u65e5\u672c", "\u5c71\u5f62\u770c" ], - "s": 21119137, - "sha1_base64": "1gKDce2woBMTXwKpAYLQHcEAgtI=" + "s": 21039457, + "sha1_base64": "sVVD651cAtbnXMiYH3RdsOKMVEU=" } ] } @@ -8252,8 +8252,8 @@ "Queen's Rock", "The Islet" ], - "s": 2025146, - "sha1_base64": "PupNehRbSr7oUN/VRPuxuQCGFck=" + "s": 1995010, + "sha1_base64": "IrZEyN7PU64Y6OELyleG+ClnsRs=" }, { "id": "Jordan", @@ -8275,8 +8275,8 @@ "Zarqa", "\u0627\u0644\u0623\u0631\u062f\u0646" ], - "s": 39854683, - "sha1_base64": "p82xj+s6uwogHYsVg1eX6b+8nwM=" + "s": 39961555, + "sha1_base64": "Kzwdw7RFawKpZzlmefSuAP3tUtE=" }, { "id": "Kazakhstan", @@ -8295,8 +8295,8 @@ "\u041f\u0430\u0432\u043b\u043e\u0434\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u041a\u0430\u0440\u0430\u0433\u0430\u043d\u0434\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 61022776, - "sha1_base64": "ooFmDiyC5ukFsRIQxUf4A30jZ0E=" + "s": 60339680, + "sha1_base64": "mglQIdyoA6mSdJDgXtFB8yqeGjU=" }, { "id": "Kazakhstan_South", @@ -8316,8 +8316,8 @@ "\u041c\u0430\u043d\u0433\u0438\u0441\u0442\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u041a\u044b\u0437\u044b\u043b\u043e\u0440\u0434\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 97669733, - "sha1_base64": "4+LxcD43epWitZw04M0t3bxaPNE=" + "s": 92003525, + "sha1_base64": "heIjpGcAr3HYaX4H5n7u6QlvKuA=" } ] }, @@ -8376,8 +8376,8 @@ "Wajir", "West Pokot" ], - "s": 211220432, - "sha1_base64": "Wza7QXKpBKa37MR1DWKrR2VnUAw=" + "s": 204139544, + "sha1_base64": "vLjrtQaTHnJtnrXV35qor0QMSSA=" }, { "id": "Kingdom of Lesotho", @@ -8390,8 +8390,8 @@ "country_name_synonyms": [ "Lesotho" ], - "s": 86935933, - "sha1_base64": "XL8s6a5XdW6y2Zjnu/eeO84UiPE=" + "s": 86545972, + "sha1_base64": "LO9Q/y1rKC3PvH0ual4vJj2MtYU=" }, { "id": "Kiribati", @@ -8401,8 +8401,8 @@ "affiliations": [ "Kiribati" ], - "s": 2858271, - "sha1_base64": "1cQxPUzu7/ZtA7wH14kaMyHapSA=" + "s": 2796119, + "sha1_base64": "0c9rmFGZAgZevxA4p3zx5Msd5jU=" }, { "id": "Kuwait", @@ -8418,8 +8418,8 @@ "\u0627\u0644\u0641\u0631\u0648\u0627\u0646\u064a\u0629", "\u200f\u0627\u0644\u0643\u0648\u064a\u062a\u200e" ], - "s": 19517422, - "sha1_base64": "PxowBW/5iQwdkeobSEDuZb9z+EQ=" + "s": 19530142, + "sha1_base64": "21xc+aYLupIWmXG42R115/wmwQ4=" }, { "id": "Kyrgyzstan", @@ -8440,8 +8440,8 @@ "\u0427\u0443\u0439\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u041a\u044b\u0440\u0433\u044b\u0437\u0441\u0442\u0430\u043d" ], - "s": 44143822, - "sha1_base64": "CHR9yunX1Z6Qy3t0i3RkJ7IqPWE=" + "s": 42674414, + "sha1_base64": "o53OwgzV/RiROzSigDhDBRyybK0=" }, { "id": "Laos", @@ -8468,8 +8468,8 @@ "\u0eaa\u0eb0\u0eab\u0ea7\u0eb1\u0e99\u0e99\u0eb0\u0ec0\u0e82\u0e94", "\u0e99\u0eb0\u0e84\u0ead\u0e99\u0eab\u0ebc\u0ea7\u0e87\u0ea7\u0ebd\u0e87\u0e88\u0eb1\u0e99" ], - "s": 43979994, - "sha1_base64": "SgAnXFJQ7YuwECWMmH0ZmL8Jdak=" + "s": 43217121, + "sha1_base64": "Mq5JytPxbkbk8QUwJAH47YDiYcM=" }, { "id": "Latvia", @@ -8483,8 +8483,8 @@ "Vidzeme", "Zemgale" ], - "s": 110326277, - "sha1_base64": "CCua9acB0ni/Gw2c55VBlef7+K8=" + "s": 107710077, + "sha1_base64": "ZtVovvdDGcUquWzrFXpfqaOVpbA=" }, { "id": "Lebanon", @@ -8519,8 +8519,8 @@ "\u0642\u0636\u0627\u0621 \u0627\u0644\u0628\u062a\u0631\u0648\u0646", "\u0642\u0636\u0627\u0621 \u0627\u0644\u0646\u0628\u0637\u064a\u0629" ], - "s": 35921171, - "sha1_base64": "hh/WfeIEGntjMLRN4pRPlOQtfFE=" + "s": 35743794, + "sha1_base64": "vZb635rUvEJjfQRXhgkzyfvayvE=" }, { "id": "Liberia", @@ -8545,8 +8545,8 @@ "River Gee County", "Sinoe County" ], - "s": 42399434, - "sha1_base64": "QdpvmY8CHzftarCo998Z50ekPYk=" + "s": 41968913, + "sha1_base64": "a0NplWmCpQEa72OlD3FX+aBXWO8=" }, { "id": "Libya", @@ -8578,8 +8578,8 @@ "\u0627\u0644\u0648\u0627\u062d\u0627\u062a", "\u0627\u0644\u0632\u0627\u0648\u064a\u0629" ], - "s": 52181305, - "sha1_base64": "a3V5wA4jrXyOPxCmiLINzn4jzpc=" + "s": 49758433, + "sha1_base64": "xGm/1YrIAepu8cA1fBct1pHoB0k=" }, { "id": "Liechtenstein", @@ -8589,8 +8589,8 @@ "affiliations": [ "Liechtenstein" ], - "s": 3126859, - "sha1_base64": "7SJBG+V5m9HQmiN3IuAxzNfDuyA=" + "s": 3115531, + "sha1_base64": "yPOrp+4iX9dg/vIkDd4GhIkoeHw=" }, { "id": "Lithuania", @@ -8607,8 +8607,8 @@ "Utenos apskritis", "Vilniaus apskritis" ], - "s": 98147411, - "sha1_base64": "SmeC9sfGKesuswxKtr8nExrocNw=" + "s": 96622491, + "sha1_base64": "yC5SEDyz6SrTXGc0y0yNxi158ps=" }, { "id": "Lithuania_West", @@ -8624,8 +8624,8 @@ "Taurag\u0117s apskritis", "\u0160iauli\u0173 apskritis" ], - "s": 87814282, - "sha1_base64": "tAa+eoVJ68OSNmWsZhuoWsxTV50=" + "s": 87225162, + "sha1_base64": "eppt4xcqTnkRE/oRVI06RBSs3DM=" } ] }, @@ -8637,8 +8637,8 @@ "affiliations": [ "L\u00ebtzebuerg" ], - "s": 38475087, - "sha1_base64": "VnH4oLZBUf163Vn5BJ14vxYubkE=" + "s": 38085975, + "sha1_base64": "A/9YfibJgx5ytZV4gB9JSKEt1ZU=" }, { "id": "Macedonia", @@ -8659,8 +8659,8 @@ "country_name_synonyms": [ "North Macedonia" ], - "s": 29297932, - "sha1_base64": "YNm7iPD6Z8BqoO8ScP1dn4qGrp8=" + "s": 28798812, + "sha1_base64": "pXcLoz6/7KHGD6AcYmYEtQoSx7M=" }, { "id": "Madagascar", @@ -8674,8 +8674,8 @@ "R\u00e9gion de Sava", "Pr\u00e9fecture de police de Nosy Be" ], - "s": 302348135, - "sha1_base64": "ukR3NuLgmJaISUUnKe9hHF83Wro=" + "s": 296679775, + "sha1_base64": "3fXMB4E5XOUnSl9nZ8a00Eo8xJU=" }, { "id": "Malawi", @@ -8691,8 +8691,8 @@ "Northern", "Southern" ], - "s": 124014950, - "sha1_base64": "WyysTsi+gUbBolFJ8RAGV+mZlAc=" + "s": 122238278, + "sha1_base64": "THfOmeZlRPb0HeJUbu7A51SpaUY=" }, { "id": "Malaysia", @@ -8738,8 +8738,8 @@ "Sarawak", "Singapura" ], - "s": 155726795, - "sha1_base64": "mOvLE/7XG3wvlIlJdTStKOSgFOY=" + "s": 151668315, + "sha1_base64": "EtKWdMJoENvUYdKpq2rbBaGzYr4=" }, { "id": "Maldives", @@ -8758,8 +8758,8 @@ "Medhu-Uthuru Province", "\u078b\u07a8\u0788\u07ac\u0780\u07a8\u0783\u07a7\u0787\u07b0\u0796\u07ad\u078e\u07ac \u0796\u07aa\u0789\u07aa\u0780\u07ab\u0783\u07a8\u0787\u07b0\u0794\u07a7" ], - "s": 3098755, - "sha1_base64": "sIqS3EYtDheUHLz8e8hJqiCFEY0=" + "s": 3026073, + "sha1_base64": "+IGHRHlQ/N1qwkd699H72QV9tR0=" }, { "id": "Mali", @@ -8778,8 +8778,8 @@ "S\u00e9gou", "Tombouctou" ], - "s": 141129941, - "sha1_base64": "iyrpbkQylJbaQ8fanba1YItw7kA=" + "s": 131799013, + "sha1_base64": "+7LiosF8GHPqyO+zw4vfsvVqlEg=" }, { "id": "Malta", @@ -8796,8 +8796,8 @@ "Malta", "Malta" ], - "s": 6490420, - "sha1_base64": "7SBzMnNY1Y+hER0kscvkJstYG0A=" + "s": 6422276, + "sha1_base64": "BorsIrXNP9zadOqgQddUwyrXi3E=" }, { "id": "Marshall Islands", @@ -8808,8 +8808,8 @@ "Aolep\u0101n Aor\u014dkin M\u0327aje\u013c", "MH" ], - "s": 1397604, - "sha1_base64": "LNlwTOox7XYoDWAbSlc2KSRgI2s=" + "s": 1361316, + "sha1_base64": "3+OCmEb1u7IfdMYbh9KOqiHHmtk=" }, { "id": "Mauritania", @@ -8831,8 +8831,8 @@ "\u0625\u064a\u0646\u0634\u064a\u0631\u064a", "\u063a\u064a\u062f\u064a\u0645\u0627\u063a\u0627" ], - "s": 28130407, - "sha1_base64": "JG4LzjQ0rVV3aRnLPwxHutX+DB0=" + "s": 27658359, + "sha1_base64": "0YOcnlXPlJDvp6XNLPD/+nssiDI=" }, { "id": "Mauritius", @@ -8867,8 +8867,8 @@ "\u00cele Deux Fr\u00e8res", "\u00cele Fr\u00e9gate" ], - "s": 8973843, - "sha1_base64": "O+67BdJevoSksIK0DlrYlG1Cwq8=" + "s": 8800203, + "sha1_base64": "UMpkb4r7+f45F3QgyowpZ65zm3o=" }, { "id": "Mexico", @@ -8887,8 +8887,8 @@ "Colima", "Estados Unidos Mexicanos" ], - "s": 77509760, - "sha1_base64": "lFP2A9j/9k7kolBPHIdKHCLZIY8=" + "s": 77043136, + "sha1_base64": "bR4kLErLgLH/aamhHOK2ybrYjzM=" }, { "id": "Mexico_Central_East", @@ -8902,8 +8902,8 @@ "San Luis Potos\u00ed", "Tamaulipas" ], - "s": 58383848, - "sha1_base64": "dAYMqlWFwsNYAgYURxqH0FCXBw0=" + "s": 57813120, + "sha1_base64": "O/0KHjJx8LhVZvQhXZwrRnaGBUA=" }, { "id": "Mexico_Central_West", @@ -8920,8 +8920,8 @@ "Sinaloa", "Zacatecas" ], - "s": 74106185, - "sha1_base64": "XgXL1WBsRZyomMvBfoMrXGVVCgY=" + "s": 73687897, + "sha1_base64": "xp7x7W6ZGGmiOLGtLZ2nwSAej1E=" }, { "id": "Mexico_East", @@ -8939,8 +8939,8 @@ "Veracruz de Ignacio de la Llave", "Yucat\u00e1n" ], - "s": 66607329, - "sha1_base64": "oIFD8naFYYd5e8Hz0t5cXxEI2ns=" + "s": 66190417, + "sha1_base64": "gjKk8KdpmcRUIMkiJm7WKFsL2OQ=" }, { "id": "Mexico_Mexico", @@ -8957,8 +8957,8 @@ "Tlaxcala", "Veracruz de Ignacio de la Llave" ], - "s": 160323437, - "sha1_base64": "AS6h1yWbm0AN+DqUGjd5mi6LE4c=" + "s": 158986453, + "sha1_base64": "XHz1XD6XteOc/NMC5cg9KQIhuBo=" }, { "id": "Mexico_Chihuahua", @@ -8973,8 +8973,8 @@ "Nuevo Le\u00f3n", "Sinaloa" ], - "s": 47087733, - "sha1_base64": "9OiTS42wgSKvqGlL/qFD/EMwQEU=" + "s": 45883893, + "sha1_base64": "4r2yEi0Ye2NTXQ/BazLywX09xD0=" }, { "id": "Mexico_Sonora", @@ -8988,8 +8988,8 @@ "Sinaloa", "Sonora" ], - "s": 43439829, - "sha1_base64": "soCXljf3Ze0BwTJlRao3+u8TtjQ=" + "s": 43019205, + "sha1_base64": "/7Jyy3dZUzpQkpeYH+8UEOBzkFo=" }, { "id": "Mexico_South", @@ -9005,8 +9005,8 @@ "Quer\u00e9taro", "Veracruz de Ignacio de la Llave" ], - "s": 145280565, - "sha1_base64": "BtDeugOLzZwhIIQyHVxfYoew2wo=" + "s": 144531389, + "sha1_base64": "BHIwW72fcO2UQYT24gMgOqgTXEg=" } ] }, @@ -9020,8 +9020,8 @@ "Moldova", "\u041f\u0440\u0438\u0434\u043d\u0435\u0441\u0442\u0440\u043e\u0432\u044c\u0435" ], - "s": 66390777, - "sha1_base64": "7Sl45qWDkmz7ZmvR4KtmrSfmA6g=" + "s": 65513064, + "sha1_base64": "U4y9Ys77ZAyhNJ8cHOSw4rt8SB4=" }, { "id": "Monaco", @@ -9032,8 +9032,8 @@ "France", "Monaco" ], - "s": 791419, - "sha1_base64": "/mBrJX8tH1KlYy4iXDtTHoAwwAE=" + "s": 790067, + "sha1_base64": "acz0Na2J7BpxPK1YWx6xINCU4S0=" }, { "id": "Mongolia", @@ -9068,8 +9068,8 @@ "\u0413\u043e\u0432\u044c\u0441\u04af\u043c\u0431\u044d\u0440", "\u04e8\u0432\u04e9\u0440\u0445\u0430\u043d\u0433\u0430\u0439" ], - "s": 49884274, - "sha1_base64": "ePh9QbflWYa5Hb85CYMxsZcV2aM=" + "s": 49459298, + "sha1_base64": "Z5M41m28vRic5DkAGNfElwdFeYk=" }, { "id": "Montenegro", @@ -9079,8 +9079,8 @@ "affiliations": [ "Crna Gora" ], - "s": 29681363, - "sha1_base64": "56ioQhbxI8yuRyf1HknHR2gKt30=" + "s": 29320963, + "sha1_base64": "focL6qjCYVABX5I3MDhpVwZWsTI=" }, { "id": "Morocco", @@ -9098,8 +9098,8 @@ "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "Souss-Massa \u2d59\u2d53\u2d59\u2d59-\u2d4e\u2d30\u2d59\u2d59\u2d30 \u0633\u0648\u0633-\u0645\u0627\u0633\u0629" ], - "s": 12396694, - "sha1_base64": "W5Wd4YmGlhpqutTPGJWBIgCUgDQ=" + "s": 12273966, + "sha1_base64": "u6H9UzLtTwgYe2FDhn72Pj2wrcg=" }, { "id": "Morocco_Southern", @@ -9115,8 +9115,8 @@ "Oriental \u2d5c\u2d30\u2d4f\u2d33\u2d4e\u2d53\u2d39\u2d5c \u0627\u0644\u0634\u0631\u0642\u064a\u0629", "Souss-Massa \u2d59\u2d53\u2d59\u2d59-\u2d4e\u2d30\u2d59\u2d59\u2d30 \u0633\u0648\u0633-\u0645\u0627\u0633\u0629" ], - "s": 58431934, - "sha1_base64": "SfJveC9QocSEiV2ssMRZ0KHrtPA=" + "s": 57690325, + "sha1_base64": "rzAf2kgcBEkYCj1J5t7oArhGuFA=" }, { "id": "Morocco_Doukkala-Abda", @@ -9129,8 +9129,8 @@ "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "Marrakech-Safi \u2d4e\u2d55\u2d55\u2d30\u2d3d\u2d5b-\u2d30\u2d59\u2d3c\u2d49 \u0645\u0631\u0627\u0643\u0634-\u0623\u0633\u0641\u064a" ], - "s": 56293261, - "sha1_base64": "oxsALCtB6/gLuOZnzPEahFgSx4M=" + "s": 55803005, + "sha1_base64": "KQT7UOKoNwxjE9eeTh+J2cpX5pU=" }, { "id": "Morocco_Rabat-Sale-Zemmour-Zaer", @@ -9144,8 +9144,8 @@ "Rabat-Sal\u00e9-K\u00e9nitra \u2d3b\u2d54\u2d54\u2d31\u2d30\u2d5f-\u2d59\u2d4d\u2d30-\u2d47\u2d4f\u2d49\u2d5f\u2d54\u2d30 \u0627\u0644\u0631\u0628\u0627\u0637-\u0633\u0644\u0627-\u0627\u0644\u0642\u0646\u064a\u0637\u0631\u0629", "Tanger-T\u00e9touan-Al Hoceima \u2d5f\u2d30\u2d4f\u2d4a-\u2d5f\u2d49\u2d5c\u2d30\u2d61\u2d49\u2d4f-\u2d4d\u2d43\u2d53\u2d59\u2d49\u2d4e\u2d30 \u0637\u0646\u062c\u0629-\u062a\u0637\u0648\u0627\u0646-\u0627\u0644\u062d\u0633\u064a\u0645\u0629" ], - "s": 56176079, - "sha1_base64": "lIb0Yx2zE72K++r65vp+5q30bkY=" + "s": 55655335, + "sha1_base64": "RhFepZEoNgwAwA9yu/soA2k463M=" } ] }, @@ -9167,8 +9167,8 @@ "Sofala", "Zamb\u00e9zia" ], - "s": 157723046, - "sha1_base64": "GY5YvHPMtbj3S7A2kBGPolIvKqE=" + "s": 156403958, + "sha1_base64": "zxrC+qtwxLCeastbhA+EzhI4yd4=" }, { "id": "Myanmar", @@ -9193,8 +9193,8 @@ "\u1005\u1005\u103a\u1000\u102d\u102f\u1004\u103a\u1038\u1010\u102d\u102f\u1004\u103a\u1038 (Sagaing)", "\u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f\u1019\u103c\u1014\u103a\u1019\u102c\u1014\u102d\u102f\u1004\u103a\u1004\u1036\u1010\u1031\u102c\u103a\u200c" ], - "s": 138410031, - "sha1_base64": "P28OSg1AEbFqf2RXJQyJYz4yRiw=" + "s": 137203631, + "sha1_base64": "t0iTbgktZWc+xCZKqgrTXYC222U=" }, { "id": "Namibia", @@ -9226,8 +9226,8 @@ "Zambezi Region", "\u01c1Karas Region" ], - "s": 173974519, - "sha1_base64": "5dtMuRIlcqpae5YesxQdJuEIliY=" + "s": 173487807, + "sha1_base64": "WMF5w76c1/+ao7Nc585QH497Q28=" }, { "id": "Nauru", @@ -9237,8 +9237,8 @@ "affiliations": [ "Naoero" ], - "s": 397376, - "sha1_base64": "GEwuVmIC1WbJs1oLjxNUJHoXNAc=" + "s": 390935, + "sha1_base64": "BFtM6AXt+qroAn22oTOx/dzxblo=" }, { "id": "Nepal", @@ -9254,8 +9254,8 @@ "\u0938\u0941\u0926\u0941\u0930 \u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930" ], - "s": 137109048, - "sha1_base64": "IzLGKUGKRrRYkPgFBf4T7fAbstI=" + "s": 133603183, + "sha1_base64": "Lirqo4oYp8q1YmCUqV7C5se1f6g=" }, { "id": "Nepal_Kathmandu", @@ -9266,8 +9266,8 @@ "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" ], - "s": 45828659, - "sha1_base64": "p0srSdPRdAYCb8nqB6S5ZzzT+g0=" + "s": 45041626, + "sha1_base64": "xadtbHu4REFJjRGxhqug77apKfU=" }, { "id": "Nepal_Madhyamanchal", @@ -9278,8 +9278,8 @@ "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" ], - "s": 71770856, - "sha1_base64": "pNDnEAsQxq2Q1Pg0wDtwemDD1+M=" + "s": 71248527, + "sha1_base64": "BIjfeJaE9dKsV7NUPsfj7imAtNs=" }, { "id": "Nepal_Purwanchal", @@ -9290,8 +9290,8 @@ "\u092a\u0941\u0930\u094d\u0935\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" ], - "s": 97782661, - "sha1_base64": "TWbgFKJDdkv/xH5VUx0XdMxXmvE=" + "s": 94835996, + "sha1_base64": "9+Vb1HhXfyjHaOvMPkvhFLeyjHU=" } ] }, @@ -9321,8 +9321,8 @@ "Regi\u00f3n Aut\u00f3noma de la Costa Caribe Sur", "Rivas" ], - "s": 41119979, - "sha1_base64": "81erBzmXDTct6Bmj6iUeKYQCY7o=" + "s": 38973483, + "sha1_base64": "yaHgFO7IooW9FEnzBhX7Ef28KT4=" }, { "id": "Niger", @@ -9340,8 +9340,8 @@ "Tillab\u00e9ri", "Zinder" ], - "s": 74310523, - "sha1_base64": "n28WIOlLNM+pIM+Pzbj1oHFU20E=" + "s": 72160211, + "sha1_base64": "vcKhR0ci0RKccT6ah0nNIuCnmS8=" }, { "id": "Nigeria", @@ -9382,8 +9382,8 @@ "Rivers", "Taraba" ], - "s": 240748838, - "sha1_base64": "xP9zE/2VYj+ONHe7TV4dHItvWpY=" + "s": 225445709, + "sha1_base64": "68lVab0z4u4UAkRXdcQs3OabEiY=" }, { "id": "Nigeria_North", @@ -9404,8 +9404,8 @@ "Yobe", "Zamfara" ], - "s": 163104958, - "sha1_base64": "7CpD4hfTXazNA5mfcBwfQHMchS4=" + "s": 161381238, + "sha1_base64": "wEkBZHprrCld3hPHDHxkyAzI7i8=" } ] }, @@ -9417,8 +9417,8 @@ "affiliations": [ "Niu\u0113" ], - "s": 449920, - "sha1_base64": "e65dlzoDydv40jutKk01HPKU4UU=" + "s": 453920, + "sha1_base64": "zVdjdWgu+0udg2YKOd7Pas+bkD4=" }, { "id": "North Korea", @@ -9439,8 +9439,8 @@ "\ud3c9\uc591\uc9c1\ud560\uc2dc", "\uc870\uc120\ubbfc\uc8fc\uc8fc\uc758\uc778\ubbfc\uacf5\ud654\uad6d" ], - "s": 60356660, - "sha1_base64": "DuA5SGgFO9O21hbfS8Uv4FUJJtw=" + "s": 55115962, + "sha1_base64": "s8g+EK+cI3OkypG8YRpj5x4dqzQ=" }, { "id": "Norway", @@ -9455,8 +9455,8 @@ "Norge", "Troms" ], - "s": 203132897, - "sha1_base64": "+j9cUCnwMiFMCyreSgopEkKE9LU=" + "s": 167240104, + "sha1_base64": "wrA+jU2Qs9u1QbXjWA78CdIdu8Y=" }, { "id": "Norway_Hordaland", @@ -9467,8 +9467,8 @@ "Hordaland", "Norge" ], - "s": 72708320, - "sha1_base64": "z5cCb9RyrqvRpjz6M0Ya/Z+0jpI=" + "s": 72276881, + "sha1_base64": "pDfMqyD+OIC4F3ejYMrcJ+hNSS0=" }, { "id": "Norway_Nordland", @@ -9480,8 +9480,8 @@ "Norge", "Troms" ], - "s": 177608000, - "sha1_base64": "VjWPfGhbFcAzFPjPS+xeQi7ZR6Y=" + "s": 154102984, + "sha1_base64": "4h9ZNyCGyC7tipPVrasMsTidTIY=" }, { "id": "Norway_Svalbard", @@ -9492,8 +9492,8 @@ "Norge", "Svalbard" ], - "s": 8713104, - "sha1_base64": "Z/E3Se+D5oGiMFqE+/i/4l2ar5M=" + "s": 8591592, + "sha1_base64": "vN5WuXsRKotBaWptrikZYNI8gOg=" }, { "id": "Norway_Oppland", @@ -9504,8 +9504,8 @@ "Norge", "Oppland" ], - "s": 80407098, - "sha1_base64": "tJMOTwCI6M6/hNh+ZVqWeIOHJwU=" + "s": 80326538, + "sha1_base64": "rDako9JxX99GbKl07YQ0MHlA43g=" }, { "id": "Norway_Rogaland", @@ -9516,8 +9516,8 @@ "Norge", "Rogaland" ], - "s": 56768424, - "sha1_base64": "F2T2SkWK5YrI228O5A4lJm87ssY=" + "s": 56235144, + "sha1_base64": "8R+GtLlAYZuKyYQqDtmj69U0BAo=" }, { "id": "Norway_Hedmark", @@ -9528,8 +9528,8 @@ "Hedmark", "Norge" ], - "s": 87423562, - "sha1_base64": "HXKMpCHiODGK+E531WHPqX4PMbc=" + "s": 87240538, + "sha1_base64": "NCf5E3PKK7nTpGFi0L2QCpeApTI=" }, { "id": "Norway_Jan Mayen", @@ -9537,8 +9537,8 @@ "Jan Mayen", "Norge" ], - "s": 1316292, - "sha1_base64": "YlY0iYkk50cmE9Dtsnn55c8jjyA=" + "s": 1306836, + "sha1_base64": "p1iJfMdhm8Zq5SwcaIv1tmftr8Q=" }, { "id": "Norway_North Trondelag", @@ -9550,8 +9550,8 @@ "Norge", "S\u00f8r-Tr\u00f8ndelag" ], - "s": 124220437, - "sha1_base64": "9DF9EY4MY4wbp1Q/yP0y+JP3voE=" + "s": 124121916, + "sha1_base64": "IvZuvbuzmFJ11gzWBzkk1HIKZZo=" }, { "id": "Norway_South Trondelag", @@ -9562,8 +9562,8 @@ "Norge", "S\u00f8r-Tr\u00f8ndelag" ], - "s": 72718065, - "sha1_base64": "Jatzmxj8lc/fAk2WsuBcZlLlotg=" + "s": 72426880, + "sha1_base64": "PP+WEKQvUXx6X3voDyyfIr7BKUw=" }, { "id": "Norway_Southern", @@ -9578,8 +9578,8 @@ "Vest-Agder", "Vestfold" ], - "s": 210035526, - "sha1_base64": "aAbCzbJaWnDtkHXQidzggwRpl70=" + "s": 208402046, + "sha1_base64": "lsXEDRNOOzP9AIopmUzFFu7e8Xw=" }, { "id": "Norway_Western", @@ -9591,8 +9591,8 @@ "Norge", "Sogn og Fjordane" ], - "s": 110148145, - "sha1_base64": "fxA6IEBw6skqga+U50tUhDS1gJg=" + "s": 109786841, + "sha1_base64": "eDuTKIRSVuVj1iw+e3hEpCFT5Yg=" }, { "id": "Norway_Central", @@ -9605,8 +9605,8 @@ "Norge", "Oslo" ], - "s": 139721477, - "sha1_base64": "jXR9kW/iIUDJU6l830D053Nbb6o=" + "s": 138321781, + "sha1_base64": "5ISm26aeHGIU/3DJI2OPCZBZODQ=" }, { "id": "Norway_Bouvet Island", @@ -9617,8 +9617,8 @@ "Bouvet\u00f8ya", "Norge" ], - "s": 171200, - "sha1_base64": "lyFB+KX5PYKSDc6yQbgvSXH2/gE=" + "s": 170688, + "sha1_base64": "UvaCLRdmp5Jx0MjWv1APTP212sg=" } ] }, @@ -9640,8 +9640,8 @@ "\u200f\u0633\u0644\u0637\u0646\u0629 \u0639\u0645\u0627\u0646\u200e", "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0628\u0631\u064a\u0645\u064a" ], - "s": 22248794, - "sha1_base64": "D9nWl5V2jD1CwwXHHXKDHrWxa5M=" + "s": 22013337, + "sha1_base64": "r5NMo7NDOqllUnsiTmk/F7W2kE8=" }, { "id": "Pakistan", @@ -9659,8 +9659,8 @@ "\u0628\u0644\u0648\u0686\u0633\u062a\u0627\u0646 / Balochistan", "\u200f\u067e\u0627\u06a9\u0633\u062a\u0627\u0646\u200e" ], - "s": 128691724, - "sha1_base64": "nfRuB9wzWBT7twxy7/H/JnqhB1Y=" + "s": 123164252, + "sha1_base64": "TdkcSSupfElb+PNajXjsZYld/78=" }, { "id": "Palau", @@ -9671,8 +9671,8 @@ "Belau", "PW" ], - "s": 1340374, - "sha1_base64": "NA3ieAopX1Kh7YbZx92f/W7t3QE=" + "s": 1339942, + "sha1_base64": "gdSrA4hZO5o89WfKmsAs6CUdDgI=" }, { "id": "Panama", @@ -9699,8 +9699,8 @@ "Panam\u00e1", "Veraguas" ], - "s": 38829985, - "sha1_base64": "lzmY8PNvol4U467uNFByAryfdRw=" + "s": 38400952, + "sha1_base64": "4E3h6PJs09BSmz2SOwLQPnLsGaU=" }, { "id": "Papua New Guinea", @@ -9733,8 +9733,8 @@ "Western", "Western Highlands" ], - "s": 40356169, - "sha1_base64": "uWOkt6FOF/fVXz7Za2qPVgkJbLI=" + "s": 39915568, + "sha1_base64": "ehsUlgnDDlOChJWlA3lo7c1cZKw=" }, { "id": "Paraguay", @@ -9764,8 +9764,8 @@ "Presidente Hayes", "San Pedro" ], - "s": 99260217, - "sha1_base64": "+GSJJZ+rMtr7Raq/lKIc7EFg6mo=" + "s": 97781553, + "sha1_base64": "pSIth2cM/NumqQ6HGkstKQTXsnE=" }, { "id": "People's Republic of China", @@ -9782,8 +9782,8 @@ "\u4e2d\u56fd", "\u5b89\u5fbd\u7701" ], - "s": 44716748, - "sha1_base64": "U+H5gUAzl0PpWqrO/sXynXH8/Zo=" + "s": 44259956, + "sha1_base64": "l15U1v+1xdG4Jd9r/KJzzbxbvXg=" }, { "id": "China_Chongqing", @@ -9794,8 +9794,8 @@ "\u91cd\u5e86\u5e02", "\u4e2d\u56fd" ], - "s": 42137850, - "sha1_base64": "fjKgcYf2BZu4d0wtOKz1THt25b8=" + "s": 41178090, + "sha1_base64": "Wis8TlnZ0phKV8gmZZ+SwCzumbo=" }, { "id": "China_Fujian", @@ -9806,8 +9806,8 @@ "\u4e2d\u56fd", "\u798f\u5efa\u7701" ], - "s": 34810482, - "sha1_base64": "PNBH8b08Bq3uI6RAk0KbrK/cd4Q=" + "s": 34431778, + "sha1_base64": "KYyCH5jBbUOS3IimMrSvVEYkwRU=" }, { "id": "China_Gansu", @@ -9818,8 +9818,8 @@ "\u4e2d\u56fd", "\u7518\u8083\u7701" ], - "s": 37407569, - "sha1_base64": "FdnF9fOuNql36F8SVepsqi6dhDk=" + "s": 35770271, + "sha1_base64": "yL6fwyH+t52+l72Ye0cg8WrkdI8=" }, { "id": "China_Guangdong", @@ -9834,8 +9834,8 @@ "country_name_synonyms": [ "Hong Kong" ], - "s": 207129998, - "sha1_base64": "MVR2zUzzGbfrkNx+hhlYzpe0oOA=" + "s": 203222422, + "sha1_base64": "9aM9Ate4KhHjuXwXQyXp7nb5teo=" }, { "id": "China_Guangxi", @@ -9846,8 +9846,8 @@ "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" ], - "s": 42118443, - "sha1_base64": "FKHN8CrwIiWC3+ViL65XrPrCXo0=" + "s": 40939899, + "sha1_base64": "PT5M24Vk+3hPj9fQJPBxy5luOBI=" }, { "id": "China_Guizhou", @@ -9858,8 +9858,8 @@ "\u8d35\u5dde\u7701", "\u4e2d\u56fd" ], - "s": 31450617, - "sha1_base64": "UKD1bpvk6ad0jXewF7BJzskO5Qs=" + "s": 30863504, + "sha1_base64": "rbvLqldeJvy/gzGpy2H/uodGksI=" }, { "id": "China_Hebei", @@ -9872,8 +9872,8 @@ "\u5929\u6d25\u5e02", "\u6cb3\u5317\u7701" ], - "s": 95782371, - "sha1_base64": "bn26ZIf9mzgmE9eS8KRV2q2v6gI=" + "s": 91172467, + "sha1_base64": "NJ9W95Ej+Fhce8dXBOl5ZsjP0A0=" }, { "id": "China_Heilongjiang", @@ -9884,8 +9884,8 @@ "\u4e2d\u56fd", "\u9ed1\u9f99\u6c5f\u7701" ], - "s": 32145043, - "sha1_base64": "F4+PH/brwbpj8Ovx7bLPwQi34Io=" + "s": 30584939, + "sha1_base64": "lyPmvGcUURtpz2a4K6fQziG5ZPs=" }, { "id": "China_Henan", @@ -9896,8 +9896,8 @@ "\u4e2d\u56fd", "\u6cb3\u5357\u7701" ], - "s": 55133941, - "sha1_base64": "K8Scdp7s3Q0xQIJaR6q+wqfqYok=" + "s": 54291093, + "sha1_base64": "FurEQc7a+GAYlNGKV7SiSIlSgxU=" }, { "id": "China_Hubei", @@ -9909,8 +9909,8 @@ "\u4e2d\u56fd", "\u6e56\u5317\u7701" ], - "s": 45989141, - "sha1_base64": "9UbZLPye88e2/PMqc961fPkUoGw=" + "s": 43551844, + "sha1_base64": "LIEDn/QEBFyJtmwNmRZ61j/Vdxo=" }, { "id": "China_Hunan", @@ -9921,8 +9921,8 @@ "\u4e2d\u56fd", "\u6e56\u5357\u7701" ], - "s": 41918811, - "sha1_base64": "YBL4n10o6KhpN9+faR0aT0NkawQ=" + "s": 40836075, + "sha1_base64": "52grtHQxlm1S7x7SMBUzD0VhXog=" }, { "id": "China_Inner Mongolia", @@ -9933,8 +9933,8 @@ "\u4e2d\u56fd", "\u5185\u8499\u53e4\u81ea\u6cbb\u533a / Inner Mongolia" ], - "s": 53808934, - "sha1_base64": "faZaqscIukU+0kh1gTydOtUhcFQ=" + "s": 52593166, + "sha1_base64": "5S8IfKSRV4cfWrfh0H4AOdLTEmU=" }, { "id": "China_Jiangsu", @@ -9946,8 +9946,8 @@ "\u6c5f\u82cf\u7701", "\u79e6\u5c71\u5c9b" ], - "s": 83868074, - "sha1_base64": "Nu8Hsk9VZt+sqmHlLankMJWBSFc=" + "s": 81624569, + "sha1_base64": "u5wUFaOnWzGKRQ678VqCVOHLekc=" }, { "id": "China_Jiangxi", @@ -9958,8 +9958,8 @@ "\u4e2d\u56fd", "\u6c5f\u897f\u7701" ], - "s": 41200444, - "sha1_base64": "+oJT5qGiIlyTma3fIaKA7tYkQ1A=" + "s": 41013868, + "sha1_base64": "HIjzFXEPoyQye5lcakv+aTg2HbM=" }, { "id": "China_Jilin", @@ -9970,8 +9970,8 @@ "\u4e2d\u56fd", "\u5409\u6797\u7701" ], - "s": 33146609, - "sha1_base64": "VdfxDI76FU5D74qh9Ou+t6DS998=" + "s": 32472753, + "sha1_base64": "fy2tSBYuxMTpqcSdKCRgWy6dS/4=" }, { "id": "China_Liaoning", @@ -9982,8 +9982,8 @@ "\u8fbd\u5b81\u7701", "\u4e2d\u56fd" ], - "s": 36868433, - "sha1_base64": "p3n632nPn4cjRdBJ2Mk2O0bBoL0=" + "s": 36413441, + "sha1_base64": "YQLpja2r6uZyzESVdnYiXgcF3DU=" }, { "id": "China_Ningxia Hui", @@ -9994,8 +9994,8 @@ "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" ], - "s": 21074548, - "sha1_base64": "bAg7SNmu3Ypnu+gRWPVxPpU/MnQ=" + "s": 20906724, + "sha1_base64": "IxyyLuVZ/a2bRsTlSJbtRReYVR4=" }, { "id": "China_Qinghai", @@ -10006,8 +10006,8 @@ "\u9752\u6d77\u7701", "\u4e2d\u56fd" ], - "s": 34398107, - "sha1_base64": "P/oEd8coaWOdCFRlpVkM4FgtDS4=" + "s": 33845131, + "sha1_base64": "o/3DLmkG04MJowonP4i+E4ujS5o=" }, { "id": "China_Shaanxi", @@ -10018,8 +10018,8 @@ "\u9655\u897f\u7701", "\u4e2d\u56fd" ], - "s": 37220020, - "sha1_base64": "M9NZy/6NUCRNVa37H+ArtMNjKZY=" + "s": 35433241, + "sha1_base64": "i6geB0LobwEfzTdP0iPFxbSStJs=" }, { "id": "China_Shandong", @@ -10030,8 +10030,8 @@ "\u4e2d\u56fd", "\u5c71\u4e1c\u7701" ], - "s": 71582327, - "sha1_base64": "SlnL7ZQsKju0NR4INw2nJkQFKik=" + "s": 69222359, + "sha1_base64": "P0QfmrF63nFsTr38E9moaxL9Qe8=" }, { "id": "China_Shanghai", @@ -10043,8 +10043,8 @@ "\u4e0a\u6d77\u5e02", "\u6d59\u6c5f\u7701" ], - "s": 20091410, - "sha1_base64": "E/gZNjM/B2cocjJazBK+lUcOtBg=" + "s": 19534954, + "sha1_base64": "Wh7Ie9T/M+TyqlVADfemOT0WfXU=" }, { "id": "China_Shanxi", @@ -10055,8 +10055,8 @@ "\u4e2d\u56fd", "\u5c71\u897f\u7701" ], - "s": 28442480, - "sha1_base64": "kXhniO/e3a+xQwSyKMYt5OKQ6Og=" + "s": 27433842, + "sha1_base64": "uLFW3aaAmjycfVpVapK6d+brT8o=" }, { "id": "China_Sichuan", @@ -10067,8 +10067,8 @@ "\u4e2d\u56fd", "\u56db\u5ddd\u7701" ], - "s": 68391931, - "sha1_base64": "l+/epCkvE6LtkhkOIhimHROZuOM=" + "s": 65836723, + "sha1_base64": "dAE8/3SRbmmwpcBTDMPMp5HVH/M=" }, { "id": "China_Tibet Autonomous Region", @@ -10079,8 +10079,8 @@ "\u4e2d\u56fd", "\u897f\u85cf\u81ea\u6cbb\u533a (\u0f56\u0f7c\u0f51\u0f0b\u0f62\u0f44\u0f0b\u0f66\u0f90\u0fb1\u0f7c\u0f44\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b)" ], - "s": 31680223, - "sha1_base64": "Y+M8gt2Hu2YoUzg0ZbpywU4G78E=" + "s": 31311287, + "sha1_base64": "yPFviVTImc3o5fX5eIdR1P56DuI=" }, { "id": "China_Xinjiang", @@ -10091,8 +10091,8 @@ "\u4e2d\u56fd", "\u65b0\u7586\u7ef4\u543e\u5c14\u81ea\u6cbb\u533a" ], - "s": 37220421, - "sha1_base64": "kemVoGN1yhM9LF59Q5H63obIydA=" + "s": 36327924, + "sha1_base64": "zlCM29i1dUSrGhrC7gytV2HqKts=" }, { "id": "China_Yunnan", @@ -10103,8 +10103,8 @@ "\u4e2d\u56fd", "\u4e91\u5357\u7701" ], - "s": 77401455, - "sha1_base64": "Iru2/xrXeVU3MeFGUZurVxdtdGU=" + "s": 72798423, + "sha1_base64": "IXOYW1QcDBTtnEwxnc42P2y7EIo=" }, { "id": "China_Zhejiang", @@ -10115,8 +10115,8 @@ "\u4e2d\u56fd", "\u6d59\u6c5f\u7701" ], - "s": 85181567, - "sha1_base64": "5npZqheI9naJ4DETK3/tPWxEgFQ=" + "s": 82745679, + "sha1_base64": "OidM1lWXv2FqnUM3/oVbqwxTw+s=" } ] }, @@ -10138,8 +10138,8 @@ "\u81fa\u5317\u5e02", "\u4e2d\u83ef\u6c11\u570b" ], - "s": 113491377, - "sha1_base64": "08RLP+uRL2EIGdFvJJE8GRJWtco=" + "s": 106142401, + "sha1_base64": "/2nRA/vrahTJ/aAf3r/it4uV2BE=" }, { "id": "Taiwan_South", @@ -10152,8 +10152,8 @@ "\u81fa\u4e2d\u5e02", "\u4e2d\u83ef\u6c11\u570b" ], - "s": 60494943, - "sha1_base64": "UzKv9kM5t6Tek4zRS5qVAFQMJ1w=" + "s": 58952942, + "sha1_base64": "usy/CI/Inl2xGSqOAv5r7QtjETY=" } ] }, @@ -10180,8 +10180,8 @@ "Tumbes", "Ucayali" ], - "s": 81189929, - "sha1_base64": "XP/sdXfG8ayNJq04XcBTd1RMjuY=" + "s": 79489569, + "sha1_base64": "SY6FO/rlscVdD4p5RB0DJe5xYiA=" }, { "id": "Peru_Lima", @@ -10196,8 +10196,8 @@ "Lima", "Per\u00fa" ], - "s": 49680478, - "sha1_base64": "7mEDZBNKxIOcUUPMQbxg6yeEiZ0=" + "s": 48279389, + "sha1_base64": "ksZbgIP13LMjpYdmyB9RDz71JDo=" }, { "id": "Peru_South", @@ -10215,8 +10215,8 @@ "Puno", "Tacna" ], - "s": 83354113, - "sha1_base64": "MPPV0JwK7jnUXWJIVySPiH3IA34=" + "s": 82346977, + "sha1_base64": "K+2HbEAzK1V2d7jd7sdC6GuRMNo=" } ] }, @@ -10262,8 +10262,8 @@ "Zamboanga del Norte", "Zamboanga del Sur" ], - "s": 123758993, - "sha1_base64": "zvyVyxsAnuQtLqbGe3uhNoVrud4=" + "s": 122735777, + "sha1_base64": "pZJHcVRL2EbWfJpNakIdHTghYnY=" }, { "id": "Philippines_Visayas", @@ -10294,8 +10294,8 @@ "Southern Leyte", "Sorsogon" ], - "s": 90563616, - "sha1_base64": "JiiMpeJoo64NvNbY0tgSzuRbMhs=" + "s": 89259264, + "sha1_base64": "70K/DpBP8kqw85BPCgT1E3ONe3M=" }, { "id": "Philippines_Luzon_South", @@ -10318,8 +10318,8 @@ "Sorsogon", "\u592a\u5e73\u5cf6" ], - "s": 25196456, - "sha1_base64": "qMLnHCtT23+6gezmNYZxx30ctLI=" + "s": 25029223, + "sha1_base64": "nEFrZw/Z3NXP4iO7Xqxxdb6Vdqs=" }, { "id": "Philippines_Luzon_Manila", @@ -10341,8 +10341,8 @@ "Rizal", "Sorsogon" ], - "s": 139021716, - "sha1_base64": "Z53NXJ4mNJUP6CiuoxWM7sBuS5U=" + "s": 137082771, + "sha1_base64": "vH2rd2P6ThXYBL4sLjGoSgTVYYI=" }, { "id": "Philippines_Luzon_North", @@ -10378,8 +10378,8 @@ "Zambales", "\u6d77\u5357\u7701" ], - "s": 143387115, - "sha1_base64": "x7xAWqvjybrJFPSD/6r7WuayODk=" + "s": 142629139, + "sha1_base64": "oASAX6E+su7HZlwwhQZ6Ik4/4bo=" } ] }, @@ -10394,8 +10394,8 @@ "country_name_synonyms": [ "Pitcairn" ], - "s": 240571, - "sha1_base64": "ChpMqQNXC2IH2ImPbERpwadn6lU=" + "s": 240979, + "sha1_base64": "b2Sxfnd+5yIZL+xy/PKw4Ef5zwI=" }, { "id": "Poland", @@ -10410,8 +10410,8 @@ "Territorial waters of Bornholm", "wojew\u00f3dztwo zachodniopomorskie" ], - "s": 81923171, - "sha1_base64": "n3GfDbaYj+nXfF7UvuehvP0tEA8=" + "s": 81102195, + "sha1_base64": "lvzxH6dyj9fXmVapu4ENkJnDVXU=" }, { "id": "Poland_Pomeranian Voivodeship", @@ -10423,8 +10423,8 @@ "Territorial waters of Bornholm", "wojew\u00f3dztwo pomorskie" ], - "s": 90870619, - "sha1_base64": "VyMIENbDW1SMh67OMiGVh85SpU4=" + "s": 89285563, + "sha1_base64": "WXFlkCpEwOqMkS3gG8U/qrKocKA=" }, { "id": "Poland_Podlaskie Voivodeship", @@ -10435,8 +10435,8 @@ "Polska", "wojew\u00f3dztwo podlaskie" ], - "s": 73002856, - "sha1_base64": "m3AWG+PgZwyyWWDpdX6dFrGvjVA=" + "s": 72233936, + "sha1_base64": "ougrdCrPRLcPQdGexfy0GuDlA1M=" }, { "id": "Poland_Masovian Voivodeship", @@ -10447,8 +10447,8 @@ "Polska", "wojew\u00f3dztwo mazowieckie" ], - "s": 232038287, - "sha1_base64": "kmyvcjOAkRUlw+Iw7Fdn//Spc3Y=" + "s": 228110959, + "sha1_base64": "ynItYHw9Ed+EtAUJOidEu/RjFPA=" }, { "id": "Poland_Lubusz Voivodeship", @@ -10459,8 +10459,8 @@ "Polska", "wojew\u00f3dztwo lubuskie" ], - "s": 52815128, - "sha1_base64": "7X5doW2p2GCxgI6T34N07TMKGkA=" + "s": 51614096, + "sha1_base64": "rI0IRDRJvjyeSqPB6MB30wwxe5M=" }, { "id": "Poland_Lublin Voivodeship", @@ -10471,8 +10471,8 @@ "Polska", "wojew\u00f3dztwo lubelskie" ], - "s": 118379269, - "sha1_base64": "s/UhaniMcdZTuhnjfsw+lAr9iTE=" + "s": 116611966, + "sha1_base64": "fCarU68uj+VUMctM9EGQWkoEDKA=" }, { "id": "Poland_Lower Silesian Voivodeship", @@ -10483,8 +10483,8 @@ "Polska", "wojew\u00f3dztwo dolno\u015bl\u0105skie" ], - "s": 128536078, - "sha1_base64": "Rx/t6LSQgMRF0m9v2g+95nAMlNI=" + "s": 124412846, + "sha1_base64": "zlzi9Mx6BTMwUHHeHVlRdn0v95o=" }, { "id": "Poland_Warmian-Masurian Voivodeship", @@ -10495,8 +10495,8 @@ "Polska", "wojew\u00f3dztwo warmi\u0144sko-mazurskie" ], - "s": 75637874, - "sha1_base64": "nhyy27hbPxvQ5L4yogUJ2G0ArCE=" + "s": 74211322, + "sha1_base64": "RxcJolNIXE2WLED/6NV94o52MpY=" }, { "id": "Poland_Lodz Voivodeship", @@ -10507,8 +10507,8 @@ "Polska", "wojew\u00f3dztwo \u0142\u00f3dzkie" ], - "s": 108795876, - "sha1_base64": "BdtaXqmRbijPUsz20Xz+igcpbIM=" + "s": 107112772, + "sha1_base64": "XkXKmhpRvAXs2NbRPErYOslr3pc=" }, { "id": "Poland_Subcarpathian Voivodeship", @@ -10519,8 +10519,8 @@ "Polska", "wojew\u00f3dztwo podkarpackie" ], - "s": 116780516, - "sha1_base64": "PH+YJ0HIJVnnY/QeRYHdBw4OfFM=" + "s": 114606756, + "sha1_base64": "2Eu2qs94yP5hqqbKriuN1IJB5KA=" }, { "id": "Poland_Lesser Poland Voivodeship", @@ -10531,8 +10531,8 @@ "Polska", "wojew\u00f3dztwo ma\u0142opolskie" ], - "s": 155260486, - "sha1_base64": "ckCZ9cc4aRWnm8jS2ZqsQjBX0dY=" + "s": 153207974, + "sha1_base64": "IO/LYrqjHi8dzTddlhosszSJgLA=" }, { "id": "Poland_Silesian Voivodeship", @@ -10543,8 +10543,8 @@ "Polska", "wojew\u00f3dztwo \u015bl\u0105skie" ], - "s": 147072582, - "sha1_base64": "7ogTtXAUCPlJDG3VTh5I+1yt3xo=" + "s": 145289166, + "sha1_base64": "YoLfDtjEv+TGOHViPVZGUFuzHks=" }, { "id": "Poland_Kuyavian-Pomeranian Voivodeship", @@ -10555,8 +10555,8 @@ "Polska", "wojew\u00f3dztwo kujawsko-pomorskie" ], - "s": 87560034, - "sha1_base64": "3y3WXWW856yuL7nPTrVXlvZZh0o=" + "s": 85720762, + "sha1_base64": "OiqdfwF51z4Q4siA1SQBvpxYKm8=" }, { "id": "Poland_Greater Poland Voivodeship", @@ -10567,8 +10567,8 @@ "Polska", "wojew\u00f3dztwo wielkopolskie" ], - "s": 141988278, - "sha1_base64": "GpDJAZ7LiGU8yTEwtyeH0QIPVCU=" + "s": 140378206, + "sha1_base64": "/whDyFIfsvha0RJDfAOjGq9n0VI=" }, { "id": "Poland_Opole Voivodeship", @@ -10579,8 +10579,8 @@ "Polska", "wojew\u00f3dztwo opolskie" ], - "s": 43365982, - "sha1_base64": "PeSS3J/XoQAwkczADw5AzjrL6JM=" + "s": 42729374, + "sha1_base64": "mHc1UwhXZKHY2W/vFxFF1a5lucc=" }, { "id": "Poland_Swietokrzyskie Voivodeship", @@ -10591,8 +10591,8 @@ "Polska", "wojew\u00f3dztwo \u015bwi\u0119tokrzyskie" ], - "s": 65207218, - "sha1_base64": "JHHQUBhg0lMkaW61WNZajK/XlCY=" + "s": 63699874, + "sha1_base64": "wMHfrdQd8S4ji52gntE807kkSKE=" } ] }, @@ -10609,8 +10609,8 @@ "Norte", "Portugal" ], - "s": 76947266, - "sha1_base64": "iGhVRx0hj9pdrIetqOQ9KryaZ00=" + "s": 75316938, + "sha1_base64": "nDAbhh7V7pmM3i6hxgg6eK/hp4M=" }, { "id": "Portugal_South", @@ -10624,8 +10624,8 @@ "Lisboa", "Portugal" ], - "s": 110496277, - "sha1_base64": "NxGlVw8wlxhOhUSAkVBMQ3gbHgE=" + "s": 106202549, + "sha1_base64": "X+EQ8AulxRsRLoAJK62B/yfsUQw=" }, { "id": "Portugal_Islands", @@ -10667,8 +10667,8 @@ "Portugal", "Portugal (\u00e1guas territoriais)" ], - "s": 26570168, - "sha1_base64": "pvopD5YbaRp1cqIOQxLJJwVmEeg=" + "s": 24332695, + "sha1_base64": "KO97cSawdwmQC2H06i+jvyIgvdk=" }, { "id": "Portugal_Viseu", @@ -10680,8 +10680,8 @@ "Norte", "Portugal" ], - "s": 89349589, - "sha1_base64": "qFuC/Dxcp0zn8BNgoR/wBh/sPFs=" + "s": 84966285, + "sha1_base64": "oTCCLWX1QtsMamjZm3G3LGFNS8Q=" } ] }, @@ -10703,8 +10703,8 @@ "Umm Salal", "\u200f\u0642\u0637\u0631\u200e" ], - "s": 20680098, - "sha1_base64": "QphRTbtREaZ6S1ObwNUusxOvB+Q=" + "s": 19004865, + "sha1_base64": "RcsMCEP3jDPlOeI1CmgWQosRHGM=" }, { "id": "Republic of Kosovo", @@ -10717,8 +10717,8 @@ "country_name_synonyms": [ "Kosovo" ], - "s": 29858433, - "sha1_base64": "iypsTQiTu7j2eDSfP8H+JctGsn0=" + "s": 28575121, + "sha1_base64": "3JhmYonQpitdVu74e9sYH7CxBCI=" }, { "id": "Romania", @@ -10737,8 +10737,8 @@ "Tulcea", "Vrancea" ], - "s": 34381564, - "sha1_base64": "o7R+BKcvGMiXbU0HS8/FsZQzSdw=" + "s": 33319028, + "sha1_base64": "CFhJlS8YqKfOTfmLCoHMHO5k6OQ=" }, { "id": "Romania_Centre", @@ -10754,8 +10754,8 @@ "Rom\u00e2nia", "Sibiu" ], - "s": 60119209, - "sha1_base64": "gA9kGRBRRlAfjWd2v/vjTs19xZI=" + "s": 59118121, + "sha1_base64": "s6n865kr3DX2RyiomAdXVQWFZ2g=" }, { "id": "Romania_West", @@ -10769,8 +10769,8 @@ "Rom\u00e2nia", "Timi\u0219" ], - "s": 41194174, - "sha1_base64": "NrfxlubK5bRahpUjQjb8srKvywQ=" + "s": 40600990, + "sha1_base64": "ZbbaszwqgNlSo5XpH+JZOQwMsHY=" }, { "id": "Romania_North_West", @@ -10786,8 +10786,8 @@ "Satu Mare", "S\u0103laj" ], - "s": 61089150, - "sha1_base64": "wgfofo/PbfQ+a8H5ujSMnfm8yIk=" + "s": 60703494, + "sha1_base64": "TtBE7FGK4o9SxzHAvFFB5CGankI=" }, { "id": "Romania_South_West", @@ -10802,8 +10802,8 @@ "Rom\u00e2nia", "V\u00e2lcea" ], - "s": 35337157, - "sha1_base64": "fAC1hcgUBIyVbxkySs+az+uJrR4=" + "s": 34509853, + "sha1_base64": "yMyYSzCgm0p11pn/crGUNWf/FT8=" }, { "id": "Romania_North_East", @@ -10819,8 +10819,8 @@ "Suceava", "Vaslui" ], - "s": 43900518, - "sha1_base64": "12WRcWEnrD94+csj4vrNGhNTR3g=" + "s": 43210302, + "sha1_base64": "ACh9Tty5XLxLEupolpKj/rXea4Q=" }, { "id": "Romania_South", @@ -10840,8 +10840,8 @@ "Rom\u00e2nia", "Teleorman" ], - "s": 55952625, - "sha1_base64": "v85fcXiHnhpHBqqMJnbh0pkwa4c=" + "s": 55580529, + "sha1_base64": "bEB4ePQ8wfsEWItbKOMNQ7dPwUg=" } ] }, @@ -10861,8 +10861,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0440\u044b\u043c" ], - "s": 51553213, - "sha1_base64": "eXET8iWu22+TSScFvhIF/rRdn2U=" + "s": 51134989, + "sha1_base64": "Q0XFvibf+oJKQm9nAwOXfEj/L+4=" }, { "id": "Russia_Altai Krai", @@ -10874,8 +10874,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u043b\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 139294193, - "sha1_base64": "KJFG0WUVXU/lpz4aSRaR4ikM5p0=" + "s": 139549474, + "sha1_base64": "SCR6fHJM0NSmmjLxe/OFUb8/f8M=" }, { "id": "Russia_Altai Republic", @@ -10887,8 +10887,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0410\u043b\u0442\u0430\u0439" ], - "s": 70752857, - "sha1_base64": "Ix2imha8paCKYrwrpzQREdRT+gQ=" + "s": 59444849, + "sha1_base64": "nVE8Q3gL4DQ7cMAIWNGqg25dsxo=" }, { "id": "Russia_Amur Oblast", @@ -10900,8 +10900,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u043c\u0443\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 21481136, - "sha1_base64": "+HDmNc2VilRiHVO+CYSkOcohbQc=" + "s": 21211808, + "sha1_base64": "MuU5d932GMAxvNG1ivvVuyuwgIw=" }, { "id": "Russia_Arkhangelsk Oblast_Central", @@ -10913,8 +10913,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u0440\u0445\u0430\u043d\u0433\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 73333246, - "sha1_base64": "AIbiOyy6XBzu2G3jDN7LTp9eYts=" + "s": 73392134, + "sha1_base64": "OZAtMneNd85ypUPG/uOJYFpbkag=" }, { "id": "Russia_Arkhangelsk Oblast_North", @@ -10928,8 +10928,8 @@ "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", "\u0410\u0440\u0445\u0430\u043d\u0433\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 30072979, - "sha1_base64": "1nY4kmfrc7dC7D7JZGdz2xnElAw=" + "s": 29896828, + "sha1_base64": "vOnV0N/o17Vc//3N33KgdYdotu4=" }, { "id": "Russia_Astrakhan Oblast", @@ -10941,8 +10941,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u0441\u0442\u0440\u0430\u0445\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 30810393, - "sha1_base64": "jyydxxrr10wTR7jveFE4yr2VAko=" + "s": 30798345, + "sha1_base64": "JQjm193JMr4OeBa3n8qoT8xpqoE=" }, { "id": "Russia_Bashkortostan", @@ -10954,8 +10954,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0430\u0448\u043a\u043e\u0440\u0442\u043e\u0441\u0442\u0430\u043d" ], - "s": 96724762, - "sha1_base64": "qwdCaDgodaObgbdMWdKsROx4Z2w=" + "s": 96257170, + "sha1_base64": "CmqHtMAUdQZscnbRvp1EJaGQR4E=" }, { "id": "Russia_Belgorod Oblast", @@ -10967,8 +10967,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0435\u043b\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 36343404, - "sha1_base64": "bV6grDgzK173cYRRS3EFsbxo27M=" + "s": 36007556, + "sha1_base64": "8W3nVgMxsKM7x644BqKILkaDJVg=" }, { "id": "Russia_Bryansk Oblast", @@ -10980,8 +10980,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0440\u044f\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 26865059, - "sha1_base64": "wwNXOKKwXGzb+Wrpa3DtF/uNQg0=" + "s": 25934850, + "sha1_base64": "ICXRHgU2Q9RV1wNQLn0pIfjisPY=" }, { "id": "Russia_Buryatia", @@ -10993,8 +10993,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0443\u0440\u044f\u0442\u0438\u044f" ], - "s": 29703546, - "sha1_base64": "JUZiAr/Ix5YraA0+G4JiIWITk2s=" + "s": 29610386, + "sha1_base64": "RGpssWLqN8zeJBy/DVS1RHeXV0g=" }, { "id": "Russia_Chechen Republic", @@ -11006,8 +11006,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 14641430, - "sha1_base64": "j5imAKHeBIqNWXkZCwSKBqnJDjY=" + "s": 14569742, + "sha1_base64": "E35WTSFCMd1sL2C2BKMjbwjv0Eg=" }, { "id": "Russia_Chelyabinsk Oblast", @@ -11019,8 +11019,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0427\u0435\u043b\u044f\u0431\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 79818116, - "sha1_base64": "NI2S84ke3tKVZfCIBOnPTEvQlkU=" + "s": 79450476, + "sha1_base64": "jcHPIwjO5obRco8eRLyJBjY7sRs=" }, { "id": "Russia_Chukotka Autonomous Okrug", @@ -11032,8 +11032,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 31560604, - "sha1_base64": "NS3L25NYY6FM2eGs5qLG4XyQUKk=" + "s": 30935252, + "sha1_base64": "55616/RYFUstunFxVjcRfg51WnM=" }, { "id": "Russia_Chuvashia", @@ -11045,8 +11045,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0427\u0443\u0432\u0430\u0448\u0438\u044f" ], - "s": 25245464, - "sha1_base64": "Ye2i6VdhZoxk7We+sArUzHoJf0k=" + "s": 25200200, + "sha1_base64": "OX0Dv09FX2DGQSbuR3DEGuaUjA4=" }, { "id": "Russia_Ingushetia", @@ -11058,8 +11058,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0418\u043d\u0433\u0443\u0448\u0435\u0442\u0438\u044f" ], - "s": 9809036, - "sha1_base64": "00ScFk+OQPntUnQikyznizyFUfU=" + "s": 9795740, + "sha1_base64": "RWaLo9v/mzIuvAXfwhh65S9Adfo=" }, { "id": "Russia_Irkutsk Oblast", @@ -11071,8 +11071,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0418\u0440\u043a\u0443\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 77275784, - "sha1_base64": "XyF9Aq+nGGIEkFSP27vV5Qn37lo=" + "s": 75859920, + "sha1_base64": "BY7bsMhfQ3pEkhPfotU03omJhwQ=" }, { "id": "Russia_Ivanovo Oblast", @@ -11084,8 +11084,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 28731195, - "sha1_base64": "aynqjZAc3qN/ZbNC74CD9XQN6fQ=" + "s": 28613371, + "sha1_base64": "D0LZjDn64XpmgZ01tXmuiC3peI0=" }, { "id": "Russia_Jewish Autonomous Oblast", @@ -11097,8 +11097,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 13907783, - "sha1_base64": "5ojb1wa742d2nqI/RvjDES+aXjY=" + "s": 13919383, + "sha1_base64": "ov7wooD+qr1bNpbyXLX6OmL75eI=" }, { "id": "Russia_Kabardino-Balkaria", @@ -11110,8 +11110,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 22351328, - "sha1_base64": "DANUawMZNLyIVyr1ZUzpI6IHuvc=" + "s": 22199584, + "sha1_base64": "+YnFpBUGSTc7iYA7XTWso4RJSF4=" }, { "id": "Russia_Kaliningrad Oblast", @@ -11123,8 +11123,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0430\u043b\u0438\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 23768442, - "sha1_base64": "Ct2QUAL0xgMFi+P0RAnKtY955eM=" + "s": 23522386, + "sha1_base64": "NEiXvfJFZ7qGz52vt3lAsA3j6JY=" }, { "id": "Russia_Kaluga Oblast", @@ -11136,8 +11136,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0430\u043b\u0443\u0436\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 36704339, - "sha1_base64": "yvLhdGyNqRa2wAjDl6XJPd/tEIg=" + "s": 36426643, + "sha1_base64": "TyZiPCGF2lC3Wkl8GHC7Kgyc77I=" }, { "id": "Russia_Kamchatka Krai", @@ -11149,8 +11149,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0430\u043c\u0447\u0430\u0442\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 37623098, - "sha1_base64": "LsfhJnfuR8ogVjHDjn3DJx0XxtE=" + "s": 37528202, + "sha1_base64": "7t2/qWaPAVuWHiXZeRuRaL5Zc64=" }, { "id": "Russia_Karachay-Cherkessia", @@ -11162,8 +11162,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 23129496, - "sha1_base64": "K1vzwxeL2yqx5ep9dVPOkwHvgWg=" + "s": 23111688, + "sha1_base64": "qJEb0UwG0yZkGqxjrGs/40bpYDg=" }, { "id": "Russia_Kemerov Oblast", @@ -11175,8 +11175,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0435\u043c\u0435\u0440\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 43709854, - "sha1_base64": "MFXIrWTq9ieL8xv1syuskkxvoAA=" + "s": 43513862, + "sha1_base64": "mNrLCU10E21E5O9fdc7kjJAfpFY=" }, { "id": "Russia_Khabarovsk Krai", @@ -11188,8 +11188,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0425\u0430\u0431\u0430\u0440\u043e\u0432\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 65678186, - "sha1_base64": "fDPoQ+2n/pTETumvaltMBjzLIFY=" + "s": 65368002, + "sha1_base64": "Rde6gA2la22Gb2deRbXMJT8r6T8=" }, { "id": "Russia_Khakassia", @@ -11201,8 +11201,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 23249241, - "sha1_base64": "GPZOU0RDDqeMrt4ps2C4xLyTjC4=" + "s": 23167393, + "sha1_base64": "Uzo+locxIodY6oc/Z+rlEN4epwY=" }, { "id": "Russia_Kirov Oblast", @@ -11214,8 +11214,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0438\u0440\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 96867351, - "sha1_base64": "WPL9hdeV6FzPRG+sU4W6ckIOBhk=" + "s": 96375479, + "sha1_base64": "xISRSAenkbnNXXHVD9olK0ylqlU=" }, { "id": "Russia_Komi Republic", @@ -11227,8 +11227,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u043e\u043c\u0438" ], - "s": 53565086, - "sha1_base64": "bSU6B3IaQu9874LyimjB0RilgXg=" + "s": 52883374, + "sha1_base64": "37KwGeBPOQxlwbxMfz/Os1Pz/Bk=" }, { "id": "Russia_Kostroma Oblast", @@ -11240,8 +11240,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u043e\u0441\u0442\u0440\u043e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 29611427, - "sha1_base64": "fyDvZ/gGN5xfT/39oVtLxmTaN0E=" + "s": 29221907, + "sha1_base64": "l7FIcDy6J2t1jVRvQbxShCEq1cI=" }, { "id": "Russia_Krasnodar Krai", @@ -11253,8 +11253,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 74564561, - "sha1_base64": "IskS+XUvOoDXG0PCPuFmYOrKxyg=" + "s": 73449913, + "sha1_base64": "52pQYwyAC0+sSs12tYYRT1h4drA=" }, { "id": "Russia_Krasnodar Krai_Adygeya", @@ -11267,8 +11267,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 55401841, - "sha1_base64": "p1IxyPc/i4pHLgq4r+utNNJXefk=" + "s": 54906081, + "sha1_base64": "FVsRnfe30SZHr8QNwc2CvcqNKOE=" }, { "id": "Russia_Krasnoyarsk Krai_North", @@ -11280,8 +11280,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u044f\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 44569511, - "sha1_base64": "D54hCaZRg+8uzJ3VLmceVDsWg/g=" + "s": 43440951, + "sha1_base64": "PCmMsCtHWWUzod++ieE/7IhEIc8=" }, { "id": "Russia_Krasnoyarsk Krai_South", @@ -11293,8 +11293,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u044f\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 53561950, - "sha1_base64": "k32fEddv4F2XV5Bx3e3T3YAAggI=" + "s": 52617134, + "sha1_base64": "TgcGC8AZHMQ2jjLCrHKJzK7pytA=" }, { "id": "Russia_Kurgan Oblast", @@ -11306,8 +11306,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 36269161, - "sha1_base64": "sFRn/aBpFUwF61FZT+rsmHSl0iA=" + "s": 36217633, + "sha1_base64": "Z+Oza1tYYePNDVcqgnkbBdEm3vs=" }, { "id": "Russia_Kursk Oblast", @@ -11319,8 +11319,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0443\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 52690084, - "sha1_base64": "/dK1J2+kRa6lg2HYldMnbR9Rg+k=" + "s": 52661044, + "sha1_base64": "MNTlebORCeDl8DYA4JVnuY9iJ2k=" }, { "id": "Russia_Leningradskaya Oblast_Karelsky", @@ -11332,8 +11332,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 45568242, - "sha1_base64": "MmFd16O+q8ruPUu6UO22HQnEKz8=" + "s": 45599602, + "sha1_base64": "7KY2LJ2WfF7I40GgctKfzZEtBgA=" }, { "id": "Russia_Leningradskaya Oblast_Southeast", @@ -11345,8 +11345,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 81430778, - "sha1_base64": "rOkqR/XMZyuoyOgcKe+MtP40YQA=" + "s": 81234754, + "sha1_base64": "TP6k4ukYXFqBA0+mROlGF30Ky9E=" }, { "id": "Russia_Lipetsk Oblast", @@ -11358,8 +11358,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0438\u043f\u0435\u0446\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 32191306, - "sha1_base64": "QscYpzrY35LHZc6iqbNhB6Jto0w=" + "s": 31915898, + "sha1_base64": "xgW4QwBJfq+1+jadrMLCKxS4j0A=" }, { "id": "Russia_Magadan Oblast", @@ -11371,8 +11371,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u0430\u0433\u0430\u0434\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 25834961, - "sha1_base64": "aLVrcvcrh7HQA5dHDBQqh8SDgbQ=" + "s": 25280760, + "sha1_base64": "Te162h3uskBcp2/2ol/VxgLPwS0=" }, { "id": "Russia_Mari El", @@ -11384,8 +11384,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u0430\u0440\u0438\u0439 \u042d\u043b" ], - "s": 29406113, - "sha1_base64": "dFOhyjA3KgY5YZis9tY5eIkhZOs=" + "s": 28424577, + "sha1_base64": "4VhavstOfrq6L3kX383oa9LJE74=" }, { "id": "Russia_Moscow Oblast_East", @@ -11397,8 +11397,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 90517573, - "sha1_base64": "qWLb+o1v04yCMR0gf5Hejs++IpY=" + "s": 89915405, + "sha1_base64": "pw5NC5CQaCGcbpBi5w5SKi64JSM=" }, { "id": "Russia_Moscow Oblast_West", @@ -11411,8 +11411,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u043e\u0441\u043a\u0432\u0430" ], - "s": 60610690, - "sha1_base64": "XFRVo70NydTIZc+Su6dcCL0jNkI=" + "s": 60041258, + "sha1_base64": "Oq7GBnERTYcPGRaBouh0HJ4imtk=" }, { "id": "Russia_Moscow", @@ -11425,8 +11425,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u043e\u0441\u043a\u0432\u0430" ], - "s": 73821662, - "sha1_base64": "VHXGXzXj5TfT5eq+edjm0Sncx20=" + "s": 72572606, + "sha1_base64": "CYk4QBhUxkq3C0ueVmy9jbbOkP0=" }, { "id": "Russia_Murmansk Oblast", @@ -11438,8 +11438,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 65364517, - "sha1_base64": "ehv3uk5acuzbWuU4S2QZcvNqXwM=" + "s": 64317621, + "sha1_base64": "v0gcWzo7VzKcDshNo3UO52qYfeE=" }, { "id": "Russia_Nenets Autonomous Okrug", @@ -11451,8 +11451,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433" ], - "s": 31587889, - "sha1_base64": "Pci6nM0kzpOMQa6x57EskxsrKUk=" + "s": 31597257, + "sha1_base64": "2+wC0seJIodsti55F1L/oDfk3bM=" }, { "id": "Russia_Nizhny Novgorod Oblast", @@ -11464,8 +11464,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u0438\u0436\u0435\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 76133209, - "sha1_base64": "64b0aj1ZsgEBi1Ynee/t3m5FZBs=" + "s": 75761673, + "sha1_base64": "PCSXSasA7VwNHLBlxNeLqBU1JXc=" }, { "id": "Russia_North Ossetia-Alania", @@ -11477,8 +11477,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f - \u0410\u043b\u0430\u043d\u0438\u044f" ], - "s": 11188181, - "sha1_base64": "Uht/Is1cleEkJDHSpQl3ioUoORE=" + "s": 11153981, + "sha1_base64": "2ikHnt99j2yZpO2fPv01Rk0ebbo=" }, { "id": "Russia_Novgorod Oblast", @@ -11490,8 +11490,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u043e\u0432\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 31318092, - "sha1_base64": "f2kWCO/4CqxXyaYqjy2xzj1Zclg=" + "s": 30731388, + "sha1_base64": "7tKPXGa9WJOZc5PTawG+/gfLu7g=" }, { "id": "Russia_Novosibirsk Oblast", @@ -11503,8 +11503,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u043e\u0432\u043e\u0441\u0438\u0431\u0438\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 78965815, - "sha1_base64": "ZTJBRGv+ygSbAEPA9wBaP+Vpqng=" + "s": 78951135, + "sha1_base64": "wopxjYOM0x3Nc/8TNzBVri2p5fM=" }, { "id": "Russia_Omsk Oblast", @@ -11516,8 +11516,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 62204534, - "sha1_base64": "5nWJvOrbRa4sKgKX8RSAawVj71s=" + "s": 61669022, + "sha1_base64": "glnJnBdpSHVWESPBlXSBQXSF13M=" }, { "id": "Russia_Orenburg Oblast", @@ -11529,8 +11529,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041e\u0440\u0435\u043d\u0431\u0443\u0440\u0433\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 52362399, - "sha1_base64": "ia8ddSGALFRhPVZkvnDRz0y6Vsg=" + "s": 52322615, + "sha1_base64": "+cZGcANZL7vwT2JLrZBMwm94A6I=" }, { "id": "Russia_Oryol Oblast", @@ -11542,8 +11542,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 19327265, - "sha1_base64": "Ys4QPQDIuio1SOROmUySvnO57c8=" + "s": 18779376, + "sha1_base64": "QTyF87fDUDN0Pi0NWpmSG8xo7oY=" }, { "id": "Russia_Penza Oblast", @@ -11555,8 +11555,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 32230499, - "sha1_base64": "hRAg1rlRXIpS1iueFfVHzp8wgdI=" + "s": 32261507, + "sha1_base64": "kqbnXMF76MJQJNnvNF65Iwt/s3c=" }, { "id": "Russia_Perm Krai_North", @@ -11568,8 +11568,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041f\u0435\u0440\u043c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 44083997, - "sha1_base64": "0lazYpwzQuZdSWGsLFFaBf5Tx7Q=" + "s": 43889981, + "sha1_base64": "LFb/xjg8OSeOCTyGp3nZH6amXJI=" }, { "id": "Russia_Perm Krai_South", @@ -11581,8 +11581,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041f\u0435\u0440\u043c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 56007001, - "sha1_base64": "sLeqj5bFTks9mhnNk77hrAIp1jQ=" + "s": 55337209, + "sha1_base64": "bLX7P2R4zLqtnITbyK4BDSHwaF8=" }, { "id": "Russia_Primorsky Krai", @@ -11594,8 +11594,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041f\u0440\u0438\u043c\u043e\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 46177911, - "sha1_base64": "XRKZ7PGOjYd45AdurEHiJUJv2cI=" + "s": 45830079, + "sha1_base64": "QfhcUGxLhgTkgyP061WsBsi7nMw=" }, { "id": "Russia_Pskov Oblast", @@ -11607,8 +11607,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 52238007, - "sha1_base64": "fBUbDYzcuJjTukSmuQgAVfNTLmA=" + "s": 51963839, + "sha1_base64": "y3Ebro8UKYcGX1r2uP9BwXR+g84=" }, { "id": "Russia_Republic of Dagestan", @@ -11620,8 +11620,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0414\u0430\u0433\u0435\u0441\u0442\u0430\u043d" ], - "s": 45485178, - "sha1_base64": "uAJyy4Mht0eqcaCrGmJgUxKmPjg=" + "s": 45288332, + "sha1_base64": "pVnSkKJmmN9st3dyBB/ZXor8OD8=" }, { "id": "Russia_Republic of Kalmykia", @@ -11634,8 +11634,8 @@ "\u041a\u0430\u043b\u043c\u044b\u043a\u0438\u044f", "\u0410\u0441\u0442\u0440\u0430\u0445\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 15484710, - "sha1_base64": "LmqOKAZFcPhse/OZUjZGnM+c7S0=" + "s": 15381598, + "sha1_base64": "WYHkQXW8P35j0Kr+VnUwjhmB3Z8=" }, { "id": "Russia_Republic of Karelia_North", @@ -11647,8 +11647,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 77576420, - "sha1_base64": "JIt9vZJxHYeKLR48xicFLGlftLo=" + "s": 76871204, + "sha1_base64": "7TMh6/ip/8p/9n5i0q6BLxFlRoQ=" }, { "id": "Russia_Republic of Karelia_South", @@ -11660,8 +11660,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 68879661, - "sha1_base64": "lnw5tQT3yexcnAw2S8+Mkq0Ceqg=" + "s": 66757365, + "sha1_base64": "eqcRMP7fmVeRL25n6YUb8jpJEis=" }, { "id": "Russia_Republic of Mordovia", @@ -11673,8 +11673,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u043e\u0440\u0434\u043e\u0432\u0438\u044f" ], - "s": 28998913, - "sha1_base64": "BbzUpaqk66rF3heYB1l3+zGYBXE=" + "s": 28875777, + "sha1_base64": "XScKpJmSKvo5ciddGCyIKRPxQB8=" }, { "id": "Russia_Rostov Oblast", @@ -11686,8 +11686,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 69139114, - "sha1_base64": "LBdcmT9SMiDUnbJ8OP3AcRTNyQ8=" + "s": 67763834, + "sha1_base64": "InJROktHBjhbuyXomu+mX9RqwWc=" }, { "id": "Russia_Ryazan Oblast", @@ -11699,8 +11699,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 32861860, - "sha1_base64": "A2u7QEA7PWMDjKJB9qQiIGGlgvI=" + "s": 32989477, + "sha1_base64": "cR0JU/LmbEE6vtnuPZcfqinIAG4=" }, { "id": "Russia_Saint Petersburg", @@ -11713,8 +11713,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 47751736, - "sha1_base64": "cUYXNs/mQv4OKvQ6WibvQx2R5IQ=" + "s": 47023440, + "sha1_base64": "J1NBnTBAhGCYhXh0sGRB8/uZE1I=" }, { "id": "Russia_Sakha Republic", @@ -11726,8 +11726,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0421\u0430\u0445\u0430 (\u042f\u043a\u0443\u0442\u0438\u044f)" ], - "s": 119840443, - "sha1_base64": "rVIN44fieR9IlY4+dego0nLN3JI=" + "s": 118648219, + "sha1_base64": "M/W17GXfp51FzNlyNXb+7IkyLUU=" }, { "id": "Russia_Sakhalin Oblast", @@ -11739,8 +11739,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0430\u0445\u0430\u043b\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 55223644, - "sha1_base64": "0fFyCp1SSez5PqaxfdKN9saSk8A=" + "s": 55157340, + "sha1_base64": "XUrft1kfMe4hAlMPxtj/tcf7sLg=" }, { "id": "Russia_Samara Oblast", @@ -11752,8 +11752,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 51041372, - "sha1_base64": "XI4YBpYvYBx4/SbzKs/XUnlv2Eo=" + "s": 51002988, + "sha1_base64": "rzr9elSp2qyli0rv92Nrkw8yd+U=" }, { "id": "Russia_Saratov Oblast", @@ -11765,8 +11765,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0430\u0440\u0430\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 48426928, - "sha1_base64": "fdYOy/uA9TMOzKJ5NiOZKPJM9ys=" + "s": 48149280, + "sha1_base64": "QaTTnrEdkTFKtLZ/NIqKWs9Kr3s=" }, { "id": "Russia_Smolensk Oblast", @@ -11778,8 +11778,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 41804253, - "sha1_base64": "tmx/15jGLUq+ZABjiRuPOHkWYVc=" + "s": 39482013, + "sha1_base64": "r75FIKrAOrMNKAgQZFb6VtgJ7Y8=" }, { "id": "Russia_Stavropol Krai", @@ -11791,8 +11791,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0442\u0430\u0432\u0440\u043e\u043f\u043e\u043b\u044c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 37675380, - "sha1_base64": "rK1EfJjq21kciTi87rAJ974VrR0=" + "s": 37290164, + "sha1_base64": "auXbzIA+zE9FoucwoDgTFMaDjwM=" }, { "id": "Russia_Sverdlovsk Oblast_Ekaterinburg", @@ -11804,8 +11804,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0432\u0435\u0440\u0434\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 53721726, - "sha1_base64": "gcnAi1aojPMYXc1+gHKxKV+ZfDo=" + "s": 53582598, + "sha1_base64": "f8zivD5WpecWDt3hUrcz5dHcyHo=" }, { "id": "Russia_Sverdlovsk Oblast_North", @@ -11817,8 +11817,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0432\u0435\u0440\u0434\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 58801334, - "sha1_base64": "PoIw+xdZpZmXyV1Zf870yR0XZT4=" + "s": 58777958, + "sha1_base64": "nqMTU47jxMHWyUytxKf0HjfnLDk=" }, { "id": "Russia_Tambov Oblast", @@ -11830,8 +11830,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 40202715, - "sha1_base64": "Au4dPej5LTYKq2hP03luSJOzp/g=" + "s": 40097971, + "sha1_base64": "2prpYSXDc5iYEhV0UgG0I7GhPXE=" }, { "id": "Russia_Tatarstan", @@ -11843,8 +11843,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u0430\u0442\u0430\u0440\u0441\u0442\u0430\u043d" ], - "s": 73274267, - "sha1_base64": "vjsFiSx4bjMytQhLwQ+YAPeq9/A=" + "s": 71423643, + "sha1_base64": "UcGcMm6ylWf/LgCQBbpYSNHkFUM=" }, { "id": "Russia_Tomsk Oblast", @@ -11856,8 +11856,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u043e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 26261759, - "sha1_base64": "KP9JzOAjhE0cWZZbIne+eK0972M=" + "s": 25860823, + "sha1_base64": "79UU6buZHLS0H/CUdl3CYDz75uE=" }, { "id": "Russia_Tula Oblast", @@ -11869,8 +11869,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u0443\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 30084651, - "sha1_base64": "Z1vKymTxcJIUAPJCvhmgc1eZmoE=" + "s": 29616795, + "sha1_base64": "M2GN+V5UBZHPWtquNnfyd5MfRWo=" }, { "id": "Russia_Tuva", @@ -11882,8 +11882,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u044b\u0432\u0430" ], - "s": 12961315, - "sha1_base64": "/2mlx4kAWMWDlMUgBTZmk3up1C8=" + "s": 12660074, + "sha1_base64": "41wNHP0rQ/O8NmEEgOtdRpv2EaQ=" }, { "id": "Russia_Tver Oblast", @@ -11895,8 +11895,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u0432\u0435\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 72066769, - "sha1_base64": "0gwmROOdtbOaVKdcj+oM1NNuyn0=" + "s": 70601865, + "sha1_base64": "9h2Cys1Zp8NZ1ZNsYkVZ5bWfi6E=" }, { "id": "Russia_Tyumen Oblast", @@ -11908,8 +11908,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 55726071, - "sha1_base64": "gu9vaoYEz6QOYrhf8R/qwzdi/5s=" + "s": 55584863, + "sha1_base64": "JRVLr9S2YsayCIFUOqm47RlUE2c=" }, { "id": "Russia_Udmurt Republic", @@ -11921,8 +11921,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0423\u0434\u043c\u0443\u0440\u0442\u0438\u044f" ], - "s": 42259492, - "sha1_base64": "/HeCtbke/Nb8W3DSebhiCWhiJVA=" + "s": 41317763, + "sha1_base64": "Gzpie6kzOFrxncgeSeKbplsZHSg=" }, { "id": "Russia_Ulyanovsk Oblast", @@ -11934,8 +11934,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0423\u043b\u044c\u044f\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 37984605, - "sha1_base64": "G8ZFMuXxYEnsYyoJBpY3ErMydp0=" + "s": 37662228, + "sha1_base64": "uOe3riGbbm36KTdWloT8tUk6eA0=" }, { "id": "Russia_Vladimir Oblast", @@ -11947,8 +11947,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043b\u0430\u0434\u0438\u043c\u0438\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 57575305, - "sha1_base64": "sj/Zx3jakVdQmuoGZId6icadJQ8=" + "s": 57521241, + "sha1_base64": "A+RMM96sdHOvc8IhbnDfwkWjgU0=" }, { "id": "Russia_Volgograd Oblast", @@ -11960,8 +11960,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043e\u043b\u0433\u043e\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 54624926, - "sha1_base64": "LSLqZgktXDd9yGYD2hrY4fDiqp0=" + "s": 52865910, + "sha1_base64": "v8v8feraVGkX+r2By1Bd+8Jgu9M=" }, { "id": "Russia_Vologda Oblast", @@ -11973,8 +11973,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043e\u043b\u043e\u0433\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 61856081, - "sha1_base64": "/WvzSqYq3TYQSdi37YcwW2a3Hpo=" + "s": 60147377, + "sha1_base64": "yDzKmNb7nOeXlAX0+/gvURmC1oE=" }, { "id": "Russia_Voronezh Oblast", @@ -11986,8 +11986,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043e\u0440\u043e\u043d\u0435\u0436\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 58683206, - "sha1_base64": "CODMA7WC5rK5I/ureiZPynZU/Ks=" + "s": 58078582, + "sha1_base64": "DVLu2+foLTD9I2xlzdLbhymRZ4w=" }, { "id": "Russia_Yamalo-Nenets Autonomous Okrug", @@ -11999,8 +11999,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 30991296, - "sha1_base64": "EhTmFyF/G/xZf44gDuEAwlvyguw=" + "s": 30872504, + "sha1_base64": "eiNXjaQlUyo4iCVEWefBuwiZAPw=" }, { "id": "Russia_Yaroslavl Oblast", @@ -12012,8 +12012,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u042f\u0440\u043e\u0441\u043b\u0430\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 40386652, - "sha1_base64": "BKlHLwqz5Bp26lDYe03oCgb50nM=" + "s": 40186468, + "sha1_base64": "GVBCCvPdtxjx1QJVzlxrgkv++9U=" }, { "id": "Russia_Yugra_Khanty", @@ -12025,8 +12025,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 42469682, - "sha1_base64": "9T1phZsATJde2U591oizkEC5JFo=" + "s": 42206642, + "sha1_base64": "iDtmvPV4VD/96UKaeQUHASONr8U=" }, { "id": "Russia_Yugra_Surgut", @@ -12038,8 +12038,8 @@ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" ], - "s": 38663840, - "sha1_base64": "t043G6/UOVhuodrqOCmFtEJ7WuE=" + "s": 38528416, + "sha1_base64": "XJ5XpU+I6o6rviS2k0g8BSs7vrI=" }, { "id": "Russia_Zabaykalsky Krai", @@ -12051,8 +12051,8 @@ "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0417\u0430\u0431\u0430\u0439\u043a\u0430\u043b\u044c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" ], - "s": 30876482, - "sha1_base64": "dAdGuzV6synahQoKoQa01Rm2Ybg=" + "s": 30963258, + "sha1_base64": "MrzJXE6BoSQEupO8BWcCHyOZKkw=" } ] }, @@ -12069,8 +12069,8 @@ "Rwanda", "Umujyi wa Kigali" ], - "s": 38208186, - "sha1_base64": "anxJjSRRlKSZZtCeXUGdBEuic8w=" + "s": 36997600, + "sha1_base64": "pt5YIc86Au/7JoVwrzW0D9o+Ri8=" }, { "id": "Sahrawi Arab Democratic Republic", @@ -12082,8 +12082,8 @@ "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "RASD" ], - "s": 15877697, - "sha1_base64": "5tv5Z6PoI4yxVZThxG1Qu+PQGdA=" + "s": 15864993, + "sha1_base64": "LsQU+ZFNnkqTUpIbiQ86imM4Xo8=" }, { "id": "Saint Helena Ascension and Tristan da Cunha", @@ -12097,8 +12097,8 @@ "Saint Helena, Ascension and Tristan da Cunha", "Tristan da Cunha" ], - "s": 1709587, - "sha1_base64": "ErOOTi+B3lQITtlX5ajXm3Eqev0=" + "s": 1663467, + "sha1_base64": "Qu8LZQ+MLdvLBsPgcdPsFvx1VXw=" }, { "id": "Samoa", @@ -12116,8 +12116,8 @@ "American Samoa", "S\u0101moa" ], - "s": 6758036, - "sha1_base64": "5O39MuVadf7tjSIwsb5Tg3XKYK4=" + "s": 6747180, + "sha1_base64": "G1KVEM30ln9Qt8z+Ijgf7JesBH4=" }, { "id": "San Marino", @@ -12129,8 +12129,8 @@ "Italia", "San Marino" ], - "s": 1553868, - "sha1_base64": "gnfKgljJzNiW7ZYcP18Xg0kj0eA=" + "s": 1554428, + "sha1_base64": "sTXelaapH+ddiPc5TUR2ZN1n1Jw=" }, { "id": "Saudi Arabia", @@ -12148,8 +12148,8 @@ "\u0627\u0644\u0634\u0631\u0642\u064a\u0629", "\u200f\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629\u200e" ], - "s": 55565306, - "sha1_base64": "rKBj8Z7dlgFLNa0/iOsXJxNlexE=" + "s": 53614634, + "sha1_base64": "F/wOwfcDQ9Hcj/3VdPaJkswzBrw=" }, { "id": "Saudi Arabia_North", @@ -12167,8 +12167,8 @@ "\u0627\u0644\u0645\u062f\u064a\u0646\u0629 \u0627\u0644\u0645\u0646\u0648\u0631\u0629", "\u200f\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629\u200e" ], - "s": 56466709, - "sha1_base64": "TL0JsDPGf2Pz9mnCfm6RwEMIcoQ=" + "s": 54453453, + "sha1_base64": "DdKK+4qLp/Ak755SxevOQpGIJm8=" } ] }, @@ -12184,8 +12184,8 @@ "Regi\u00e3o de Cacheu", "Senegal" ], - "s": 68852716, - "sha1_base64": "Ri5jzYG+Z612DoMwXlCWt5mJ/H4=" + "s": 60999042, + "sha1_base64": "B5gnJ7bH+1Pq7UX+xhCHUxax0ow=" }, { "id": "Serbia", @@ -12197,8 +12197,8 @@ "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430", "\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u0430 \u0421\u0440\u0431\u0438\u0458\u0430" ], - "s": 148055149, - "sha1_base64": "X3W9N3xLrqc16itkO9Mld6in5Ac=" + "s": 143122173, + "sha1_base64": "buc8aUQh1mVe8kCMs2TaBGQnBMY=" }, { "id": "Seychelles", @@ -12208,8 +12208,8 @@ "affiliations": [ "Sesel" ], - "s": 2797112, - "sha1_base64": "Ouc+uthoV2wDXBOOqClhE4dXmlg=" + "s": 2797040, + "sha1_base64": "qTjvsbrq84ifVWow5+jmY2aZnZM=" }, { "id": "Sierra Leone", @@ -12223,8 +12223,8 @@ "Southern Province", "Western Area" ], - "s": 42309962, - "sha1_base64": "/O01aDhkV/S5P38yoxInytVNTho=" + "s": 42038497, + "sha1_base64": "ViIvvofbRznRXHkfVs6STeuv8s8=" }, { "id": "Singapore", @@ -12236,8 +12236,8 @@ "Malaysia", "Singapura" ], - "s": 24858370, - "sha1_base64": "9G6LMJP50fekHpuyrWNILGZMOMk=" + "s": 24561442, + "sha1_base64": "RREJdHiUj1kzIxUGnfjPSVvnUjY=" }, { "id": "Slovakia", @@ -12251,8 +12251,8 @@ "Pre\u0161ovsk\u00fd kraj", "Slovensko" ], - "s": 46532995, - "sha1_base64": "VwZPDq0erdbn5DdAJStiXThuIZI=" + "s": 45755035, + "sha1_base64": "KbJsJw7UckEDSm0b6v0X9x3Xo0A=" }, { "id": "Slovakia_Region of Kosice", @@ -12263,8 +12263,8 @@ "Ko\u0161ick\u00fd kraj", "Slovensko" ], - "s": 44000444, - "sha1_base64": "E0HwaEDQxi/iUZV4Ua6lF50HgYI=" + "s": 42611420, + "sha1_base64": "TGGyHhnLVRH1o6YjMLG3N0PD7mk=" }, { "id": "Slovakia_Region of Banska Bystrica", @@ -12275,8 +12275,8 @@ "Banskobystrick\u00fd kraj", "Slovensko" ], - "s": 52839116, - "sha1_base64": "yzQBJq5b+w1MEPRaHj/fI9/qisc=" + "s": 51988299, + "sha1_base64": "AMp4PHqMfQCGk2vUs7xLLwZST34=" }, { "id": "Slovakia_Region of Trnava", @@ -12287,8 +12287,8 @@ "Slovensko", "Trnavsk\u00fd kraj" ], - "s": 25366026, - "sha1_base64": "P3ka4s86RgcOSem12GoXohTQQLE=" + "s": 24448650, + "sha1_base64": "yNarZd1l0N9e2nYKmqptBDJAxtE=" }, { "id": "Slovakia_Region of Trencin", @@ -12299,8 +12299,8 @@ "Slovensko", "Tren\u010diansky kraj" ], - "s": 35744148, - "sha1_base64": "MXsQAAqy+nacpShh7MZ1ipbmOS4=" + "s": 34502372, + "sha1_base64": "qu+Z1ANwjdV3ZuoBBejOeu8RlLc=" }, { "id": "Slovakia_Region of Nitra", @@ -12311,8 +12311,8 @@ "Nitriansky kraj", "Slovensko" ], - "s": 25761985, - "sha1_base64": "ug+uArSiLjjVAaE3vs6aux0wGDE=" + "s": 25083641, + "sha1_base64": "2LVTvuJX44LdFNrRiIwQHivULpA=" }, { "id": "Slovakia_Region of Bratislava", @@ -12323,8 +12323,8 @@ "Bratislavsk\u00fd kraj", "Slovensko" ], - "s": 21848785, - "sha1_base64": "rQJggyl9BGZPFMP5BLdwiaGtnYQ=" + "s": 21589905, + "sha1_base64": "rr2ZEDseytB2UugcC+urHt1vM4A=" }, { "id": "Slovakia_Region of Zilina", @@ -12335,8 +12335,8 @@ "Slovensko", "\u017dilinsk\u00fd kraj" ], - "s": 49568388, - "sha1_base64": "xvmP3cYCMZQCjwCMvsB5g2bq0wo=" + "s": 48745371, + "sha1_base64": "uWdGI2UFjesj/ymHZmEz+qqBaSw=" } ] }, @@ -12352,8 +12352,8 @@ "Border SI-HR", "Slovenija" ], - "s": 159997170, - "sha1_base64": "5M3PvFIaoEtgzmdFx1ZeAmdfk8E=" + "s": 158734450, + "sha1_base64": "aejGqs80/9ODuoGelO2qu+xTQMU=" }, { "id": "Slovenia_West", @@ -12363,8 +12363,8 @@ "affiliations": [ "Slovenija" ], - "s": 117703664, - "sha1_base64": "fGz/abotpqI1XDhhR/CccxxULO4=" + "s": 117002688, + "sha1_base64": "LX+njG4XV92wMMET+kOzkVhUnGo=" } ] }, @@ -12386,8 +12386,8 @@ "Temotu Province", "Western Province" ], - "s": 17028152, - "sha1_base64": "bLvLCFri3GDTc05kQu7eE/dlJTY=" + "s": 17028729, + "sha1_base64": "pl93JP+3f8G+hsQ3yHg4G0ixUtk=" }, { "id": "Somalia", @@ -12415,8 +12415,8 @@ "Togdheer", "Woqooyi Galbeed" ], - "s": 151386107, - "sha1_base64": "HmqEKtNtewBW/iFg5jxwk7k/HwY=" + "s": 148009858, + "sha1_base64": "9YQk++0ihjJaW9SSz/1ojEiOw1s=" }, { "id": "South Africa", @@ -12431,8 +12431,8 @@ "South Africa", "Western Cape" ], - "s": 66238833, - "sha1_base64": "xqxy91tSxA8u4h0ylB/UBLLkxrE=" + "s": 65307625, + "sha1_base64": "PzhGRtiyZ9A0MurI1j3tC9gUnow=" }, { "id": "South Africa_Gauteng", @@ -12443,8 +12443,8 @@ "Gauteng", "South Africa" ], - "s": 41372499, - "sha1_base64": "PxTc4QRNoWKaXybJl49ts8IpbEQ=" + "s": 40987563, + "sha1_base64": "djFNUgLj6Ov/vAZY0X7qDeKkNQo=" }, { "id": "South Africa_North West", @@ -12455,8 +12455,8 @@ "North West", "South Africa" ], - "s": 26181223, - "sha1_base64": "VdGI9Z3kuIGn+gBtI47GjLbrtFk=" + "s": 26018550, + "sha1_base64": "kiR/sWXw6Y0sdX8sZI2Q2UorBJY=" }, { "id": "South Africa_Free State", @@ -12467,8 +12467,8 @@ "Free State", "South Africa" ], - "s": 30413450, - "sha1_base64": "v2gF1IqFaAijvGUi0VOCl65FS6I=" + "s": 30116233, + "sha1_base64": "EsjyBUdJn10qcfBgmavv3Sktd0g=" }, { "id": "South Africa_Eastern Cape", @@ -12479,8 +12479,8 @@ "Eastern Cape", "South Africa" ], - "s": 42747505, - "sha1_base64": "tO+T725PCd9g/CRCxEvsYz4/ZQY=" + "s": 42181217, + "sha1_base64": "y5RBz2CXSuIiHIEjioHvai1rjug=" }, { "id": "South Africa_Northern Cape", @@ -12491,8 +12491,8 @@ "Northern Cape", "South Africa" ], - "s": 20534655, - "sha1_base64": "0MESEjLfbYuo3EXJlZNWi5hNgJQ=" + "s": 20080607, + "sha1_base64": "oF7hfhfwPKNBdJdckbAMLtLzHEM=" }, { "id": "South Africa_Mpumalanga", @@ -12503,8 +12503,8 @@ "Mpumalanga", "South Africa" ], - "s": 31752603, - "sha1_base64": "eiYcOyeHGiFqTaRIy8fd35q6w0g=" + "s": 30488177, + "sha1_base64": "6lhkHYLpVo51wTIC30B88bz8KSY=" }, { "id": "South Africa_Limpopo", @@ -12515,8 +12515,8 @@ "Limpopo", "South Africa" ], - "s": 32826290, - "sha1_base64": "uPIkoW42prx0IJVN3R1JbMAtVh8=" + "s": 31856873, + "sha1_base64": "xBVi3fBN/EF6xr3aA+Tlaa+5Jh8=" }, { "id": "South Africa_KwaZulu-Natal", @@ -12527,8 +12527,8 @@ "KwaZulu-Natal", "South Africa" ], - "s": 83055680, - "sha1_base64": "HBwUXoSIPLefKSInZ12fbvt3EP8=" + "s": 74445136, + "sha1_base64": "1I5e2t2k/LHQgSews/K76FQ1GXg=" } ] }, @@ -12544,8 +12544,8 @@ "country_name_synonyms": [ "South Georgia and South Sandwich Islands" ], - "s": 12304978, - "sha1_base64": "D/SWq8nT/Xrf2XD7m5GoE/xIKok=" + "s": 12251618, + "sha1_base64": "Ps5X53SYtJnfJxM/hr13QSWQb8U=" }, { "id": "South Ossetia", @@ -12557,8 +12557,8 @@ "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" ], - "s": 12209192, - "sha1_base64": "XQ5df6w+siwxODMocxE4ikZzZis=" + "s": 12201992, + "sha1_base64": "ccOAWhS6mGZi/VsVRCxEzdEPXbA=" }, { "id": "South Sudan", @@ -12579,8 +12579,8 @@ "Western Equatoria", "\u0648\u0627\u0631\u0627\u0628" ], - "s": 86577285, - "sha1_base64": "q+6TTUdM4LmO61SNZfYeuy7+xVo=" + "s": 85533940, + "sha1_base64": "o+jCManO9h/5fQM8e4WjcdwBqnE=" }, { "id": "Spain", @@ -12595,8 +12595,8 @@ "Espa\u00f1a (mare territorial)", "Espa\u00f1a" ], - "s": 65668939, - "sha1_base64": "arg8gqO3+FUz0lQYQ5ATQyGYEpI=" + "s": 64799931, + "sha1_base64": "QH2BkkexTuJDn/mPWsMxAqW0XEA=" }, { "id": "Spain_Andalusia_Sevilla", @@ -12607,8 +12607,8 @@ "Andaluc\u00eda", "Espa\u00f1a" ], - "s": 87513124, - "sha1_base64": "0GQHJhctGC3KyksTF9pxnWOti+Y=" + "s": 85087084, + "sha1_base64": "AXQHJk294cbe5Xwsz3+wfWOCsy0=" }, { "id": "Spain_Aragon", @@ -12619,8 +12619,8 @@ "Arag\u00f3n", "Espa\u00f1a" ], - "s": 83004757, - "sha1_base64": "wYOD/RkQXnJJFC2R3yY7YVzX8ag=" + "s": 80551837, + "sha1_base64": "lTsCyThTkP1qjn9xxv++0U4s8g4=" }, { "id": "Spain_Balearic Islands", @@ -12631,8 +12631,8 @@ "Illes Balears", "Espa\u00f1a" ], - "s": 36059793, - "sha1_base64": "K9087k+0YHnDiRUgeKqNwHBHIuo=" + "s": 33579512, + "sha1_base64": "qu363VZfCjkFGNq+bSmCC2jkFq4=" }, { "id": "Spain_Basque Country", @@ -12644,8 +12644,8 @@ "Espa\u00f1a", "Euskadi" ], - "s": 70906024, - "sha1_base64": "0Q9u9vPKQGyv5OEGBdn81dUztUg=" + "s": 70384272, + "sha1_base64": "ehMDw3b7ONT1T1o3raZnIRRrheY=" }, { "id": "Spain_Canary Islands", @@ -12656,8 +12656,8 @@ "Canarias", "Espa\u00f1a" ], - "s": 54861246, - "sha1_base64": "46wI5RQ4NYDmNC1mGvPAaxSffsY=" + "s": 54311422, + "sha1_base64": "NHbrGNFuDYYJm7aeMZcN8k4nDsc=" }, { "id": "Spain_Cantabria", @@ -12668,8 +12668,8 @@ "Cantabria", "Espa\u00f1a" ], - "s": 32031444, - "sha1_base64": "N35NWm5YtWVrEL9g1rsds2ud9Tw=" + "s": 31858172, + "sha1_base64": "entY513yuKwye8XmAX01S7H29a0=" }, { "id": "Spain_Castile and Leon_West", @@ -12680,8 +12680,8 @@ "Castilla y Le\u00f3n", "Espa\u00f1a" ], - "s": 88908454, - "sha1_base64": "d/xzbpsb6P62GA9B6/tueqjgf6E=" + "s": 87786230, + "sha1_base64": "DbpakYCM9hqG5Xwo0Eb6IR4561Q=" }, { "id": "Spain_Castile and Leon_East", @@ -12692,8 +12692,8 @@ "Castilla y Le\u00f3n", "Espa\u00f1a" ], - "s": 71041869, - "sha1_base64": "kL/Gk+JDbmW1oZEC0/o/CjmonIw=" + "s": 69221085, + "sha1_base64": "OhK+nV7YUjQbGtJms8byQp0JKSU=" }, { "id": "Spain_Castile-La Mancha", @@ -12704,8 +12704,8 @@ "Castilla-La Mancha", "Espa\u00f1a" ], - "s": 109146239, - "sha1_base64": "x/Pw+osdCNOSFVg/V2cqQpmy6no=" + "s": 107030087, + "sha1_base64": "gteIeHGe9/WY3uVrBlxJs8XR89Q=" }, { "id": "Spain_Catalonia_Provincia de Barcelona", @@ -12716,8 +12716,8 @@ "Catalunya", "Espa\u00f1a" ], - "s": 112489347, - "sha1_base64": "yanCfMKgnh5mJxE23g0BWO/1dZs=" + "s": 101163403, + "sha1_base64": "EoI00dVRD9eUD8IvLH27G3K1n1E=" }, { "id": "Spain_Catalonia_Provincia de Girona", @@ -12728,8 +12728,8 @@ "Catalunya", "Espa\u00f1a" ], - "s": 44510685, - "sha1_base64": "YCV/BoCqi7qflbH8LSju6UkuuRU=" + "s": 41320109, + "sha1_base64": "CSnu94xQDwq175vB3agzmnR6XOw=" }, { "id": "Spain_Catalonia_Provincia de Lleida", @@ -12740,8 +12740,8 @@ "Catalunya", "Espa\u00f1a" ], - "s": 47930207, - "sha1_base64": "RNg6m5+MrVKx32zIrZoO/odIF3Q=" + "s": 44350495, + "sha1_base64": "O532v5r9EAdWUxAadzX96Nr9FaI=" }, { "id": "Spain_Catalonia_Provincia de Tarragona", @@ -12752,8 +12752,8 @@ "Catalunya", "Espa\u00f1a" ], - "s": 38409339, - "sha1_base64": "kAKTBaHzHsPWu0XkJxQkj77wWhQ=" + "s": 34728995, + "sha1_base64": "poQ0mTN/KLXvjB3c7X59VXQ+EkA=" }, { "id": "Spain_Ceuta", @@ -12765,8 +12765,8 @@ "Espa\u00f1a", "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628" ], - "s": 769445, - "sha1_base64": "hIgIgMS+3U2UkB4YmfVOVUdMW7o=" + "s": 746501, + "sha1_base64": "76vuroGQty/NH0sWQpnS1YMLrXc=" }, { "id": "Spain_Community of Madrid", @@ -12777,8 +12777,8 @@ "Comunidad de Madrid", "Espa\u00f1a" ], - "s": 72902649, - "sha1_base64": "uye/2FjgA11J2u4KPwMahb5O88c=" + "s": 71671993, + "sha1_base64": "LeVU+A4AaabWVojGgkZgL5WZwus=" }, { "id": "Spain_Comunidad Foral de Navarra", @@ -12789,8 +12789,8 @@ "Comunidad Foral de Navarra", "Espa\u00f1a" ], - "s": 39579381, - "sha1_base64": "YFpJRDu8tIKvo2EOb3jaDyKeI90=" + "s": 39072925, + "sha1_base64": "xBGfTz9xVkWVus/YApUmAGg0E/w=" }, { "id": "Spain_Extremadura", @@ -12801,8 +12801,8 @@ "Espa\u00f1a", "Extremadura" ], - "s": 39300470, - "sha1_base64": "Bvq8PDdq22k859+bvGuhCC2xzpU=" + "s": 38561742, + "sha1_base64": "q9v95jyL7ruiGXmeWN/vTYfClmA=" }, { "id": "Spain_Galicia_North", @@ -12813,8 +12813,8 @@ "Espa\u00f1a", "Galicia" ], - "s": 64230521, - "sha1_base64": "1MP7I9BhpDjNY0z7JsBwvkM5Us4=" + "s": 63200793, + "sha1_base64": "T0tq5EzrGz8vCwaxUy+bCPmJ+Hk=" }, { "id": "Spain_Galicia_South", @@ -12825,8 +12825,8 @@ "Espa\u00f1a", "Galicia" ], - "s": 37801254, - "sha1_base64": "fABmW4OIoiSWlDuL34XC7lCKr5Y=" + "s": 36892605, + "sha1_base64": "NPq/H1hONH0Zy8FmUuZDIny0KaA=" }, { "id": "Spain_La Rioja", @@ -12837,8 +12837,8 @@ "Espa\u00f1a", "La Rioja" ], - "s": 15142928, - "sha1_base64": "b5nYdONqWKhr2wTqOzKEwxus50w=" + "s": 14968383, + "sha1_base64": "Dan/7d/khe1BKCjRbw4AiRHQDFo=" }, { "id": "Spain_Melilla", @@ -12851,8 +12851,8 @@ "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "Melilla" ], - "s": 1234462, - "sha1_base64": "e976Dfx+CIWXhl+ALzhQch7SSMo=" + "s": 1030118, + "sha1_base64": "YhJtRklJv1J/G5TxlTF4Jswf+fc=" }, { "id": "Spain_Principado de Asturias", @@ -12863,8 +12863,8 @@ "Espa\u00f1a", "Principado de Asturias" ], - "s": 32814653, - "sha1_base64": "KwojoA+ckpBHRzos6FqPBtVxCck=" + "s": 32405189, + "sha1_base64": "wqcS6XBEmeU/hlWzKBcCanXr/3s=" }, { "id": "Spain_Region de Murcia", @@ -12875,8 +12875,8 @@ "Espa\u00f1a", "Regi\u00f3n de Murcia" ], - "s": 36102452, - "sha1_base64": "GgEwGrzYVRZqTeWwYGMiuDG4PuY=" + "s": 34896907, + "sha1_base64": "pKmGeTpvb/M6S77wfJt+Rp2TGkY=" }, { "id": "Spain_Valencian Community", @@ -12887,8 +12887,8 @@ "Comunitat Valenciana", "Espa\u00f1a" ], - "s": 105533699, - "sha1_base64": "zStvFMAN/Y4VwA9jOI7wD4FNFfg=" + "s": 98730146, + "sha1_base64": "olNHcEvPsylhTSoHM3xqu98lYrs=" } ] }, @@ -12908,8 +12908,8 @@ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" ], - "s": 8445947, - "sha1_base64": "YxY8U6UkXAAK4iijY+/vYbosgsQ=" + "s": 8260147, + "sha1_base64": "KL9Nye9XnMIt1QJdMQPRTxpOgrA=" }, { "id": "Palestine", @@ -12921,8 +12921,8 @@ "Area B", "Area C" ], - "s": 28703513, - "sha1_base64": "e3pdddy15zFfQPWrgBvuBm/2QVk=" + "s": 28545305, + "sha1_base64": "+0mUMi3NqcU52EN8HkhzD4vePTc=" } ] }, @@ -12943,8 +12943,8 @@ "Western Province", "\u0dc1\u0dca\u200d\u0dbb\u0dd3 \u0dbd\u0d82\u0d9a\u0dcf" ], - "s": 112033400, - "sha1_base64": "VZDuSG+Y86xaoceYFKVEMpzNbrU=" + "s": 109271696, + "sha1_base64": "MIHj/F4vQ7dgWhQjKvoY8qhFuzw=" }, { "id": "Sudan", @@ -12967,8 +12967,8 @@ "an-Nil al-Azraq", "ash-Shamaliyah" ], - "s": 37940961, - "sha1_base64": "R5bB49N2DkoAGeKUiMdVBN2bOC4=" + "s": 37624425, + "sha1_base64": "GgSaygnhBrYLd1PrmNEaRv4M5Ws=" }, { "id": "Sudan_West", @@ -12993,8 +12993,8 @@ "ash-Shamaliyah", "\u0648\u0627\u0631\u0627\u0628" ], - "s": 61132611, - "sha1_base64": "RMVmNYJfDYzepgxpUwJ6dLbC9i4=" + "s": 60496067, + "sha1_base64": "MORD73FEHDmYKkqYV3NwAFbN9EM=" } ] }, @@ -13016,8 +13016,8 @@ "Suriname", "Wanica" ], - "s": 34804568, - "sha1_base64": "EbllP6iBBLtJpZLwuB9BEAxaA44=" + "s": 34831656, + "sha1_base64": "0esjBhEzDvHp4tYk/yDPNOPGbGo=" }, { "id": "Swaziland", @@ -13034,8 +13034,8 @@ "country_name_synonyms": [ "Eswatini" ], - "s": 24266244, - "sha1_base64": "zHjnyJkGYZo+NZQteyLn4PouE9w=" + "s": 24017347, + "sha1_base64": "FkuY0DUzIEvi6VNw2fEB5xrDKEk=" }, { "id": "Sweden", @@ -13051,8 +13051,8 @@ "Uppsala l\u00e4n", "V\u00e4stmanlands l\u00e4n" ], - "s": 60451808, - "sha1_base64": "+jm/CKFuiY8Fhn8xPSIYmvSZHZg=" + "s": 59131159, + "sha1_base64": "6FmsfJ5zeGBkzuleDKYrWvDZGvw=" }, { "id": "Sweden_Stockholm", @@ -13063,8 +13063,8 @@ "Stockholms l\u00e4n", "Sverige" ], - "s": 61388064, - "sha1_base64": "Q9xT6lEv2WGTjAmRolws6gPOOPM=" + "s": 60219232, + "sha1_base64": "Jx2DBGfWPFHNAY7uS4OQpThRSn4=" }, { "id": "Sweden_Ostra Gotaland", @@ -13081,8 +13081,8 @@ "Sverige", "Territorial waters of Gotland" ], - "s": 105921324, - "sha1_base64": "wr9RunO8Jy1yaFO05zGilrhmHgY=" + "s": 103976500, + "sha1_base64": "oWtjIUgPxoPOnqPHy2S3tA9uhNI=" }, { "id": "Sweden_Norra Sverige", @@ -13094,8 +13094,8 @@ "Sverige", "V\u00e4sterbottens l\u00e4n" ], - "s": 65026497, - "sha1_base64": "4n6XIDZstcZYQhjj2Gf5dZITSgA=" + "s": 63911137, + "sha1_base64": "8kjRbJI6ZiH+F5/CNIdkT+gr/fE=" }, { "id": "Sweden_Mellannorrland", @@ -13107,8 +13107,8 @@ "Sverige", "V\u00e4sternorrlands l\u00e4n" ], - "s": 123058794, - "sha1_base64": "5G3wB8TAUCyyayaToJHqEPuS3Ys=" + "s": 121287313, + "sha1_base64": "VOCs5tTkjLMP7Tid08xueSuOkWU=" }, { "id": "Sweden_Bergslagen", @@ -13122,8 +13122,8 @@ "Sverige", "V\u00e4rmlands l\u00e4n" ], - "s": 140797724, - "sha1_base64": "eZ+JuTHN1/VMslE/v929ePU9iFc=" + "s": 136314860, + "sha1_base64": "Ct5DIgRac6fhQLE7vs6eghj+S+Y=" }, { "id": "Sweden_Vastra Gotaland", @@ -13136,8 +13136,8 @@ "Sverige", "V\u00e4stra G\u00f6talands l\u00e4n" ], - "s": 121934932, - "sha1_base64": "s6guGsaPxLIv+HYf1J71Jd7S6zE=" + "s": 119026524, + "sha1_base64": "16SZBmBANDBm5qlDexG07H7KrBk=" }, { "id": "Sweden_Sodra Gotaland", @@ -13151,8 +13151,8 @@ "Sverige", "Territorial waters of Bornholm" ], - "s": 55756128, - "sha1_base64": "aSQBWL69WmFqr+0+6nRi8F+DHJs=" + "s": 54719601, + "sha1_base64": "5CsvYUwGoXLcJ0Vnw65YESWuyiA=" } ] }, @@ -13174,8 +13174,8 @@ "Schweiz, Suisse, Svizzera, Svizra", "Thurgau" ], - "s": 79018124, - "sha1_base64": "PPkmE9wZlFdU7NKicoP7iddIZug=" + "s": 76914876, + "sha1_base64": "nk7hVtcJPxy3HLJX3ZBAktK8T8s=" }, { "id": "Switzerland_Central", @@ -13191,8 +13191,8 @@ "Uri", "Zug" ], - "s": 43406398, - "sha1_base64": "dEXvS+rZ2jLc4KIeldaVNAJZAQk=" + "s": 42127126, + "sha1_base64": "G8Pxb28aF6OgbWcN5H5eCvS8+b4=" }, { "id": "Switzerland_Espace Mittelland_Bern", @@ -13209,8 +13209,8 @@ "Solothurn", "Vaud" ], - "s": 74533434, - "sha1_base64": "nxbNkPozYMxyLWYUIRYMpXHniJc=" + "s": 72353546, + "sha1_base64": "ciGL1uScPMuKXq6i1/iK942qLnE=" }, { "id": "Switzerland_Espace Mittelland_East", @@ -13221,8 +13221,8 @@ "Bern - Berne", "Schweiz, Suisse, Svizzera, Svizra" ], - "s": 43708700, - "sha1_base64": "8ajKPm7mPho9xj5TYGN1itC3l30=" + "s": 43336835, + "sha1_base64": "n/ryocJtoyYKiuQKd6Uh4YJfxMs=" }, { "id": "Switzerland_Ticino", @@ -13233,8 +13233,8 @@ "Schweiz, Suisse, Svizzera, Svizra", "Ticino" ], - "s": 24334073, - "sha1_base64": "bmQeN4HgcdwjM/KLD/RMmPAP5pE=" + "s": 23724313, + "sha1_base64": "ToHXcDdymaZ+yXMY27NV0zkaOeI=" }, { "id": "Switzerland_Northwestern", @@ -13247,8 +13247,8 @@ "Basel-Stadt", "Schweiz, Suisse, Svizzera, Svizra" ], - "s": 46108055, - "sha1_base64": "7Y5MipB5eZKkewCN7QAcREResf0=" + "s": 45350607, + "sha1_base64": "LRkaXsFJ1Lzuq+tHwY7V+S19Dao=" }, { "id": "Switzerland_Lake Geneva region", @@ -13262,8 +13262,8 @@ "Vaud", "Valais - Wallis" ], - "s": 86430194, - "sha1_base64": "DBHL0+13rkjD7XyjMUeg9xDmuQU=" + "s": 85597034, + "sha1_base64": "/YULqgrAa1OLC3C3JwwFWASRAFs=" }, { "id": "Switzerland_Zurich", @@ -13274,8 +13274,8 @@ "Schweiz, Suisse, Svizzera, Svizra", "Z\u00fcrich" ], - "s": 52405321, - "sha1_base64": "ZbQG8tDytBB9mlqqQLTh0t4EHI8=" + "s": 51293976, + "sha1_base64": "xToal/dwxG6tG/gE+UTbTNh2N4U=" } ] }, @@ -13301,8 +13301,8 @@ "UNDOF", "\u062d\u0645\u0635" ], - "s": 63482141, - "sha1_base64": "9K8CWl09lNaF/Av+k+JLJPXkkqQ=" + "s": 59712245, + "sha1_base64": "zII8HwBgNQStNGLNq35k8ofGakQ=" }, { "id": "Sao Tome and Principe", @@ -13314,8 +13314,8 @@ "S\u00e3o Tom\u00e9 Province", "S\u00e3o Tom\u00e9 e Pr\u00edncipe" ], - "s": 1343440, - "sha1_base64": "5tu9A8pqJXSYyx1sdVZ1j0pDqnk=" + "s": 1268391, + "sha1_base64": "fiY4dZv937xnw+k78cH9EjSNpRw=" }, { "id": "Tajikistan", @@ -13329,8 +13329,8 @@ "\u041d\u043e\u04b3\u0438\u044f\u04b3\u043e\u0438 \u0442\u043e\u0431\u0435\u0438 \u04b7\u0443\u043c\u04b3\u0443\u0440\u04e3", "\u0422\u043e\u04b7\u0438\u043a\u0438\u0441\u0442\u043e\u043d" ], - "s": 44183404, - "sha1_base64": "rRQHESgdXBBtTWIQcp0wJ4f2hv0=" + "s": 43594323, + "sha1_base64": "g47ZCnrRF0qP7nMml9h7mO9RQbs=" }, { "id": "Tanzania", @@ -13365,8 +13365,8 @@ "Unguja Kusini", "Unguja Mjini Magharibi" ], - "s": 517806109, - "sha1_base64": "2R8hEbyQ+SOPAKYr1wXNmSAbmNw=" + "s": 505672213, + "sha1_base64": "AP3TbUn1lllEI3/es1wwaV6mR2I=" }, { "id": "Thailand", @@ -13392,8 +13392,8 @@ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e0a\u0e35\u0e22\u0e07\u0e43\u0e2b\u0e21\u0e48", "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e41\u0e21\u0e48\u0e2e\u0e48\u0e2d\u0e07\u0e2a\u0e2d\u0e19" ], - "s": 63289857, - "sha1_base64": "l0Q0AARLyN3KE5rwisATCgLOKII=" + "s": 62703233, + "sha1_base64": "aX0ltDjMNzhQ1kY/gleMBNlI8Tw=" }, { "id": "Thailand_Central", @@ -13439,8 +13439,8 @@ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e33\u0e19\u0e32\u0e08\u0e40\u0e08\u0e23\u0e34\u0e0d", "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e23\u0e30\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e2d\u0e22\u0e38\u0e18\u0e22\u0e32" ], - "s": 123028786, - "sha1_base64": "kDHNXwly6PQn1S5RQeA4KkxyI4g=" + "s": 121676610, + "sha1_base64": "Mu1YNy3Te6JcFfi8xMfT0mG1QPI=" }, { "id": "Thailand_South", @@ -13482,8 +13482,8 @@ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e18\u0e23\u0e23\u0e21\u0e23\u0e32\u0e0a", "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e23\u0e30\u0e08\u0e27\u0e1a\u0e04\u0e35\u0e23\u0e35\u0e02\u0e31\u0e19\u0e18\u0e4c" ], - "s": 130237602, - "sha1_base64": "AP6tIdA2ThYvr5H7YVjaDAkmiho=" + "s": 128204362, + "sha1_base64": "6njru1rbD1eeGTTriX4V7Wnr458=" } ] }, @@ -13499,8 +13499,8 @@ "country_name_synonyms": [ "Bahamas" ], - "s": 14162595, - "sha1_base64": "C0KSXua2/4M+uWXAOgNQpxouAqM=" + "s": 14055659, + "sha1_base64": "eeDRxhdFQkoMpbXWKXj+oauOIA8=" }, { "id": "The Gambia", @@ -13519,8 +13519,8 @@ "Mansakonko", "Senegal" ], - "s": 15133190, - "sha1_base64": "Zy7A9hw08k+DWW9V3RO605lp6fI=" + "s": 14943949, + "sha1_base64": "8vniGysTbiWh9ZpoKa3uJk/J6+Y=" }, { "id": "Netherlands", @@ -13534,8 +13534,8 @@ "Drenthe", "Nederland" ], - "s": 42344942, - "sha1_base64": "gBVM7iyUQalugXBYH124x2a0Plg=" + "s": 41813110, + "sha1_base64": "+PH0uYy7dQGtgvXoJSa7cJJaD/g=" }, { "id": "Netherlands_Flevoland", @@ -13546,8 +13546,8 @@ "Flevoland", "Nederland" ], - "s": 24630905, - "sha1_base64": "i6FAW3XPFrINRA9lXbmPnEYiK0I=" + "s": 24496857, + "sha1_base64": "esjEbEaH3RFK2RVeB1apP3d3+90=" }, { "id": "Netherlands_Friesland", @@ -13558,8 +13558,8 @@ "Friesland", "Nederland" ], - "s": 61795679, - "sha1_base64": "5NhFjp0/yRCDD2vLol0IUzYltHU=" + "s": 61227999, + "sha1_base64": "zutGftITVpS4/WG61gHyy/BRRxA=" }, { "id": "Netherlands_Gelderland_Nijmegen", @@ -13570,8 +13570,8 @@ "Gelderland", "Nederland" ], - "s": 38371454, - "sha1_base64": "y71Zu7zI/lUk4YiL2UcuV2p96z8=" + "s": 38107149, + "sha1_base64": "VRDPYSUlGgjJ8XWnfLjOL9jyY0w=" }, { "id": "Netherlands_Gelderland_North", @@ -13582,8 +13582,8 @@ "Gelderland", "Nederland" ], - "s": 65610008, - "sha1_base64": "LZ5n+ND+KOzWXaOOC9+vVIGQPME=" + "s": 64887952, + "sha1_base64": "ao58tdpkihpZZctw+rpk/P5fCOQ=" }, { "id": "Netherlands_Gelderland_Zutphen", @@ -13594,8 +13594,8 @@ "Gelderland", "Nederland" ], - "s": 26082058, - "sha1_base64": "+sYeNUEW8noo+TbaHZMSnP3EXos=" + "s": 26052346, + "sha1_base64": "GA4YAwGjDzmHcYH3pzI0xz82j1k=" }, { "id": "Netherlands_Groningen", @@ -13608,8 +13608,8 @@ "Nederland", "Niedersachsen" ], - "s": 41446318, - "sha1_base64": "BOkiZnpbw27RmOQzOTag8zvjn9U=" + "s": 41262070, + "sha1_base64": "3+ouC1kRGBeHnIzBTEmdrU9Fj48=" }, { "id": "Netherlands_Limburg", @@ -13620,8 +13620,8 @@ "Limburg", "Nederland" ], - "s": 74740152, - "sha1_base64": "t3lYPEZwy9gMrV5+G0FT/NNGsUc=" + "s": 74418144, + "sha1_base64": "Gfcpj33S6bOwM9LeNukjYFW8dqA=" }, { "id": "Netherlands_North Brabant_Eindhoven", @@ -13632,8 +13632,8 @@ "Nederland", "Noord-Brabant" ], - "s": 58611910, - "sha1_base64": "sPjgtWkbHFDB7aYwuxQ1g7pFOCg=" + "s": 58191294, + "sha1_base64": "ZNmkFMJns4fPEkGi0iGpEOfbykM=" }, { "id": "Netherlands_North Brabant_Roosendaal", @@ -13644,8 +13644,8 @@ "Nederland", "Noord-Brabant" ], - "s": 20318215, - "sha1_base64": "DWsvyBMqknEDyPfOxW87cfp8tU8=" + "s": 20329951, + "sha1_base64": "61KaJU5rpg3/I05Rway/wdtjoQI=" }, { "id": "Netherlands_North Brabant_Tiburg", @@ -13657,8 +13657,8 @@ "Nederland - Belgique / Belgi\u00eb / Belgien", "Noord-Brabant" ], - "s": 47096853, - "sha1_base64": "qmVTmvD1+LAhj9PxksM1aMMmWqM=" + "s": 46940308, + "sha1_base64": "gdwYq0JtEWiwbq5TCcHumSFstPg=" }, { "id": "Netherlands_North Brabant_Uden", @@ -13669,8 +13669,8 @@ "Nederland", "Noord-Brabant" ], - "s": 21752911, - "sha1_base64": "rx2gMtCnfTRHdPQL+CNqmzkDVRg=" + "s": 21675983, + "sha1_base64": "OS1LHyeK7Jd56VIeGWcih4RpGyU=" }, { "id": "Netherlands_North Holland_Alkmaar", @@ -13681,8 +13681,8 @@ "Nederland", "Noord-Holland" ], - "s": 37577123, - "sha1_base64": "bBas+QSWCqBOP0p66Kp1/vwpY5g=" + "s": 37411643, + "sha1_base64": "Vx9rip+kbN+oB0wI5ybgo4rj4dk=" }, { "id": "Netherlands_North Holland_Amsterdam", @@ -13693,8 +13693,8 @@ "Nederland", "Noord-Holland" ], - "s": 78336525, - "sha1_base64": "j0zOeXp51KLZS6rMYIIlf9oZydU=" + "s": 77968333, + "sha1_base64": "2U+W6d7sK8jf/QO7DZSxfj0SMDE=" }, { "id": "Netherlands_North Holland_Zaandam", @@ -13705,8 +13705,8 @@ "Nederland", "Noord-Holland" ], - "s": 26522049, - "sha1_base64": "T1oe4bFwIjRiEBkyx4VaHh9i7jg=" + "s": 26405089, + "sha1_base64": "Na4aGHElO2rVIe8daugq4yucR4M=" }, { "id": "Netherlands_Overijssel_Enschede", @@ -13717,8 +13717,8 @@ "Nederland", "Overijssel" ], - "s": 40175332, - "sha1_base64": "dHt9Y+Dz93DtB9CDMIPH6iALzHY=" + "s": 39945932, + "sha1_base64": "RDVND0QcOfqBnrXR+Cp0RpMzbmE=" }, { "id": "Netherlands_Overijssel_Zwolle", @@ -13729,8 +13729,8 @@ "Nederland", "Overijssel" ], - "s": 39356357, - "sha1_base64": "v69egxibLLYV+UW33k+jvKaqmA0=" + "s": 38903821, + "sha1_base64": "XfZD9GEE3AIq2aLAeVd0ktJ9QH4=" }, { "id": "Netherlands_South Holland_Brielle", @@ -13741,8 +13741,8 @@ "Nederland", "Zuid-Holland" ], - "s": 20424659, - "sha1_base64": "yENpSCcUgcK4ETFi8E1WPBl/TGk=" + "s": 20371435, + "sha1_base64": "nEBAxEESGtm9Q9IbveCCjYh/YBI=" }, { "id": "Netherlands_South Holland_Den Haag", @@ -13753,8 +13753,8 @@ "Nederland", "Zuid-Holland" ], - "s": 60233255, - "sha1_base64": "w2AeRP9PmfhCdXO1OPOBA0JHiX0=" + "s": 59860183, + "sha1_base64": "Fews107+GUiM88YgC5hDCyrA2Wo=" }, { "id": "Netherlands_South Holland_Leiden", @@ -13765,8 +13765,8 @@ "Nederland", "Zuid-Holland" ], - "s": 26397747, - "sha1_base64": "w+PcjSfBiLQGjWWkMcalJZ4HPXg=" + "s": 26165299, + "sha1_base64": "CrLa2hcGQdeXPnEDjFxJye1OMSg=" }, { "id": "Netherlands_South Holland_Rotterdam", @@ -13777,8 +13777,8 @@ "Nederland", "Zuid-Holland" ], - "s": 61233843, - "sha1_base64": "tmNXX122NOcykF/Sc3QxCXafNn0=" + "s": 61016771, + "sha1_base64": "EGncthaMYXShZZsXiPn93yWXOS8=" }, { "id": "Netherlands_Utrecht_Amersfoort", @@ -13789,8 +13789,8 @@ "Utrecht", "Nederland" ], - "s": 30111243, - "sha1_base64": "LyNDmVr0J35fpfHdOF+J7V/TMiw=" + "s": 29926835, + "sha1_base64": "fFoqSng8KZLHUZycLFu0vJM0R7g=" }, { "id": "Netherlands_Utrecht_Utrecht", @@ -13801,8 +13801,8 @@ "Utrecht", "Nederland" ], - "s": 36211222, - "sha1_base64": "LW56Ovj0G4O8j6gozPzfzlZ/4kk=" + "s": 35819030, + "sha1_base64": "kFa47JRDCLONJCAfBsekhIqVwBU=" }, { "id": "Netherlands_Zeeland", @@ -13813,8 +13813,8 @@ "Nederland", "Zeeland" ], - "s": 34195564, - "sha1_base64": "FbE79ON1Ygtn0nPLEt6QseDXXtM=" + "s": 34033532, + "sha1_base64": "4b1FtcuwGOrPZmlYu446E/7upRE=" } ] }, @@ -13831,8 +13831,8 @@ "R\u00e9gion des Savanes", "Togo" ], - "s": 47716680, - "sha1_base64": "MwXkuZ4FZQVdPWNO9qMlMx9o4D4=" + "s": 46137687, + "sha1_base64": "oeV4AjUwFIfLGHS86miviqXfoRA=" }, { "id": "Tonga", @@ -13852,8 +13852,8 @@ "Vahe Vaini", "Vava\u02bbu" ], - "s": 3696849, - "sha1_base64": "Ask82bSF1dAd+o4W+19lLaMujno=" + "s": 3708345, + "sha1_base64": "UF06SAsL8Rs9OpGP8au4ri4BRkk=" }, { "id": "Tunisia", @@ -13887,8 +13887,8 @@ "\u0627\u0644\u0642\u064a\u0631\u0648\u0627\u0646", "\u0627\u0644\u0645\u0646\u0633\u062a\u064a\u0631" ], - "s": 81216057, - "sha1_base64": "XmFjkyjG9JlJdyhh+b/CoP6jiZ4=" + "s": 80359425, + "sha1_base64": "yi3h81dk3qACQ4Bon9GpZ+Vr8BM=" }, { "id": "Turkey", @@ -13909,8 +13909,8 @@ "Osmaniye", "T\u00fcrkiye" ], - "s": 79379800, - "sha1_base64": "ES6M5WinYbxUCn6imV5vvjIPags=" + "s": 64980975, + "sha1_base64": "MbrcuXK3EsOGJx5biL+v3l3yaM8=" }, { "id": "Turkey_Southeastern Anatolia Region", @@ -13930,8 +13930,8 @@ "\u015eanl\u0131urfa", "\u015e\u0131rnak" ], - "s": 55564068, - "sha1_base64": "lc2cC3se9xXYEYFnx7a2mmiiDb4=" + "s": 46122378, + "sha1_base64": "VxjAOekdj/LkWbdMddQq5/6X47k=" }, { "id": "Turkey_Marmara Region_Istanbul", @@ -13948,8 +13948,8 @@ "\u00c7anakkale", "\u0130stanbul" ], - "s": 74882241, - "sha1_base64": "b6bLw3lhcEA2vbU87n4YUFN49bI=" + "s": 72911967, + "sha1_base64": "54A/KvRS1wiMbu0R31AjgUqG0sI=" }, { "id": "Turkey_Marmara Region_Bursa", @@ -13969,8 +13969,8 @@ "\u00c7anakkale", "\u0130stanbul" ], - "s": 52030582, - "sha1_base64": "iKE1Y2m52hPL3mG1l8Hsw3M/088=" + "s": 50785644, + "sha1_base64": "L/R2F02lAM3HMaNgpuGptEArc6M=" }, { "id": "Turkey_Eastern Anatolia Region", @@ -13994,8 +13994,8 @@ "Tunceli", "T\u00fcrkiye" ], - "s": 40582018, - "sha1_base64": "kTyornmQLu1ftWQslFgTYXF8+vQ=" + "s": 37143433, + "sha1_base64": "CN3xSEKkitxP1qEXVnDvSbjKuEY=" }, { "id": "Turkey_Black Sea Region", @@ -14023,8 +14023,8 @@ "Zonguldak", "\u00c7orum" ], - "s": 95817905, - "sha1_base64": "8T+o14gkUYNOY0h3WTATtcpw4Ew=" + "s": 93828057, + "sha1_base64": "75LzVQMbbrAHqzeBJzAUosekY+U=" }, { "id": "Turkey_Central Anatolia Region_Ankara", @@ -14042,8 +14042,8 @@ "T\u00fcrkiye", "\u00c7ank\u0131r\u0131" ], - "s": 52125926, - "sha1_base64": "ohcLT0UyuKYphSh/S3Xo6xE3K0E=" + "s": 50625076, + "sha1_base64": "PnwEB936dKq+eBuXcRB3pmQiDGQ=" }, { "id": "Turkey_Central Anatolia Region_Kayseri", @@ -14059,8 +14059,8 @@ "T\u00fcrkiye", "Yozgat" ], - "s": 54891115, - "sha1_base64": "VBoeHtzBhmaXOeH1f+zVy8MZhMI=" + "s": 54089738, + "sha1_base64": "qSMJkuU8OidIN66qu1la2jdJAkU=" }, { "id": "Turkey_Aegean Region", @@ -14078,8 +14078,8 @@ "U\u015fak", "\u0130zmir" ], - "s": 78475001, - "sha1_base64": "GumMRTMW7qiG32u6xkaCCn7ZgIE=" + "s": 77234409, + "sha1_base64": "QHQi0NpNMJ9sX5oFlTYdhB69ID8=" } ] }, @@ -14096,8 +14096,8 @@ "Mary", "T\u00fcrkmenistan" ], - "s": 18103769, - "sha1_base64": "I0VCr9gXFBGVXg8F71vegefo2TY=" + "s": 17877265, + "sha1_base64": "AciOIeCeX0iXjZVmwGx6+ozn2+I=" }, { "id": "Turks and Caicos Islands", @@ -14109,8 +14109,8 @@ "The Bahamas", "Turks and Caicos Islands" ], - "s": 1529320, - "sha1_base64": "yE0W102UJl8fo/nspT98vSfiWKU=" + "s": 1525560, + "sha1_base64": "hsAX0xAE4o7YNDACsnmjLMHki8U=" }, { "id": "Tuvalu", @@ -14120,8 +14120,8 @@ "affiliations": [ "Tuvalu" ], - "s": 538575, - "sha1_base64": "01AoUVqCxENKpjOCnaVxnqQSLcs=" + "s": 537719, + "sha1_base64": "26mpSo8+9nxb0roECAKp/6f+vFI=" }, { "id": "Uganda", @@ -14170,8 +14170,8 @@ "Uganda", "Western Region" ], - "s": 277352253, - "sha1_base64": "JyrNEM8ItQ4kSE6dqEFpxowcOnE=" + "s": 270149043, + "sha1_base64": "sJULtTj44k/XWsNFfk61huLcwdk=" }, { "id": "Ukraine", @@ -14185,8 +14185,8 @@ "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 40182362, - "sha1_base64": "bBxyK0AiEoF0CanxRyTcE9XJeVo=" + "s": 39324594, + "sha1_base64": "5T8w4qoO+nIMRMqUJyEU2PeFbLQ=" }, { "id": "Ukraine_Chernihiv Oblast", @@ -14197,8 +14197,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0427\u0435\u0440\u043d\u0456\u0433\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 34291731, - "sha1_base64": "rnYBBZPQM8Be4uj3p2GA0ddRSig=" + "s": 33910627, + "sha1_base64": "b7fx5XzXr46IIr3c1N1EA0bj5I8=" }, { "id": "Ukraine_Chernivtsi Oblast", @@ -14209,8 +14209,8 @@ "\u0427\u0435\u0440\u043d\u0456\u0432\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 27684888, - "sha1_base64": "0Ta4X/hiHn1cKH4wJFmjFQy8mFo=" + "s": 27534960, + "sha1_base64": "F02WiNso35YyowZb1HMIkEXQjng=" }, { "id": "Ukraine_Dnipropetrovsk Oblast", @@ -14221,8 +14221,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043d\u0456\u043f\u0440\u043e\u043f\u0435\u0442\u0440\u043e\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 57945966, - "sha1_base64": "PbN4q8A77lGnhMHhMi1YmOfhXGE=" + "s": 56148854, + "sha1_base64": "CGaAVoKsXHuzbU0S3JeBVVRTipY=" }, { "id": "Ukraine_Donetsk Oblast", @@ -14233,8 +14233,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043e\u043d\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 65518727, - "sha1_base64": "wxk/VKa1hjLmSuw0HnsW3fMtp4w=" + "s": 60907735, + "sha1_base64": "0NmLdw3EdriYSTCU8UJofagVCk8=" }, { "id": "Ukraine_Ivano-Frankivsk Oblast", @@ -14245,8 +14245,8 @@ "\u0406\u0432\u0430\u043d\u043e-\u0424\u0440\u0430\u043d\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 37039106, - "sha1_base64": "WT7shgABW5uHxdb6QYWEAj9ibUM=" + "s": 36943250, + "sha1_base64": "qGn5LQ+ccK/1usW/64vUZgPMDO0=" }, { "id": "Ukraine_Kharkiv Oblast", @@ -14257,8 +14257,8 @@ "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 58590494, - "sha1_base64": "Zpu8q8Nqi1KWdZKA/hWgPwXVquU=" + "s": 58435406, + "sha1_base64": "n0aatranFBM7RBouyirkZNAs41g=" }, { "id": "Ukraine_Kherson Oblast", @@ -14269,8 +14269,8 @@ "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 21714896, - "sha1_base64": "yw8acWQiTma+soHVY0vDZGpVMGI=" + "s": 21451952, + "sha1_base64": "YEETwI07XwkQL+g6GswvZh+AFpI=" }, { "id": "Ukraine_Khmelnytskyi Oblast", @@ -14281,8 +14281,8 @@ "\u0425\u043c\u0435\u043b\u044c\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 32557545, - "sha1_base64": "gIx/HwRskULeHKUVydUbONtCGBs=" + "s": 32258289, + "sha1_base64": "umVoeS2+gl1k0lx6LlTWH6lwBJM=" }, { "id": "Ukraine_Kirovohrad Oblast", @@ -14293,8 +14293,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041a\u0456\u0440\u043e\u0432\u043e\u0433\u0440\u0430\u0434\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 33264825, - "sha1_base64": "PSvioNYq1+iUNONBRhtMDs6vHhc=" + "s": 32162881, + "sha1_base64": "j/d4veTBzUXEwkQtL+HcT3z5YrU=" }, { "id": "Ukraine_Kyiv Oblast", @@ -14306,8 +14306,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041a\u0438\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 71846753, - "sha1_base64": "S1sRYNOwZnSE/rHj+/tmopWiRtI=" + "s": 71407665, + "sha1_base64": "BSt8Ti1FYKAXr6vX6HTf0lZ8t98=" }, { "id": "Ukraine_Luhansk Oblast", @@ -14318,8 +14318,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041b\u0443\u0433\u0430\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 50395396, - "sha1_base64": "JbwRPL2zq+Y7E8TF18Nj9cXc0v4=" + "s": 50070068, + "sha1_base64": "XUVbp9aLOcLSJ+UIQTT6oWE7bV0=" }, { "id": "Ukraine_Lviv Oblast", @@ -14330,8 +14330,8 @@ "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 61865104, - "sha1_base64": "16aQdqh3DJHHvcFMAr8mfFwouhM=" + "s": 61141912, + "sha1_base64": "Jxff8UfMw8T9Oy8F0eGItfFRgP0=" }, { "id": "Ukraine_Mykolaiv Oblast", @@ -14342,8 +14342,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041c\u0438\u043a\u043e\u043b\u0430\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 33142251, - "sha1_base64": "cMu4dsyXq3VfwV4rtfcT2T+vuIU=" + "s": 32699627, + "sha1_base64": "NloNhWG1suM+Q2xfECFMgRJkF6A=" }, { "id": "Ukraine_Odessa Oblast", @@ -14354,8 +14354,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041e\u0434\u0435\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 41633925, - "sha1_base64": "K2+/bzMOQIdSYpaAkZtCM6X2vKY=" + "s": 40773013, + "sha1_base64": "37tYDI7DlJ/AC32UcbPfnQ5I98o=" }, { "id": "Ukraine_Poltava Oblast", @@ -14366,8 +14366,8 @@ "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 35719037, - "sha1_base64": "Zhpu0sowo9e5K09liK85dHeSM/U=" + "s": 35156829, + "sha1_base64": "rBub/W8Tl9fl97bFqt/z9+tLTD4=" }, { "id": "Ukraine_Rivne Oblast", @@ -14378,8 +14378,8 @@ "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 27741784, - "sha1_base64": "i4IgkVDWz1JuG+yyexywumPsD0A=" + "s": 27372704, + "sha1_base64": "NerUq7XPZ6Le8fjfQyH9k7JQWTs=" }, { "id": "Ukraine_Sumy Oblast", @@ -14390,8 +14390,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0421\u0443\u043c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 32540347, - "sha1_base64": "/qgEa03oQVRsoq4qxDh4Fp1bf3w=" + "s": 33826932, + "sha1_base64": "L3Y5uHGpjIL7Ga9/UYIEbkZu5Nw=" }, { "id": "Ukraine_Ternopil Oblast", @@ -14402,8 +14402,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0422\u0435\u0440\u043d\u043e\u043f\u0456\u043b\u044c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 28902936, - "sha1_base64": "YpuVzXxgUY2hsLpj5hb5pI61kNI=" + "s": 28653728, + "sha1_base64": "6L8lN0Y9ObgwcyMJ4f6J7IN6Xo4=" }, { "id": "Ukraine_Vinnytsia Oblast", @@ -14414,8 +14414,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u0456\u043d\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 34861785, - "sha1_base64": "q3BHjAO7siAsVxaR9S+g83uYSSU=" + "s": 33942817, + "sha1_base64": "f5YD0tJLBxkWGUM32zh/1OTKDBA=" }, { "id": "Ukraine_Volyn Oblast", @@ -14426,8 +14426,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u043e\u043b\u0438\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 30204417, - "sha1_base64": "UaAaLG9CUj6yV7pp/Z9gVLkbgMo=" + "s": 30113121, + "sha1_base64": "3ciL2075ZjLP+zPaFuzSb1FgRQg=" }, { "id": "Ukraine_Zakarpattia Oblast", @@ -14438,8 +14438,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0417\u0430\u043a\u0430\u0440\u043f\u0430\u0442\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" ], - "s": 35528682, - "sha1_base64": "15/5+BiD/0h87nFlU0tYopKSqMc=" + "s": 34229514, + "sha1_base64": "PEYq9t7tYM4IUwJtflnGFT5CjHI=" }, { "id": "Ukraine_Zaporizhia Oblast", @@ -14450,8 +14450,8 @@ "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 32241362, - "sha1_base64": "lTUTlMrHjXw/zJQFIK25DpLhnvM=" + "s": 31731858, + "sha1_base64": "SvUcEATwpSI8Tgn8+PIIppEXiwE=" }, { "id": "Ukraine_Zhytomyr Oblast", @@ -14462,8 +14462,8 @@ "\u0416\u0438\u0442\u043e\u043c\u0438\u0440\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" ], - "s": 32923322, - "sha1_base64": "uWEmrUShzk7qWApdlWl8xd7HzDk=" + "s": 33136722, + "sha1_base64": "mPY46cGiFvjLsFgygoU43gqiOQ4=" }, { "id": "Crimea", @@ -14478,8 +14478,8 @@ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0440\u044b\u043c" ], - "s": 51553213, - "sha1_base64": "eXET8iWu22+TSScFvhIF/rRdn2U=" + "s": 51134989, + "sha1_base64": "Q0XFvibf+oJKQm9nAwOXfEj/L+4=" } ] }, @@ -14499,8 +14499,8 @@ "\u0627\u0644\u0634\u0627\u0631\u0642\u0629", "\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629 \u0627\u0644\u0645\u062a\u0651\u062d\u062f\u0629" ], - "s": 80934937, - "sha1_base64": "sguE7qZitDZ7vjuTUGWUcmB9dDE=" + "s": 72733201, + "sha1_base64": "8jxmcQRSarvObdc4Ld9VI5a4dnY=" }, { "id": "Falkland Islands", @@ -14510,8 +14510,8 @@ "affiliations": [ "Falkland Islands" ], - "s": 10354820, - "sha1_base64": "yHBZF5N0tm3KvjPHBtbQkJOCVhg=" + "s": 10289195, + "sha1_base64": "JXHMGXAIXu9oqAA02jYa4c/pjMk=" }, { "id": "United Kingdom", @@ -14524,8 +14524,8 @@ "affiliations": [ "British Indian Ocean Territory" ], - "s": 548345, - "sha1_base64": "ef6bKjfbwhE23vvWdFZZFlYoowM=" + "s": 547897, + "sha1_base64": "3QN9FqHJ17crWvGy6vFBd5qKYg0=" }, { "id": "UK_England_East Midlands", @@ -14536,8 +14536,8 @@ "England", "United Kingdom" ], - "s": 107620997, - "sha1_base64": "P8LE/HHxR2qyMagFB5m98aQargc=" + "s": 105987997, + "sha1_base64": "ecUaRDZYpQ20oGBggoP0mdl5Zn8=" }, { "id": "UK_England_East of England_Essex", @@ -14548,8 +14548,8 @@ "England", "United Kingdom" ], - "s": 62625377, - "sha1_base64": "5Ztk6eKFbjUjDEOY9ykzYSkWBo0=" + "s": 61291506, + "sha1_base64": "6oc74H8RTUFezDjiZSBJmelK8fE=" }, { "id": "UK_England_East of England_Norfolk", @@ -14560,8 +14560,8 @@ "England", "United Kingdom" ], - "s": 79969051, - "sha1_base64": "gtyoYK2pAL9E+3/7gVcN8g6Hf4M=" + "s": 78890819, + "sha1_base64": "qUrltLe/MMZ/JIgyMfObNh94kS8=" }, { "id": "UK_England_Greater London", @@ -14572,8 +14572,8 @@ "England", "United Kingdom" ], - "s": 95862412, - "sha1_base64": "oyXASP5C6VZIwZv/tQ4lBGSAJ54=" + "s": 92906952, + "sha1_base64": "N0T4ZQaYYdKCJoPEaDnf1eXBvQ0=" }, { "id": "UK_England_North East England", @@ -14584,8 +14584,8 @@ "England", "United Kingdom" ], - "s": 57880792, - "sha1_base64": "Agx7eiLjCdWr5AzTyk5LHmr8JoQ=" + "s": 57133880, + "sha1_base64": "4al4zHxTGJSSXz1KNzoFhflF4jo=" }, { "id": "UK_England_North West England_Manchester", @@ -14596,8 +14596,8 @@ "England", "United Kingdom" ], - "s": 97134532, - "sha1_base64": "cEQacOkeonfTWP89jgg55JAmocI=" + "s": 94539267, + "sha1_base64": "Ea9+2UtRyMk6a75U/LuINKFk2e4=" }, { "id": "UK_England_North West England_Lancaster", @@ -14608,8 +14608,8 @@ "England", "United Kingdom" ], - "s": 46045511, - "sha1_base64": "iI9psZcbOrNMyu8rcXz6sHIg+Yo=" + "s": 44918831, + "sha1_base64": "GUyVY0DFMcPCNEbqZfNNsHrHMsQ=" }, { "id": "UK_England_South East_Brighton", @@ -14620,8 +14620,8 @@ "England", "United Kingdom" ], - "s": 99276820, - "sha1_base64": "7oXdR0yHtzXMk6HKmWBqc4qwaX0=" + "s": 97210484, + "sha1_base64": "GNdQa3TIg0RTqmq5Y6myhbtMy8Y=" }, { "id": "UK_England_South East_Oxford", @@ -14632,8 +14632,8 @@ "England", "United Kingdom" ], - "s": 99806400, - "sha1_base64": "4XEZmh3BfWFyZopUPjocf6pauVc=" + "s": 97759915, + "sha1_base64": "ScCJECm7kc0590rHVYMVhCKm/YU=" }, { "id": "UK_England_South West England_Bristol", @@ -14644,8 +14644,8 @@ "England", "United Kingdom" ], - "s": 113229196, - "sha1_base64": "WiwWiFpR826S0rA6W871WCz5w/Y=" + "s": 110186124, + "sha1_base64": "UgU69c9MwDvIvoQuMm6T37pcgQE=" }, { "id": "UK_England_South West England_Cornwall", @@ -14656,8 +14656,8 @@ "England", "United Kingdom" ], - "s": 64143074, - "sha1_base64": "jV40RdsSIZcCe2U40rgaN6fidSM=" + "s": 61847810, + "sha1_base64": "xYxrQMJcg2krSM64bHb3VolUAOE=" }, { "id": "UK_England_West Midlands", @@ -14668,8 +14668,8 @@ "England", "United Kingdom" ], - "s": 128884430, - "sha1_base64": "BrZzotfv8TcYUBCfKWSf6UAuFXU=" + "s": 127371302, + "sha1_base64": "gWswJuy07aTjbrssjEy0+LBkQs0=" }, { "id": "UK_England_Yorkshire and the Humber", @@ -14680,8 +14680,8 @@ "England", "United Kingdom" ], - "s": 118860774, - "sha1_base64": "ug4z7R8LDlz3VLWT5SA3aLms93w=" + "s": 117574222, + "sha1_base64": "1RJVSPDf8D8LGs5D7+FocV1PxGI=" }, { "id": "UK_Northern Ireland", @@ -14693,8 +14693,8 @@ "Scotland", "United Kingdom" ], - "s": 44406102, - "sha1_base64": "bCPwbK4ymDKDagW/OO9wrqdPTBM=" + "s": 43985094, + "sha1_base64": "SOcybi2YA9tVOWXZ+lLck54qnvw=" }, { "id": "UK_Scotland_North", @@ -14705,8 +14705,8 @@ "Scotland", "United Kingdom" ], - "s": 126654076, - "sha1_base64": "5W5eEbSDRykluszCSMHBjGQoZDE=" + "s": 124171676, + "sha1_base64": "e7v5FCZDgLhFp7XEYYBe6FgcN3A=" }, { "id": "UK_Scotland_South", @@ -14718,8 +14718,8 @@ "Scotland", "United Kingdom" ], - "s": 103643961, - "sha1_base64": "WAXFNsGrQQoz7cicSsyG/yAksn8=" + "s": 100284905, + "sha1_base64": "xsgY4JmEaJ9YOMUqfoeh4W1sbhA=" }, { "id": "UK_Wales", @@ -14730,8 +14730,8 @@ "United Kingdom", "Wales" ], - "s": 106527508, - "sha1_base64": "aqXPxFkzVWYP6oag0GCLaG54e+I=" + "s": 104856292, + "sha1_base64": "za9XHLdXod53Oxm/qD5pYSVZoqQ=" } ] }, @@ -14746,8 +14746,8 @@ "affiliations": [ "Ireland" ], - "s": 44346749, - "sha1_base64": "dR/1B9fCXCQzRsMD3CAHZU+MsJM=" + "s": 42414909, + "sha1_base64": "9DVTcQmvV3TGmvIeLIU8OycMpHo=" }, { "id": "Ireland_Leinster", @@ -14757,8 +14757,8 @@ "affiliations": [ "Ireland" ], - "s": 86252600, - "sha1_base64": "PYVf41sQuwN0HtLTDnPdPz4+RBw=" + "s": 83257704, + "sha1_base64": "I24DNmzpTqDwMdyjg1jwQclqXO0=" }, { "id": "Ireland_Munster", @@ -14768,8 +14768,8 @@ "affiliations": [ "Ireland" ], - "s": 65517503, - "sha1_base64": "wYe9dI/dsuhJ9aC6KSBdpeKVZBk=" + "s": 65077151, + "sha1_base64": "OmNXoUSD1P03q5gT550OBDAK3vE=" }, { "id": "Ireland_Northern Counties", @@ -14779,8 +14779,8 @@ "affiliations": [ "Ireland" ], - "s": 25843762, - "sha1_base64": "WRUpsHuiXBoGiqCGNGXIw9MCjqA=" + "s": 22909104, + "sha1_base64": "zxs3ujKzu37lWWcz5k21JZNdsYU=" } ] }, @@ -14800,8 +14800,8 @@ "AL", "United States of America" ], - "s": 48081375, - "sha1_base64": "K8g+UvBTWmzTXKMh0kuRSuR2f4o=" + "s": 47391895, + "sha1_base64": "OJGnvJUgAnXjmpLR/a3TUGD2F+Q=" }, { "id": "US_Alabama_Montgomery", @@ -14813,8 +14813,8 @@ "AL", "United States of America" ], - "s": 74981490, - "sha1_base64": "bnJ4NZPa7YYV7nQFU3aHDvYLZgI=" + "s": 73749778, + "sha1_base64": "n1iA5MJQAIgRy3wA2eQa524ir/o=" } ] }, @@ -14828,8 +14828,8 @@ "AK", "United States of America" ], - "s": 165859279, - "sha1_base64": "SNrBPH9BDlfqJm/rO8jjnEcUW3g=" + "s": 164887279, + "sha1_base64": "ePB9toz0m4jhYy7gN0dHkdg/lMc=" }, { "id": "Arizona", @@ -14844,8 +14844,8 @@ "AZ", "United States of America" ], - "s": 85826056, - "sha1_base64": "DUninLdFimkycjn807gTh4URQT4=" + "s": 83339536, + "sha1_base64": "mUZMAMETYCEVvXEd5GSlCx/VHyo=" }, { "id": "US_Arizona_Phoenix", @@ -14857,8 +14857,8 @@ "AZ", "United States of America" ], - "s": 121708691, - "sha1_base64": "1lSd+8f/12kGtEk4jlapsoW7qs4=" + "s": 115656051, + "sha1_base64": "he7gt7TLJSFQDuvuEdFUMrOATjU=" }, { "id": "US_Arizona_Tucson", @@ -14870,8 +14870,8 @@ "AZ", "United States of America" ], - "s": 52445070, - "sha1_base64": "UZ5RuobIRFVlpAAnKIpcC2y85e0=" + "s": 50604030, + "sha1_base64": "8csCGGt7CpoQIl6KKv02B0rSuTM=" } ] }, @@ -14888,8 +14888,8 @@ "AR", "United States of America" ], - "s": 51406198, - "sha1_base64": "3HG4m0JiQoLcjDUd6xhMqXIp58k=" + "s": 51100710, + "sha1_base64": "zVwdsa9xepoPMVgEf78Ee00oOWc=" }, { "id": "US_Arkansas_South", @@ -14901,8 +14901,8 @@ "AR", "United States of America" ], - "s": 31787162, - "sha1_base64": "VggwZc18QOQoeehGgOMNv862vlI=" + "s": 31208690, + "sha1_base64": "676qM1uQzgr957MrQ0aqoO7UEjg=" } ] }, @@ -14919,8 +14919,8 @@ "CA", "United States of America" ], - "s": 48936837, - "sha1_base64": "P41JsQr9ghKniPUcQwG4CyRukEk=" + "s": 48798684, + "sha1_base64": "v+TsesbZaZ4bpSEubmCYKIxml8A=" }, { "id": "US_California_Bakersfield_Bakersfield", @@ -14932,8 +14932,8 @@ "CA", "United States of America" ], - "s": 42671899, - "sha1_base64": "pgWSiOSIyBPw/GZMgKgfPbdJvJk=" + "s": 42130571, + "sha1_base64": "vTD1egzbq/uU93e65IAS2wlfqT8=" }, { "id": "US_California_Bakersfield_Lancaster", @@ -14945,8 +14945,8 @@ "CA", "United States of America" ], - "s": 47045315, - "sha1_base64": "l/T779b2Ry+UOzK0mSGwWPEtSyI=" + "s": 45994139, + "sha1_base64": "o5uNa+yOCD5M7QmHhkWtTCchUKU=" }, { "id": "US_California_LA", @@ -14958,8 +14958,8 @@ "CA", "United States of America" ], - "s": 218436317, - "sha1_base64": "YQtfPoxx35XRbaaRdgsDHy8qrdc=" + "s": 210761381, + "sha1_base64": "cLAoZ0ATfxRQmHaJAsQ8gPLVUVc=" }, { "id": "US_California_LA North", @@ -14971,8 +14971,8 @@ "CA", "United States of America" ], - "s": 66353182, - "sha1_base64": "6NfeQcUKbEHxGcPTy4FzDYTvZwQ=" + "s": 65583718, + "sha1_base64": "MpO7Ws7TDQ7T/C0+CSrlVA+zaq8=" }, { "id": "US_California_Redding", @@ -14985,8 +14985,8 @@ "Hoopa Valley Tribe", "United States of America" ], - "s": 61596949, - "sha1_base64": "xZ2us+6U7gI0Vwi/i9TaB0G/+Uw=" + "s": 60656877, + "sha1_base64": "G32cCpOyeHjHg3s43zYcX7Dt4K0=" }, { "id": "US_California_Sacramento_Sacramento", @@ -14998,8 +14998,8 @@ "CA", "United States of America" ], - "s": 41908076, - "sha1_base64": "n0rjWRIWiwYhx3KmUW5NFeQjs1o=" + "s": 40836444, + "sha1_base64": "G6ZxLsn8fWxs86wTAnmSfxy0Xtw=" }, { "id": "US_California_Sacramento_Fresno", @@ -15011,8 +15011,8 @@ "CA", "United States of America" ], - "s": 46459972, - "sha1_base64": "dIW8poYQv2Xti+JzZnre84UdM0I=" + "s": 45552956, + "sha1_base64": "J0j7Y1HNXFO80RfE0/xDLKS0sUg=" }, { "id": "US_California_Sacramento_Stockton", @@ -15024,8 +15024,8 @@ "CA", "United States of America" ], - "s": 52708022, - "sha1_base64": "IMBhiAkeEKFZ6KLpVmBrsz8p6to=" + "s": 51861438, + "sha1_base64": "EZVPYyELetOgOSwj4jofIBX0wng=" }, { "id": "US_California_San Diego", @@ -15037,8 +15037,8 @@ "CA", "United States of America" ], - "s": 83963489, - "sha1_base64": "xMHGOdS5H6Ta38D9rGY9qpd3xRk=" + "s": 80450081, + "sha1_base64": "gDG+e1Mvz3K4niBOaRyUNsUMyYY=" }, { "id": "US_California_Santa_Clara_Santa Cruz", @@ -15050,8 +15050,8 @@ "CA", "United States of America" ], - "s": 30847963, - "sha1_base64": "BqHvl7cUe5K1r8ntaXkr8aWV3FE=" + "s": 30513651, + "sha1_base64": "6/r62ANQHSqGKNjAnqNxbRpjOOg=" }, { "id": "US_California_Santa_Clara_Palo Alto", @@ -15063,8 +15063,8 @@ "CA", "United States of America" ], - "s": 166047933, - "sha1_base64": "xC4PQxmynbGW00tdUu+Cubeub2Y=" + "s": 163095581, + "sha1_base64": "S2o+EZMBbHs6cENb1Lj5B0T4c3U=" } ] }, @@ -15081,8 +15081,8 @@ "CO", "United States of America" ], - "s": 68254934, - "sha1_base64": "wOs6Jt1dthjg1bEnQKMjJkNomi8=" + "s": 67916174, + "sha1_base64": "G7k1LGq2Lp+eWXoiXBITuKhw2LA=" }, { "id": "US_Colorado_Denver", @@ -15094,8 +15094,8 @@ "CO", "United States of America" ], - "s": 116933260, - "sha1_base64": "pLQ9rjHccmWwQ5HCeTXbaIZMOlA=" + "s": 113928852, + "sha1_base64": "25TqYqsIAnVN4Kk9PtOFhueKQT8=" }, { "id": "US_Colorado_South", @@ -15107,8 +15107,8 @@ "CO", "United States of America" ], - "s": 65504871, - "sha1_base64": "0X4lLPARWecG8bzpURcMwwb1rUE=" + "s": 64905735, + "sha1_base64": "xMCY2/a4P5QVWMkRXrDsfoyDaoA=" } ] }, @@ -15122,8 +15122,8 @@ "CT", "United States of America" ], - "s": 153919259, - "sha1_base64": "kmtjAIbxEnVE52s80ZpbGwhrAGk=" + "s": 152723339, + "sha1_base64": "wrjWA/Xx0h7O5zkAsRAmXN7PH2Y=" }, { "id": "US_Delaware", @@ -15135,8 +15135,8 @@ "DE", "United States of America" ], - "s": 18408282, - "sha1_base64": "UquibqW/XhjbXUwXDpL0NRvHbdY=" + "s": 17999793, + "sha1_base64": "SG0xvvRHRmdyhznmCZ9EkklO1ss=" }, { "id": "Florida", @@ -15151,8 +15151,8 @@ "FL", "United States of America" ], - "s": 155424216, - "sha1_base64": "4U6nVYMPUSkpHEZFJo5I+O4psBw=" + "s": 92001127, + "sha1_base64": "dEIddIAE6nOc8+8AtUOU0p0BwMI=" }, { "id": "US_Florida_Miami", @@ -15164,8 +15164,8 @@ "FL", "United States of America" ], - "s": 128519771, - "sha1_base64": "/fFW/iM1P7QftpBqKz32JciHx2o=" + "s": 125062171, + "sha1_base64": "7+vtE2Qy3mBjkvwj0Ttx/p1qdhk=" }, { "id": "US_Florida_Orlando", @@ -15177,8 +15177,8 @@ "FL", "United States of America" ], - "s": 54314342, - "sha1_base64": "TdLa4r9so85iw3RqbPRAQuVlzq4=" + "s": 52797454, + "sha1_base64": "iFdI7ondZIlb6kcTuJgUHlZzbZk=" }, { "id": "US_Florida_Tampa", @@ -15190,8 +15190,8 @@ "FL", "United States of America" ], - "s": 96899876, - "sha1_base64": "Q2wub9tgpcNgE4mirfYaFAIFqt8=" + "s": 93811628, + "sha1_base64": "z6CaCcYhkkm3HGKPlzHtIuIrJP0=" }, { "id": "US_Florida_Gainesville", @@ -15203,8 +15203,8 @@ "FL", "United States of America" ], - "s": 64861767, - "sha1_base64": "56ZW4NrXD+sXdCJM/6yhm3PDRio=" + "s": 57100158, + "sha1_base64": "Dqhpk91TNzSPPqfRA4M3gNif1ZA=" } ] }, @@ -15221,8 +15221,8 @@ "GA", "United States of America" ], - "s": 107104114, - "sha1_base64": "SXo+F54srmaLI6IiCE0Iq2n+vOs=" + "s": 105460738, + "sha1_base64": "hbSHZGN3oSxDA0RV3IEXmmCs7Wg=" }, { "id": "US_Georgia_Macon", @@ -15234,8 +15234,8 @@ "GA", "United States of America" ], - "s": 54930032, - "sha1_base64": "s2gumLFlzUZrbohs6p1DVdqLeCE=" + "s": 53924336, + "sha1_base64": "qK0DTqcwio6M+Y8bkuasYggra5s=" }, { "id": "US_Georgia_North", @@ -15247,8 +15247,8 @@ "GA", "United States of America" ], - "s": 41346430, - "sha1_base64": "GrcS+APQKQoONXAnZ7kIrqXuyNw=" + "s": 40749373, + "sha1_base64": "BOBQGEGMtO+i2GfsofZQaTKL1r4=" }, { "id": "US_Georgia_South", @@ -15260,8 +15260,8 @@ "GA", "United States of America" ], - "s": 58960008, - "sha1_base64": "o5z1OZUrcZIjBnd1lOXSCHDn3VE=" + "s": 58088312, + "sha1_base64": "IzXpVAlVj0eJ0mZu1v21s5k/y2g=" } ] }, @@ -15281,8 +15281,8 @@ "country_name_synonyms": [ "Guam" ], - "s": 3973558, - "sha1_base64": "te23q+k2r6Fx5BXMGC+sbnSpDCU=" + "s": 3963310, + "sha1_base64": "IhtnAB1DucWuun+zNI6RCeH9pSI=" }, { "id": "US_Hawaii", @@ -15294,8 +15294,8 @@ "HI", "United States of America" ], - "s": 19818336, - "sha1_base64": "Ri/7rp4mVYi5gFAWI/DnFnCp8N8=" + "s": 19504896, + "sha1_base64": "GSUxV2fZQsEU3G/4A5LvZro23gc=" }, { "id": "US_Idaho", @@ -15310,8 +15310,8 @@ "ID", "United States of America" ], - "s": 37216893, - "sha1_base64": "7qaSsBkk7Hm8WtavZ2N33VaTx0Y=" + "s": 37048373, + "sha1_base64": "HRk4iKK9G2eB82olsirwc91uKwo=" }, { "id": "US_Idaho_South", @@ -15323,8 +15323,8 @@ "ID", "United States of America" ], - "s": 61179816, - "sha1_base64": "LYISmNxiX5xWCYgma2Kea9HcbPA=" + "s": 60796720, + "sha1_base64": "68pM0kp9E+ovk9cEnOcTXQm683g=" } ] }, @@ -15341,8 +15341,8 @@ "IL", "United States of America" ], - "s": 41521007, - "sha1_base64": "RzXlkwUmFI7go7BOnf266AxFyUM=" + "s": 39366239, + "sha1_base64": "Jx7QWVTNBBaxgW3EUuiJTx3LN9g=" }, { "id": "US_Illinois_Chickago", @@ -15354,8 +15354,8 @@ "IL", "United States of America" ], - "s": 73466009, - "sha1_base64": "06E3de1I3FqMTMrF6IvcpnsNCiM=" + "s": 71931313, + "sha1_base64": "0G3Nu1sNIB0QuNK4iKWyW3vymCE=" }, { "id": "US_Illinois_Elgin", @@ -15367,8 +15367,8 @@ "IL", "United States of America" ], - "s": 39396925, - "sha1_base64": "wrIr4kpCl8t25ONVDnfd+aFvIZk=" + "s": 38805333, + "sha1_base64": "GBh4oh8REQM8I5LrlcfaFtXtTPQ=" }, { "id": "US_Illinois_Rockford", @@ -15380,8 +15380,8 @@ "IL", "United States of America" ], - "s": 28041090, - "sha1_base64": "ElVG05fKhMXW9ZQLtNrSkdh/nrI=" + "s": 27715858, + "sha1_base64": "d+nVlt7YNWvEWijdxDTedlDZ4lk=" }, { "id": "US_Illinois_Springfield", @@ -15393,8 +15393,8 @@ "IL", "United States of America" ], - "s": 61181097, - "sha1_base64": "sGMq9+4NlhrTSSJe8iaa/Wbokw4=" + "s": 59538001, + "sha1_base64": "FRdqxj0jMP5Jtdc/J8H0bhB8Cd4=" } ] }, @@ -15411,8 +15411,8 @@ "IN", "United States of America" ], - "s": 62766434, - "sha1_base64": "DslI+omn92gzqE/2maYE0HD8H+8=" + "s": 61264498, + "sha1_base64": "ZtrGmj8seq/LbXtdgGpwzYMW0wk=" }, { "id": "US_Indiana_Evansville", @@ -15424,8 +15424,8 @@ "IN", "United States of America" ], - "s": 31384027, - "sha1_base64": "Ke8/4aZ/cmSicum5tVNc150TKzQ=" + "s": 30468363, + "sha1_base64": "p9vIpRiY7+kWe/BEpT6ImLm7PLQ=" }, { "id": "US_Indiana_Indianapolis", @@ -15437,8 +15437,8 @@ "IN", "United States of America" ], - "s": 62381623, - "sha1_base64": "gbsCASNRcYAhsULfZ5UZGDEnTcc=" + "s": 59033879, + "sha1_base64": "Q4IP7Ihg+oYgtc6y3R9+xSTx0IY=" } ] }, @@ -15455,8 +15455,8 @@ "IA", "United States of America" ], - "s": 42099060, - "sha1_base64": "7HtHpR1KVf4ZBLmYxjYdY4OyP2s=" + "s": 41435940, + "sha1_base64": "bABs00jF1i5gixRbcKIckfwXqIU=" }, { "id": "US_Iowa_Waterloo", @@ -15468,8 +15468,8 @@ "IA", "United States of America" ], - "s": 37827396, - "sha1_base64": "l2noPXXPYmxR3pdAlyMedW9YjlY=" + "s": 37301172, + "sha1_base64": "gheg8IVVf1vWV95yczuiO6CSS9U=" }, { "id": "US_Iowa_West", @@ -15481,8 +15481,8 @@ "IA", "United States of America" ], - "s": 39535204, - "sha1_base64": "9QlzEOdjy5lcVD+vF+NCT4GxXdc=" + "s": 39289092, + "sha1_base64": "pG2UjR4iWkxPDvdd3DuGY2Lx0Rc=" } ] }, @@ -15499,8 +15499,8 @@ "KS", "United States of America" ], - "s": 46553638, - "sha1_base64": "Bj/CpcIXzSI9qTcTADs1ySI1ZoU=" + "s": 45837710, + "sha1_base64": "0MsSLw770xG+6nNokrvtLo1rkL8=" }, { "id": "US_Kansas_West", @@ -15512,8 +15512,8 @@ "KS", "United States of America" ], - "s": 27500010, - "sha1_base64": "fyB64J1SuV+9gw2eEDVsOj+/Dpk=" + "s": 26924785, + "sha1_base64": "GSqXfs2075snhkkW7/40K8V5RhY=" }, { "id": "US_Kansas_Wichita", @@ -15525,8 +15525,8 @@ "KS", "United States of America" ], - "s": 36089458, - "sha1_base64": "MZHYwh7Rk4AHpxQ2PqKcghF7H9s=" + "s": 35711610, + "sha1_base64": "mOQ/Edi/CCD0UAeHbIcdSyRTA5U=" } ] }, @@ -15543,8 +15543,8 @@ "KY", "United States of America" ], - "s": 58758241, - "sha1_base64": "K5mdfkkpSLU7wj7Llg1m9Twc4qU=" + "s": 57558729, + "sha1_base64": "f+CMj4kTkBqE1HKS0m/gyu6hUco=" }, { "id": "US_Kentucky_West", @@ -15556,8 +15556,8 @@ "KY", "United States of America" ], - "s": 34617379, - "sha1_base64": "MAX3HZDG1hs9gXymoDC7r9i5rnA=" + "s": 34232347, + "sha1_base64": "zbGOuh930SPVR5OARWBWZK1yVPA=" }, { "id": "US_Kentucky_Louisville", @@ -15569,8 +15569,8 @@ "KY", "United States of America" ], - "s": 40602509, - "sha1_base64": "QAJOOo7uN43irB++pmq+aPdYha0=" + "s": 40315956, + "sha1_base64": "JFUcEp0lsm823EaWPNOxNd/QJqo=" } ] }, @@ -15587,8 +15587,8 @@ "LA", "United States of America" ], - "s": 45561732, - "sha1_base64": "lYWbf2fxyha6XhTzaAjMpGr8Nx8=" + "s": 44797412, + "sha1_base64": "2ithYiFXnv5CscOXkZPbhP2Qj1k=" }, { "id": "US_Louisiana_New Orleans", @@ -15600,8 +15600,8 @@ "LA", "United States of America" ], - "s": 74529880, - "sha1_base64": "rQydDP1eCtR2RQwhXJSKfG2fIlk=" + "s": 73715872, + "sha1_base64": "AAMxsGKUuqMdrF9daydGgNqh2DM=" } ] }, @@ -15615,8 +15615,8 @@ "ME", "United States of America" ], - "s": 89749403, - "sha1_base64": "4Z8q2UtR5wifqG4HfjqL9hgjTYU=" + "s": 88194843, + "sha1_base64": "Lei1anJXDhtdV8JL3Ad5omuSWjI=" }, { "id": "Maryland", @@ -15631,8 +15631,8 @@ "MD", "United States of America" ], - "s": 102578947, - "sha1_base64": "9HbP/V7h3t2zZVoDXmhkKSHDfPY=" + "s": 101298843, + "sha1_base64": "JEibsbHDzqEBlLQje8+R7iNRFio=" }, { "id": "US_Maryland_and_DC", @@ -15647,8 +15647,8 @@ "MD", "United States of America" ], - "s": 78166154, - "sha1_base64": "xJ9JsFhe7O8YteLgjN9ZGXT6Uos=" + "s": 76827050, + "sha1_base64": "S1puJraeaysKVoXZA5wdMLupn5U=" } ] }, @@ -15665,8 +15665,8 @@ "MA", "United States of America" ], - "s": 80149263, - "sha1_base64": "2ELoBvyqM8b7yEm44xpHKMmDluA=" + "s": 79730999, + "sha1_base64": "pTehC/IDBUpOyrVIxoVNBxkeRec=" }, { "id": "US_Massachusetts_Central", @@ -15678,8 +15678,8 @@ "MA", "United States of America" ], - "s": 36809283, - "sha1_base64": "5jUgVOU3xDYj+JoB3Pj4YhiBvEc=" + "s": 36599987, + "sha1_base64": "FL34Dxw89LNlJqybqcViT1dUP2k=" }, { "id": "US_Massachusetts_Plymouth", @@ -15691,8 +15691,8 @@ "MA", "United States of America" ], - "s": 39206355, - "sha1_base64": "123JBUXW5zdq6fkfgrincx9XGcg=" + "s": 38747275, + "sha1_base64": "YiqAfq05y4UJRSRhFQwQ/wzE2j4=" }, { "id": "US_Massachusetts_Southeastern", @@ -15704,8 +15704,8 @@ "MA", "United States of America" ], - "s": 18202111, - "sha1_base64": "hGSIlZZ8j82GraeEJ/QMqV+caOA=" + "s": 17873023, + "sha1_base64": "hOEQQ3E+nWmBOUptNKidE1tylFk=" }, { "id": "US_Massachusetts_West", @@ -15717,8 +15717,8 @@ "MA", "United States of America" ], - "s": 36524458, - "sha1_base64": "U01CE0R/2+1/Qs+D3ceCntu73vw=" + "s": 36266658, + "sha1_base64": "PGt/pISq1qd4SQ/szyB0pJxMM3k=" } ] }, @@ -15735,8 +15735,8 @@ "MI", "United States of America" ], - "s": 78888234, - "sha1_base64": "t8FabN/BLfZ7ULeAP8zmm4E5BqY=" + "s": 76769874, + "sha1_base64": "mb4jrY62kfBvIUnr929Zxi2uVzw=" }, { "id": "US_Michigan_North", @@ -15748,8 +15748,8 @@ "MI", "United States of America" ], - "s": 41947949, - "sha1_base64": "S88InpjUrPQYnKHpCwCrw7raIRk=" + "s": 41408837, + "sha1_base64": "kpqqiF8bZZqZjwzEFq7wM0u9JIE=" }, { "id": "US_Michigan_Grand Rapids", @@ -15767,8 +15767,8 @@ "MI", "United States of America" ], - "s": 58331208, - "sha1_base64": "JXWLRKNeMC7cZIrqsHbB66JGAiM=" + "s": 55749768, + "sha1_base64": "oh2DwZ0fcqEaCqI3aaZA67R93y8=" }, { "id": "US_Michigan_Lansing", @@ -15782,8 +15782,8 @@ "MI", "United States of America" ], - "s": 60751633, - "sha1_base64": "8gmuyFqhONYbByt7iRC3dR4BLoA=" + "s": 59872137, + "sha1_base64": "zCCng4wBunOc60AgtpQYVQYsqAg=" } ] }, @@ -15800,8 +15800,8 @@ "MN", "United States of America" ], - "s": 44495966, - "sha1_base64": "1XTo9WSXAqBJxfebiWR3y5he7pM=" + "s": 43736198, + "sha1_base64": "xhMJ/WuqA+Q487eu2na6fryW1Rc=" }, { "id": "US_Minnesota_Minneapolis", @@ -15813,8 +15813,8 @@ "MN", "United States of America" ], - "s": 61855695, - "sha1_base64": "PzgzjE0ZbWR4O1gOW8WTARfFhT8=" + "s": 60939263, + "sha1_base64": "TW3fBOs8MmkciKrNe1wEDLTIqH8=" }, { "id": "US_Minnesota_North", @@ -15826,8 +15826,8 @@ "MN", "United States of America" ], - "s": 60111616, - "sha1_base64": "cgx8njQWgGG9pwJzX4XtOxMT0S8=" + "s": 59575624, + "sha1_base64": "V/FIQEsDt+FCaiItlFJwkK2ka5M=" }, { "id": "US_Minnesota_Saint Cloud", @@ -15839,8 +15839,8 @@ "MN", "United States of America" ], - "s": 37688507, - "sha1_base64": "4zGhjeKFexRUBHoUB2gQTgvGsK0=" + "s": 37350307, + "sha1_base64": "9dOWsBGWLK4PU+2S4CtIecJmJMY=" } ] }, @@ -15857,8 +15857,8 @@ "MS", "United States of America" ], - "s": 26491130, - "sha1_base64": "NZYX8mP1gwvChFDOmaTiy51kpyM=" + "s": 26361418, + "sha1_base64": "IeQr0yLqyB49pQZfwa9ezF+qpbQ=" }, { "id": "US_Mississippi_North", @@ -15870,8 +15870,8 @@ "MS", "United States of America" ], - "s": 55173145, - "sha1_base64": "zhAXMYEhk2qrxpt+f1VP/lHZEPE=" + "s": 54183881, + "sha1_base64": "UBGhPFPKf7MbL5vhtZsUYKTH57o=" } ] }, @@ -15888,8 +15888,8 @@ "MO", "United States of America" ], - "s": 19695761, - "sha1_base64": "KArouw1xfjVuLOQpK4/DWW/8luw=" + "s": 19588721, + "sha1_base64": "4ug0tBlZWrrQ8dm8H/m1fDLu3Pc=" }, { "id": "US_Missouri_Springfield", @@ -15901,8 +15901,8 @@ "MO", "United States of America" ], - "s": 38595692, - "sha1_base64": "usqzcExV8dcXjNRS45BYikPsAKk=" + "s": 38243364, + "sha1_base64": "QjKLBwWk29L/PZxk1G0bJgHftVc=" }, { "id": "US_Missouri_Kansas", @@ -15914,8 +15914,8 @@ "MO", "United States of America" ], - "s": 45727870, - "sha1_base64": "z627405cc6L9zc5UaW380DFYly8=" + "s": 44464038, + "sha1_base64": "QHKVShH4Y90EuitS9/q1/JqBCu8=" }, { "id": "US_Missouri_St Louis", @@ -15927,8 +15927,8 @@ "MO", "United States of America" ], - "s": 63890054, - "sha1_base64": "CTz4IYId1bh4WnQSg1uFinsdtyk=" + "s": 62912302, + "sha1_base64": "Q8nB1bbUG5Rem3Rd+GHWii6GkKk=" } ] }, @@ -15945,8 +15945,8 @@ "MT", "United States of America" ], - "s": 40535260, - "sha1_base64": "Q8pcuRmfGz0tfru4Cf6jgYys+Cw=" + "s": 40148492, + "sha1_base64": "AhaWNkbMvm7EqAdRywb0Di3g6Z8=" }, { "id": "US_Montana_West", @@ -15958,8 +15958,8 @@ "MT", "United States of America" ], - "s": 50131436, - "sha1_base64": "VIuB4TViZvVWDzovDf0yhFOZX8Y=" + "s": 49781524, + "sha1_base64": "CJt/RGtTh8lVMKOR0NBJqIO8A58=" } ] }, @@ -15976,8 +15976,8 @@ "NE", "United States of America" ], - "s": 36446589, - "sha1_base64": "XsDduqXMsvESdevM6QF4zQF0ygs=" + "s": 35773309, + "sha1_base64": "MilU442241TVt73ig9BgPJRI7xw=" }, { "id": "US_Nebraska_West", @@ -15989,8 +15989,8 @@ "NE", "United States of America" ], - "s": 47096077, - "sha1_base64": "euU287jD94jJd4lVjAYD10/SZSY=" + "s": 46780197, + "sha1_base64": "0nuRoFa3OKDzoiFdHlYvwoZJozs=" } ] }, @@ -16004,8 +16004,8 @@ "NV", "United States of America" ], - "s": 71377024, - "sha1_base64": "SPWpcpM03o31F1VNCJJ1GbOSVs8=" + "s": 69095680, + "sha1_base64": "uUmFJTqFTE7ae857YjwnHWpcbSA=" }, { "id": "US_New Hampshire", @@ -16017,8 +16017,8 @@ "NH", "United States of America" ], - "s": 48689503, - "sha1_base64": "8tl1A38QfMOJG8e4zA12N9RepHU=" + "s": 47702798, + "sha1_base64": "QWc6jwDL1geg/suLwRVQmC4QK+c=" }, { "id": "New Jersey", @@ -16033,8 +16033,8 @@ "NJ", "United States of America" ], - "s": 60222213, - "sha1_base64": "xZT5RJ7gV5VhQVuumihuZHqeMO8=" + "s": 58889541, + "sha1_base64": "icWSSqviF5Dd96/TD8SYLw+9Ehs=" }, { "id": "US_New Jersey_South", @@ -16046,8 +16046,8 @@ "NJ", "United States of America" ], - "s": 72005799, - "sha1_base64": "q1ZMyTHqfetdb8vr+yeYTbWm0CQ=" + "s": 71378487, + "sha1_base64": "uenqQbRURe+I7CNiUZ7uvLBc6J8=" } ] }, @@ -16064,8 +16064,8 @@ "NM", "United States of America" ], - "s": 69970962, - "sha1_base64": "yekr+T6d8oinHwgPqb7Ba06C0kc=" + "s": 67753753, + "sha1_base64": "WnqTwD/0uIu8k6j97ZBMOsd3oyQ=" }, { "id": "US_New Mexico_Roswell", @@ -16077,8 +16077,8 @@ "NM", "United States of America" ], - "s": 52225006, - "sha1_base64": "01ttbw0CW8EM0uiNwKHKmrQ6Ihs=" + "s": 51745813, + "sha1_base64": "Xe2++9FxF2PV4HEXNbiaSOmbyGU=" } ] }, @@ -16096,8 +16096,8 @@ "NY", "United States of America" ], - "s": 106513817, - "sha1_base64": "UMEfX231W8kty9k+kLSaC9tzV5g=" + "s": 104888425, + "sha1_base64": "685GgnDodalnqXhWx6ouSxbx/w0=" }, { "id": "US_New York_New York", @@ -16111,8 +16111,8 @@ "NY", "United States of America" ], - "s": 89363067, - "sha1_base64": "0YcD62xivxyiYpSAHXXad78bxKw=" + "s": 88787483, + "sha1_base64": "ah64Gj/H1KSD/wmIoaSUgihbyok=" }, { "id": "US_New York_North", @@ -16124,8 +16124,8 @@ "NY", "United States of America" ], - "s": 100174035, - "sha1_base64": "9jua3eZPyjbG7dluASDNQsU5H1U=" + "s": 99492315, + "sha1_base64": "wc2IuJQDt9Go29d/sm8tF8zHB4w=" }, { "id": "US_New York_West", @@ -16137,8 +16137,8 @@ "NY", "United States of America" ], - "s": 162622925, - "sha1_base64": "zJm4mHcRkHmGxlBX7NwbJFfUURY=" + "s": 161448381, + "sha1_base64": "w+4y7TGFfSwfl6gfZ6iyYaOxTUc=" } ] }, @@ -16155,8 +16155,8 @@ "NC", "United States of America" ], - "s": 41077557, - "sha1_base64": "qsiRNgyvQC71KQ04n/beLeyJKHQ=" + "s": 39312060, + "sha1_base64": "qzqim3XK9046x7gLvcxqsp9dM6o=" }, { "id": "US_North Carolina_Asheville", @@ -16168,8 +16168,8 @@ "NC", "United States of America" ], - "s": 40467310, - "sha1_base64": "8rjRBeahFXGkS4mL+BQPQF3jGus=" + "s": 39979246, + "sha1_base64": "23knXnEziIr/C45kfqrCNLYBK2U=" }, { "id": "US_North Carolina_Charlotte", @@ -16181,8 +16181,8 @@ "NC", "United States of America" ], - "s": 71718014, - "sha1_base64": "BsXzIdymzOpYwumUx7v6YWQHWt0=" + "s": 68929454, + "sha1_base64": "FCoq6NBUnKT9XVj5F/DmpUUK/4U=" }, { "id": "US_North Carolina_Greensboro", @@ -16194,8 +16194,8 @@ "NC", "United States of America" ], - "s": 53786480, - "sha1_base64": "3QddbCsjTPdElTizG5P3dol+LNg=" + "s": 51754055, + "sha1_base64": "vqtgOovJai7yGU4ZuEiUmJ5KagU=" }, { "id": "US_North Carolina_Raleigh", @@ -16207,8 +16207,8 @@ "NC", "United States of America" ], - "s": 78655439, - "sha1_base64": "rdob4k+yct4FZpfkM0iS9CnxGmE=" + "s": 76589495, + "sha1_base64": "5/jfMAnpMeC8V5wqYXAbitLqRIY=" }, { "id": "US_North Carolina_Wilmington", @@ -16220,8 +16220,8 @@ "NC", "United States of America" ], - "s": 38656867, - "sha1_base64": "1xIjOI5Gc6XSty6wZcm8220gL/g=" + "s": 37599491, + "sha1_base64": "LS6mHSFD44cwiNnXkQ7G8RKxO1Y=" } ] }, @@ -16238,8 +16238,8 @@ "ND", "United States of America" ], - "s": 30287690, - "sha1_base64": "5whIxJHuJPmeMhkyxNwGoLj44Cg=" + "s": 30123826, + "sha1_base64": "OBjiPEjART7LswFWP2Sv2w2wtqI=" }, { "id": "US_North Dakota_East", @@ -16251,8 +16251,8 @@ "ND", "United States of America" ], - "s": 39414891, - "sha1_base64": "LD/WwrXPZaqv2czAOvbIe5wxIR8=" + "s": 39377595, + "sha1_base64": "c7WB01dmfPG+VIZGhTyf9QZ6si8=" }, { "id": "US_North Dakota_Minot", @@ -16264,8 +16264,8 @@ "ND", "United States of America" ], - "s": 25206752, - "sha1_base64": "qAuDLzGlylD7cRnVlKAob6jkGaM=" + "s": 25086848, + "sha1_base64": "igES0BnNgQLpW8lf0RTJeiz6dkQ=" } ] }, @@ -16282,8 +16282,8 @@ "OH", "United States of America" ], - "s": 69906668, - "sha1_base64": "6jjGL4H1GL1UJh9Lmzs5vkmwkA8=" + "s": 67581796, + "sha1_base64": "iLxtlBAV7nQ00W6p+Cfgmn/IAV8=" }, { "id": "US_Ohio_Cincinnati", @@ -16295,8 +16295,8 @@ "OH", "United States of America" ], - "s": 70600666, - "sha1_base64": "7oGgR3LIt8ZkkE56aFtEjinWejo=" + "s": 69588650, + "sha1_base64": "0zRrDPlZKGPT1/IKGV+YrTnh2BU=" }, { "id": "US_Ohio_Columbus", @@ -16308,8 +16308,8 @@ "OH", "United States of America" ], - "s": 50273239, - "sha1_base64": "HdoUpqh8n3uiuf97B1HJpwhE3i4=" + "s": 49027311, + "sha1_base64": "DJ9q+wEWwH4kLV4COyq/7Z56HZE=" }, { "id": "US_Ohio_Toledo", @@ -16321,8 +16321,8 @@ "OH", "United States of America" ], - "s": 40787878, - "sha1_base64": "dY07O0TD9n61KLdDyEKqxmS2Z7k=" + "s": 40503302, + "sha1_base64": "AHn5l88gRwlHZ7/ZYbGQqOyPwj8=" } ] }, @@ -16339,8 +16339,8 @@ "OK", "United States of America" ], - "s": 22458947, - "sha1_base64": "7FfoyBrQbbLjGWkiZmf89d0uo8A=" + "s": 22237771, + "sha1_base64": "GvAaPtiRCHjEt8BZuIpzbJKH2fU=" }, { "id": "US_Oklahoma_West", @@ -16352,8 +16352,8 @@ "OK", "United States of America" ], - "s": 26613010, - "sha1_base64": "kXT30y3jg/UsKk/a4kVbfXoTnGQ=" + "s": 26383050, + "sha1_base64": "N0WOSoYJE6EglA1YhCWazMGXRVc=" }, { "id": "US_Oklahoma_Tulsa", @@ -16365,8 +16365,8 @@ "OK", "United States of America" ], - "s": 43788780, - "sha1_base64": "ohPil6ByRh/CTghWiM7pbdRCUq8=" + "s": 43184036, + "sha1_base64": "tAntisxLpjcVsaqwaOcHXFhVUjw=" }, { "id": "US_Oklahoma_Oklahoma", @@ -16378,8 +16378,8 @@ "OK", "United States of America" ], - "s": 37467636, - "sha1_base64": "aOgFM0SpjzRatAHAQVuaRNCmfQA=" + "s": 36877756, + "sha1_base64": "pMxNmQFXKvQrkFWPKImKWMd8cMk=" } ] }, @@ -16396,8 +16396,8 @@ "OR", "United States of America" ], - "s": 66475625, - "sha1_base64": "PHIx/R+tl3HEgo6ZbTJbYNS8/k0=" + "s": 60418184, + "sha1_base64": "Yyq4G7f368p0OkU2ujzEQDMiKtM=" }, { "id": "US_Oregon_Portland", @@ -16409,8 +16409,8 @@ "OR", "United States of America" ], - "s": 92413476, - "sha1_base64": "52rOt/EdwoGlfSNti6hJzv79A00=" + "s": 90808148, + "sha1_base64": "/dBi/B4ZU0Or7gmVe6zwcC/3Mx0=" }, { "id": "US_Oregon_West", @@ -16422,8 +16422,8 @@ "OR", "United States of America" ], - "s": 59757087, - "sha1_base64": "FWodDMRy+5cmi7WNsmSeUIGE61w=" + "s": 59160886, + "sha1_base64": "cb+Z2nTmjLT04OlCa/KRv6IRPBI=" } ] }, @@ -16440,8 +16440,8 @@ "PA", "United States of America" ], - "s": 64181433, - "sha1_base64": "vm6PmJH/OSsEFeOZIS7wX/2g5bM=" + "s": 63196833, + "sha1_base64": "+YvNMNXcSWPJzglEJ4V6BwxpYKE=" }, { "id": "US_Pennsylvania_Pittsburgh", @@ -16453,8 +16453,8 @@ "PA", "United States of America" ], - "s": 69113272, - "sha1_base64": "IvEwOt3a+kYAqvpwDioPwlpbW58=" + "s": 67646128, + "sha1_base64": "tCi3ve/gv+BEl/82ouE+6nrWWAs=" }, { "id": "US_Pennsylvania_Reading", @@ -16466,8 +16466,8 @@ "PA", "United States of America" ], - "s": 61824092, - "sha1_base64": "NHuIBQBBnt7ElXjssyup3vdVbBM=" + "s": 56527780, + "sha1_base64": "bb2dlsA0OLyWoap9oNdr1wyu4wY=" }, { "id": "US_Pennsylvania_Scranton", @@ -16479,8 +16479,8 @@ "PA", "United States of America" ], - "s": 51406336, - "sha1_base64": "mmQQfJuXm+tzZvBpl5dESKUwbuE=" + "s": 50643112, + "sha1_base64": "j+5lU+YkQucDbQQyjnjJ+/lGg8k=" } ] }, @@ -16495,8 +16495,8 @@ "Rep\u00fablica Dominicana", "United States of America" ], - "s": 67514874, - "sha1_base64": "KS7T/B/vPHryS9S1FymTkDJ7VMk=" + "s": 67277665, + "sha1_base64": "JO4PC1nSlBhlNXhW2JvJw9JNybQ=" }, { "id": "US_Rhode Island", @@ -16509,8 +16509,8 @@ "RI", "United States of America" ], - "s": 30435323, - "sha1_base64": "npZ+lVfuFaXBc8N11DSIiIMGytE=" + "s": 30229275, + "sha1_base64": "pPIguopPRIYY5Kp2JTQhd1v6C2k=" }, { "id": "South Carolina", @@ -16525,8 +16525,8 @@ "SC", "United States of America" ], - "s": 36426186, - "sha1_base64": "aN8W/Bp9IUIdaaJDPxgxvVAOipw=" + "s": 35629450, + "sha1_base64": "ZNCSovecGrV8P2Bz4pwONr1hyyM=" }, { "id": "US_South Carolina_Columbia", @@ -16538,8 +16538,8 @@ "SC", "United States of America" ], - "s": 64206465, - "sha1_base64": "vR8BPyCqgq4CJjufxG6fEgRRG9M=" + "s": 63068257, + "sha1_base64": "hj5b3Zwd1+RFAcuzl1Yg/h2Srxw=" }, { "id": "US_South Carolina_Florence", @@ -16551,8 +16551,8 @@ "SC", "United States of America" ], - "s": 39986172, - "sha1_base64": "mMfIvZc7D0q13515sgWYuacF9aM=" + "s": 39552228, + "sha1_base64": "BX+iwZwlq1fcK7tpZ0jgxYcS3To=" } ] }, @@ -16566,8 +16566,8 @@ "SD", "United States of America" ], - "s": 55824239, - "sha1_base64": "d9dDpH0Z46OXnXfSE4SdFBbi5pU=" + "s": 54521183, + "sha1_base64": "D/+xI2xEaVVgP7eYk7CGcrgnld4=" }, { "id": "Tennessee", @@ -16582,8 +16582,8 @@ "TN", "United States of America" ], - "s": 76688160, - "sha1_base64": "iznyn/bwOsBZmC3mJDau5aGGQpU=" + "s": 74756392, + "sha1_base64": "Csn+irq8MU/ZJtpcCIInXwhtxIg=" }, { "id": "US_Tennessee_West", @@ -16595,8 +16595,8 @@ "TN", "United States of America" ], - "s": 72703801, - "sha1_base64": "l0MmugG/4OkcGd4dZH2g2gSxlSE=" + "s": 70309561, + "sha1_base64": "JQL0/gOSAJWgkJrdnB0uMW3W1Lc=" } ] }, @@ -16613,8 +16613,8 @@ "TX", "United States of America" ], - "s": 70678265, - "sha1_base64": "cR+p1uvPmyHGHT90H6ZBScj0LwE=" + "s": 69286761, + "sha1_base64": "GoFVsLYv/1mg+SlCgpeVMQHo6pU=" }, { "id": "US_Texas_Victoria", @@ -16626,8 +16626,8 @@ "TX", "United States of America" ], - "s": 24372226, - "sha1_base64": "57VYnWmYZLUmVQE1Tvscr+jIkto=" + "s": 24084074, + "sha1_base64": "RwB7HC21xH8PKlBUZojccX5B224=" }, { "id": "US_Texas_Dallas", @@ -16639,8 +16639,8 @@ "TX", "United States of America" ], - "s": 136057076, - "sha1_base64": "GICb7bE7GyP8y4NrJGx/ZKXItH8=" + "s": 132360308, + "sha1_base64": "GsQxNPwN+zeRPxohMIHl9DeN1/8=" }, { "id": "US_Texas_Houston", @@ -16652,8 +16652,8 @@ "TX", "United States of America" ], - "s": 81192210, - "sha1_base64": "gskKKtJN9e+3ilq5Ldt/e6Bfj3o=" + "s": 79643034, + "sha1_base64": "XBA0C8ZTjETFwPWGp+4YSFYHiRQ=" }, { "id": "US_Texas_Amarillo", @@ -16665,8 +16665,8 @@ "TX", "United States of America" ], - "s": 28842065, - "sha1_base64": "Vi6Jh+H83+tj7yezqLh9cnmR3dg=" + "s": 28503505, + "sha1_base64": "ardYmkrwmfZ4YtEkBTjmLf81nuA=" }, { "id": "US_Texas_Lubbock", @@ -16678,8 +16678,8 @@ "TX", "United States of America" ], - "s": 31532329, - "sha1_base64": "9+P69JU1dUjULRPR07HL8mGBENo=" + "s": 31367169, + "sha1_base64": "Un1abywRnROXGMoSrF4K/tUZ4pI=" }, { "id": "US_Texas_San Antonio", @@ -16691,8 +16691,8 @@ "TX", "United States of America" ], - "s": 44465799, - "sha1_base64": "+mVv34/pjxmY0zrBQkHkqvdESio=" + "s": 41493190, + "sha1_base64": "fuKByCV+9BTX/IFheS9S+HISCdw=" }, { "id": "US_Texas_Southwest", @@ -16704,8 +16704,8 @@ "TX", "United States of America" ], - "s": 37100883, - "sha1_base64": "MKUYw8PjG23KVguTNqav7/C+WSU=" + "s": 36945019, + "sha1_base64": "EQvOp4Ls+qPFXHHwajVasYNkEFs=" }, { "id": "US_Texas_Tyler", @@ -16717,8 +16717,8 @@ "TX", "United States of America" ], - "s": 50096544, - "sha1_base64": "8h/fJf4lN5MNBrkY4gEawNcHYhU=" + "s": 48982496, + "sha1_base64": "7/LTHsvTCCU4LsFLoNu3awIeNwQ=" }, { "id": "US_Texas_Wako", @@ -16730,8 +16730,8 @@ "TX", "United States of America" ], - "s": 33789907, - "sha1_base64": "nCQgLmyk3l1WviZXn0rITTf0Cak=" + "s": 33335091, + "sha1_base64": "HG52KM92N8h1U6fqmIgrIdYz9Y8=" }, { "id": "US_Texas_West", @@ -16743,8 +16743,8 @@ "TX", "United States of America" ], - "s": 44974460, - "sha1_base64": "FTKLYBMDtDtgCVm7gtEvCwmsMNs=" + "s": 44544396, + "sha1_base64": "z0qqUr29E243F6xmpSFgIwjQgdM=" } ] }, @@ -16754,8 +16754,8 @@ "Navassa Island", "United States Minor Outlying Islands" ], - "s": 879930, - "sha1_base64": "DpvXe4m+EHgzHYU3JcJslE8POBY=" + "s": 869202, + "sha1_base64": "l4eUF9ecYGue4NXYaKn3SABIy+E=" }, { "id": "US_Utah", @@ -16770,8 +16770,8 @@ "Utah", "UT" ], - "s": 51442739, - "sha1_base64": "WlOvMH8aQg5oZzVGpq78+O+MDR0=" + "s": 48574139, + "sha1_base64": "glELtOox9ZAK5r3ZVPMt8TT04EA=" }, { "id": "US_Utah_North", @@ -16783,8 +16783,8 @@ "Utah", "UT" ], - "s": 87495296, - "sha1_base64": "ApDpQh0IL33zopaveaVwsaoIamo=" + "s": 79449664, + "sha1_base64": "nCUsidlG8AkQ3ydI5ZcY7sZIpZw=" } ] }, @@ -16798,8 +16798,8 @@ "Vermont", "VT" ], - "s": 33503908, - "sha1_base64": "8UNdjuLebhQMAYG8kpvTkOuqMpg=" + "s": 32306828, + "sha1_base64": "hEgBASMB0AuHTQU72XdCrALRhkE=" }, { "id": "Virginia", @@ -16814,8 +16814,8 @@ "VA", "United States of America" ], - "s": 45023910, - "sha1_base64": "Jzw8SJt3CQx4hi2ciHzmbwm4u98=" + "s": 43379893, + "sha1_base64": "OwcswwG79AKCayCHuatdde35Fsk=" }, { "id": "US_Virginia_Norfolk", @@ -16827,8 +16827,8 @@ "VA", "United States of America" ], - "s": 81076823, - "sha1_base64": "E+1LMwFXV24quGd9TDNS4vVcSmk=" + "s": 80040655, + "sha1_base64": "ClUpvHdcVVZzeTeJmXHZcG+tLQg=" }, { "id": "US_Virginia_Lynchburg", @@ -16840,8 +16840,8 @@ "VA", "United States of America" ], - "s": 60955023, - "sha1_base64": "mzMO9pCXbdzy9kZrL7a6ESFnAcw=" + "s": 59516174, + "sha1_base64": "dZANal77nRL/ozuncWh7dcieWMo=" }, { "id": "US_Virginia_Richmond", @@ -16853,8 +16853,8 @@ "VA", "United States of America" ], - "s": 59645439, - "sha1_base64": "G4Ng636zT/1BYWXBSAQbB9wLWLc=" + "s": 58446263, + "sha1_base64": "/ZLaf1hwsSR8n9v3dRR7YuD6nsI=" }, { "id": "US_Virginia_Alexandria", @@ -16866,8 +16866,8 @@ "VA", "United States of America" ], - "s": 76042490, - "sha1_base64": "dgKU3qj2kx9qR25u5G+Klnulxh4=" + "s": 74057961, + "sha1_base64": "ltnEKJzw4YK1/zJ5RjywxahxZnA=" } ] }, @@ -16886,8 +16886,8 @@ "Washington", "WA" ], - "s": 114079331, - "sha1_base64": "obSs8eGehRiTFHY5YOdlb//fbzE=" + "s": 111001355, + "sha1_base64": "SuIwg9gXHTijRqv3TQdlBlVcvqY=" }, { "id": "US_Washington_Seattle", @@ -16899,8 +16899,8 @@ "Washington", "WA" ], - "s": 78598963, - "sha1_base64": "WXs7q83MdtY4lS5QuceceOML114=" + "s": 77117715, + "sha1_base64": "pcS8lym4JwulZoYwaXFygS5EhkQ=" }, { "id": "US_Washington_Yakima", @@ -16912,8 +16912,8 @@ "Washington", "WA" ], - "s": 69197930, - "sha1_base64": "WE1/YyHpqP9vN70F/A/lcj2EKFg=" + "s": 67577705, + "sha1_base64": "DqmGyQDxaT9gF96RIzRr/owybtA=" } ] }, @@ -16927,8 +16927,8 @@ "West Virginia", "WV" ], - "s": 85285028, - "sha1_base64": "nUQMV7vwbqyI5Ogvsa/PXznTAZE=" + "s": 80356028, + "sha1_base64": "xOJhPO2FW8EPMQOqdw4YKIBMtFY=" }, { "id": "Wisconsin", @@ -16943,8 +16943,8 @@ "Wisconsin", "WI" ], - "s": 96973492, - "sha1_base64": "g6A9z6cpRiIxOuA2/ZuHsBaz0+8=" + "s": 91220331, + "sha1_base64": "LYxG9TmTGJprW/fbwhIX7/BeSrk=" }, { "id": "US_Wisconsin_North", @@ -16956,8 +16956,8 @@ "Wisconsin", "WI" ], - "s": 41037245, - "sha1_base64": "7IV31UndmKJ4t1sAZ+7mUoA2TzA=" + "s": 39470213, + "sha1_base64": "uw0B3aSO8Iad6Qs8P302ydoGZQU=" }, { "id": "US_Wisconsin_Madison", @@ -16969,8 +16969,8 @@ "Wisconsin", "WI" ], - "s": 41457676, - "sha1_base64": "ur5K1WNw+xQUwvSUFPVXjIFxHVo=" + "s": 40851436, + "sha1_base64": "41OrUHEBcXZ1Aa9wv+trPSljdKA=" }, { "id": "US_Wisconsin_Eau Claire", @@ -16982,8 +16982,8 @@ "Wisconsin", "WI" ], - "s": 38791469, - "sha1_base64": "AGM7Wk0mEvou6i+0sIbcr8e/9vg=" + "s": 38127692, + "sha1_base64": "P9TSsyjxHIrZcrgYWOpby6abzx4=" } ] }, @@ -16997,8 +16997,8 @@ "Wyoming", "WY" ], - "s": 60256288, - "sha1_base64": "wFngiGIaC+CLjI5dS/XGcEje4mM=" + "s": 58440552, + "sha1_base64": "9olTFyDoQSgieJrmlawYIfyTMhU=" } ] }, @@ -17030,8 +17030,8 @@ "Treinta y Tres", "Uruguay" ], - "s": 65823556, - "sha1_base64": "xqlc3dyCucCCQIEbexr9I2DYniU=" + "s": 65570596, + "sha1_base64": "5wwxCQtBO6CE7KP048IsW3xEz+A=" }, { "id": "Uzbekistan", @@ -17056,8 +17056,8 @@ "Toshkent", "Xorazm Viloyati" ], - "s": 84063162, - "sha1_base64": "tvJM/jEkFuYZaziDWqnCsL1f1Cw=" + "s": 79731026, + "sha1_base64": "B57PX1Po6lthppbMlu6qmWni/a8=" }, { "id": "Vanuatu", @@ -17073,8 +17073,8 @@ "Vanuatu", "Torba" ], - "s": 9045362, - "sha1_base64": "56AHvYWUYSmXNdeMCRW9wgVb9pw=" + "s": 9042410, + "sha1_base64": "8XLVOUBUHf8sAL36qcC7eTLTs74=" }, { "id": "Venezuela", @@ -17109,8 +17109,8 @@ "Yaracuy", "Zulia" ], - "s": 48711503, - "sha1_base64": "afjhp95LFXKdBa4ckRZX08S3c+8=" + "s": 46865487, + "sha1_base64": "n1r6PLfZYFv9fPUzgaJ0X1kWleM=" }, { "id": "Venezuela_South", @@ -17131,8 +17131,8 @@ "Venezuela", "Zulia" ], - "s": 43549114, - "sha1_base64": "PF+G0w/jgZNsxPNkQt9TYJpgCco=" + "s": 43254218, + "sha1_base64": "UymU8W5g1HFQ3bPb4LywDjDulA4=" } ] }, @@ -17207,8 +17207,8 @@ "T\u1ec9nh H\u00e0 Giang", "Vi\u1ec7t Nam" ], - "s": 245175570, - "sha1_base64": "PUPreFJGyuh2tnPEeBF1WHPkKcw=" + "s": 242126026, + "sha1_base64": "25uPWnJy/mFMiUF7l0BcxqcRmVA=" }, { "id": "Yemen", @@ -17239,8 +17239,8 @@ "\u1e28a\u1e11ramawt", "\u0627\u0644\u064a\u0645\u0646" ], - "s": 53983162, - "sha1_base64": "NL0za0fRdmJtTgK1zJkR7r/4Xpg=" + "s": 53454042, + "sha1_base64": "cvoCGclWoBqBF4t83nd8ZO9V+3o=" }, { "id": "Zambia", @@ -17260,8 +17260,8 @@ "Western Province", "Zambia" ], - "s": 200488197, - "sha1_base64": "J/c4pLgwxVlhiorSF8MYCTT/+so=" + "s": 196047797, + "sha1_base64": "9Sx4F83EhGnd2w3NenxsNazwQ5I=" }, { "id": "Zimbabwe", @@ -17281,16 +17281,16 @@ "Midlands Province", "Zimbabwe" ], - "s": 128235171, - "sha1_base64": "C1bqL7ft0uh4l3adTcBrQe53ov4=" + "s": 127455867, + "sha1_base64": "1V1WGWx4przGaulQo87eov5KKR4=" }, { "id": "Antarctica", "affiliations": [ "South Georgia and South Sandwich Islands" ], - "s": 64195923, - "sha1_base64": "nkgwB3juYUicEZVCTDOj3/urzHA=" + "s": 64086099, + "sha1_base64": "eeSAvqo69Xq8eDQeTua17W4YTZw=" }, { "id": "New Zealand", @@ -17303,8 +17303,8 @@ "affiliations": [ "Tokelau" ], - "s": 366449, - "sha1_base64": "Ecoldq+3euLbe/NPG9/R8xBJhuU=" + "s": 365625, + "sha1_base64": "TQ3P5qlx06dhlHXE+kQKpn/3lGY=" }, { "id": "New Zealand North_Auckland", @@ -17318,8 +17318,8 @@ "Northland", "Waikato" ], - "s": 122664453, - "sha1_base64": "TNTuUP01buAo/74P9lYen4uxPK0=" + "s": 121580366, + "sha1_base64": "X3mGDryP7sVIOM1O0myhhPkTIDs=" }, { "id": "New Zealand North_Wellington", @@ -17334,8 +17334,8 @@ "Taranaki", "Wellington" ], - "s": 85546354, - "sha1_base64": "/MmmV3BbtqaIMs9aKJvEaUoF5os=" + "s": 84823699, + "sha1_base64": "zMvaqjdmtKH+o6b3fxPn1Yz6Kic=" }, { "id": "New Zealand South_Canterbury", @@ -17351,8 +17351,8 @@ "Tasman", "West Coast" ], - "s": 95730513, - "sha1_base64": "j2W3rYgC3sMd5iBaRJ9ABhoz4kg=" + "s": 95306498, + "sha1_base64": "uxItjV/Voz3dNmFOqYPhlOeR/rE=" }, { "id": "New Zealand South_Southland", @@ -17365,8 +17365,8 @@ "Southland", "West Coast" ], - "s": 59480788, - "sha1_base64": "JUi7kKcbF7ZYp56zzgNH9eJlX2k=" + "s": 59631045, + "sha1_base64": "Qv+KI++crxDAbhEqNN560RfgCtU=" } ] }, @@ -17390,8 +17390,8 @@ "\ucda9\uccad\ub0a8\ub3c4", "\ucda9\uccad\ubd81\ub3c4" ], - "s": 139443101, - "sha1_base64": "Vk//V9Zms46lyAcesiqAzhRygNU=" + "s": 134782789, + "sha1_base64": "MDKpwRB+x+RTxF+I0Y17jUw2G6w=" }, { "id": "South Korea_South", @@ -17411,8 +17411,8 @@ "\uc804\ub77c\ub0a8\ub3c4", "\uc804\ub77c\ubd81\ub3c4" ], - "s": 115289594, - "sha1_base64": "9O9X5OpICkqVgSipoLQ4ilwxoo8=" + "s": 111463794, + "sha1_base64": "CMr+yacbWdGAjeJPiugUHiefQQM=" } ] } diff --git a/data/countries_names.txt b/data/countries_names.txt index a9c2a0abe4..63681529f3 100644 --- a/data/countries_names.txt +++ b/data/countries_names.txt @@ -32475,152 +32475,140 @@ sk = Castile-La Mancha [Spain_Catalonia_Provincia de Barcelona] - en = Catalonia – Barcelona Province - ru = Каталония – Барселона - ar = كاتالونيا – برشلونة - be = Каталонія – правінцыя Барселона - bg = Каталуния – Барселона + en = Barcelona Province + ru = Барселона + ar = برشلونة ca = Catalunya – Barcelona - cs = Katalánsko – Provincie Barcelona - da = Catalonien – Barcelona - nl = Catalonië – Barcelona - fa = کاتالونیا – بارسلون - fi = Katalonia – Barcelona - fr = Catalogne – Province de Barcelone - de = Katalonien – Provinz Barcelona - hu = Katalónia – Barcelona tartomány - id = Catalunya – Provinsi Barcelona - it = Catalogna – Provincia di Barcellona - ja = カタロニア – バルセロナ県 - ko = 카탈로니아 – 바르셀로나 주 - nb = Catalonia – Barcelona - pl = Katalonia – Barcelona - pt = Catalunha – Província de Barcelona - ro = Catalonia – Provincia Barcelona - es = Cataluña – Provincia de Barcelona - et = Kataloonia – Barcelona maakond - eu = Katalunia – Bartzelonako probintzia - sv = Katalonien – Barcelona - th = คาตาโลเนีย – จังหวัดบาร์เซโลนา - tr = Katalonya – Barselona ili - uk = Каталонія – Барселона - vi = Catalonia – Barcelona - zh-Hans = 加泰罗尼亚 – 巴塞罗那省 - zh-Hant = 加泰羅尼亞 – 巴塞羅那省 - el = Καταλονία – Επαρχία της Βαρκελώνης - he = קטלוניה – מחוז ברצלונה - sk = Katalánsko – Barcelona Province + cs = Provincie Barcelona + da = Barcelona + nl = Barcelona + fi = Barcelona + fr = Province de Barcelone + de = Provinz Barcelona + hu = Barcelona tartomány + id = Provinsi Barcelona + it = Provincia di Barcellona + ja = バルセロナ県 + ko = 바르셀로나 주 + nb = Barcelona + pl = Barcelona + pt = Barcelona + ro = Provincia Barcelona + es = Provincia de Barcelona + et = Barcelona maakond + eu = Bartzelonako probintzia + sv = Barcelona + th = จังหวัดบาร์เซโลนา + tr = Barselona ili + uk = Барселона + vi = Barcelona + zh-Hans = 巴塞罗那省 + zh-Hant = 巴塞羅那省 + el = Επαρχία της Βαρκελώνης + he = + sk = Barcelona Province [Spain_Catalonia_Provincia de Girona] - en = Catalonia – Girona Province - ru = Каталония – Херона - ar = كاتالونيا – جرندة - be = Каталонія – правінцыя Жирона - bg = Каталуния – Жирона + en = Girona Province + ru = Херона + ar = جرندة ca = Catalunya – Girona - cs = Katalánsko – Provincie Girona - da = Catalonien – Girona - nl = Catalonië – Gerona - fa = کاتالونیا – خیرونا - fi = Katalonia – Girona - fr = Catalogne – Province de Gérone - de = Katalonien – Provinz Girona - hu = Katalónia – Girona - id = Catalunya – Provinsi Girona - it = Catalogna – Provincia di Girona - ja = カタロニア – ジローナ県 - ko = 카탈로니아 – 지로나 주 - nb = Catalonia – Girona - pl = Katalonia – Girona - pt = Catalunha – Província de Girona - ro = Catalonia – Provincia Girona - es = Cataluña – Provincia de Gerona - et = Kataloonia – Girona maakond - eu = Katalunia – Gironako probintzia - sv = Katalonien – Girona - th = คาตาโลเนีย – จังหวัดกิโรนา - tr = Katalonya – Gerona ili - uk = Каталонія – Жирона - vi = Catalonia – Girona - zh-Hans = 加泰罗尼亚 – 赫罗纳省 - zh-Hant = 加泰羅尼亞 – 赫羅納省 - el = Καταλονία – Επαρχία της Γκιρόνα - he = קטלוניה – מחוז ז'ירונה - sk = Katalánsko – Girona Province + cs = Provincie Girona + da = Girona (provins) + nl = Gerona + fi = Girona + fr = Province de Gérone + de = Provinz Girona + hu = Girona + id = Provinsi Girona + it = Provincia di Girona + ja = ジローナ県 + ko = 지로나 주 + nb = Girona + pl = Girona + pt = Girona + ro = Provincia Girona + es = Provincia de Gerona + et = Girona maakond + eu = Gironako probintzia + sv = Girona + th = จังหวัดกิโรนา + tr = Gerona ili + uk = Жирона + vi = Girona + zh-Hans = 赫罗纳省 + zh-Hant = 赫羅納省 + el = Επαρχία της Γκιρόνα + he = מחוז ז'ירונה + sk = Girona Province [Spain_Catalonia_Provincia de Lleida] - en = Catalonia – Lleida Province - ru = Каталония – Лерида - ar = كاتالونيا – لاردة - be = Каталонія – правінцыя Лерыда - bg = Каталуния – Лерида + en = Lleida Province + ru = Лерида + ar = لاردة ca = Catalunya – Lleida - cs = Katalánsko – Provincie Lleida - da = Catalonien – Lleida - nl = Catalonië – Lerida - fa = کاتالونیا – لیدا - fi = Katalonia – leida - fr = Catalogne – Province de Lérida - de = Katalonien – Provinz Lleida - hu = Katalónia – Lleida - id = Catalunya – Provinsi Lleida - it = Catalogna – Provincia di Lleida - ja = カタロニア – リェイダ県 - ko = 카탈로니아 – 예이다 주 - nb = Catalonia – Lleida - pl = Katalonia – Lleida - pt = Catalunha – Província de Lérida - ro = Catalonia – Provincia Lleida - es = Cataluña – Provincia de Lérida - et = Kataloonia – Lleida maakond - eu = Katalunia – Lleidako probintzia - sv = Katalonien – Lleida - th = คาตาโลเนีย – จังหวัดเลดา - tr = Katalonya – Lérida ili - uk = Каталонія – Льєйда - vi = Catalonia – Lérida - zh-Hans = 加泰罗尼亚 – 莱里达省 - zh-Hant = 加泰羅尼亞 – 萊里達省 - el = Καταλονία – Επαρχία Λέιντα - he = קטלוניה – מחוז ג'ירונה - sk = Katalánsko – Lleida Province + cs = Provincie Lleida + da = Lleida + nl = Lerida + fi = Lleida + fr = province de Lérida + de = Provinz Lleida + hu = Lleida + id = Provinsi Lleida + it = Provincia di Lleida + ja = リェイダ県 + ko = 예이다 주 + nb = Lleida + pl = Lleida + pt = Província de Lérida + ro = Provincia Lleida + es = Provincia de Lérida + et = Lleida maakond + eu = Lleidako probintzia + sv = Lleida + th = จังหวัดเลดา + tr = Lérida ili + uk = Льєйда + vi = Lérida + zh-Hans = 莱里达省 + zh-Hant = 萊里達省 + el = Επαρχία Λέιντα + he = + sk = Lleida Province [Spain_Catalonia_Provincia de Tarragona] - en = Catalonia – Tarragona Province - ru = Каталония – Таррагона - ar = كاتالونيا – طراغونة - be = Каталонія – правінцыя Таррагона - bg = Каталуния – Тарагона + en = Tarragona Province + ru = Таррагона + ar = طراغونة ca = Catalunya – Tarragona - cs = Katalánsko – Provincie Tarragona - da = Catalonien – Tarragona - nl = Catalonië – Tarragona - fa = کاتالونیا – تاراگونا - fi = Katalonia – Tarragona - fr = Catalogne – Province de Tarragone - de = Katalonien – Provinz Tarragona - hu = Katalónia – Tarragona - id = Catalunya – Provinsi Tarragona - it = Catalogna – Provincia di Tarragona - ja = カタロニア – タラゴナ県 - ko = 카탈로니아 – 타라고나 주 - nb = Catalonia – Tarragona - pl = Katalonia – Tarragona - pt = Catalunha – Província de Tarragona - ro = Catalonia – Provincia Tarragona - es = Cataluña – Provincia de Tarragona - et = Kataloonia – Tarragona maakond - eu = Katalunia – Tarragonako probintzia - sv = Katalonien – Tarragona - th = คาตาโลเนีย – จังหวัดทาร์ราโกนา - tr = Katalonya – Tarragona İli - uk = Каталонія – Таррагона - vi = Catalonia – Tarragona - zh-Hans = 加泰罗尼亚 – 塔拉戈纳省 - zh-Hant = 加泰羅尼亞 – 塔拉戈納省 - el = Καταλονία – Επαρχία Ταραγόνα - he = קטלוניה – מחוז טרגונה - sk = Katalánsko – Tarragona Province + cs = Provincie Tarragona + da = Tarragona + nl = Tarragona + fi = Tarragona + fr = Province de Tarragone + de = Tarragona + hu = Tarragona + id = Provinsi Tarragona + it = Provincia di Tarragona + ja = タラゴナ県 + ko = 타라고나 주 + nb = Tarragona + pl = Tarragona + pt = Tarragona + ro = Provincia Tarragona + es = Provincia de Tarragona + et = Tarragona maakond + eu = Tarragonako probintzia + sv = Tarragona + th = จังหวัดทาร์ราโกนา + tr = Tarragona İli + uk = Таррагона + vi = Tarragona + zh-Hans = 塔拉戈纳省 + zh-Hant = 塔拉戈納省 + el = Επαρχία Ταραγόνα + he = מחוז טרגונה + sk = Tarragona Province [Spain_Ceuta] en = Ceuta @@ -56620,7 +56608,7 @@ it = Barcellona ja = バルセロナ, バダロナ ko = 바달로나 - es = Barcelona, Hospitalet de Llobregat, Badalona + es = Barcelona, Hospitalet de Llobregat eu = Bartzelona, L'Hospitalet de Llobregat th = บาดาโลนา uk = Барселона, Бадалона @@ -56636,7 +56624,7 @@ ja = ジローナ ko = 지로나 pt = Gerunda - es = San Antonio, Gerona, Figueras + es = Gerona, Figueras eu = Girona, Figueres uk = Жірона el = Σαντ Αντόνιο, Γκιρόνα, Φιγκέρες @@ -56646,7 +56634,7 @@ en = Lleida, Mollerussa, Balaguer ru = Ллейда fr = Lérida - es = Lérida, Mollerussa, Balaguer + es = Lérida eu = Lerida el = Λέιντα, Μολερούσα, Μπαλαγκέρ @@ -56654,7 +56642,6 @@ en = Tarragona, Reus, el Vendrell ru = Таррагона, Реус ar = طراغونة - es = Tarragona, Reus, Vendrell fr = Tarragone ja = タラゴナ ko = 타라고나 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index d1d9c68abc..9d49d38c2a 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 5cf8c1ad1b..8fda6cf8d9 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -9,20 +9,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -35,18 +36,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -59,18 +61,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -82,18 +85,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -103,7 +107,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -115,16 +119,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -134,7 +139,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -146,16 +151,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -165,7 +171,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -177,16 +183,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -196,7 +203,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -208,16 +215,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -227,7 +235,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -242,20 +250,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -268,18 +277,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -292,18 +302,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -315,18 +326,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -336,7 +348,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -348,16 +360,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -367,7 +380,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -379,16 +392,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -398,7 +412,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -410,16 +424,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -429,7 +444,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -441,16 +456,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -460,7 +476,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -475,14 +491,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -496,13 +512,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -515,13 +531,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -534,18 +550,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -555,7 +572,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -567,16 +584,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -586,7 +604,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -598,16 +616,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -617,7 +636,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -629,16 +648,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -648,7 +668,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -660,16 +680,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -679,7 +700,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -694,20 +715,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -720,18 +742,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -744,18 +767,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -767,18 +791,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -788,7 +813,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -800,16 +825,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -819,7 +845,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -831,16 +857,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -850,7 +877,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -862,16 +889,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -881,7 +909,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -893,16 +921,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -912,7 +941,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -927,14 +956,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -948,13 +977,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -967,13 +996,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -986,18 +1015,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1007,7 +1037,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1019,16 +1049,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1038,7 +1069,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1050,16 +1081,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1069,7 +1101,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1081,16 +1113,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1100,7 +1133,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1112,16 +1145,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1131,7 +1165,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1146,14 +1180,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1167,13 +1201,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1186,13 +1220,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1205,18 +1239,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1226,7 +1261,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1238,16 +1273,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1257,7 +1293,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1269,16 +1305,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1288,7 +1325,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1300,16 +1337,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1319,7 +1357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1331,16 +1369,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1350,7 +1389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1365,20 +1404,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -1391,18 +1431,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -1415,18 +1456,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -1438,18 +1480,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1459,7 +1502,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1471,16 +1514,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1490,7 +1534,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1502,16 +1546,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1521,7 +1566,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1533,16 +1578,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1552,7 +1598,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1564,16 +1610,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1583,7 +1630,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1598,14 +1645,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1619,13 +1666,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1638,13 +1685,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1657,18 +1704,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1678,7 +1726,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1690,16 +1738,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1709,7 +1758,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1721,16 +1770,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1740,7 +1790,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1752,16 +1802,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1771,7 +1822,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1783,16 +1834,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1802,7 +1854,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1817,14 +1869,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1838,13 +1890,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1857,13 +1909,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1876,18 +1928,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1897,7 +1950,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1909,16 +1962,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1928,7 +1982,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1940,16 +1994,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1959,7 +2014,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1971,16 +2026,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1990,7 +2046,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2002,16 +2058,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2021,7 +2078,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2031,7 +2088,8 @@ cont { scale: 12 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -2039,7 +2097,8 @@ cont { scale: 13 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -2047,14 +2106,16 @@ cont { scale: 14 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 15 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2064,14 +2125,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 16 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2081,14 +2143,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2098,14 +2161,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2115,14 +2179,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2132,7 +2197,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2147,14 +2212,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -2168,13 +2233,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -2187,13 +2252,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -2206,18 +2271,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2227,7 +2293,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2239,16 +2305,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2258,7 +2325,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2270,16 +2337,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2289,7 +2357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2301,16 +2369,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2320,7 +2389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2332,16 +2401,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2351,7 +2421,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2363,6 +2433,15 @@ cont { color: 13942770 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + priority: 15009 + } } element { scale: 11 @@ -2370,6 +2449,15 @@ cont { color: 13942770 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + priority: 15009 + } } element { scale: 12 @@ -2377,6 +2465,23 @@ cont { color: 13746411 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15009 + } } element { scale: 13 @@ -2384,6 +2489,23 @@ cont { color: 13615592 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15009 + } } element { scale: 14 @@ -2566,21 +2688,21 @@ cont { scale: 7 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { scale: 8 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { scale: 9 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { @@ -2612,7 +2734,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2633,7 +2755,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2662,7 +2784,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2864,7 +2986,7 @@ cont { scale: 17 symbol { name: "gate-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -2872,14 +2994,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "gate-m" - priority: 16980 + priority: 16981 } caption { primary { @@ -2887,14 +3009,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15980 + priority: 15981 } } element { scale: 19 symbol { name: "gate-m" - priority: 16980 + priority: 16981 } caption { primary { @@ -2902,7 +3024,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15980 + priority: 15981 } } } @@ -2912,7 +3034,7 @@ cont { scale: 16 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2921,14 +3043,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2937,14 +3059,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2953,14 +3075,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2969,7 +3091,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2980,7 +3102,7 @@ cont { lines { width: 1.0 color: 2164260863 - priority: 1142 + priority: 1160 join: BEVELJOIN cap: BUTTCAP } @@ -2990,7 +3112,7 @@ cont { lines { width: 1.5 color: 872415231 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -2999,7 +3121,7 @@ cont { lines { width: 2.4 color: 16777215 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3008,7 +3130,7 @@ cont { lines { width: 2.4 color: 16777215 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3017,7 +3139,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } element { @@ -3025,7 +3147,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } element { @@ -3033,7 +3155,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } element { @@ -3041,7 +3163,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } } @@ -3052,7 +3174,7 @@ cont { lines { width: 0.6 color: 1728053247 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3061,7 +3183,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3070,7 +3192,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } element { @@ -3078,7 +3200,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } element { @@ -3086,7 +3208,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } element { @@ -3094,7 +3216,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } } @@ -3108,7 +3230,7 @@ cont { width: 1.0 color: 10592406 } - priority: -15762 + priority: -15746 } } element { @@ -3119,14 +3241,14 @@ cont { width: 1.0 color: 10592406 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3137,14 +3259,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3155,14 +3277,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3173,14 +3295,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3191,14 +3313,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } } @@ -3276,7 +3398,7 @@ cont { scale: 18 symbol { name: "atm-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -3285,14 +3407,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "atm-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -3301,7 +3423,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3311,7 +3433,7 @@ cont { scale: 16 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3319,14 +3441,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3334,14 +3456,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3349,14 +3471,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3364,7 +3486,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -3373,8 +3495,8 @@ cont { element { scale: 15 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 28 } caption { @@ -3383,14 +3505,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 16 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3399,14 +3521,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 17 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3415,14 +3537,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 18 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3432,14 +3554,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15695 + priority: 15707 } } element { scale: 19 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3449,7 +3571,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15695 + priority: 15707 } } } @@ -3459,7 +3581,7 @@ cont { scale: 18 symbol { name: "bbq-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -3475,7 +3597,7 @@ cont { scale: 19 symbol { name: "bbq-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -3494,14 +3616,16 @@ cont { scale: 18 symbol { name: "bench" - priority: 16590 + apply_for_type: 1 + priority: 16603 } } element { scale: 19 symbol { name: "bench" - priority: 16590 + apply_for_type: 1 + priority: 16603 } caption { primary { @@ -3509,7 +3633,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -3519,7 +3643,7 @@ cont { scale: 17 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3529,14 +3653,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3546,14 +3670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3563,7 +3687,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -3573,7 +3697,7 @@ cont { scale: 17 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3582,14 +3706,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3598,14 +3722,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3614,7 +3738,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3624,7 +3748,7 @@ cont { scale: 17 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3633,14 +3757,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3649,14 +3773,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3665,7 +3789,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3675,7 +3799,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 28 } caption { @@ -3684,14 +3808,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 16 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3700,14 +3824,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 17 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3716,14 +3840,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 18 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3733,14 +3857,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } element { scale: 19 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3750,7 +3874,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } } @@ -3774,14 +3898,16 @@ cont { scale: 17 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } } element { scale: 18 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -3790,14 +3916,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -3806,7 +3933,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3977,7 +4104,7 @@ cont { scale: 15 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -3986,14 +4113,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 16 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4002,14 +4129,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 17 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4018,14 +4145,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 18 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4035,14 +4162,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 19 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4052,7 +4179,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } } @@ -4062,7 +4189,7 @@ cont { scale: 18 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -4071,14 +4198,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -4087,7 +4214,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -4097,7 +4224,7 @@ cont { scale: 18 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16613 } caption { primary { @@ -4106,14 +4233,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15613 } } element { scale: 19 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16613 } caption { primary { @@ -4122,7 +4249,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15613 } } } @@ -4132,7 +4259,7 @@ cont { scale: 17 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4142,14 +4269,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4159,14 +4286,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4176,7 +4303,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -4186,7 +4313,7 @@ cont { scale: 17 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4196,14 +4323,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4213,14 +4340,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4230,7 +4357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -4240,7 +4367,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -4257,7 +4384,7 @@ cont { scale: 17 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4266,14 +4393,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4282,14 +4409,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4298,7 +4425,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -4308,7 +4435,7 @@ cont { scale: 14 symbol { name: "charging-station-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -4325,7 +4452,7 @@ cont { scale: 15 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -4342,7 +4469,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -4359,7 +4486,7 @@ cont { scale: 17 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4368,14 +4495,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4384,14 +4511,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4400,7 +4527,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -4410,7 +4537,7 @@ cont { scale: 17 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4418,14 +4545,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4434,14 +4561,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4450,7 +4577,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -4460,7 +4587,7 @@ cont { scale: 17 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4469,14 +4596,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4485,14 +4612,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4501,7 +4628,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4511,7 +4638,7 @@ cont { scale: 17 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 min_distance: 4 } caption { @@ -4521,14 +4648,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4537,14 +4664,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4553,7 +4680,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4563,18 +4690,18 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4589,11 +4716,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4608,11 +4735,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4628,11 +4755,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4651,7 +4778,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16800 + priority: 16811 min_distance: 8 } caption { @@ -4661,14 +4788,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 24 } caption { @@ -4678,14 +4805,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4695,14 +4822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4712,14 +4839,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4729,14 +4856,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4746,7 +4873,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } } @@ -4756,7 +4883,7 @@ cont { scale: 17 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4765,14 +4892,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4781,14 +4908,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4797,7 +4924,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4807,7 +4934,7 @@ cont { scale: 17 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4815,14 +4942,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4831,14 +4958,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4847,7 +4974,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } } @@ -4857,32 +4984,32 @@ cont { scale: 14 area { color: 16308697 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 16308697 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 16308697 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 16308697 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 min_distance: 4 } caption { @@ -4892,18 +5019,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 16308697 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4912,18 +5039,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 16308697 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4932,7 +5059,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4942,7 +5069,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4950,7 +5077,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4958,7 +5085,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4966,7 +5093,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4974,7 +5101,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } caption { @@ -4984,7 +5111,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -5030,7 +5157,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { @@ -5041,7 +5168,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { @@ -5052,7 +5179,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -5062,7 +5189,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 28 } caption { @@ -5071,14 +5198,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5087,14 +5214,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 17 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5103,14 +5230,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 18 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5120,14 +5247,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } element { scale: 19 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5137,7 +5264,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } } @@ -5147,6 +5274,7 @@ cont { scale: 11 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 min_distance: 12 } @@ -5155,6 +5283,7 @@ cont { scale: 12 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 min_distance: 12 } @@ -5163,6 +5292,7 @@ cont { scale: 13 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 } } @@ -5170,6 +5300,7 @@ cont { scale: 14 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 } } @@ -5177,6 +5308,7 @@ cont { scale: 15 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } } @@ -5184,6 +5316,7 @@ cont { scale: 16 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5201,6 +5334,7 @@ cont { scale: 17 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5218,6 +5352,7 @@ cont { scale: 18 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5235,6 +5370,7 @@ cont { scale: 19 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5255,7 +5391,7 @@ cont { scale: 18 symbol { name: "fire_station-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -5264,14 +5400,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "fire_station-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -5280,7 +5416,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -5290,7 +5426,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 28 } caption { @@ -5299,14 +5435,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5315,14 +5451,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 17 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5331,14 +5467,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 18 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5348,14 +5484,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } element { scale: 19 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5365,7 +5501,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } } @@ -5375,11 +5511,11 @@ cont { scale: 16 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5388,18 +5524,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 17 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5408,18 +5544,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 18 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5428,18 +5564,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 19 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-m" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5448,7 +5584,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } } @@ -5458,7 +5594,7 @@ cont { scale: 12 symbol { name: "fuel-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5475,7 +5611,7 @@ cont { scale: 13 symbol { name: "fuel-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5492,7 +5628,7 @@ cont { scale: 14 symbol { name: "fuel-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5509,7 +5645,7 @@ cont { scale: 15 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5526,7 +5662,7 @@ cont { scale: 16 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -5543,7 +5679,7 @@ cont { scale: 17 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5552,14 +5688,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5568,14 +5704,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5584,7 +5720,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -5594,32 +5730,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5627,18 +5763,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5646,18 +5782,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5665,7 +5801,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -5675,32 +5811,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5708,18 +5844,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5727,18 +5863,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5746,7 +5882,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -5756,11 +5892,11 @@ cont { scale: 14 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-s" - priority: 16019 + priority: 16018 min_distance: 8 } } @@ -5768,11 +5904,12 @@ cont { scale: 15 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 6 } caption { @@ -5788,11 +5925,12 @@ cont { scale: 16 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5809,11 +5947,12 @@ cont { scale: 17 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5830,11 +5969,12 @@ cont { scale: 18 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5851,11 +5991,12 @@ cont { scale: 19 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5875,7 +6016,7 @@ cont { scale: 18 symbol { name: "hunting-tower-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -5884,14 +6025,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "hunting-tower-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -5900,7 +6041,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -5910,14 +6051,14 @@ cont { scale: 16 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 } } element { scale: 17 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } } @@ -5925,7 +6066,7 @@ cont { scale: 18 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } } @@ -5933,7 +6074,7 @@ cont { scale: 19 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } caption { @@ -5943,7 +6084,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15300 } } } @@ -5953,6 +6094,7 @@ cont { scale: 18 symbol { name: "internet_cafe-m" + apply_for_type: 1 priority: 16000 } } @@ -5960,6 +6102,7 @@ cont { scale: 19 symbol { name: "internet_cafe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -5978,25 +6121,25 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -6011,11 +6154,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -6031,11 +6174,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -6086,7 +6229,8 @@ cont { scale: 18 symbol { name: "library-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -6095,14 +6239,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "library-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -6111,7 +6256,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -6121,7 +6266,8 @@ cont { scale: 18 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -6130,14 +6276,15 @@ cont { offset_x: 1 text: "ref" } - priority: 15038 + priority: 15056 } } element { scale: 19 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -6156,7 +6303,7 @@ cont { scale: 16 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 24 } caption { @@ -6165,14 +6312,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 17 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6181,14 +6328,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6197,14 +6344,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6213,7 +6360,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } } @@ -6308,8 +6455,8 @@ cont { element { scale: 16 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6317,14 +6464,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 17 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6332,14 +6479,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 18 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6347,14 +6494,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 19 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6362,7 +6509,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } } @@ -6423,7 +6570,7 @@ cont { scale: 17 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6432,14 +6579,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6448,14 +6595,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6464,7 +6611,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -6474,18 +6621,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6493,22 +6640,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6524,11 +6671,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6547,18 +6694,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6566,22 +6713,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6597,11 +6744,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6620,18 +6767,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6639,22 +6786,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6670,11 +6817,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6693,18 +6840,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6712,22 +6859,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6743,11 +6890,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6766,18 +6913,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6785,22 +6932,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6816,11 +6963,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6839,18 +6986,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6858,22 +7005,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6889,11 +7036,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6912,18 +7059,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6931,22 +7078,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6962,11 +7109,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6985,18 +7132,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -7004,22 +7151,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -7035,11 +7182,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -7486,7 +7633,7 @@ cont { scale: 16 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } } @@ -7494,7 +7641,7 @@ cont { scale: 17 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7504,14 +7651,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } element { scale: 18 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7521,14 +7668,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } element { scale: 19 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7538,7 +7685,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } } @@ -7548,7 +7695,7 @@ cont { scale: 14 symbol { name: "place-of-worship-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7558,14 +7705,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7575,18 +7722,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7596,18 +7743,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7617,18 +7764,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7638,18 +7785,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7659,7 +7806,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7669,7 +7816,7 @@ cont { scale: 14 symbol { name: "buddhist-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7679,14 +7826,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7696,18 +7843,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7717,18 +7864,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7738,18 +7885,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7759,18 +7906,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7780,7 +7927,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7790,7 +7937,7 @@ cont { scale: 14 symbol { name: "christian-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7800,14 +7947,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7817,18 +7964,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7838,18 +7985,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7859,18 +8006,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7880,18 +8027,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7901,7 +8048,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7911,7 +8058,7 @@ cont { scale: 14 symbol { name: "hindu-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7921,14 +8068,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7938,18 +8085,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7959,18 +8106,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7980,18 +8127,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8001,18 +8148,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8022,7 +8169,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8032,7 +8179,7 @@ cont { scale: 14 symbol { name: "jewish-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8042,14 +8189,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8059,18 +8206,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8080,18 +8227,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8101,18 +8248,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8122,18 +8269,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8143,7 +8290,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8153,7 +8300,7 @@ cont { scale: 14 symbol { name: "muslim-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8163,14 +8310,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8180,18 +8327,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8201,18 +8348,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8222,18 +8369,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8243,18 +8390,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8264,7 +8411,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8274,7 +8421,7 @@ cont { scale: 14 symbol { name: "shinto-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8284,14 +8431,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8301,18 +8448,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8322,18 +8469,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8343,18 +8490,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8364,18 +8511,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8385,7 +8532,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8395,7 +8542,7 @@ cont { scale: 14 symbol { name: "taoist-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8405,14 +8552,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8422,18 +8569,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8443,18 +8590,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8464,18 +8611,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8485,18 +8632,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8506,7 +8653,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8516,7 +8663,7 @@ cont { scale: 17 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8525,14 +8672,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8541,14 +8688,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8557,7 +8704,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -8567,7 +8714,7 @@ cont { scale: 18 symbol { name: "postbox-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -8576,14 +8723,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "postbox-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -8592,7 +8739,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -8602,7 +8749,7 @@ cont { scale: 17 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8611,14 +8758,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8627,14 +8774,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8643,7 +8790,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } } @@ -8653,7 +8800,7 @@ cont { scale: 17 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8661,14 +8808,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8677,14 +8824,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8693,7 +8840,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -8703,7 +8850,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 28 } caption { @@ -8712,14 +8859,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 16 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8728,14 +8875,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 17 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8744,14 +8891,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 18 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8761,14 +8908,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } element { scale: 19 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8778,7 +8925,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } } @@ -8802,7 +8949,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8810,7 +8957,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8818,7 +8965,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8827,7 +8974,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8837,7 +8984,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8845,7 +8992,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8853,7 +9000,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8862,7 +9009,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8872,7 +9019,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8880,7 +9027,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8888,7 +9035,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8897,7 +9044,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8907,7 +9054,7 @@ cont { scale: 15 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 28 } caption { @@ -8916,14 +9063,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 16 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8932,14 +9079,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 17 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8948,14 +9095,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 18 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8965,14 +9112,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15714 + priority: 15726 } } element { scale: 19 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8982,7 +9129,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15714 + priority: 15726 } } } @@ -8992,7 +9139,7 @@ cont { scale: 15 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9002,14 +9149,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9019,14 +9166,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9036,14 +9183,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9053,14 +9200,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9070,7 +9217,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -9080,25 +9227,25 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9113,11 +9260,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9133,11 +9280,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9156,7 +9303,7 @@ cont { scale: 16 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -9165,14 +9312,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -9181,14 +9328,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -9197,14 +9344,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -9213,7 +9360,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -9223,7 +9370,7 @@ cont { scale: 17 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9232,14 +9379,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9248,14 +9395,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9264,7 +9411,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9274,7 +9421,7 @@ cont { scale: 16 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -9283,14 +9430,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9299,14 +9446,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9315,14 +9462,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9331,7 +9478,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -9341,7 +9488,8 @@ cont { scale: 17 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } } @@ -9349,7 +9497,8 @@ cont { scale: 18 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } } @@ -9357,7 +9506,8 @@ cont { scale: 19 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } caption { @@ -9366,7 +9516,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9376,7 +9526,7 @@ cont { scale: 14 symbol { name: "theatre-s" - priority: 16723 + priority: 16735 min_distance: 8 } caption { @@ -9386,7 +9536,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { @@ -9398,14 +9548,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 16 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9415,14 +9565,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 17 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9432,14 +9582,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 18 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9449,14 +9599,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 19 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9466,7 +9616,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } } @@ -9476,7 +9626,7 @@ cont { scale: 18 symbol { name: "toilets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -9485,14 +9635,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "toilets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -9501,7 +9651,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -9525,11 +9675,11 @@ cont { scale: 14 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-s" - priority: 16019 + priority: 16018 min_distance: 12 } caption { @@ -9546,11 +9696,11 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 12 } caption { @@ -9567,7 +9717,7 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9583,11 +9733,11 @@ cont { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 11 } caption { @@ -9604,7 +9754,7 @@ cont { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9620,11 +9770,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 10 } caption { @@ -9641,7 +9791,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9657,11 +9807,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9678,7 +9828,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9694,11 +9844,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9715,7 +9865,7 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9734,7 +9884,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9743,14 +9893,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9759,14 +9909,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9775,7 +9925,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9785,7 +9935,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9794,14 +9944,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9810,14 +9960,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9826,7 +9976,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9836,7 +9986,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9845,14 +9995,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9861,14 +10011,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9877,7 +10027,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9887,7 +10037,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9896,14 +10046,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9912,14 +10062,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9928,7 +10078,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9938,7 +10088,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9947,14 +10097,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9963,14 +10113,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9979,7 +10129,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9989,7 +10139,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9998,14 +10148,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10014,14 +10164,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10030,7 +10180,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10040,7 +10190,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10049,14 +10199,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10065,14 +10215,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10081,7 +10231,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10091,7 +10241,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16590 + priority: 16603 min_distance: 20 } } @@ -10099,7 +10249,7 @@ cont { scale: 18 symbol { name: "fuel-dispenser-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10108,14 +10258,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "fuel-dispenser-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10124,7 +10274,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10134,7 +10284,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10143,14 +10293,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10159,14 +10309,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10175,7 +10325,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10185,7 +10335,7 @@ cont { scale: 17 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10194,14 +10344,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10210,14 +10360,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10226,7 +10376,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10236,7 +10386,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10245,14 +10395,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10261,14 +10411,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10277,7 +10427,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10287,7 +10437,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10296,14 +10446,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10312,14 +10462,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10328,7 +10478,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10338,7 +10488,7 @@ cont { scale: 16 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10346,14 +10496,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10361,14 +10511,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10377,14 +10527,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10393,7 +10543,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -10403,14 +10553,16 @@ cont { scale: 18 symbol { name: "waste-basket-s" - priority: 16580 + apply_for_type: 1 + priority: 16594 } } element { scale: 19 symbol { name: "waste-basket-s" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -10418,7 +10570,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15580 + priority: 15594 } } } @@ -10428,7 +10580,7 @@ cont { scale: 18 symbol { name: "waste-basket-m" - priority: 16580 + priority: 16594 } caption { primary { @@ -10436,14 +10588,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "waste-basket-m" - priority: 16580 + priority: 16594 } caption { primary { @@ -10451,7 +10603,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15580 + priority: 15594 } } } @@ -10461,7 +10613,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -10469,7 +10621,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -10477,7 +10629,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -10486,7 +10638,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10496,7 +10648,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10504,7 +10656,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10512,7 +10664,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10520,7 +10672,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10528,7 +10680,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } caption { @@ -10538,7 +10690,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -10548,77 +10700,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 16 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } } @@ -10628,42 +10780,42 @@ cont { scale: 14 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 16 area { color: 15920858 - priority: -15886 + priority: -15868 } } element { scale: 17 area { color: 15920858 - priority: -15886 + priority: -15868 } } element { scale: 18 area { color: 15920858 - priority: -15886 + priority: -15868 } } element { scale: 19 area { color: 15920858 - priority: -15886 + priority: -15868 } } } @@ -10673,77 +10825,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 16 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } } @@ -10753,6 +10905,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10768,6 +10921,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10783,6 +10937,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10798,6 +10953,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10816,6 +10972,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10831,6 +10988,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10846,6 +11004,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10861,6 +11020,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10879,7 +11039,8 @@ cont { scale: 15 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10887,14 +11048,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10902,14 +11064,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10917,14 +11080,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10932,14 +11096,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 19 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10947,7 +11112,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } } @@ -10957,6 +11122,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10972,6 +11138,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10987,6 +11154,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11002,6 +11170,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11021,7 +11190,7 @@ cont { lines { width: 2.0 color: 12763315 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -11030,7 +11199,7 @@ cont { lines { width: 2.8 color: 12763315 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -11045,7 +11214,7 @@ cont { dd: 1.5 dd: 3.0 } - priority: 1457 + priority: 1471 } } element { @@ -11059,7 +11228,7 @@ cont { dd: 1.9 dd: 4.0 } - priority: 1457 + priority: 1471 } } element { @@ -11073,7 +11242,7 @@ cont { dd: 2.5 dd: 6.0 } - priority: 1457 + priority: 1471 } } element { @@ -11087,7 +11256,7 @@ cont { dd: 3.0 dd: 8.0 } - priority: 1457 + priority: 1471 } } } @@ -11102,7 +11271,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } element { @@ -11114,7 +11283,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } element { @@ -11126,7 +11295,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } } @@ -11136,6 +11305,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11151,6 +11321,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11166,6 +11337,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11181,6 +11353,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11200,7 +11373,7 @@ cont { lines { width: 1.0 color: 1300793480 - priority: 1457 + priority: 1471 } } element { @@ -11208,7 +11381,7 @@ cont { lines { width: 1.3 color: 864585864 - priority: 1457 + priority: 1471 } } element { @@ -11216,7 +11389,7 @@ cont { lines { width: 2.0 color: 8947848 - priority: 1457 + priority: 1471 } } element { @@ -11224,7 +11397,7 @@ cont { lines { width: 3.0 color: 8947848 - priority: 1457 + priority: 1471 } } } @@ -11234,6 +11407,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11249,6 +11423,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11264,6 +11439,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11279,6 +11455,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11298,7 +11475,7 @@ cont { lines { width: 1.6 color: 1720563840 - priority: 1457 + priority: 1471 } } element { @@ -11306,7 +11483,7 @@ cont { lines { width: 2.2 color: 1301133440 - priority: 1457 + priority: 1471 } } element { @@ -11314,7 +11491,7 @@ cont { lines { width: 3.0 color: 864925824 - priority: 1457 + priority: 1471 } } element { @@ -11322,7 +11499,7 @@ cont { lines { width: 4.0 color: 9287808 - priority: 1457 + priority: 1471 } } } @@ -11332,6 +11509,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11347,6 +11525,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11362,6 +11541,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11377,6 +11557,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11395,7 +11576,7 @@ cont { scale: 16 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -11404,14 +11585,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11421,14 +11602,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11438,14 +11619,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11455,7 +11636,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -11472,7 +11653,7 @@ cont { dd: 1.4 dd: 1.0 } - priority: 1219 + priority: 1235 } } element { @@ -11486,7 +11667,7 @@ cont { dd: 2.0 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -11500,7 +11681,7 @@ cont { dd: 3.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -11514,7 +11695,7 @@ cont { dd: 4.0 dd: 2.0 } - priority: 1219 + priority: 1235 } } } @@ -11524,6 +11705,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11539,6 +11721,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11554,6 +11737,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11569,6 +11753,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11657,7 +11842,7 @@ cont { scale: 12 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } } @@ -11665,7 +11850,7 @@ cont { scale: 13 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } } @@ -11673,7 +11858,7 @@ cont { scale: 14 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11682,14 +11867,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15895 + priority: 15896 } } element { scale: 15 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11699,14 +11884,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 16 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11716,14 +11901,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 17 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11733,14 +11918,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 18 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11750,14 +11935,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 19 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11767,7 +11952,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } } @@ -11778,7 +11963,7 @@ cont { lines { width: 1.0 color: 1300793480 - priority: 1457 + priority: 1471 } } element { @@ -11786,7 +11971,7 @@ cont { lines { width: 1.3 color: 864585864 - priority: 1457 + priority: 1471 } } element { @@ -11794,7 +11979,7 @@ cont { lines { width: 2.0 color: 8947848 - priority: 1457 + priority: 1471 } } element { @@ -11802,7 +11987,7 @@ cont { lines { width: 3.0 color: 8947848 - priority: 1457 + priority: 1471 } } } @@ -11813,7 +11998,7 @@ cont { lines { width: 0.5 color: 1298359132 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11823,7 +12008,7 @@ cont { lines { width: 0.5 color: 862151516 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11833,7 +12018,7 @@ cont { lines { width: 0.6 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11843,7 +12028,7 @@ cont { lines { width: 0.8 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11853,7 +12038,7 @@ cont { lines { width: 0.85 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11863,7 +12048,7 @@ cont { lines { width: 1.0 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11873,7 +12058,7 @@ cont { lines { width: 1.1 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11883,7 +12068,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11893,7 +12078,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11903,7 +12088,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11913,7 +12098,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11923,7 +12108,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11932,7 +12117,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11941,7 +12126,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11950,7 +12135,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } element { @@ -11958,7 +12143,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } element { @@ -11966,7 +12151,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } element { @@ -11974,7 +12159,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } } @@ -11989,7 +12174,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12006,7 +12191,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12020,7 +12205,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12034,7 +12219,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12048,7 +12233,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12062,7 +12247,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12076,7 +12261,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12090,7 +12275,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12104,7 +12289,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -12118,7 +12303,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -12131,7 +12316,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -12144,7 +12329,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -12157,7 +12342,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -12169,7 +12354,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -12181,7 +12366,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -12193,7 +12378,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } } @@ -12208,7 +12393,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12222,7 +12407,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12236,7 +12421,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12250,7 +12435,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12263,7 +12448,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12276,7 +12461,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12289,7 +12474,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12301,7 +12486,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12313,7 +12498,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12325,7 +12510,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } } @@ -12335,18 +12520,18 @@ cont { scale: 10 area { color: 3431500856 - priority: -15334 + priority: -15321 } } element { scale: 11 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 20 } } @@ -12354,11 +12539,11 @@ cont { scale: 12 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -12368,18 +12553,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 13 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -12389,18 +12574,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 14 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 } caption { primary { @@ -12409,18 +12594,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12429,18 +12614,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12449,18 +12634,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12469,18 +12654,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12490,18 +12675,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } element { scale: 19 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12511,7 +12696,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } } @@ -12521,14 +12706,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1724500155 - priority: 1267 + priority: 1284 } } element { @@ -12539,7 +12724,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12552,7 +12737,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12563,7 +12748,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12576,7 +12761,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12587,7 +12772,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12600,7 +12785,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12611,7 +12796,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12624,7 +12809,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12643,7 +12828,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12659,7 +12844,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12675,7 +12860,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12691,7 +12876,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12701,14 +12886,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1724500155 - priority: 1267 + priority: 1284 } } element { @@ -12719,7 +12904,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12732,7 +12917,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12743,7 +12928,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12756,7 +12941,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12767,7 +12952,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12780,7 +12965,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12791,7 +12976,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12804,7 +12989,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12814,14 +12999,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1724500155 - priority: 1267 + priority: 1284 } } element { @@ -12832,7 +13017,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12845,7 +13030,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12856,7 +13041,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12869,7 +13054,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12880,7 +13065,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12893,7 +13078,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12904,7 +13089,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12917,7 +13102,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12927,14 +13112,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1962 + priority: 1963 } } element { scale: 15 area { color: 1724500155 - priority: 1962 + priority: 1963 } } element { @@ -12945,7 +13130,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12958,7 +13143,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12969,7 +13154,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12982,7 +13167,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12993,7 +13178,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -13006,7 +13191,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -13017,7 +13202,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -13030,7 +13215,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -13044,7 +13229,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1229 + priority: 1246 } } element { @@ -13055,7 +13240,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -13066,7 +13251,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -13077,7 +13262,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } } @@ -13087,7 +13272,7 @@ cont { scale: 17 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -13095,14 +13280,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -13110,14 +13295,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -13125,7 +13310,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -13142,7 +13327,7 @@ cont { scale: 18 symbol { name: "beekeeper-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13151,14 +13336,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beekeeper-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13167,7 +13352,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13184,7 +13369,7 @@ cont { scale: 18 symbol { name: "blacksmith-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13193,14 +13378,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "blacksmith-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13209,7 +13394,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13226,7 +13411,7 @@ cont { scale: 18 symbol { name: "brewery-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13235,14 +13420,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "brewery-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13251,7 +13436,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13268,7 +13453,7 @@ cont { scale: 18 symbol { name: "carpenter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13277,14 +13462,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "carpenter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13293,7 +13478,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13310,7 +13495,7 @@ cont { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13319,14 +13504,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13335,7 +13520,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13352,7 +13537,7 @@ cont { scale: 18 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13361,14 +13546,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13377,7 +13562,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13394,7 +13579,7 @@ cont { scale: 18 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13403,14 +13588,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13419,7 +13604,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13436,7 +13621,7 @@ cont { scale: 18 symbol { name: "florist-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13445,14 +13630,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "florist-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13461,7 +13646,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13471,7 +13656,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13480,14 +13665,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13496,7 +13681,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13506,7 +13691,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13515,14 +13700,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13531,7 +13716,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13541,7 +13726,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13550,14 +13735,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13566,7 +13751,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13583,7 +13768,7 @@ cont { scale: 18 symbol { name: "painter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13592,14 +13777,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "painter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13608,7 +13793,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13625,7 +13810,7 @@ cont { scale: 18 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13634,14 +13819,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13650,7 +13835,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13667,7 +13852,7 @@ cont { scale: 18 symbol { name: "plumber-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13676,14 +13861,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "plumber-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13692,7 +13877,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13709,7 +13894,7 @@ cont { scale: 18 symbol { name: "sawmill-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13718,14 +13903,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sawmill-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13734,7 +13919,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13751,7 +13936,7 @@ cont { scale: 18 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13760,14 +13945,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13776,7 +13961,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13793,7 +13978,7 @@ cont { scale: 18 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13802,14 +13987,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13818,7 +14003,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13828,7 +14013,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13837,14 +14022,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13853,7 +14038,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13932,35 +14117,56 @@ cont { element { scale: 17 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } element { scale: 18 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } element { scale: 19 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } } cont { name: "entrance" + element { + scale: 18 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16056 + } + caption { + primary { + height: 10 + color: 6381914 + offset_x: 1 + text: "ref" + } + priority: 15056 + } + } element { scale: 19 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -13974,197 +14180,7 @@ cont { offset_y: 10 text: "addr:flats" } - priority: 15038 - } - } -} -cont { - name: "entrance-main" - element { - scale: 18 - symbol { - name: "main_entrance-s" - priority: 16038 - } - caption { - primary { - height: 10 - color: 6381914 - offset_x: 1 - text: "ref" - } - priority: 15038 - } - } - element { - scale: 19 - symbol { - name: "main_entrance-s" - priority: 16038 - } - caption { - primary { - height: 10 - color: 6381914 - offset_x: 1 - text: "ref" - } - secondary { - height: 12 - offset_y: 10 - text: "addr:flats" - } - priority: 15038 - } - } -} -cont { - name: "healthcare-alternative" - element { - scale: 17 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-audiologist" - element { - scale: 17 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-blood_donation" - element { - scale: 17 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15056 } } } @@ -14173,23 +14189,25 @@ cont { element { scale: 17 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 + min_distance: 4 } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 } caption { primary { @@ -14198,14 +14216,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 } caption { primary { @@ -14214,57 +14232,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 - } - } -} -cont { - name: "healthcare-optometrist" - element { - scale: 17 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15669 } } } @@ -14274,7 +14242,7 @@ cont { scale: 17 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14282,14 +14250,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14298,14 +14266,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14314,207 +14282,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 - } - } -} -cont { - name: "healthcare-podiatrist" - element { - scale: 17 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-psychotherapist" - element { - scale: 17 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-sample_collection" - element { - scale: 17 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-speech_therapist" - element { - scale: 17 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15669 } } } @@ -14529,7 +14297,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14542,7 +14310,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14551,7 +14319,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14563,7 +14331,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14571,7 +14339,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14583,7 +14351,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14591,7 +14359,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14603,7 +14371,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14611,7 +14379,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14623,7 +14391,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14631,7 +14399,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14646,7 +14414,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14659,7 +14427,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14668,7 +14436,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14680,7 +14448,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14688,7 +14456,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14700,7 +14468,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14708,7 +14476,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14720,7 +14488,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14728,7 +14496,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14740,7 +14508,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14748,7 +14516,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14763,7 +14531,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14776,7 +14544,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14785,7 +14553,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14797,7 +14565,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14805,7 +14573,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14817,7 +14585,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14825,7 +14593,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14837,7 +14605,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14845,7 +14613,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14857,7 +14625,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14865,7 +14633,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14880,7 +14648,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14893,7 +14661,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14902,7 +14670,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14914,7 +14682,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14922,7 +14690,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14934,7 +14702,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14942,7 +14710,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14954,7 +14722,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14962,7 +14730,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14974,7 +14742,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14982,7 +14750,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14992,14 +14760,14 @@ cont { scale: 16 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } } element { scale: 17 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -15017,14 +14785,14 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -15042,14 +14810,14 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -15067,235 +14835,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 - } - } -} -cont { - name: "highway-busway" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } -} -cont { - name: "highway-busway-bridge" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } -} -cont { - name: "highway-busway-tunnel" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 + priority: 15915 } } } @@ -15310,7 +14850,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1295 + priority: 1311 cap: BUTTCAP } } @@ -15323,7 +14863,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1295 + priority: 1311 cap: BUTTCAP } } @@ -15336,7 +14876,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1295 + priority: 1311 cap: BUTTCAP } path_text { @@ -15345,7 +14885,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15357,7 +14897,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15365,7 +14905,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15377,7 +14917,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15385,7 +14925,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15397,7 +14937,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15405,7 +14945,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15417,7 +14957,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15425,7 +14965,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } } @@ -15436,7 +14976,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15445,7 +14985,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15454,7 +14994,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15463,7 +15003,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15471,7 +15011,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15479,7 +15019,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15487,7 +15027,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15495,7 +15035,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15503,7 +15043,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15511,7 +15051,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15519,7 +15059,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15527,7 +15067,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15538,7 +15078,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15547,7 +15087,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15556,7 +15096,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15565,7 +15105,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15573,7 +15113,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15581,7 +15121,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15589,7 +15129,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15597,7 +15137,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15605,7 +15145,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15613,7 +15153,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15621,7 +15161,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15629,7 +15169,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15640,7 +15180,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15649,7 +15189,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15658,7 +15198,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15667,7 +15207,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15675,7 +15215,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15683,7 +15223,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15691,7 +15231,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15699,7 +15239,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15707,7 +15247,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15715,7 +15255,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15723,7 +15263,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15731,7 +15271,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15742,7 +15282,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15751,7 +15291,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15760,7 +15300,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15769,7 +15309,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15777,7 +15317,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15785,7 +15325,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15793,7 +15333,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15801,7 +15341,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15809,7 +15349,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15817,7 +15357,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15825,7 +15365,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15833,7 +15373,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15843,21 +15383,21 @@ cont { scale: 17 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } element { scale: 18 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } element { scale: 19 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } } @@ -15872,7 +15412,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -15881,7 +15421,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15893,7 +15433,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15901,7 +15441,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15913,7 +15453,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15921,7 +15461,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15933,7 +15473,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15941,7 +15481,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15953,7 +15493,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15961,7 +15501,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -15976,7 +15516,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -15989,7 +15529,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -15998,7 +15538,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16010,7 +15550,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16018,7 +15558,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16030,7 +15570,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16038,7 +15578,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16050,7 +15590,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16058,7 +15598,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16070,7 +15610,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16078,7 +15618,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16088,7 +15628,7 @@ cont { scale: 14 area { color: 15591638 - priority: -15686 + priority: -15670 } } element { @@ -16100,12 +15640,12 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } area { color: 15591638 - priority: -15686 + priority: -15670 } path_text { primary { @@ -16113,7 +15653,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16125,11 +15665,11 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -16137,7 +15677,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16149,11 +15689,11 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -16161,7 +15701,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16173,11 +15713,11 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -16185,7 +15725,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16197,11 +15737,11 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -16209,7 +15749,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16224,7 +15764,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16233,7 +15773,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16245,7 +15785,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16253,7 +15793,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16265,7 +15805,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16273,7 +15813,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16285,7 +15825,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16293,7 +15833,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16305,7 +15845,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16313,7 +15853,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16328,7 +15868,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16341,7 +15881,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16350,7 +15890,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16362,7 +15902,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16370,7 +15910,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16382,7 +15922,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16390,7 +15930,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16402,7 +15942,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16410,7 +15950,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16422,7 +15962,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16430,7 +15970,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16445,7 +15985,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16458,7 +15998,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16467,7 +16007,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16479,7 +16019,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16487,7 +16027,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16499,7 +16039,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16507,7 +16047,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16519,7 +16059,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16527,7 +16067,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16539,7 +16079,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16547,7 +16087,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16562,7 +16102,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16575,7 +16115,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16584,7 +16124,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16596,7 +16136,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16604,7 +16144,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16616,7 +16156,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16624,7 +16164,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16636,7 +16176,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16644,7 +16184,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16656,7 +16196,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16664,7 +16204,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16679,7 +16219,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16692,7 +16232,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16701,7 +16241,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16713,7 +16253,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16721,7 +16261,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16733,7 +16273,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16741,7 +16281,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16753,7 +16293,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16761,7 +16301,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16773,7 +16313,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16781,7 +16321,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16796,7 +16336,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16809,7 +16349,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16818,7 +16358,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16830,7 +16370,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16838,7 +16378,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16850,7 +16390,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16858,7 +16398,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16870,7 +16410,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16878,7 +16418,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16890,7 +16430,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16898,7 +16438,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16913,7 +16453,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16922,7 +16462,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16934,7 +16474,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16942,7 +16482,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16954,7 +16494,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16962,7 +16502,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16974,7 +16514,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16982,7 +16522,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16994,7 +16534,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -17002,7 +16542,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -17017,7 +16557,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -17026,7 +16566,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -17038,7 +16578,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -17046,7 +16586,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -17058,7 +16598,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -17066,7 +16606,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -17076,7 +16616,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -17084,7 +16624,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -17096,7 +16636,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -17104,7 +16644,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -17114,7 +16654,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -17122,7 +16662,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -17134,7 +16674,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -17142,7 +16682,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -17152,7 +16692,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -17160,7 +16700,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -17175,7 +16715,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -17188,7 +16728,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -17201,7 +16741,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -17214,11 +16754,12 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17226,7 +16767,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -17238,11 +16779,12 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17250,7 +16792,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -17262,11 +16804,12 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17274,7 +16817,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -17286,11 +16829,12 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17298,7 +16842,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } } @@ -17309,7 +16853,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17319,7 +16863,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17328,7 +16872,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17337,7 +16881,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17345,7 +16889,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17354,7 +16898,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17362,7 +16906,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17370,7 +16914,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17378,7 +16922,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17386,7 +16930,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17394,7 +16938,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17402,7 +16946,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -17410,7 +16954,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17418,7 +16962,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -17429,7 +16973,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17439,7 +16983,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17448,7 +16992,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17457,7 +17001,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17465,7 +17009,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17474,7 +17018,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17482,7 +17026,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17490,7 +17034,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17498,7 +17042,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17506,7 +17050,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17514,7 +17058,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17522,7 +17066,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -17530,7 +17074,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17538,7 +17082,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -17549,7 +17093,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17559,7 +17103,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17568,7 +17112,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17577,7 +17121,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17585,7 +17129,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17594,7 +17138,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17606,13 +17150,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17620,7 +17164,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17632,13 +17176,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17646,7 +17190,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17658,13 +17202,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17672,7 +17216,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -17684,13 +17228,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17698,7 +17242,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -17709,7 +17253,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17719,7 +17263,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17729,7 +17273,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17739,7 +17283,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17749,12 +17293,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -17763,7 +17307,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17773,12 +17317,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -17787,7 +17331,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17797,12 +17341,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -17811,7 +17355,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17820,12 +17364,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -17834,7 +17378,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17843,12 +17387,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -17857,7 +17401,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17866,12 +17410,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -17880,7 +17424,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17888,12 +17432,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17902,7 +17446,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17910,12 +17454,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17924,7 +17468,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17932,12 +17476,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17946,7 +17490,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17954,12 +17498,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -17971,7 +17515,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17981,7 +17525,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17991,7 +17535,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18001,7 +17545,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18011,12 +17555,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -18025,7 +17569,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18035,12 +17579,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -18049,7 +17593,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18059,12 +17603,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -18075,7 +17619,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18083,13 +17627,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18098,12 +17642,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -18114,7 +17658,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18122,13 +17666,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18137,12 +17681,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -18153,7 +17697,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18161,13 +17705,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18176,12 +17720,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -18192,7 +17736,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18200,13 +17744,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18214,12 +17758,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18230,7 +17774,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18238,13 +17782,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18252,12 +17796,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18268,7 +17812,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18276,13 +17820,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18290,12 +17834,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18306,7 +17850,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18314,13 +17858,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18328,12 +17872,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -18345,7 +17889,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18355,7 +17899,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18365,7 +17909,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18375,7 +17919,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18385,12 +17929,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -18399,7 +17943,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18409,12 +17953,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -18427,13 +17971,13 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18443,12 +17987,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -18461,13 +18005,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18476,12 +18020,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -18494,13 +18038,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18509,12 +18053,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -18527,13 +18071,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18542,12 +18086,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -18560,13 +18104,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18574,12 +18118,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18592,13 +18136,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18606,12 +18150,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18624,13 +18168,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18638,12 +18182,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18656,13 +18200,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18670,12 +18214,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -18689,7 +18233,7 @@ cont { height: 9 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18699,7 +18243,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18709,7 +18253,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18719,7 +18263,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18729,7 +18273,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } } @@ -18740,7 +18284,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18750,12 +18294,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -18764,7 +18308,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18774,12 +18318,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -18788,7 +18332,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18798,12 +18342,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -18812,7 +18356,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18821,12 +18365,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -18835,7 +18379,7 @@ cont { lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18844,12 +18388,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -18858,7 +18402,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18867,12 +18411,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -18881,7 +18425,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18889,12 +18433,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18903,7 +18447,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18911,12 +18455,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18925,7 +18469,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18933,12 +18477,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18947,7 +18491,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18955,12 +18499,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -18972,7 +18516,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18982,12 +18526,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -18996,7 +18540,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19006,12 +18550,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -19020,7 +18564,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19030,12 +18574,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -19044,7 +18588,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19053,12 +18597,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -19069,7 +18613,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19077,13 +18621,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19092,12 +18636,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -19108,7 +18652,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19116,13 +18660,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19131,12 +18675,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -19147,7 +18691,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19155,13 +18699,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19169,12 +18713,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19185,7 +18729,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19193,13 +18737,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19207,12 +18751,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19223,7 +18767,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19231,13 +18775,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19245,12 +18789,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19261,7 +18805,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19269,13 +18813,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19283,12 +18827,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -19300,7 +18844,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19310,12 +18854,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -19324,7 +18868,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19334,12 +18878,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -19350,13 +18894,13 @@ cont { color: 8421504 dashdot { } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19366,12 +18910,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -19384,13 +18928,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19399,12 +18943,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -19417,13 +18961,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.0 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19432,12 +18976,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -19450,13 +18994,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19465,12 +19009,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -19483,13 +19027,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19497,12 +19041,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19515,13 +19059,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19529,12 +19073,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19547,13 +19091,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19561,12 +19105,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19579,13 +19123,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19593,12 +19137,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -19614,7 +19158,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19627,7 +19171,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19636,7 +19180,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19648,7 +19192,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19656,7 +19200,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19668,7 +19212,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19676,7 +19220,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19688,7 +19232,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19696,7 +19240,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19708,7 +19252,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19716,7 +19260,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19731,7 +19275,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19744,7 +19288,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19753,7 +19297,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19765,7 +19309,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19773,7 +19317,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19785,7 +19329,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19793,7 +19337,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19805,7 +19349,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19813,7 +19357,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19825,7 +19369,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19833,7 +19377,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19848,7 +19392,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19861,7 +19405,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19870,7 +19414,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19882,7 +19426,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19890,7 +19434,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19902,7 +19446,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19910,7 +19454,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19922,7 +19466,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19930,7 +19474,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19942,7 +19486,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19950,7 +19494,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19965,7 +19509,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19978,7 +19522,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19987,7 +19531,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19999,7 +19543,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20007,7 +19551,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20019,7 +19563,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20027,7 +19571,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20039,7 +19583,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20047,7 +19591,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20059,7 +19603,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20067,7 +19611,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20082,7 +19626,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20095,7 +19639,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20104,7 +19648,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20116,7 +19660,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20124,7 +19668,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20136,7 +19680,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20144,7 +19688,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20156,7 +19700,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20164,7 +19708,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20176,7 +19720,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20184,7 +19728,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20199,7 +19743,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20212,7 +19756,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20221,7 +19765,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20233,7 +19777,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20241,7 +19785,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20253,7 +19797,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20261,7 +19805,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20273,7 +19817,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20281,7 +19825,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20293,7 +19837,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20301,7 +19845,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20316,7 +19860,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20329,7 +19873,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20338,7 +19882,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20350,7 +19894,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20358,7 +19902,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20370,7 +19914,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20378,7 +19922,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20390,7 +19934,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20398,7 +19942,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20410,7 +19954,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20418,7 +19962,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20433,7 +19977,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20446,7 +19990,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20455,7 +19999,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20467,7 +20011,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20475,7 +20019,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20487,7 +20031,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20495,7 +20039,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20507,7 +20051,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20515,7 +20059,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20527,7 +20071,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20535,7 +20079,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20550,7 +20094,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20563,7 +20107,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20572,7 +20116,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20584,7 +20128,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20592,7 +20136,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20604,7 +20148,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20612,7 +20156,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20624,7 +20168,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20632,7 +20176,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20644,7 +20188,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20652,7 +20196,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20667,7 +20211,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20680,7 +20224,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20689,7 +20233,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20701,7 +20245,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20709,7 +20253,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20721,7 +20265,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20729,7 +20273,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20741,7 +20285,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20749,7 +20293,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20761,7 +20305,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20769,7 +20313,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20784,7 +20328,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20797,7 +20341,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20806,7 +20350,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20818,7 +20362,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20826,7 +20370,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20838,7 +20382,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20846,7 +20390,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20858,7 +20402,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20866,7 +20410,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20878,7 +20422,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20886,7 +20430,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20901,7 +20445,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20914,7 +20458,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20923,7 +20467,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20935,7 +20479,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20943,7 +20487,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20955,7 +20499,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20963,7 +20507,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20973,7 +20517,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20981,7 +20525,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20993,7 +20537,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -21001,7 +20545,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -21011,7 +20555,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -21019,7 +20563,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -21031,7 +20575,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -21039,7 +20583,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -21049,7 +20593,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -21057,7 +20601,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -21072,7 +20616,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21085,7 +20629,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21094,7 +20638,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21106,7 +20650,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21115,7 +20659,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21127,7 +20671,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21135,7 +20679,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21147,7 +20691,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21155,7 +20699,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21167,7 +20711,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21175,7 +20719,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21187,7 +20731,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21195,7 +20739,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21210,7 +20754,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21223,12 +20767,12 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } area { color: 15591638 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21236,7 +20780,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21248,12 +20792,12 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } area { color: 15591638 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21261,7 +20805,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21273,11 +20817,11 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21285,7 +20829,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21297,11 +20841,11 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21309,7 +20853,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21321,11 +20865,11 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21333,7 +20877,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21345,11 +20889,11 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21357,7 +20901,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21370,7 +20914,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21380,7 +20924,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21391,7 +20935,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21399,7 +20943,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21409,7 +20953,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21418,7 +20962,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21428,7 +20972,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21436,7 +20980,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21446,7 +20990,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21455,7 +20999,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21465,7 +21009,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21473,7 +21017,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21483,7 +21027,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21491,7 +21035,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21501,7 +21045,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21509,7 +21053,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21519,7 +21063,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21527,7 +21071,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21537,7 +21081,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21545,7 +21089,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21555,7 +21099,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21563,7 +21107,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21573,7 +21117,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21581,7 +21125,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21591,7 +21135,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21599,7 +21143,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21614,7 +21158,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21627,7 +21171,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21636,7 +21180,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21648,7 +21192,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21657,7 +21201,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21669,7 +21213,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21679,7 +21223,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21687,7 +21231,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21699,7 +21243,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21709,7 +21253,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21717,7 +21261,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21729,7 +21273,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21739,7 +21283,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21747,7 +21291,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21759,7 +21303,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21769,7 +21313,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21777,7 +21321,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21788,7 +21332,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21798,7 +21342,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21808,7 +21352,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21818,12 +21362,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 85 } } @@ -21832,7 +21376,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21842,12 +21386,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -21856,7 +21400,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21866,12 +21410,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -21880,7 +21424,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21889,12 +21433,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 120 } } @@ -21903,7 +21447,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21912,12 +21456,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 175 } } @@ -21926,7 +21470,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21935,12 +21479,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 250 } } @@ -21949,7 +21493,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21957,12 +21501,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -21971,7 +21515,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21979,12 +21523,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -21993,7 +21537,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22001,12 +21545,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22015,7 +21559,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22023,12 +21567,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 11 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 350 } } @@ -22040,7 +21584,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22050,7 +21594,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22060,7 +21604,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22070,12 +21614,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 85 } } @@ -22084,7 +21628,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22094,12 +21638,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -22108,7 +21652,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22118,12 +21662,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -22132,7 +21676,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22141,12 +21685,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 120 } } @@ -22157,7 +21701,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22165,13 +21709,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22180,12 +21724,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 175 } } @@ -22196,7 +21740,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22204,13 +21748,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22219,12 +21763,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 250 } } @@ -22235,7 +21779,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22243,13 +21787,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22257,12 +21801,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22273,7 +21817,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22281,13 +21825,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22295,12 +21839,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22311,7 +21855,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22319,13 +21863,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22333,12 +21877,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22349,7 +21893,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22357,13 +21901,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22371,12 +21915,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 11 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 350 } } @@ -22388,7 +21932,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22398,7 +21942,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22408,7 +21952,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22418,12 +21962,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 85 } } @@ -22432,7 +21976,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22442,12 +21986,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -22456,7 +22000,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22466,12 +22010,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -22480,7 +22024,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22489,12 +22033,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 120 } } @@ -22507,13 +22051,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22522,12 +22066,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 175 } } @@ -22540,13 +22084,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22555,12 +22099,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 250 } } @@ -22573,13 +22117,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22587,12 +22131,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22605,13 +22149,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22619,12 +22163,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22637,13 +22181,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22651,12 +22195,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22669,13 +22213,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22683,12 +22227,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 11 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 350 } } @@ -22703,7 +22247,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } } element { @@ -22711,7 +22255,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22721,12 +22265,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22735,7 +22279,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22745,12 +22289,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22759,7 +22303,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22768,12 +22312,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 120 } } @@ -22782,7 +22326,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22791,12 +22335,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 175 } } @@ -22805,7 +22349,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22814,12 +22358,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 250 } } @@ -22828,7 +22372,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22836,12 +22380,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22850,7 +22394,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22858,12 +22402,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22872,7 +22416,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22880,12 +22424,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22894,7 +22438,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22902,12 +22446,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 11 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 350 } } @@ -22922,7 +22466,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } } element { @@ -22930,7 +22474,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22940,12 +22484,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22954,7 +22498,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22964,12 +22508,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22978,7 +22522,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22987,12 +22531,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 120 } } @@ -23003,7 +22547,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23011,13 +22555,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23026,12 +22570,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 175 } } @@ -23042,7 +22586,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23050,13 +22594,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23065,12 +22609,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 250 } } @@ -23081,7 +22625,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23089,13 +22633,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23103,12 +22647,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23119,7 +22663,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23127,13 +22671,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23141,12 +22685,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23157,7 +22701,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23165,13 +22709,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23179,12 +22723,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23195,7 +22739,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23203,13 +22747,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23217,12 +22761,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 11 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 350 } } @@ -23237,7 +22781,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } } element { @@ -23245,7 +22789,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -23255,12 +22799,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -23269,7 +22813,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -23279,12 +22823,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -23293,7 +22837,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23302,12 +22846,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 120 } } @@ -23320,13 +22864,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23335,12 +22879,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 175 } } @@ -23353,13 +22897,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23368,12 +22912,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 250 } } @@ -23386,13 +22930,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23400,12 +22944,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23418,13 +22962,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23432,12 +22976,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23450,13 +22994,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23464,12 +23008,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23482,13 +23026,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23496,12 +23040,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 11 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 350 } } @@ -23513,7 +23057,7 @@ cont { lines { width: 1.0 color: 6510384 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -23522,7 +23066,7 @@ cont { lines { width: 1.5 color: 6510384 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -23531,7 +23075,7 @@ cont { lines { width: 1.8 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23539,7 +23083,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -23547,7 +23091,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23555,7 +23099,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -23563,7 +23107,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23571,7 +23115,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -23579,7 +23123,7 @@ cont { lines { width: 4.0 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23587,7 +23131,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -23598,7 +23142,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23608,7 +23152,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23617,7 +23161,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23625,7 +23169,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23634,7 +23178,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23642,7 +23186,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23651,7 +23195,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23659,7 +23203,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23667,7 +23211,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23675,7 +23219,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23683,7 +23227,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23691,7 +23235,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23699,12 +23243,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -23713,7 +23257,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23721,12 +23265,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -23738,7 +23282,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23748,7 +23292,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23757,7 +23301,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23765,7 +23309,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23774,7 +23318,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23782,7 +23326,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23791,7 +23335,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23799,7 +23343,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23807,7 +23351,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23815,7 +23359,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23823,7 +23367,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23831,7 +23375,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23839,12 +23383,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -23853,7 +23397,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23861,12 +23405,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -23878,7 +23422,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23888,7 +23432,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23897,7 +23441,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23907,7 +23451,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23915,13 +23459,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23930,7 +23474,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23940,7 +23484,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23948,13 +23492,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23963,7 +23507,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23973,7 +23517,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23981,13 +23525,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23995,7 +23539,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -24005,7 +23549,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24013,13 +23557,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24027,7 +23571,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -24037,7 +23581,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24045,13 +23589,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24059,12 +23603,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -24075,7 +23619,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24083,13 +23627,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24097,12 +23641,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -24114,7 +23658,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -24124,7 +23668,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -24133,7 +23677,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -24141,7 +23685,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -24150,7 +23694,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -24158,7 +23702,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -24167,7 +23711,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -24179,13 +23723,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24193,7 +23737,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -24205,13 +23749,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24219,7 +23763,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -24231,13 +23775,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24245,12 +23789,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -24263,13 +23807,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24277,12 +23821,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -24293,7 +23837,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24302,14 +23846,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 17 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24318,14 +23862,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 18 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24334,14 +23878,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 19 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24350,7 +23894,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } } @@ -24361,7 +23905,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24371,7 +23915,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24380,7 +23924,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24389,7 +23933,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24397,7 +23941,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24406,7 +23950,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24414,7 +23958,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24422,7 +23966,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24430,7 +23974,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24438,7 +23982,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24446,7 +23990,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24454,7 +23998,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -24462,7 +24006,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24470,7 +24014,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -24481,7 +24025,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24491,7 +24035,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24500,7 +24044,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24509,7 +24053,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24517,7 +24061,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24526,7 +24070,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24536,7 +24080,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24544,13 +24088,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24558,7 +24102,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24568,7 +24112,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24576,13 +24120,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24590,7 +24134,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24600,7 +24144,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24608,13 +24152,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24622,7 +24166,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -24632,7 +24176,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24640,13 +24184,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24654,7 +24198,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -24665,7 +24209,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24675,7 +24219,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24684,7 +24228,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24693,7 +24237,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24701,7 +24245,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24710,7 +24254,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24718,7 +24262,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24726,7 +24270,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24734,7 +24278,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24742,7 +24286,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24750,7 +24294,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24758,7 +24302,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -24766,7 +24310,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24774,7 +24318,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -24785,7 +24329,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24795,7 +24339,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -24803,7 +24347,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24813,7 +24357,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -24821,7 +24365,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24831,12 +24375,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 90 } } @@ -24845,7 +24389,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24854,12 +24398,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 120 } } @@ -24868,7 +24412,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24877,12 +24421,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 175 } } @@ -24891,7 +24435,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24900,12 +24444,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 250 } } @@ -24914,7 +24458,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24922,12 +24466,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24936,7 +24480,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24944,12 +24488,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24958,7 +24502,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24966,12 +24510,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24980,7 +24524,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24988,12 +24532,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 11 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 350 } } @@ -25005,7 +24549,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25015,7 +24559,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -25023,7 +24567,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25033,7 +24577,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -25041,7 +24585,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25051,12 +24595,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 90 } } @@ -25065,7 +24609,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25074,12 +24618,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 120 } } @@ -25090,7 +24634,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25098,13 +24642,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25113,12 +24657,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 175 } } @@ -25129,7 +24673,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25137,13 +24681,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25152,12 +24696,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 250 } } @@ -25168,7 +24712,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25176,13 +24720,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25190,12 +24734,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25206,7 +24750,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25214,13 +24758,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25228,12 +24772,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25244,7 +24788,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25252,13 +24796,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25266,12 +24810,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25282,7 +24826,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25290,13 +24834,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25304,12 +24848,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 11 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 350 } } @@ -25321,7 +24865,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25331,7 +24875,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -25339,7 +24883,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25349,7 +24893,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -25357,7 +24901,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25367,12 +24911,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 90 } } @@ -25381,7 +24925,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25390,12 +24934,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 120 } } @@ -25404,7 +24948,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25413,12 +24957,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 175 } } @@ -25427,7 +24971,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25436,12 +24980,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 250 } } @@ -25454,13 +24998,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25468,12 +25012,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25486,13 +25030,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25500,12 +25044,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25518,13 +25062,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25532,12 +25076,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25550,13 +25094,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25564,12 +25108,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 11 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 350 } } @@ -25581,7 +25125,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25590,7 +25134,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25599,7 +25143,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25607,7 +25151,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25615,7 +25159,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25623,7 +25167,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25631,7 +25175,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25639,7 +25183,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } element { @@ -25647,7 +25191,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25655,7 +25199,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } } @@ -25668,7 +25212,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25676,13 +25220,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25693,7 +25237,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25701,13 +25245,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25718,7 +25262,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25726,13 +25270,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25740,7 +25284,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25750,7 +25294,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25758,13 +25302,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25772,7 +25316,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25782,7 +25326,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25790,13 +25334,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25804,7 +25348,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } element { @@ -25814,7 +25358,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25822,13 +25366,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25836,7 +25380,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } } @@ -25847,7 +25391,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25856,7 +25400,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25869,13 +25413,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25883,7 +25427,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25895,13 +25439,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25909,7 +25453,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25921,13 +25465,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25935,7 +25479,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } element { @@ -25947,13 +25491,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25961,7 +25505,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } } @@ -25972,7 +25516,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25981,7 +25525,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25990,7 +25534,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25998,7 +25542,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26006,7 +25550,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26014,7 +25558,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26022,7 +25566,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26030,7 +25574,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26038,7 +25582,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26046,7 +25590,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26057,7 +25601,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26066,7 +25610,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26075,7 +25619,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26083,7 +25627,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26091,7 +25635,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26099,7 +25643,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26107,7 +25651,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26115,7 +25659,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26123,7 +25667,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26131,7 +25675,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26142,7 +25686,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26151,7 +25695,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26162,7 +25706,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26170,13 +25714,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26184,7 +25728,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26194,7 +25738,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26202,13 +25746,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26216,7 +25760,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26226,7 +25770,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26234,13 +25778,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26248,7 +25792,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26258,7 +25802,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26266,13 +25810,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26280,92 +25824,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 - } - } -} -cont { - name: "highway-service-busway" - element { - scale: 14 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 + priority: 16339 } } } @@ -26376,7 +25835,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26384,7 +25843,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26392,7 +25851,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26400,7 +25859,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26408,7 +25867,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26416,7 +25875,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26424,7 +25883,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26432,7 +25891,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26440,7 +25899,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26448,7 +25907,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26456,7 +25915,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26464,7 +25923,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26475,7 +25934,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26484,7 +25943,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26493,7 +25952,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26501,7 +25960,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26509,7 +25968,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26517,7 +25976,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26525,7 +25984,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26533,7 +25992,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26541,7 +26000,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26549,7 +26008,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26560,7 +26019,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26569,7 +26028,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26578,7 +26037,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26586,7 +26045,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26594,7 +26053,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26602,7 +26061,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26610,7 +26069,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26618,7 +26077,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26626,7 +26085,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26634,7 +26093,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26644,7 +26103,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16657 + priority: 16669 min_distance: 20 } path_text { @@ -26660,7 +26119,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26675,7 +26134,7 @@ cont { scale: 17 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26690,7 +26149,7 @@ cont { scale: 18 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26705,7 +26164,7 @@ cont { scale: 19 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26723,6 +26182,7 @@ cont { scale: 13 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -26730,6 +26190,7 @@ cont { scale: 14 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -26737,6 +26198,7 @@ cont { scale: 15 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -26744,6 +26206,7 @@ cont { scale: 16 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -26751,6 +26214,7 @@ cont { scale: 17 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -26758,6 +26222,7 @@ cont { scale: 18 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -26773,7 +26238,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26786,7 +26251,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26794,7 +26259,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26806,7 +26271,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26814,7 +26279,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26826,7 +26291,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26834,7 +26299,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26846,7 +26311,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26854,7 +26319,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -26869,7 +26334,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26882,7 +26347,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26890,7 +26355,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26902,7 +26367,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26910,7 +26375,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26922,7 +26387,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26930,7 +26395,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26942,7 +26407,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26950,7 +26415,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -26965,7 +26430,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26978,7 +26443,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26986,7 +26451,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26998,7 +26463,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -27006,7 +26471,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -27016,7 +26481,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -27024,7 +26489,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -27036,7 +26501,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -27044,7 +26509,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -27054,7 +26519,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -27062,7 +26527,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -27074,7 +26539,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -27082,7 +26547,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -27092,7 +26557,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -27100,7 +26565,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -27111,7 +26576,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27121,7 +26586,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27131,7 +26596,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27139,7 +26604,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27148,7 +26613,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27156,7 +26621,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27165,7 +26630,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -27173,7 +26638,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27182,12 +26647,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 250 } } @@ -27196,7 +26661,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27204,12 +26669,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27218,7 +26683,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27226,12 +26691,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27240,7 +26705,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27248,12 +26713,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27262,7 +26727,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27270,12 +26735,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -27287,7 +26752,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27297,7 +26762,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27307,7 +26772,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27315,7 +26780,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27324,7 +26789,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27334,7 +26799,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27342,13 +26807,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27357,7 +26822,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -27367,7 +26832,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27375,13 +26840,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27390,12 +26855,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 250 } } @@ -27406,7 +26871,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27414,13 +26879,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27428,12 +26893,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27444,7 +26909,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27452,13 +26917,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27466,12 +26931,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27482,7 +26947,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27490,13 +26955,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27504,12 +26969,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27520,7 +26985,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27528,13 +26993,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27542,12 +27007,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -27559,7 +27024,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27569,7 +27034,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27579,7 +27044,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27587,7 +27052,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27596,7 +27061,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27604,7 +27069,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27613,7 +27078,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -27621,7 +27086,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27630,12 +27095,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 250 } } @@ -27648,13 +27113,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27662,12 +27127,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27680,13 +27145,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27694,12 +27159,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27712,13 +27177,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27726,12 +27191,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27744,13 +27209,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27758,12 +27223,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -27775,7 +27240,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27784,7 +27249,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27792,7 +27257,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27800,7 +27265,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27808,7 +27273,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } element { @@ -27816,7 +27281,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27824,7 +27289,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } } @@ -27837,7 +27302,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27845,13 +27310,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16777215 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27862,7 +27327,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27870,13 +27335,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27886,7 +27351,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27894,13 +27359,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27910,7 +27375,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27918,13 +27383,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27932,7 +27397,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } element { @@ -27942,7 +27407,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27950,13 +27415,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27964,7 +27429,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } } @@ -27975,7 +27440,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27988,13 +27453,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -28006,13 +27471,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -28024,13 +27489,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -28038,7 +27503,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } element { @@ -28050,13 +27515,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -28064,7 +27529,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } } @@ -28079,7 +27544,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28092,7 +27557,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28101,7 +27566,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28113,7 +27578,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28121,7 +27586,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28133,7 +27598,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28141,7 +27606,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28153,7 +27618,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28161,7 +27626,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28173,7 +27638,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28181,7 +27646,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28196,7 +27661,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28209,7 +27674,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28218,7 +27683,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28230,7 +27695,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28238,7 +27703,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28250,7 +27715,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28258,7 +27723,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28270,7 +27735,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28278,7 +27743,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28290,7 +27755,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28298,7 +27763,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28313,7 +27778,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28326,7 +27791,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28335,7 +27800,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28347,7 +27812,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28355,7 +27820,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28367,7 +27832,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28375,7 +27840,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28387,7 +27852,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28395,7 +27860,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28407,7 +27872,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28415,7 +27880,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28430,7 +27895,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28443,7 +27908,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28452,7 +27917,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28464,7 +27929,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28472,7 +27937,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28484,7 +27949,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28492,7 +27957,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28504,7 +27969,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28512,7 +27977,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28524,7 +27989,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28532,7 +27997,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28547,7 +28012,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28560,7 +28025,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28569,7 +28034,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28581,7 +28046,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28589,7 +28054,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28601,7 +28066,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28609,7 +28074,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28621,7 +28086,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28629,7 +28094,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28641,7 +28106,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28649,7 +28114,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28664,7 +28129,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28677,7 +28142,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28686,7 +28151,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28698,7 +28163,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28706,7 +28171,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28718,7 +28183,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28726,7 +28191,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28738,7 +28203,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28746,7 +28211,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28758,7 +28223,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28766,7 +28231,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28781,7 +28246,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28794,7 +28259,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28803,7 +28268,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28815,7 +28280,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28823,7 +28288,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28835,7 +28300,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28843,7 +28308,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28855,7 +28320,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28863,7 +28328,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28875,7 +28340,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28883,7 +28348,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28898,7 +28363,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28911,7 +28376,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28920,7 +28385,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28932,7 +28397,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28940,7 +28405,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28952,7 +28417,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28960,7 +28425,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28972,7 +28437,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28980,7 +28445,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28992,7 +28457,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29000,7 +28465,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -29015,7 +28480,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -29028,7 +28493,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -29037,7 +28502,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29049,7 +28514,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29057,7 +28522,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29069,7 +28534,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29077,7 +28542,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29089,7 +28554,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29097,7 +28562,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29109,7 +28574,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29117,7 +28582,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -29132,7 +28597,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -29145,7 +28610,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -29154,7 +28619,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29166,7 +28631,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29174,7 +28639,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29186,7 +28651,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29194,7 +28659,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29206,7 +28671,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29214,7 +28679,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29226,7 +28691,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29234,7 +28699,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -29249,7 +28714,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -29262,7 +28727,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -29271,7 +28736,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29283,7 +28748,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29291,7 +28756,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29303,7 +28768,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29311,7 +28776,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29323,7 +28788,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29331,7 +28796,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -29343,7 +28808,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29351,7 +28816,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -29362,7 +28827,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29372,7 +28837,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29382,7 +28847,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29392,7 +28857,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29402,12 +28867,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -29416,7 +28881,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29426,12 +28891,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29440,7 +28905,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29450,12 +28915,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29464,7 +28929,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29473,12 +28938,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -29487,7 +28952,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29496,12 +28961,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -29510,7 +28975,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29519,12 +28984,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -29533,7 +28998,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29541,12 +29006,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29555,7 +29020,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29563,12 +29028,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29577,7 +29042,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29585,12 +29050,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29599,7 +29064,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29607,12 +29072,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -29624,7 +29089,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29634,7 +29099,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29644,7 +29109,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29654,7 +29119,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29664,12 +29129,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -29678,7 +29143,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29688,12 +29153,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29702,7 +29167,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29712,12 +29177,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29728,7 +29193,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29736,13 +29201,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29751,12 +29216,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -29767,7 +29232,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29775,13 +29240,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29790,12 +29255,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -29806,7 +29271,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29814,13 +29279,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29829,12 +29294,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -29845,7 +29310,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29853,13 +29318,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29867,12 +29332,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29883,7 +29348,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29891,13 +29356,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29905,12 +29370,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29921,7 +29386,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29929,13 +29394,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29943,12 +29408,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29959,7 +29424,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29967,13 +29432,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29981,12 +29446,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -29998,7 +29463,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -30008,7 +29473,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -30018,7 +29483,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -30028,7 +29493,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -30038,12 +29503,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -30052,7 +29517,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -30062,12 +29527,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -30080,13 +29545,13 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -30096,12 +29561,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -30114,13 +29579,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -30129,12 +29594,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -30147,13 +29612,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -30162,12 +29627,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -30180,13 +29645,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -30195,12 +29660,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -30213,13 +29678,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30227,12 +29692,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -30245,13 +29710,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30259,12 +29724,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -30277,13 +29742,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30291,12 +29756,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -30309,13 +29774,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30323,12 +29788,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -30340,7 +29805,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30350,12 +29815,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -30364,7 +29829,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30374,12 +29839,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30388,7 +29853,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30398,12 +29863,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30412,7 +29877,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30421,12 +29886,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -30435,7 +29900,7 @@ cont { lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30444,12 +29909,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -30458,7 +29923,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30467,12 +29932,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -30481,7 +29946,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30489,12 +29954,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30503,7 +29968,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30511,12 +29976,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30525,7 +29990,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30533,12 +29998,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30547,7 +30012,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30555,12 +30020,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -30572,7 +30037,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30582,12 +30047,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -30596,7 +30061,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30606,12 +30071,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30620,7 +30085,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30630,12 +30095,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30644,7 +30109,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30653,12 +30118,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -30669,7 +30134,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30677,13 +30142,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30692,12 +30157,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -30708,7 +30173,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30716,13 +30181,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30731,12 +30196,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -30747,7 +30212,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30755,13 +30220,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30769,12 +30234,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30785,7 +30250,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30793,13 +30258,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30807,12 +30272,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30823,7 +30288,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30831,13 +30296,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30845,12 +30310,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30861,7 +30326,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30869,13 +30334,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30883,12 +30348,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -30900,7 +30365,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30910,12 +30375,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -30924,7 +30389,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30934,12 +30399,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30950,13 +30415,13 @@ cont { color: 8421504 dashdot { } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30966,12 +30431,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30984,13 +30449,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30999,12 +30464,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -31017,13 +30482,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.0 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -31032,12 +30497,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -31050,13 +30515,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -31065,12 +30530,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -31083,13 +30548,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -31097,12 +30562,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -31115,13 +30580,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -31129,12 +30594,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -31147,13 +30612,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -31161,12 +30626,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -31179,13 +30644,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -31193,12 +30658,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -31210,7 +30675,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31220,7 +30685,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31230,7 +30695,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31239,7 +30704,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31247,7 +30712,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31256,7 +30721,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31264,7 +30729,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31273,7 +30738,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31281,7 +30746,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31289,7 +30754,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31297,7 +30762,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31305,7 +30770,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31313,7 +30778,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31321,7 +30786,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31329,7 +30794,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31337,7 +30802,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31348,7 +30813,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31358,7 +30823,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31368,7 +30833,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31377,7 +30842,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31385,7 +30850,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31394,7 +30859,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31402,7 +30867,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31411,7 +30876,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31419,7 +30884,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31427,7 +30892,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31435,7 +30900,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31443,7 +30908,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31451,7 +30916,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31459,7 +30924,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31467,7 +30932,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31475,7 +30940,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31486,7 +30951,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31496,7 +30961,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31506,7 +30971,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31515,7 +30980,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31525,7 +30990,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31533,13 +30998,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31548,7 +31013,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31558,7 +31023,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31566,13 +31031,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31581,7 +31046,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31591,7 +31056,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31599,13 +31064,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31613,7 +31078,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31623,7 +31088,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31631,13 +31096,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31645,7 +31110,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31655,7 +31120,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31663,13 +31128,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31677,7 +31142,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31687,7 +31152,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31695,13 +31160,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31709,7 +31174,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31720,7 +31185,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31730,7 +31195,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31740,7 +31205,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31749,7 +31214,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31757,7 +31222,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31766,7 +31231,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31774,7 +31239,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31783,7 +31248,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31795,13 +31260,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31809,7 +31274,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31821,13 +31286,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31835,7 +31300,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31847,13 +31312,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31861,7 +31326,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31873,13 +31338,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31887,7 +31352,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31898,7 +31363,7 @@ cont { lines { width: 0.5 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31908,7 +31373,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31918,7 +31383,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31928,7 +31393,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31938,7 +31403,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31948,7 +31413,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31961,7 +31426,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31971,7 +31436,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31981,7 +31446,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31991,7 +31456,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -32003,7 +31468,7 @@ cont { scale: 17 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -32012,14 +31477,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -32028,14 +31493,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -32044,7 +31509,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -32054,7 +31519,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -32064,14 +31529,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -32081,14 +31546,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -32098,14 +31563,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -32115,14 +31580,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -32132,7 +31597,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -32142,7 +31607,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -32152,14 +31617,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -32169,14 +31634,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -32186,14 +31651,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -32203,7 +31668,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -32213,7 +31678,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32223,14 +31688,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32240,14 +31705,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32257,14 +31722,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32274,14 +31739,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32290,14 +31755,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32306,14 +31771,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32322,14 +31787,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32338,7 +31803,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32348,7 +31813,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32358,14 +31823,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32375,14 +31840,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32392,14 +31857,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32409,14 +31874,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32425,14 +31890,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32441,14 +31906,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32457,14 +31922,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32473,7 +31938,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32483,7 +31948,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32493,14 +31958,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32510,14 +31975,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32527,14 +31992,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32544,14 +32009,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32560,14 +32025,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32576,14 +32041,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32592,14 +32057,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32608,7 +32073,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32618,7 +32083,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32628,14 +32093,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32645,14 +32110,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32662,14 +32127,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32679,14 +32144,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32695,14 +32160,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32711,14 +32176,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32727,14 +32192,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32743,7 +32208,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32753,7 +32218,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32763,14 +32228,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32780,14 +32245,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32797,14 +32262,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32814,14 +32279,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32830,14 +32295,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32846,14 +32311,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32862,14 +32327,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32878,7 +32343,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32888,7 +32353,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32898,14 +32363,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32915,14 +32380,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32932,14 +32397,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32949,14 +32414,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32965,14 +32430,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32981,14 +32446,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32997,14 +32462,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33013,7 +32478,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33023,7 +32488,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33033,14 +32498,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33050,14 +32515,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33067,14 +32532,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33084,14 +32549,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33100,14 +32565,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33116,14 +32581,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33132,14 +32597,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33148,7 +32613,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33158,7 +32623,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33168,14 +32633,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33185,14 +32650,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33202,14 +32667,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33219,14 +32684,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33235,14 +32700,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33251,14 +32716,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33267,14 +32732,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33283,7 +32748,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33293,7 +32758,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33303,14 +32768,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33320,14 +32785,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33337,14 +32802,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33354,14 +32819,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33370,14 +32835,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33386,14 +32851,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33402,14 +32867,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33418,7 +32883,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33428,7 +32893,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33438,14 +32903,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33455,14 +32920,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33472,14 +32937,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33489,14 +32954,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33505,14 +32970,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33521,14 +32986,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33537,14 +33002,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33553,7 +33018,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33563,7 +33028,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33573,14 +33038,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33590,14 +33055,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33607,14 +33072,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33624,14 +33089,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33640,14 +33105,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33656,14 +33121,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33672,14 +33137,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33688,7 +33153,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33698,7 +33163,7 @@ cont { scale: 13 symbol { name: "remains-s" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33708,14 +33173,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "remains-s" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33725,14 +33190,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 24 } caption { @@ -33742,14 +33207,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33759,14 +33224,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33776,14 +33241,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33793,14 +33258,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33810,7 +33275,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -33821,7 +33286,7 @@ cont { lines { width: 2.0 color: 12763315 - priority: 1590 + priority: 1603 cap: BUTTCAP } } @@ -33830,7 +33295,7 @@ cont { lines { width: 2.8 color: 12763315 - priority: 1590 + priority: 1603 cap: BUTTCAP } } @@ -33845,7 +33310,7 @@ cont { dd: 1.5 dd: 3.0 } - priority: 1590 + priority: 1603 } } element { @@ -33859,7 +33324,7 @@ cont { dd: 1.9 dd: 4.0 } - priority: 1590 + priority: 1603 } } element { @@ -33873,7 +33338,7 @@ cont { dd: 2.5 dd: 6.0 } - priority: 1590 + priority: 1603 } } element { @@ -33887,7 +33352,7 @@ cont { dd: 3.0 dd: 8.0 } - priority: 1590 + priority: 1603 } } } @@ -33897,7 +33362,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33907,14 +33372,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33924,14 +33389,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33941,14 +33406,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33958,14 +33423,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33974,14 +33439,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33990,14 +33455,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -34006,14 +33471,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -34022,7 +33487,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -34032,7 +33497,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -34040,7 +33505,7 @@ cont { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34050,14 +33515,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34067,14 +33532,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34084,7 +33549,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34094,7 +33559,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34104,14 +33569,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34121,14 +33586,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34138,14 +33603,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34155,14 +33620,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34172,7 +33637,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34182,7 +33647,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16733 + priority: 16745 min_distance: 24 } } @@ -34190,7 +33655,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16733 + priority: 16745 min_distance: 12 } } @@ -34198,7 +33663,7 @@ cont { scale: 17 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34208,14 +33673,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34225,14 +33690,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34242,7 +33707,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34252,7 +33717,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 24 } } @@ -34260,7 +33725,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34268,7 +33733,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34276,7 +33741,7 @@ cont { scale: 18 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34286,14 +33751,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34303,7 +33768,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -34313,7 +33778,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34323,14 +33788,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34340,14 +33805,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34357,14 +33822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34374,14 +33839,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34391,7 +33856,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34401,7 +33866,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34411,14 +33876,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34428,14 +33893,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34445,14 +33910,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34462,14 +33927,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34479,7 +33944,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34489,7 +33954,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 24 } } @@ -34497,7 +33962,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34505,7 +33970,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34513,7 +33978,7 @@ cont { scale: 18 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34521,7 +33986,7 @@ cont { scale: 19 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34531,7 +33996,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -34541,7 +34006,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34551,14 +34016,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34568,14 +34033,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34585,14 +34050,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34602,14 +34067,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34619,7 +34084,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34629,7 +34094,7 @@ cont { scale: 13 symbol { name: "monument-s" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34639,14 +34104,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 14 symbol { name: "monument-s" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34656,14 +34121,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34673,14 +34138,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34690,14 +34155,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34707,14 +34172,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34724,14 +34189,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34741,7 +34206,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34751,7 +34216,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -34759,7 +34224,7 @@ cont { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34769,14 +34234,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34786,14 +34251,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34803,7 +34268,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34813,7 +34278,7 @@ cont { scale: 17 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34822,7 +34287,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34830,7 +34295,7 @@ cont { scale: 18 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34839,7 +34304,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34847,7 +34312,7 @@ cont { scale: 19 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34856,7 +34321,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34864,7 +34329,7 @@ cont { scale: 19 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34873,7 +34338,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "!name" } @@ -34884,7 +34349,7 @@ cont { scale: 16 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34894,14 +34359,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 17 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34911,14 +34376,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 18 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34928,14 +34393,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 19 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34945,7 +34410,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } } @@ -34955,7 +34420,7 @@ cont { scale: 16 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34965,14 +34430,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34982,14 +34447,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34999,14 +34464,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35016,7 +34481,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -35026,7 +34491,7 @@ cont { scale: 16 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35036,14 +34501,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35053,14 +34518,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35070,14 +34535,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35087,7 +34552,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -35097,7 +34562,7 @@ cont { scale: 16 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -35105,7 +34570,7 @@ cont { scale: 17 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35115,14 +34580,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35132,14 +34597,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -35149,7 +34614,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -35158,7 +34623,7 @@ cont { element { scale: 15 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-xs" step: 44.0 @@ -35169,7 +34634,7 @@ cont { element { scale: 16 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-s" step: 54.0 @@ -35180,7 +34645,7 @@ cont { element { scale: 17 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-s" step: 64.0 @@ -35191,7 +34656,7 @@ cont { element { scale: 18 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-m" step: 74.0 @@ -35202,7 +34667,7 @@ cont { element { scale: 19 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-m" step: 74.0 @@ -35218,7 +34683,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35227,7 +34692,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35235,14 +34700,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35250,14 +34715,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35265,14 +34730,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35283,7 +34748,7 @@ cont { lines { width: 1.0 color: 2152292681 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35292,7 +34757,7 @@ cont { lines { width: 1.3 color: 1716085065 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35301,7 +34766,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35309,7 +34774,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35317,14 +34782,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35332,14 +34797,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35347,14 +34812,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35362,14 +34827,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35380,7 +34845,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35389,7 +34854,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35397,7 +34862,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35406,7 +34871,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35414,7 +34879,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35422,7 +34887,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35430,7 +34895,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35438,7 +34903,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35446,7 +34911,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35454,7 +34919,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35462,14 +34927,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35477,14 +34942,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35492,14 +34957,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35507,14 +34972,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35525,7 +34990,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35534,7 +34999,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35542,14 +35007,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35557,14 +35022,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35572,14 +35037,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35590,7 +35055,7 @@ cont { lines { width: 1.0 color: 2152292681 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35600,7 +35065,7 @@ cont { lines { width: 1.3 color: 1716085065 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35609,7 +35074,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35617,7 +35082,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35625,7 +35090,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35633,7 +35098,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35641,7 +35106,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35649,7 +35114,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35657,7 +35122,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35665,14 +35130,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35680,14 +35145,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35695,14 +35160,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35710,14 +35175,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35728,7 +35193,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35737,7 +35202,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35745,14 +35210,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35760,14 +35225,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35775,14 +35240,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35795,7 +35260,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35805,7 +35270,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35815,7 +35280,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } } @@ -35828,7 +35293,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35838,7 +35303,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35848,7 +35313,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } } @@ -35858,91 +35323,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -35952,56 +35417,56 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } } } @@ -36011,18 +35476,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36030,18 +35495,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36049,18 +35514,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36068,18 +35533,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36087,18 +35552,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36106,7 +35571,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -36116,18 +35581,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36135,18 +35600,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36154,18 +35619,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36173,18 +35638,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36192,18 +35657,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -36211,7 +35676,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -36403,105 +35868,105 @@ cont { scale: 10 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 11 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 12 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -36511,105 +35976,105 @@ cont { scale: 10 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 11 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 12 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -36619,56 +36084,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } } } @@ -36678,21 +36143,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -36700,7 +36165,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36708,7 +36173,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36716,11 +36181,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -36730,7 +36195,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36738,7 +36203,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36746,11 +36211,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36760,7 +36225,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36768,7 +36233,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36776,11 +36241,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36790,7 +36255,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36798,7 +36263,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36806,11 +36271,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36827,7 +36292,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36835,7 +36300,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36843,11 +36308,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36864,7 +36329,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36872,7 +36337,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36880,11 +36345,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36901,7 +36366,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36909,11 +36374,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36921,11 +36386,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36942,7 +36407,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36950,11 +36415,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36965,21 +36430,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -36987,7 +36452,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36995,7 +36460,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37003,11 +36468,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -37017,7 +36482,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37025,7 +36490,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37033,11 +36498,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37047,7 +36512,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37055,7 +36520,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37063,11 +36528,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37077,7 +36542,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37085,7 +36550,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37093,11 +36558,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37114,7 +36579,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37122,7 +36587,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37130,11 +36595,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37151,7 +36616,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37159,7 +36624,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37167,11 +36632,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37188,7 +36653,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37196,11 +36661,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37208,11 +36673,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37229,7 +36694,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37237,11 +36702,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37252,21 +36717,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -37274,7 +36739,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37282,7 +36747,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37290,11 +36755,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -37304,7 +36769,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37312,7 +36777,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37320,11 +36785,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37334,7 +36799,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37342,7 +36807,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37350,11 +36815,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37364,7 +36829,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37372,7 +36837,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37380,11 +36845,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37401,7 +36866,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37409,7 +36874,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37417,11 +36882,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37438,7 +36903,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37446,7 +36911,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37454,11 +36919,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37475,7 +36940,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37483,11 +36948,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37495,11 +36960,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37516,7 +36981,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37524,11 +36989,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37539,21 +37004,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -37561,7 +37026,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37569,7 +37034,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37577,11 +37042,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -37591,7 +37056,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37599,7 +37064,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37607,11 +37072,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37621,7 +37086,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37629,7 +37094,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37637,11 +37102,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37651,7 +37116,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37659,7 +37124,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37667,11 +37132,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37688,7 +37153,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37696,7 +37161,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37704,11 +37169,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37725,7 +37190,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37733,7 +37198,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37741,11 +37206,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37762,7 +37227,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37770,11 +37235,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37782,11 +37247,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37803,7 +37268,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37811,11 +37276,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37826,14 +37291,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1229 + priority: 1246 } } element { scale: 15 area { color: 1724500155 - priority: 1229 + priority: 1246 } } element { @@ -37844,7 +37309,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1229 + priority: 1246 } } element { @@ -37855,7 +37320,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -37866,7 +37331,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -37877,7 +37342,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } } @@ -37887,56 +37352,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 13029267 - priority: -15877 + priority: -15859 } } } @@ -38019,11 +37484,11 @@ cont { scale: 15 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -38031,18 +37496,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 16 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -38050,18 +37515,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -38069,18 +37534,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -38088,18 +37553,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -38107,7 +37572,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -38117,56 +37582,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } } } @@ -38176,39 +37641,39 @@ cont { scale: 12 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 14 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 15 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 16 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 min_distance: 10 } } @@ -38216,11 +37681,11 @@ cont { scale: 17 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38228,18 +37693,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 18 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38247,18 +37712,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 19 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38266,7 +37731,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } } @@ -38276,53 +37741,53 @@ cont { scale: 10 area { color: 15022389 - priority: -15524 + priority: -15510 } } element { scale: 11 area { color: 15022389 - priority: -15524 + priority: -15510 } } element { scale: 12 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 14 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 15 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 16 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 min_distance: 10 } } @@ -38330,11 +37795,11 @@ cont { scale: 17 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38342,18 +37807,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 18 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38361,18 +37826,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 19 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38380,7 +37845,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } } @@ -38390,91 +37855,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -38630,91 +38095,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -38727,7 +38192,7 @@ cont { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38738,7 +38203,7 @@ cont { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38746,14 +38211,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38761,7 +38226,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38769,14 +38234,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38784,7 +38249,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38792,14 +38257,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38807,7 +38272,7 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38815,14 +38280,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38830,7 +38295,7 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38838,14 +38303,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38853,7 +38318,7 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38861,14 +38326,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38876,7 +38341,7 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38884,14 +38349,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38899,7 +38364,7 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38907,14 +38372,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38922,7 +38387,7 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38983,140 +38448,140 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } } } @@ -39126,56 +38591,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } } } @@ -39185,91 +38650,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -39346,11 +38811,11 @@ cont { scale: 17 area { color: 16575614 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39359,18 +38824,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 + priority: 15047 } } element { scale: 18 area { color: 16575614 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39379,18 +38844,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 + priority: 15047 } } element { scale: 19 area { color: 16575614 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39399,58 +38864,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 - } - } -} -cont { - name: "leisure-bowling_alley" - element { - scale: 17 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15047 } } } @@ -39532,7 +38946,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -39541,14 +38955,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39558,14 +38972,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39575,14 +38989,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39592,7 +39006,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -39602,7 +39016,8 @@ cont { scale: 17 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39618,7 +39033,8 @@ cont { scale: 18 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39634,7 +39050,8 @@ cont { scale: 19 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39653,7 +39070,8 @@ cont { scale: 17 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39669,7 +39087,8 @@ cont { scale: 18 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39685,7 +39104,8 @@ cont { scale: 19 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39704,39 +39124,39 @@ cont { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } } element { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } } element { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39753,7 +39173,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39761,7 +39181,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -39769,11 +39189,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39790,7 +39210,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39798,7 +39218,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39806,7 +39226,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39814,11 +39234,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39835,7 +39255,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39843,11 +39263,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -39855,11 +39275,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39876,7 +39296,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39884,11 +39304,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -39899,35 +39319,35 @@ cont { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } } element { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } } element { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -39935,7 +39355,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39943,7 +39363,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39951,7 +39371,7 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39959,7 +39379,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39967,7 +39387,7 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39975,7 +39395,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39983,7 +39403,7 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39991,7 +39411,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39999,7 +39419,7 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -40007,7 +39427,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40018,46 +39438,46 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -40066,18 +39486,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15142 + priority: 15160 } } element { scale: 18 area { color: 13029267 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -40086,18 +39506,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15142 + priority: 15160 } } element { scale: 19 area { color: 13029267 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -40106,7 +39526,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15142 + priority: 15160 } } } @@ -40116,7 +39536,8 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -40132,7 +39553,8 @@ cont { scale: 18 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -40148,7 +39570,8 @@ cont { scale: 19 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -40203,7 +39626,7 @@ cont { scale: 16 symbol { name: "marina-m" - priority: 16095 + priority: 16113 min_distance: 30 } caption { @@ -40212,14 +39635,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15095 + priority: 15113 } } element { scale: 17 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -40229,14 +39652,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } element { scale: 18 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -40246,14 +39669,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } element { scale: 19 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -40263,7 +39686,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } } @@ -40273,18 +39696,18 @@ cont { scale: 10 area { color: 3431500856 - priority: -15334 + priority: -15321 } } element { scale: 11 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 20 } } @@ -40292,11 +39715,11 @@ cont { scale: 12 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -40306,18 +39729,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 13 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -40327,18 +39750,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 14 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 } caption { primary { @@ -40347,18 +39770,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40367,18 +39790,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40387,18 +39810,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40407,18 +39830,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40428,18 +39851,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } element { scale: 19 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40449,7 +39872,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } } @@ -40459,39 +39882,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40501,7 +39924,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40509,7 +39932,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40517,11 +39940,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40531,7 +39954,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40539,7 +39962,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40547,11 +39970,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40568,7 +39991,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40576,7 +39999,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40584,11 +40007,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40605,7 +40028,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40613,7 +40036,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -40621,7 +40044,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40629,11 +40052,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40650,7 +40073,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40658,11 +40081,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40670,11 +40093,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40691,7 +40114,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40699,11 +40122,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40714,39 +40137,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40756,7 +40179,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40764,7 +40187,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40772,11 +40195,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40786,7 +40209,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40794,7 +40217,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40802,11 +40225,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40823,7 +40246,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40831,7 +40254,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40839,11 +40262,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40860,7 +40283,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40868,7 +40291,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -40876,7 +40299,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40884,11 +40307,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40905,7 +40328,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40913,11 +40336,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40925,11 +40348,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40946,7 +40369,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40954,11 +40377,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40969,39 +40392,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41011,7 +40434,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41019,7 +40442,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41027,11 +40450,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41041,7 +40464,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41049,7 +40472,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41057,11 +40480,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41078,7 +40501,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41086,7 +40509,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41094,11 +40517,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41115,7 +40538,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41123,7 +40546,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -41131,7 +40554,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -41139,11 +40562,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41160,7 +40583,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41168,11 +40591,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41180,11 +40603,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41201,7 +40624,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41209,11 +40632,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41224,39 +40647,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41266,7 +40689,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41274,7 +40697,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41282,11 +40705,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41296,7 +40719,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41304,7 +40727,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41312,11 +40735,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41333,7 +40756,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41341,7 +40764,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41349,11 +40772,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41370,7 +40793,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41378,7 +40801,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -41386,7 +40809,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -41394,11 +40817,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41415,7 +40838,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41423,11 +40846,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41435,11 +40858,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41456,7 +40879,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41464,11 +40887,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41479,7 +40902,7 @@ cont { scale: 16 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41488,14 +40911,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41504,14 +40927,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41520,14 +40943,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41536,7 +40959,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -41546,25 +40969,26 @@ cont { scale: 15 area { color: 13749671 - priority: -15924 + priority: -15963 } } element { scale: 16 area { color: 13749671 - priority: -15924 + priority: -15963 } } element { scale: 17 area { color: 13749671 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41580,11 +41004,12 @@ cont { scale: 18 area { color: 13749671 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41600,11 +41025,12 @@ cont { scale: 19 area { color: 13749671 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41623,18 +41049,19 @@ cont { scale: 16 area { color: 13749671 - priority: -15924 + priority: -15963 } } element { scale: 17 area { color: 13749671 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41643,18 +41070,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 area { color: 13749671 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41663,18 +41091,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 area { color: 13749671 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41683,7 +41112,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -41729,7 +41158,8 @@ cont { scale: 17 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41745,7 +41175,8 @@ cont { scale: 18 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41761,7 +41192,8 @@ cont { scale: 19 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41816,7 +41248,8 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41832,7 +41265,8 @@ cont { scale: 18 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41848,7 +41282,8 @@ cont { scale: 19 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41867,7 +41302,8 @@ cont { scale: 13 symbol { name: "stadium-s" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 16 } caption { @@ -41876,14 +41312,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 14 symbol { name: "stadium-s" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 16 } caption { @@ -41892,18 +41329,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 15 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41912,18 +41350,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 16 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41932,18 +41371,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 17 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41952,18 +41392,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 18 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41972,18 +41413,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 19 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41992,7 +41434,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } } @@ -42002,39 +41444,39 @@ cont { scale: 13 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 14 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -42043,18 +41485,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -42063,18 +41505,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -42083,7 +41525,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -42093,39 +41535,39 @@ cont { scale: 13 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 14 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -42134,18 +41576,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -42154,18 +41596,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -42174,7 +41616,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -42185,7 +41627,7 @@ cont { lines { width: 1.5 color: 13749671 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -42194,7 +41636,7 @@ cont { lines { width: 1.8 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -42202,7 +41644,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 15314 + priority: 15330 } } element { @@ -42210,7 +41652,7 @@ cont { lines { width: 3.0 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -42219,7 +41661,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { @@ -42227,7 +41669,7 @@ cont { lines { width: 3.0 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -42236,7 +41678,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { @@ -42244,7 +41686,7 @@ cont { lines { width: 4.0 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -42253,7 +41695,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } } @@ -42263,14 +41705,14 @@ cont { scale: 15 area { color: 13749671 - priority: -15686 + priority: -15670 } } element { scale: 16 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -42278,14 +41720,14 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 15314 + priority: 15330 } } element { scale: 17 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -42294,14 +41736,14 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { scale: 18 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -42310,14 +41752,14 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { scale: 19 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -42326,7 +41768,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } } @@ -42336,7 +41778,7 @@ cont { scale: 16 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -42345,14 +41787,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42362,14 +41804,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42379,14 +41821,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42396,7 +41838,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -42406,14 +41848,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42421,12 +41863,12 @@ cont { lines { width: 1.5 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42434,12 +41876,12 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42447,11 +41889,11 @@ cont { lines { width: 3.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42459,7 +41901,7 @@ cont { lines { width: 4.5 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42470,7 +41912,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42478,7 +41920,7 @@ cont { lines { width: 6.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42489,7 +41931,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42497,7 +41939,7 @@ cont { lines { width: 8.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42508,7 +41950,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } } @@ -42518,21 +41960,21 @@ cont { scale: 16 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } } element { scale: 17 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } } element { scale: 18 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -42540,14 +41982,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -42555,7 +41997,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -42566,7 +42008,7 @@ cont { lines { width: 1.0 color: 1724896680 - priority: 1180 + priority: 1198 cap: BUTTCAP } } @@ -42575,7 +42017,7 @@ cont { lines { width: 1.5 color: 1724896680 - priority: 1180 + priority: 1198 cap: BUTTCAP } } @@ -42584,7 +42026,7 @@ cont { lines { width: 2.0 color: 1724896680 - priority: 1180 + priority: 1198 } } element { @@ -42592,7 +42034,7 @@ cont { lines { width: 3.0 color: 1724896680 - priority: 1180 + priority: 1198 } } element { @@ -42600,7 +42042,7 @@ cont { lines { width: 4.5 color: 1724896680 - priority: 1180 + priority: 1198 } } element { @@ -42608,7 +42050,7 @@ cont { lines { width: 6.0 color: 1724896680 - priority: 1180 + priority: 1198 } } } @@ -42625,7 +42067,7 @@ cont { dd: 2.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -42639,7 +42081,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1219 + priority: 1235 } } element { @@ -42653,7 +42095,7 @@ cont { dd: 4.0 dd: 3.0 } - priority: 1219 + priority: 1235 } } element { @@ -42667,7 +42109,7 @@ cont { dd: 5.0 dd: 4.0 } - priority: 1219 + priority: 1235 } } } @@ -42677,6 +42119,7 @@ cont { scale: 15 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42684,6 +42127,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42691,6 +42135,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42698,6 +42143,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42705,6 +42151,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42715,7 +42162,7 @@ cont { scale: 14 symbol { name: "lighthouse-s" - priority: 16666 + priority: 16679 min_distance: 5 } caption { @@ -42724,14 +42171,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42739,14 +42186,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42754,14 +42201,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42769,14 +42216,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42784,14 +42231,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 19 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42799,7 +42246,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } } @@ -42809,6 +42256,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42816,6 +42264,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42823,6 +42272,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42830,6 +42280,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42840,14 +42291,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42855,12 +42306,12 @@ cont { lines { width: 1.5 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42868,12 +42319,12 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42881,11 +42332,11 @@ cont { lines { width: 3.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42893,7 +42344,7 @@ cont { lines { width: 4.5 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42904,7 +42355,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42912,7 +42363,7 @@ cont { lines { width: 6.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42923,7 +42374,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42931,7 +42382,7 @@ cont { lines { width: 8.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42942,7 +42393,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } } @@ -43046,7 +42497,8 @@ cont { scale: 16 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -43055,14 +42507,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -43071,14 +42524,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -43087,14 +42541,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -43103,7 +42558,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -43113,7 +42568,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43121,7 +42576,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43129,7 +42584,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43137,7 +42592,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43145,7 +42600,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43156,7 +42611,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43164,7 +42619,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43172,7 +42627,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43180,7 +42635,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43188,7 +42643,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -43199,7 +42654,7 @@ cont { scale: 16 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -43208,14 +42663,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -43225,14 +42680,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -43242,14 +42697,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -43259,7 +42714,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -43316,7 +42771,7 @@ cont { scale: 14 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43325,14 +42780,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43341,14 +42796,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43357,14 +42812,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43373,14 +42828,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43389,14 +42844,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43405,7 +42860,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -43415,21 +42870,21 @@ cont { scale: 12 area { color: 15590876 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 15590876 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43438,14 +42893,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 15 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43454,14 +42909,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43470,14 +42925,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43486,14 +42941,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43502,14 +42957,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43518,7 +42973,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } } @@ -44002,7 +43457,7 @@ cont { scale: 11 symbol { name: "cave-s" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -44012,14 +43467,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -44028,14 +43483,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -44044,14 +43499,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -44060,14 +43515,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44076,14 +43531,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44092,14 +43547,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44108,14 +43563,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44124,14 +43579,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44140,7 +43595,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -44155,7 +43610,7 @@ cont { dd: 1.4 dd: 1.4 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44168,7 +43623,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44183,7 +43638,7 @@ cont { dd: 4.5 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -44197,7 +43652,7 @@ cont { dd: 6.0 dd: 1.4 } - priority: 1219 + priority: 1235 } } element { @@ -44211,7 +43666,7 @@ cont { dd: 8.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -44225,7 +43680,7 @@ cont { dd: 10.0 dd: 1.9 } - priority: 1219 + priority: 1235 } } } @@ -44566,7 +44021,7 @@ cont { dd: 1.4 dd: 1.4 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44579,7 +44034,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44594,7 +44049,7 @@ cont { dd: 4.5 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -44608,7 +44063,7 @@ cont { dd: 6.0 dd: 1.4 } - priority: 1219 + priority: 1235 } } element { @@ -44622,7 +44077,7 @@ cont { dd: 8.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -44636,7 +44091,7 @@ cont { dd: 10.0 dd: 1.9 } - priority: 1219 + priority: 1235 } } } @@ -44646,7 +44101,7 @@ cont { scale: 14 symbol { name: "geyser-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44656,14 +44111,14 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44673,14 +44128,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44690,14 +44145,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44707,14 +44162,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44724,14 +44179,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44741,7 +44196,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -44893,56 +44348,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 13029267 - priority: -15877 + priority: -15859 } } } @@ -44952,56 +44407,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 13029267 - priority: -15877 + priority: -15859 } } } @@ -45011,7 +44466,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45021,65 +44476,65 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45089,14 +44544,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45106,7 +44561,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -45258,7 +44713,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 min_distance: 10 } caption { @@ -45268,7 +44723,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -45280,7 +44735,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "!name" } @@ -45288,7 +44743,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45297,7 +44752,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -45309,7 +44764,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "!name" } @@ -45317,7 +44772,7 @@ cont { scale: 14 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45326,7 +44781,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -45334,7 +44789,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45343,14 +44798,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45359,14 +44814,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45375,14 +44830,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45391,14 +44846,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45407,7 +44862,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45455,7 +44910,7 @@ cont { scale: 14 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45464,14 +44919,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45480,14 +44935,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45496,14 +44951,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45512,14 +44967,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45528,14 +44983,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45544,7 +44999,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45554,42 +45009,42 @@ cont { scale: 14 area { color: 11453035 - priority: -15867 + priority: -15850 } } element { scale: 15 area { color: 11584112 - priority: -15867 + priority: -15850 } } element { scale: 16 area { color: 11190117 - priority: -15867 + priority: -15850 } } element { scale: 17 area { color: 11190117 - priority: -15867 + priority: -15850 } } element { scale: 18 area { color: 11190117 - priority: -15867 + priority: -15850 } } element { scale: 19 area { color: 11190117 - priority: -15867 + priority: -15850 } } } @@ -45599,7 +45054,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45609,65 +45064,65 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45677,14 +45132,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45694,7 +45149,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -45815,7 +45270,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45824,14 +45279,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45840,14 +45295,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45856,14 +45311,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45872,14 +45327,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45888,14 +45343,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45904,14 +45359,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45920,14 +45375,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45936,14 +45391,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45952,14 +45407,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45968,7 +45423,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45977,84 +45432,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46062,7 +45517,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46070,14 +45525,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46085,7 +45540,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46093,14 +45548,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46108,7 +45563,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46116,14 +45571,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46131,7 +45586,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46139,14 +45594,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46154,14 +45609,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46169,14 +45624,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46184,14 +45639,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46199,14 +45654,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46214,14 +45669,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46229,14 +45684,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46244,14 +45699,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46259,14 +45714,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46274,14 +45729,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46289,14 +45744,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46304,14 +45759,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46321,84 +45776,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46406,7 +45861,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46414,14 +45869,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46429,7 +45884,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46437,14 +45892,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46452,7 +45907,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46460,14 +45915,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46475,7 +45930,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46483,14 +45938,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46498,14 +45953,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46513,14 +45968,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46528,14 +45983,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46543,14 +45998,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46558,14 +46013,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46573,14 +46028,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46588,14 +46043,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46603,14 +46058,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46618,14 +46073,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46633,14 +46088,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46648,14 +46103,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46665,84 +46120,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46750,7 +46205,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46758,14 +46213,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46773,7 +46228,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46781,14 +46236,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46796,7 +46251,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46804,14 +46259,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46819,7 +46274,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46827,14 +46282,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46842,14 +46297,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46857,14 +46312,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46872,14 +46327,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46887,14 +46342,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46902,14 +46357,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46917,14 +46372,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46932,14 +46387,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46947,14 +46402,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46962,14 +46417,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46977,14 +46432,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46992,14 +46447,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47009,84 +46464,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47094,7 +46549,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47102,14 +46557,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47117,7 +46572,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47125,14 +46580,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47140,7 +46595,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47148,14 +46603,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47163,7 +46618,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47171,14 +46626,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47186,14 +46641,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47201,14 +46656,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47216,14 +46671,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47231,14 +46686,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47246,14 +46701,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47261,14 +46716,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47276,14 +46731,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47291,14 +46746,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47306,14 +46761,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47321,14 +46776,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47336,14 +46791,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47353,84 +46808,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47438,7 +46893,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47446,14 +46901,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47461,7 +46916,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47469,14 +46924,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47484,7 +46939,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47492,14 +46947,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47507,7 +46962,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47515,14 +46970,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47530,14 +46985,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47545,14 +47000,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47560,14 +47015,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47575,14 +47030,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47590,14 +47045,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47605,14 +47060,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47620,14 +47075,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47635,14 +47090,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47650,14 +47105,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47665,14 +47120,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47680,14 +47135,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47697,84 +47152,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47782,7 +47237,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47790,14 +47245,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47805,7 +47260,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47813,14 +47268,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47828,7 +47283,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47836,14 +47291,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47851,7 +47306,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47859,14 +47314,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47874,14 +47329,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47889,14 +47344,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47904,14 +47359,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47919,14 +47374,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47934,14 +47389,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47949,14 +47404,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47964,14 +47419,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47979,14 +47434,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47994,14 +47449,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48009,14 +47464,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48024,14 +47479,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48041,84 +47496,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48126,7 +47581,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48134,14 +47589,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48149,7 +47604,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48157,14 +47612,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48172,7 +47627,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48180,14 +47635,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48195,7 +47650,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48203,14 +47658,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48218,14 +47673,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48233,14 +47688,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48248,14 +47703,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48263,14 +47718,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48278,14 +47733,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48293,14 +47748,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48308,14 +47763,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48323,14 +47778,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48338,14 +47793,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48353,14 +47808,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48368,14 +47823,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48385,84 +47840,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48470,7 +47925,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48478,14 +47933,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48493,7 +47948,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48501,14 +47956,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48516,7 +47971,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48524,14 +47979,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48539,7 +47994,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48547,14 +48002,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48562,14 +48017,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48577,14 +48032,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48592,14 +48047,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48607,14 +48062,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48622,14 +48077,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48637,14 +48092,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48652,14 +48107,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48667,14 +48122,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48682,14 +48137,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48697,14 +48152,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48712,14 +48167,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48730,91 +48185,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } } @@ -48824,91 +48279,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } } @@ -48918,91 +48373,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } } @@ -49012,7 +48467,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49021,14 +48476,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49037,7 +48492,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49047,7 +48502,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49056,14 +48511,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49072,7 +48527,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49082,7 +48537,7 @@ cont { scale: 17 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -49091,14 +48546,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -49107,14 +48562,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -49123,7 +48578,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -49133,7 +48588,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49142,14 +48597,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49158,7 +48613,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49168,7 +48623,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49177,14 +48632,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49193,7 +48648,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49203,7 +48658,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49212,14 +48667,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49228,7 +48683,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49238,7 +48693,7 @@ cont { scale: 17 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -49248,14 +48703,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -49265,14 +48720,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -49282,7 +48737,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -49292,7 +48747,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49301,14 +48756,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49317,7 +48772,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49327,7 +48782,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49336,14 +48791,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49352,7 +48807,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49363,7 +48818,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49372,7 +48827,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49381,7 +48836,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49389,7 +48844,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49397,7 +48852,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49405,7 +48860,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } } @@ -49416,7 +48871,7 @@ cont { lines { width: 1.0 color: 657933 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49425,7 +48880,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49434,7 +48889,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1247 + priority: 1264 } } element { @@ -49442,7 +48897,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1247 + priority: 1264 } } element { @@ -49450,7 +48905,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1247 + priority: 1264 } } element { @@ -49458,7 +48913,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1247 + priority: 1264 } } } @@ -49469,7 +48924,7 @@ cont { lines { width: 1.0 color: 731131 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49478,7 +48933,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49487,7 +48942,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49495,7 +48950,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49503,7 +48958,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49511,7 +48966,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } } @@ -49522,7 +48977,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49531,7 +48986,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49540,7 +48995,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49548,7 +49003,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49556,7 +49011,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49564,7 +49019,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } } @@ -49575,7 +49030,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49584,7 +49039,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49593,7 +49048,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49601,7 +49056,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49609,7 +49064,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49617,7 +49072,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } } @@ -49628,7 +49083,7 @@ cont { lines { width: 1.0 color: 16518683 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49637,7 +49092,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49646,7 +49101,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49654,7 +49109,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49662,7 +49117,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49670,7 +49125,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } } @@ -49681,7 +49136,7 @@ cont { lines { width: 1.0 color: 6286126 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49690,7 +49145,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49699,7 +49154,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49707,7 +49162,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49715,7 +49170,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49723,7 +49178,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } } @@ -49734,7 +49189,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49743,7 +49198,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49752,7 +49207,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49760,7 +49215,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49768,7 +49223,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49776,7 +49231,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } } @@ -49787,7 +49242,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49796,7 +49251,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49805,7 +49260,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49813,7 +49268,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49821,7 +49276,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49829,7 +49284,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } } @@ -49907,7 +49362,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49926,7 +49381,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49945,7 +49400,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49964,7 +49419,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50002,7 +49457,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50021,7 +49476,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50059,7 +49514,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50078,7 +49533,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50116,7 +49571,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50135,7 +49590,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50154,7 +49609,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50173,7 +49628,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50192,7 +49647,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50211,7 +49666,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50230,7 +49685,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50249,7 +49704,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50328,7 +49783,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50347,7 +49802,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50366,7 +49821,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50385,7 +49840,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50423,7 +49878,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50442,7 +49897,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50480,7 +49935,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50499,7 +49954,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50537,7 +49992,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50556,7 +50011,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50575,7 +50030,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50594,7 +50049,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50613,7 +50068,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50632,7 +50087,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50651,7 +50106,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50670,7 +50125,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50749,7 +50204,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50768,7 +50223,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50787,7 +50242,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50806,7 +50261,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50844,7 +50299,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50863,7 +50318,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50901,7 +50356,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50920,7 +50375,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50958,7 +50413,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50977,7 +50432,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50996,7 +50451,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51015,7 +50470,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51034,7 +50489,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51053,7 +50508,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51072,7 +50527,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51091,7 +50546,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51170,7 +50625,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51189,7 +50644,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51208,7 +50663,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51227,7 +50682,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51265,7 +50720,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51284,7 +50739,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51322,7 +50777,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51341,7 +50796,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51379,7 +50834,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51398,7 +50853,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51417,7 +50872,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51436,7 +50891,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51455,7 +50910,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51474,7 +50929,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51493,7 +50948,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51512,7 +50967,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51523,7 +50978,8 @@ cont { scale: 4 symbol { name: "star-s" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51532,7 +50988,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51554,7 +51010,8 @@ cont { scale: 5 symbol { name: "star-m" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51563,7 +51020,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51585,7 +51042,8 @@ cont { scale: 6 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51594,7 +51052,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51616,7 +51074,8 @@ cont { scale: 7 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51625,7 +51084,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51647,7 +51106,8 @@ cont { scale: 8 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51656,7 +51116,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51678,7 +51138,8 @@ cont { scale: 9 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51687,7 +51148,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51709,7 +51170,8 @@ cont { scale: 10 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51718,7 +51180,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51740,7 +51202,8 @@ cont { scale: 11 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51749,7 +51212,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51771,7 +51234,8 @@ cont { scale: 12 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51780,7 +51244,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51802,7 +51266,8 @@ cont { scale: 13 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51811,7 +51276,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51833,7 +51298,8 @@ cont { scale: 14 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51842,7 +51308,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51864,7 +51330,8 @@ cont { scale: 15 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51873,7 +51340,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51895,7 +51362,8 @@ cont { scale: 16 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51904,7 +51372,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51926,7 +51394,8 @@ cont { scale: 17 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51935,7 +51404,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51957,7 +51426,8 @@ cont { scale: 18 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51966,7 +51436,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51988,7 +51458,8 @@ cont { scale: 19 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51997,7 +51468,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -52090,7 +51561,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52109,7 +51580,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52128,7 +51599,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52147,7 +51618,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52185,7 +51656,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52204,7 +51675,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52242,7 +51713,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52261,7 +51732,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52299,7 +51770,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52318,7 +51789,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52337,7 +51808,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52356,7 +51827,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52375,7 +51846,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52394,7 +51865,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52413,7 +51884,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52432,7 +51903,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52511,7 +51982,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52530,7 +52001,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52549,7 +52020,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52568,7 +52039,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52606,7 +52077,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52625,7 +52096,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52663,7 +52134,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52682,7 +52153,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52720,7 +52191,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52739,7 +52210,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52758,7 +52229,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52777,7 +52248,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52796,7 +52267,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52815,7 +52286,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52834,7 +52305,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52853,7 +52324,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52932,7 +52403,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52951,7 +52422,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52970,7 +52441,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52989,7 +52460,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53027,7 +52498,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53046,7 +52517,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53084,7 +52555,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53103,7 +52574,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53141,7 +52612,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53160,7 +52631,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53179,7 +52650,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53198,7 +52669,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53217,7 +52688,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53236,7 +52707,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53255,7 +52726,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53274,7 +52745,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53353,7 +52824,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53372,7 +52843,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53391,7 +52862,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53410,7 +52881,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53448,7 +52919,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53467,7 +52938,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53505,7 +52976,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53524,7 +52995,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53562,7 +53033,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53581,7 +53052,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53600,7 +53071,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53619,7 +53090,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53638,7 +53109,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53657,7 +53128,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53676,7 +53147,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53695,7 +53166,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53774,7 +53245,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53793,7 +53264,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53812,7 +53283,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53831,7 +53302,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53869,7 +53340,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53888,7 +53359,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53926,7 +53397,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53945,7 +53416,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53983,7 +53454,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54002,7 +53473,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54021,7 +53492,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54040,7 +53511,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54059,7 +53530,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54078,7 +53549,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54097,7 +53568,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54116,7 +53587,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54195,7 +53666,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54214,7 +53685,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54233,7 +53704,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54252,7 +53723,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54290,7 +53761,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54309,7 +53780,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54347,7 +53818,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54366,7 +53837,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54404,7 +53875,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54423,7 +53894,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54442,7 +53913,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54461,7 +53932,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54480,7 +53951,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54499,7 +53970,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54518,7 +53989,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54537,7 +54008,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54616,7 +54087,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54635,7 +54106,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54654,7 +54125,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54673,7 +54144,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54711,7 +54182,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54730,7 +54201,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54768,7 +54239,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54787,7 +54258,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54825,7 +54296,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54844,7 +54315,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54863,7 +54334,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54882,7 +54353,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54901,7 +54372,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54920,7 +54391,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54939,7 +54410,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54958,7 +54429,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -55370,7 +54841,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55381,7 +54852,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55392,7 +54863,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55403,7 +54874,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55414,7 +54885,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55425,7 +54896,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55436,22 +54907,12 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } } cont { name: "place-island" - element { - scale: 9 - caption { - primary { - height: 8 - color: 8355711 - } - priority: 15000 - } - } element { scale: 10 caption { @@ -56006,7 +55467,7 @@ cont { height: 14 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56016,7 +55477,7 @@ cont { height: 14 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56026,7 +55487,7 @@ cont { height: 15 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56036,7 +55497,7 @@ cont { height: 16 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56046,7 +55507,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56056,7 +55517,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56066,7 +55527,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56076,7 +55537,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56086,7 +55547,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56096,7 +55557,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56106,7 +55567,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56116,7 +55577,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56126,7 +55587,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56136,7 +55597,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56146,7 +55607,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56156,7 +55617,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56166,7 +55627,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56176,7 +55637,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56186,7 +55647,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } } @@ -56199,7 +55660,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56209,7 +55670,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56219,7 +55680,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56229,7 +55690,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56239,7 +55700,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56249,7 +55710,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56259,7 +55720,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56269,7 +55730,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56279,7 +55740,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56289,7 +55750,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56299,7 +55760,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56309,7 +55770,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56319,7 +55780,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56329,7 +55790,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56339,7 +55800,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -56349,7 +55810,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } } @@ -56359,7 +55820,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -56369,14 +55830,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -56386,14 +55847,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56403,14 +55864,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56420,14 +55881,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56437,14 +55898,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56454,7 +55915,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -56467,7 +55928,7 @@ cont { height: 11 color: 9211020 } - priority: 15485 + priority: 15500 } } element { @@ -56483,7 +55944,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56499,7 +55960,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56515,7 +55976,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56531,7 +55992,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } } @@ -56544,7 +56005,7 @@ cont { height: 11 color: 9211020 } - priority: 15485 + priority: 15500 } } element { @@ -56554,7 +56015,7 @@ cont { height: 11 color: 9211020 } - priority: 15485 + priority: 15500 } } element { @@ -56570,7 +56031,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56586,7 +56047,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56602,7 +56063,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56618,7 +56079,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } } @@ -56702,7 +56163,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=40000" } @@ -56719,7 +56180,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=20000" } @@ -56738,7 +56199,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=0" } @@ -56757,7 +56218,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=0" } @@ -56776,7 +56237,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56795,7 +56256,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56814,7 +56275,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56833,7 +56294,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56852,7 +56313,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56871,7 +56332,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56890,7 +56351,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56909,7 +56370,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56931,7 +56392,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56949,7 +56410,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56967,7 +56428,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56985,7 +56446,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -57003,7 +56464,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -57021,7 +56482,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -57039,7 +56500,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -57057,7 +56518,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -57075,7 +56536,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } } @@ -57086,7 +56547,7 @@ cont { lines { width: 1.0 color: 1721144710 - priority: 1571 + priority: 1584 } } } @@ -57096,7 +56557,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -57105,14 +56566,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -57121,14 +56582,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -57137,7 +56598,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -57147,7 +56608,7 @@ cont { scale: 19 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -57156,7 +56617,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -57166,6 +56627,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -57173,6 +56635,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -57180,6 +56643,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -57187,6 +56651,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -57333,49 +56798,49 @@ cont { scale: 16 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 17 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } } @@ -57390,7 +56855,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57402,7 +56867,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57414,7 +56879,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57426,7 +56891,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57448,7 +56913,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57467,7 +56932,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57486,7 +56951,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57505,7 +56970,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57520,7 +56985,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57532,7 +56997,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57544,7 +57009,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57556,7 +57021,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57571,7 +57036,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57583,7 +57048,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57595,7 +57060,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57607,7 +57072,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } } @@ -57622,7 +57087,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57634,7 +57099,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57646,7 +57111,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57658,7 +57123,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } } @@ -57884,7 +57349,8 @@ cont { scale: 13 symbol { name: "train-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57902,14 +57368,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 14 symbol { name: "train-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57927,14 +57394,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 15 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57952,14 +57420,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 16 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57977,14 +57446,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 17 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -58002,14 +57472,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 18 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -58027,14 +57498,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 19 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -58052,7 +57524,7 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } } @@ -58062,21 +57534,24 @@ cont { scale: 17 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 18 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 19 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } } @@ -58087,7 +57562,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58096,7 +57571,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58105,7 +57580,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58114,7 +57589,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58123,7 +57598,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58131,7 +57606,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58140,7 +57615,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58148,7 +57623,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58157,7 +57632,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58165,7 +57640,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58174,7 +57649,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58185,7 +57660,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58196,13 +57671,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58213,13 +57688,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58230,7 +57705,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -58238,13 +57713,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58253,7 +57728,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58263,7 +57738,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -58271,13 +57746,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58286,7 +57761,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58296,7 +57771,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -58304,13 +57779,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58319,7 +57794,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58329,7 +57804,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -58337,13 +57812,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58352,7 +57827,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58363,7 +57838,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58372,7 +57847,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58381,7 +57856,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58389,7 +57864,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58397,7 +57872,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58405,7 +57880,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58416,7 +57891,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58425,7 +57900,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58434,7 +57909,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58442,7 +57917,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58450,7 +57925,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58458,7 +57933,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58469,7 +57944,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58478,7 +57953,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58487,7 +57962,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58495,7 +57970,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58503,7 +57978,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58511,7 +57986,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58522,7 +57997,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58531,7 +58006,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58539,7 +58014,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58547,7 +58022,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58555,7 +58030,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58566,7 +58041,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58575,7 +58050,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58583,7 +58058,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58591,7 +58066,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58599,7 +58074,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58610,7 +58085,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58619,7 +58094,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58627,7 +58102,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58635,7 +58110,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58643,7 +58118,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58653,56 +58128,56 @@ cont { scale: 16 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } } @@ -58717,7 +58192,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58729,7 +58204,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58741,7 +58216,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58753,7 +58228,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58775,7 +58250,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58794,7 +58269,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58813,7 +58288,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58832,7 +58307,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58847,7 +58322,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58859,7 +58334,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58871,7 +58346,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58883,7 +58358,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58894,7 +58369,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58904,7 +58379,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58914,7 +58389,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58923,7 +58398,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58932,7 +58407,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58941,7 +58416,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58950,7 +58425,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58958,7 +58433,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58967,7 +58442,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58975,7 +58450,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58984,7 +58459,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58992,7 +58467,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59001,7 +58476,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -59012,7 +58487,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -59022,7 +58497,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -59032,7 +58507,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59043,13 +58518,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59060,13 +58535,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59077,7 +58552,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -59085,13 +58560,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -59100,7 +58575,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -59110,7 +58585,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -59118,13 +58593,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59133,7 +58608,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -59143,7 +58618,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -59151,13 +58626,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59166,7 +58641,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -59176,7 +58651,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -59184,13 +58659,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59199,7 +58674,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -59210,7 +58685,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -59220,7 +58695,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -59230,7 +58705,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59239,7 +58714,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59248,7 +58723,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59257,7 +58732,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -59266,7 +58741,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -59274,7 +58749,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59283,7 +58758,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -59291,7 +58766,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59300,7 +58775,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -59308,7 +58783,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59317,7 +58792,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -59328,7 +58803,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -59338,7 +58813,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -59348,7 +58823,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59361,13 +58836,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59380,13 +58855,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -59399,13 +58874,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -59414,7 +58889,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -59426,13 +58901,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59441,7 +58916,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -59453,13 +58928,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59468,7 +58943,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -59480,13 +58955,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59495,7 +58970,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -59505,6 +58980,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59530,6 +59006,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59555,6 +59032,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59580,6 +59058,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59605,6 +59084,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59630,6 +59110,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59655,6 +59136,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59680,6 +59162,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59708,6 +59191,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59733,6 +59217,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59758,6 +59243,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59783,6 +59269,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59808,6 +59295,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59833,6 +59321,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59858,6 +59347,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59883,6 +59373,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59911,6 +59402,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59936,6 +59428,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59961,6 +59454,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59986,6 +59480,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60011,6 +59506,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60036,6 +59532,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60061,6 +59558,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60086,6 +59584,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60114,6 +59613,7 @@ cont { scale: 13 symbol { name: "subway-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60122,6 +59622,7 @@ cont { scale: 14 symbol { name: "subway-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60148,6 +59649,7 @@ cont { scale: 15 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60173,6 +59675,7 @@ cont { scale: 16 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60198,6 +59701,7 @@ cont { scale: 17 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60223,6 +59727,7 @@ cont { scale: 18 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60248,6 +59753,7 @@ cont { scale: 19 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60276,6 +59782,7 @@ cont { scale: 12 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60284,6 +59791,7 @@ cont { scale: 13 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60292,6 +59800,7 @@ cont { scale: 14 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60318,6 +59827,7 @@ cont { scale: 15 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60343,6 +59853,7 @@ cont { scale: 16 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60368,6 +59879,7 @@ cont { scale: 17 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60393,6 +59905,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60418,6 +59931,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60446,6 +59960,7 @@ cont { scale: 12 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60454,6 +59969,7 @@ cont { scale: 13 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60462,6 +59978,7 @@ cont { scale: 14 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60488,6 +60005,7 @@ cont { scale: 15 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60513,6 +60031,7 @@ cont { scale: 16 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60538,6 +60057,7 @@ cont { scale: 17 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60563,6 +60083,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60588,6 +60109,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60616,6 +60138,7 @@ cont { scale: 12 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60624,6 +60147,7 @@ cont { scale: 13 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60632,6 +60156,7 @@ cont { scale: 14 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60658,6 +60183,7 @@ cont { scale: 15 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60683,6 +60209,7 @@ cont { scale: 16 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60708,6 +60235,7 @@ cont { scale: 17 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60733,6 +60261,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60758,6 +60287,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60786,6 +60316,7 @@ cont { scale: 12 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60794,6 +60325,7 @@ cont { scale: 13 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60802,6 +60334,7 @@ cont { scale: 14 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60828,6 +60361,7 @@ cont { scale: 15 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60853,6 +60387,7 @@ cont { scale: 16 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60878,6 +60413,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60903,6 +60439,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60928,6 +60465,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60956,6 +60494,7 @@ cont { scale: 13 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60964,6 +60503,7 @@ cont { scale: 14 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60990,6 +60530,7 @@ cont { scale: 15 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61015,6 +60556,7 @@ cont { scale: 16 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61040,6 +60582,7 @@ cont { scale: 17 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61065,6 +60608,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61090,6 +60634,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61118,6 +60663,7 @@ cont { scale: 13 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61126,6 +60672,7 @@ cont { scale: 14 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61152,6 +60699,7 @@ cont { scale: 15 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61177,6 +60725,7 @@ cont { scale: 16 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61202,6 +60751,7 @@ cont { scale: 17 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61227,6 +60777,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61252,6 +60803,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61280,6 +60832,7 @@ cont { scale: 13 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61288,6 +60841,7 @@ cont { scale: 14 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61314,6 +60868,7 @@ cont { scale: 15 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61339,6 +60894,7 @@ cont { scale: 16 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61364,6 +60920,7 @@ cont { scale: 17 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61389,6 +60946,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61414,6 +60972,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61442,6 +61001,7 @@ cont { scale: 13 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61450,6 +61010,7 @@ cont { scale: 14 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61476,6 +61037,7 @@ cont { scale: 15 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61501,6 +61063,7 @@ cont { scale: 16 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61526,6 +61089,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61551,6 +61115,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61576,6 +61141,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61604,6 +61170,7 @@ cont { scale: 12 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61612,6 +61179,7 @@ cont { scale: 13 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61620,6 +61188,7 @@ cont { scale: 14 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61646,6 +61215,7 @@ cont { scale: 15 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61671,6 +61241,7 @@ cont { scale: 16 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61696,6 +61267,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61721,6 +61293,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61746,6 +61319,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61774,6 +61348,7 @@ cont { scale: 12 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61782,6 +61357,7 @@ cont { scale: 13 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61790,6 +61366,7 @@ cont { scale: 14 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61816,6 +61393,7 @@ cont { scale: 15 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61841,6 +61419,7 @@ cont { scale: 16 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61866,6 +61445,7 @@ cont { scale: 17 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61891,6 +61471,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61916,6 +61497,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61944,6 +61526,7 @@ cont { scale: 13 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61952,6 +61535,7 @@ cont { scale: 14 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61978,6 +61562,7 @@ cont { scale: 15 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62003,6 +61588,7 @@ cont { scale: 16 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62028,6 +61614,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62053,6 +61640,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62078,6 +61666,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62106,6 +61695,7 @@ cont { scale: 12 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62114,6 +61704,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62122,6 +61713,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62148,6 +61740,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62173,6 +61766,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62198,6 +61792,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62223,6 +61818,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62248,168 +61844,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } -} -cont { - name: "railway-station-subway-bilbao" - element { - scale: 13 - symbol { - name: "subway-bilbao-s" - priority: 16952 - min_distance: 1 - } - } - element { - scale: 14 - symbol { - name: "subway-bilbao-s" - priority: 16952 - min_distance: 1 - } - caption { - primary { - height: 11 - color: 2236962 - stroke_color: 1308622847 - offset_y: 1 - is_optional: true - } - secondary { - height: 9 - color: 2236962 - stroke_color: 1308622847 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 15 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 12 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - secondary { - height: 10 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 16 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 17 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 18 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 19 - symbol { - name: "subway-bilbao-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62438,6 +61873,7 @@ cont { scale: 13 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62446,6 +61882,7 @@ cont { scale: 14 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62472,6 +61909,7 @@ cont { scale: 15 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62497,6 +61935,7 @@ cont { scale: 16 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62522,6 +61961,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62547,6 +61987,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62572,6 +62013,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62600,6 +62042,7 @@ cont { scale: 13 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62608,6 +62051,7 @@ cont { scale: 14 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62634,6 +62078,7 @@ cont { scale: 15 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62659,6 +62104,7 @@ cont { scale: 16 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62684,6 +62130,7 @@ cont { scale: 17 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62709,6 +62156,7 @@ cont { scale: 18 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62734,6 +62182,7 @@ cont { scale: 19 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62762,6 +62211,7 @@ cont { scale: 13 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62770,6 +62220,7 @@ cont { scale: 14 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62796,6 +62247,7 @@ cont { scale: 15 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62821,6 +62273,7 @@ cont { scale: 16 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62846,6 +62299,7 @@ cont { scale: 17 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62871,6 +62325,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62896,6 +62351,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62924,6 +62380,7 @@ cont { scale: 13 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62932,6 +62389,7 @@ cont { scale: 14 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62958,6 +62416,7 @@ cont { scale: 15 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62983,6 +62442,7 @@ cont { scale: 16 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63008,6 +62468,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63033,6 +62494,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63058,6 +62520,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63086,6 +62549,7 @@ cont { scale: 13 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63094,6 +62558,7 @@ cont { scale: 14 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63120,6 +62585,7 @@ cont { scale: 15 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63145,6 +62611,7 @@ cont { scale: 16 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63170,6 +62637,7 @@ cont { scale: 17 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63195,6 +62663,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63220,6 +62689,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63248,6 +62718,7 @@ cont { scale: 12 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63256,6 +62727,7 @@ cont { scale: 13 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63264,6 +62736,7 @@ cont { scale: 14 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63290,6 +62763,7 @@ cont { scale: 15 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63315,6 +62789,7 @@ cont { scale: 16 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63340,6 +62815,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63365,6 +62841,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63390,6 +62867,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63418,6 +62896,7 @@ cont { scale: 13 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63426,6 +62905,7 @@ cont { scale: 14 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63452,6 +62932,7 @@ cont { scale: 15 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63477,6 +62958,7 @@ cont { scale: 16 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63502,6 +62984,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63527,6 +63010,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63552,6 +63036,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63580,6 +63065,7 @@ cont { scale: 13 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63588,6 +63074,7 @@ cont { scale: 14 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63614,6 +63101,7 @@ cont { scale: 15 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63639,6 +63127,7 @@ cont { scale: 16 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63664,6 +63153,7 @@ cont { scale: 17 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63689,6 +63179,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63714,6 +63205,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63742,6 +63234,7 @@ cont { scale: 13 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63750,6 +63243,7 @@ cont { scale: 14 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63776,6 +63270,7 @@ cont { scale: 15 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63801,6 +63296,7 @@ cont { scale: 16 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63826,6 +63322,7 @@ cont { scale: 17 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63851,6 +63348,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63876,6 +63374,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63904,6 +63403,7 @@ cont { scale: 13 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63912,6 +63412,7 @@ cont { scale: 14 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63938,6 +63439,7 @@ cont { scale: 15 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63963,6 +63465,7 @@ cont { scale: 16 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63988,6 +63491,7 @@ cont { scale: 17 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64013,6 +63517,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64038,6 +63543,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64066,6 +63572,7 @@ cont { scale: 13 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64074,6 +63581,7 @@ cont { scale: 14 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64100,6 +63608,7 @@ cont { scale: 15 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64125,6 +63634,7 @@ cont { scale: 16 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64150,6 +63660,7 @@ cont { scale: 17 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64175,6 +63686,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64200,6 +63712,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64228,6 +63741,7 @@ cont { scale: 13 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64236,6 +63750,7 @@ cont { scale: 14 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64262,6 +63777,7 @@ cont { scale: 15 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64287,6 +63803,7 @@ cont { scale: 16 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64312,6 +63829,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64337,6 +63855,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64362,6 +63881,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64390,6 +63910,7 @@ cont { scale: 13 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64398,6 +63919,7 @@ cont { scale: 14 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64424,6 +63946,7 @@ cont { scale: 15 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64449,6 +63972,7 @@ cont { scale: 16 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64474,6 +63998,7 @@ cont { scale: 17 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64499,6 +64024,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64524,6 +64050,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64552,6 +64079,7 @@ cont { scale: 13 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64560,6 +64088,7 @@ cont { scale: 14 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64586,6 +64115,7 @@ cont { scale: 15 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64611,6 +64141,7 @@ cont { scale: 16 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64636,6 +64167,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64661,6 +64193,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64686,6 +64219,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64714,6 +64248,7 @@ cont { scale: 13 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64722,6 +64257,7 @@ cont { scale: 14 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64748,6 +64284,7 @@ cont { scale: 15 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64773,6 +64310,7 @@ cont { scale: 16 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64798,6 +64336,7 @@ cont { scale: 17 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64823,6 +64362,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64848,6 +64388,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64876,6 +64417,7 @@ cont { scale: 13 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64884,6 +64426,7 @@ cont { scale: 14 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64910,6 +64453,7 @@ cont { scale: 15 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64935,6 +64479,7 @@ cont { scale: 16 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64960,6 +64505,7 @@ cont { scale: 17 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64985,6 +64531,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65010,6 +64557,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65038,6 +64586,7 @@ cont { scale: 13 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65046,6 +64595,7 @@ cont { scale: 14 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65072,6 +64622,7 @@ cont { scale: 15 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65097,6 +64648,7 @@ cont { scale: 16 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65122,6 +64674,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65147,6 +64700,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65172,6 +64726,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65200,6 +64755,7 @@ cont { scale: 13 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65208,6 +64764,7 @@ cont { scale: 14 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65234,6 +64791,7 @@ cont { scale: 15 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65259,6 +64817,7 @@ cont { scale: 16 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65284,6 +64843,7 @@ cont { scale: 17 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65309,6 +64869,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65334,6 +64895,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65362,6 +64924,7 @@ cont { scale: 13 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65370,6 +64933,7 @@ cont { scale: 14 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65396,6 +64960,7 @@ cont { scale: 15 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65421,6 +64986,7 @@ cont { scale: 16 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65446,6 +65012,7 @@ cont { scale: 17 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65471,6 +65038,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65496,6 +65064,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65524,6 +65093,7 @@ cont { scale: 13 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65532,6 +65102,7 @@ cont { scale: 14 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65558,6 +65129,7 @@ cont { scale: 15 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65583,6 +65155,7 @@ cont { scale: 16 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65608,6 +65181,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65633,6 +65207,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65658,6 +65233,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65686,6 +65262,7 @@ cont { scale: 13 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65694,6 +65271,7 @@ cont { scale: 14 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65720,6 +65298,7 @@ cont { scale: 15 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65745,6 +65324,7 @@ cont { scale: 16 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65770,6 +65350,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65795,6 +65376,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65820,6 +65402,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65848,6 +65431,7 @@ cont { scale: 13 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65856,6 +65440,7 @@ cont { scale: 14 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65882,6 +65467,7 @@ cont { scale: 15 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65907,6 +65493,7 @@ cont { scale: 16 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65932,6 +65519,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65957,6 +65545,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65982,6 +65571,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66010,6 +65600,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66018,6 +65609,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66044,6 +65636,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66069,6 +65662,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66094,6 +65688,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66119,6 +65714,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66144,6 +65740,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66172,6 +65769,7 @@ cont { scale: 13 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66180,6 +65778,7 @@ cont { scale: 14 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66206,6 +65805,7 @@ cont { scale: 15 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66231,6 +65831,7 @@ cont { scale: 16 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66256,6 +65857,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66281,6 +65883,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66306,6 +65909,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66334,6 +65938,7 @@ cont { scale: 13 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66342,6 +65947,7 @@ cont { scale: 14 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66368,6 +65974,7 @@ cont { scale: 15 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66393,6 +66000,7 @@ cont { scale: 16 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66418,6 +66026,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66443,6 +66052,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66468,6 +66078,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66496,6 +66107,7 @@ cont { scale: 13 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66504,6 +66116,7 @@ cont { scale: 14 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66530,6 +66143,7 @@ cont { scale: 15 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66555,6 +66169,7 @@ cont { scale: 16 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66580,6 +66195,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66605,6 +66221,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66630,6 +66247,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66658,6 +66276,7 @@ cont { scale: 12 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66666,6 +66285,7 @@ cont { scale: 13 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66674,6 +66294,7 @@ cont { scale: 14 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66700,6 +66321,7 @@ cont { scale: 15 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66725,6 +66347,7 @@ cont { scale: 16 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66750,6 +66373,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66775,6 +66399,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66800,6 +66425,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66828,6 +66454,7 @@ cont { scale: 13 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66836,6 +66463,7 @@ cont { scale: 14 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66862,6 +66490,7 @@ cont { scale: 15 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66887,6 +66516,7 @@ cont { scale: 16 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66912,6 +66542,7 @@ cont { scale: 17 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66937,6 +66568,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66962,6 +66594,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66990,6 +66623,7 @@ cont { scale: 13 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66998,6 +66632,7 @@ cont { scale: 14 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67024,6 +66659,7 @@ cont { scale: 15 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67049,6 +66685,7 @@ cont { scale: 16 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67074,6 +66711,7 @@ cont { scale: 17 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67099,6 +66737,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67124,6 +66763,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67152,6 +66792,7 @@ cont { scale: 13 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67160,6 +66801,7 @@ cont { scale: 14 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67186,6 +66828,7 @@ cont { scale: 15 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67211,6 +66854,7 @@ cont { scale: 16 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67236,6 +66880,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67261,6 +66906,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67286,6 +66932,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67314,6 +66961,7 @@ cont { scale: 12 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67331,6 +66979,7 @@ cont { scale: 13 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67349,6 +66998,7 @@ cont { scale: 14 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67375,6 +67025,7 @@ cont { scale: 15 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67400,6 +67051,7 @@ cont { scale: 16 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67425,6 +67077,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -67448,6 +67101,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -67471,6 +67125,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -67497,6 +67152,7 @@ cont { scale: 13 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67505,6 +67161,7 @@ cont { scale: 14 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67531,6 +67188,7 @@ cont { scale: 15 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67556,6 +67214,7 @@ cont { scale: 16 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67581,6 +67240,7 @@ cont { scale: 17 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67606,6 +67266,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67631,6 +67292,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67659,6 +67321,7 @@ cont { scale: 13 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67667,6 +67330,7 @@ cont { scale: 14 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67693,6 +67357,7 @@ cont { scale: 15 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67718,6 +67383,7 @@ cont { scale: 16 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67743,6 +67409,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67768,6 +67435,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67793,6 +67461,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67821,6 +67490,7 @@ cont { scale: 13 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67829,6 +67499,7 @@ cont { scale: 14 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67855,6 +67526,7 @@ cont { scale: 15 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67880,6 +67552,7 @@ cont { scale: 16 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67905,6 +67578,7 @@ cont { scale: 17 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67930,6 +67604,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67955,6 +67630,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67983,6 +67659,7 @@ cont { scale: 13 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67991,6 +67668,7 @@ cont { scale: 14 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68017,6 +67695,7 @@ cont { scale: 15 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68042,6 +67721,7 @@ cont { scale: 16 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68067,6 +67747,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68092,6 +67773,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68117,6 +67799,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68145,6 +67828,7 @@ cont { scale: 12 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68153,6 +67837,7 @@ cont { scale: 13 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68161,6 +67846,7 @@ cont { scale: 14 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68187,6 +67873,7 @@ cont { scale: 15 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68212,6 +67899,7 @@ cont { scale: 16 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68237,6 +67925,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68262,6 +67951,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68287,6 +67977,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68315,6 +68006,7 @@ cont { scale: 13 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68323,6 +68015,7 @@ cont { scale: 14 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68349,6 +68042,7 @@ cont { scale: 15 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68374,6 +68068,7 @@ cont { scale: 16 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68399,6 +68094,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68424,6 +68120,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68449,6 +68146,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68477,6 +68175,7 @@ cont { scale: 13 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68485,6 +68184,7 @@ cont { scale: 14 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68511,6 +68211,7 @@ cont { scale: 15 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68536,6 +68237,7 @@ cont { scale: 16 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68561,6 +68263,7 @@ cont { scale: 17 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68586,6 +68289,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68611,6 +68315,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68639,6 +68344,7 @@ cont { scale: 13 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68647,6 +68353,7 @@ cont { scale: 14 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68673,6 +68380,7 @@ cont { scale: 15 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68698,6 +68406,7 @@ cont { scale: 16 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68723,6 +68432,7 @@ cont { scale: 17 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68748,6 +68458,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68773,6 +68484,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68801,6 +68513,7 @@ cont { scale: 12 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68809,6 +68522,7 @@ cont { scale: 13 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68817,6 +68531,7 @@ cont { scale: 14 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68843,6 +68558,7 @@ cont { scale: 15 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68868,6 +68584,7 @@ cont { scale: 16 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68893,6 +68610,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68918,6 +68636,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68943,6 +68662,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68971,6 +68691,7 @@ cont { scale: 12 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68979,6 +68700,7 @@ cont { scale: 13 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68987,6 +68709,7 @@ cont { scale: 14 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69013,6 +68736,7 @@ cont { scale: 15 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69038,6 +68762,7 @@ cont { scale: 16 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69063,6 +68788,7 @@ cont { scale: 17 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69088,6 +68814,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69113,6 +68840,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69141,6 +68869,7 @@ cont { scale: 13 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69149,6 +68878,7 @@ cont { scale: 14 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69175,6 +68905,7 @@ cont { scale: 15 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69200,6 +68931,7 @@ cont { scale: 16 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69225,6 +68957,7 @@ cont { scale: 17 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69250,6 +68983,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69275,6 +69009,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69303,6 +69038,7 @@ cont { scale: 12 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69311,6 +69047,7 @@ cont { scale: 13 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69319,6 +69056,7 @@ cont { scale: 14 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69345,6 +69083,7 @@ cont { scale: 15 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69370,6 +69109,7 @@ cont { scale: 16 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69395,6 +69135,7 @@ cont { scale: 17 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69420,6 +69161,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69445,6 +69187,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69473,6 +69216,7 @@ cont { scale: 13 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69481,6 +69225,7 @@ cont { scale: 14 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69507,6 +69252,7 @@ cont { scale: 15 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69532,6 +69278,7 @@ cont { scale: 16 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69557,6 +69304,7 @@ cont { scale: 17 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69582,6 +69330,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69607,6 +69356,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69635,6 +69385,7 @@ cont { scale: 13 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69643,6 +69394,7 @@ cont { scale: 14 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69669,6 +69421,7 @@ cont { scale: 15 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69694,6 +69447,7 @@ cont { scale: 16 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69719,6 +69473,7 @@ cont { scale: 17 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69744,6 +69499,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69769,6 +69525,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69797,6 +69554,7 @@ cont { scale: 13 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69805,6 +69563,7 @@ cont { scale: 14 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69831,6 +69590,7 @@ cont { scale: 15 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69856,6 +69616,7 @@ cont { scale: 16 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69881,6 +69642,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69906,6 +69668,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69931,6 +69694,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69959,6 +69723,7 @@ cont { scale: 13 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69967,6 +69732,7 @@ cont { scale: 14 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69993,6 +69759,7 @@ cont { scale: 15 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70018,6 +69785,7 @@ cont { scale: 16 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70043,6 +69811,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70068,6 +69837,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70093,6 +69863,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70121,6 +69892,7 @@ cont { scale: 13 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70129,6 +69901,7 @@ cont { scale: 14 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70155,6 +69928,7 @@ cont { scale: 15 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70180,6 +69954,7 @@ cont { scale: 16 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70205,6 +69980,7 @@ cont { scale: 17 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70230,6 +70006,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70255,6 +70032,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70283,6 +70061,7 @@ cont { scale: 13 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70291,6 +70070,7 @@ cont { scale: 14 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70317,6 +70097,7 @@ cont { scale: 15 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70342,6 +70123,7 @@ cont { scale: 16 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70367,6 +70149,7 @@ cont { scale: 17 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70392,6 +70175,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70417,6 +70201,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70445,6 +70230,7 @@ cont { scale: 12 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70453,6 +70239,7 @@ cont { scale: 13 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70461,6 +70248,7 @@ cont { scale: 14 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70487,6 +70275,7 @@ cont { scale: 15 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70512,6 +70301,7 @@ cont { scale: 16 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70537,6 +70327,7 @@ cont { scale: 17 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70562,6 +70353,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70587,6 +70379,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70615,6 +70408,7 @@ cont { scale: 13 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70623,6 +70417,7 @@ cont { scale: 14 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70649,6 +70444,7 @@ cont { scale: 15 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70674,6 +70470,7 @@ cont { scale: 16 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70699,6 +70496,7 @@ cont { scale: 17 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70724,6 +70522,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70749,6 +70548,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70777,6 +70577,7 @@ cont { scale: 12 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70794,6 +70595,7 @@ cont { scale: 13 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70812,6 +70614,7 @@ cont { scale: 14 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70838,6 +70641,7 @@ cont { scale: 15 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70863,6 +70667,7 @@ cont { scale: 16 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70886,6 +70691,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70909,6 +70715,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70932,6 +70739,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70958,6 +70766,7 @@ cont { scale: 13 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70966,6 +70775,7 @@ cont { scale: 14 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70992,6 +70802,7 @@ cont { scale: 15 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71017,6 +70828,7 @@ cont { scale: 16 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71042,6 +70854,7 @@ cont { scale: 17 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71067,6 +70880,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71092,6 +70906,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71120,6 +70935,7 @@ cont { scale: 11 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71128,6 +70944,7 @@ cont { scale: 12 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71154,6 +70971,7 @@ cont { scale: 13 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71180,6 +70998,7 @@ cont { scale: 14 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71206,6 +71025,7 @@ cont { scale: 15 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71231,6 +71051,7 @@ cont { scale: 16 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -71238,6 +71059,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -71245,6 +71067,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -71252,6 +71075,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -71262,6 +71086,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71270,6 +71095,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71296,6 +71122,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71321,6 +71148,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71346,6 +71174,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71371,6 +71200,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71396,6 +71226,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71424,6 +71255,7 @@ cont { scale: 13 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71432,6 +71264,7 @@ cont { scale: 14 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71458,6 +71291,7 @@ cont { scale: 15 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71483,6 +71317,7 @@ cont { scale: 16 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71508,6 +71343,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71533,6 +71369,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71558,6 +71395,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71586,6 +71424,7 @@ cont { scale: 12 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71594,6 +71433,7 @@ cont { scale: 13 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71602,6 +71442,7 @@ cont { scale: 14 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71628,6 +71469,7 @@ cont { scale: 15 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71653,6 +71495,7 @@ cont { scale: 16 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71678,6 +71521,7 @@ cont { scale: 17 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71703,6 +71547,7 @@ cont { scale: 18 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71728,6 +71573,7 @@ cont { scale: 19 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71756,6 +71602,7 @@ cont { scale: 13 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71764,6 +71611,7 @@ cont { scale: 14 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71790,6 +71638,7 @@ cont { scale: 15 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71815,6 +71664,7 @@ cont { scale: 16 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71840,6 +71690,7 @@ cont { scale: 17 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71865,6 +71716,7 @@ cont { scale: 18 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71890,6 +71742,7 @@ cont { scale: 19 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71918,6 +71771,7 @@ cont { scale: 13 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71926,6 +71780,7 @@ cont { scale: 14 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71952,6 +71807,7 @@ cont { scale: 15 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71977,6 +71833,7 @@ cont { scale: 16 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72002,6 +71859,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72027,6 +71885,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72052,6 +71911,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72080,6 +71940,7 @@ cont { scale: 13 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72088,6 +71949,7 @@ cont { scale: 14 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72114,6 +71976,7 @@ cont { scale: 15 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72139,6 +72002,7 @@ cont { scale: 16 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72164,6 +72028,7 @@ cont { scale: 17 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72189,6 +72054,7 @@ cont { scale: 18 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72214,6 +72080,7 @@ cont { scale: 19 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72242,6 +72109,7 @@ cont { scale: 13 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72250,6 +72118,7 @@ cont { scale: 14 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72276,6 +72145,7 @@ cont { scale: 15 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72301,6 +72171,7 @@ cont { scale: 16 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72326,6 +72197,7 @@ cont { scale: 17 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72351,6 +72223,7 @@ cont { scale: 18 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72376,6 +72249,7 @@ cont { scale: 19 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72404,6 +72278,7 @@ cont { scale: 13 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72412,6 +72287,7 @@ cont { scale: 14 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72438,6 +72314,7 @@ cont { scale: 15 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72463,6 +72340,7 @@ cont { scale: 16 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72488,6 +72366,7 @@ cont { scale: 17 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72513,6 +72392,7 @@ cont { scale: 18 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72538,6 +72418,7 @@ cont { scale: 19 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72566,6 +72447,7 @@ cont { scale: 13 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72574,6 +72456,7 @@ cont { scale: 14 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72600,6 +72483,7 @@ cont { scale: 15 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72625,6 +72509,7 @@ cont { scale: 16 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72650,6 +72535,7 @@ cont { scale: 17 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72675,6 +72561,7 @@ cont { scale: 18 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72700,6 +72587,7 @@ cont { scale: 19 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72728,6 +72616,7 @@ cont { scale: 12 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72736,6 +72625,7 @@ cont { scale: 13 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72744,6 +72634,7 @@ cont { scale: 14 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72770,6 +72661,7 @@ cont { scale: 15 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72795,6 +72687,7 @@ cont { scale: 16 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72820,6 +72713,7 @@ cont { scale: 17 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72845,6 +72739,7 @@ cont { scale: 18 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72870,6 +72765,7 @@ cont { scale: 19 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72898,6 +72794,7 @@ cont { scale: 13 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72906,6 +72803,7 @@ cont { scale: 14 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72932,6 +72830,7 @@ cont { scale: 15 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72957,6 +72856,7 @@ cont { scale: 16 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72982,6 +72882,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73007,6 +72908,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73032,6 +72934,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73060,6 +72963,7 @@ cont { scale: 13 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73068,6 +72972,7 @@ cont { scale: 14 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73094,6 +72999,7 @@ cont { scale: 15 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73119,6 +73025,7 @@ cont { scale: 16 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73144,6 +73051,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73169,6 +73077,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73194,6 +73103,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73222,6 +73132,7 @@ cont { scale: 13 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73230,6 +73141,7 @@ cont { scale: 14 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73256,6 +73168,7 @@ cont { scale: 15 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73281,6 +73194,7 @@ cont { scale: 16 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73306,6 +73220,7 @@ cont { scale: 17 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73331,6 +73246,7 @@ cont { scale: 18 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73356,6 +73272,7 @@ cont { scale: 19 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73384,6 +73301,7 @@ cont { scale: 13 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73392,6 +73310,7 @@ cont { scale: 14 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73418,6 +73337,7 @@ cont { scale: 15 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73443,6 +73363,7 @@ cont { scale: 16 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73468,6 +73389,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73493,6 +73415,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73518,6 +73441,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73546,6 +73470,7 @@ cont { scale: 12 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73554,6 +73479,7 @@ cont { scale: 13 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73562,6 +73488,7 @@ cont { scale: 14 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73588,6 +73515,7 @@ cont { scale: 15 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73613,6 +73541,7 @@ cont { scale: 16 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73638,6 +73567,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73661,6 +73591,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73684,6 +73615,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73710,6 +73642,7 @@ cont { scale: 13 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73718,6 +73651,7 @@ cont { scale: 14 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73744,6 +73678,7 @@ cont { scale: 15 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73769,6 +73704,7 @@ cont { scale: 16 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73794,6 +73730,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73819,6 +73756,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73844,6 +73782,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73872,6 +73811,7 @@ cont { scale: 13 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73880,6 +73820,7 @@ cont { scale: 14 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73906,6 +73847,7 @@ cont { scale: 15 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73931,6 +73873,7 @@ cont { scale: 16 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73956,6 +73899,7 @@ cont { scale: 17 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73981,6 +73925,7 @@ cont { scale: 18 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74006,6 +73951,7 @@ cont { scale: 19 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74034,6 +73980,7 @@ cont { scale: 13 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74042,6 +73989,7 @@ cont { scale: 14 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74068,6 +74016,7 @@ cont { scale: 15 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74093,6 +74042,7 @@ cont { scale: 16 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74118,6 +74068,7 @@ cont { scale: 17 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74143,6 +74094,7 @@ cont { scale: 18 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74168,6 +74120,7 @@ cont { scale: 19 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74196,6 +74149,7 @@ cont { scale: 13 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74204,6 +74158,7 @@ cont { scale: 14 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74230,6 +74185,7 @@ cont { scale: 15 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74255,6 +74211,7 @@ cont { scale: 16 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74280,6 +74237,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74305,6 +74263,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74330,6 +74289,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74358,6 +74318,7 @@ cont { scale: 13 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74366,6 +74327,7 @@ cont { scale: 14 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74392,6 +74354,7 @@ cont { scale: 15 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74417,6 +74380,7 @@ cont { scale: 16 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74442,6 +74406,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74467,6 +74432,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74492,6 +74458,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74520,6 +74487,7 @@ cont { scale: 13 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74528,6 +74496,7 @@ cont { scale: 14 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74554,6 +74523,7 @@ cont { scale: 15 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74579,6 +74549,7 @@ cont { scale: 16 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74604,6 +74575,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74629,6 +74601,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74654,6 +74627,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74682,6 +74656,7 @@ cont { scale: 13 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74690,6 +74665,7 @@ cont { scale: 14 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74716,6 +74692,7 @@ cont { scale: 15 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74741,6 +74718,7 @@ cont { scale: 16 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74766,6 +74744,7 @@ cont { scale: 17 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74791,6 +74770,7 @@ cont { scale: 18 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74816,6 +74796,7 @@ cont { scale: 19 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74844,6 +74825,7 @@ cont { scale: 12 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74852,6 +74834,7 @@ cont { scale: 13 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74860,6 +74843,7 @@ cont { scale: 14 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74886,6 +74870,7 @@ cont { scale: 15 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74911,6 +74896,7 @@ cont { scale: 16 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74936,6 +74922,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74961,6 +74948,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74986,6 +74974,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75014,6 +75003,7 @@ cont { scale: 12 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75022,6 +75012,7 @@ cont { scale: 13 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75030,6 +75021,7 @@ cont { scale: 14 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75056,6 +75048,7 @@ cont { scale: 15 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75081,6 +75074,7 @@ cont { scale: 16 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75106,6 +75100,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75131,6 +75126,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75156,6 +75152,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75184,6 +75181,7 @@ cont { scale: 13 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75192,6 +75190,7 @@ cont { scale: 14 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75218,6 +75217,7 @@ cont { scale: 15 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75243,6 +75243,7 @@ cont { scale: 16 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75268,6 +75269,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75293,6 +75295,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75318,6 +75321,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75346,6 +75350,7 @@ cont { scale: 13 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75354,6 +75359,7 @@ cont { scale: 14 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75380,6 +75386,7 @@ cont { scale: 15 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75405,6 +75412,7 @@ cont { scale: 16 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75430,6 +75438,7 @@ cont { scale: 17 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75455,6 +75464,7 @@ cont { scale: 18 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75480,6 +75490,7 @@ cont { scale: 19 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75508,6 +75519,7 @@ cont { scale: 11 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75516,6 +75528,7 @@ cont { scale: 12 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 } caption { @@ -75541,6 +75554,7 @@ cont { scale: 13 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75567,6 +75581,7 @@ cont { scale: 14 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75593,6 +75608,7 @@ cont { scale: 15 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75618,6 +75634,7 @@ cont { scale: 16 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75641,6 +75658,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75648,6 +75666,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75655,6 +75674,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75665,6 +75685,7 @@ cont { scale: 12 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75673,6 +75694,7 @@ cont { scale: 13 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75681,6 +75703,7 @@ cont { scale: 14 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75707,6 +75730,7 @@ cont { scale: 15 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75732,6 +75756,7 @@ cont { scale: 16 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75757,6 +75782,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75782,6 +75808,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75807,6 +75834,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75835,6 +75863,7 @@ cont { scale: 13 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75843,6 +75872,7 @@ cont { scale: 14 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75869,6 +75899,7 @@ cont { scale: 15 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75894,6 +75925,7 @@ cont { scale: 16 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75919,6 +75951,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75944,6 +75977,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75969,6 +76003,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75997,6 +76032,7 @@ cont { scale: 13 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76005,6 +76041,7 @@ cont { scale: 14 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76031,6 +76068,7 @@ cont { scale: 15 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76056,6 +76094,7 @@ cont { scale: 16 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76081,6 +76120,7 @@ cont { scale: 17 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76106,6 +76146,7 @@ cont { scale: 18 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76131,6 +76172,7 @@ cont { scale: 19 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76159,6 +76201,7 @@ cont { scale: 13 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76167,6 +76210,7 @@ cont { scale: 14 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76193,6 +76237,7 @@ cont { scale: 15 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76218,6 +76263,7 @@ cont { scale: 16 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76243,6 +76289,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76268,6 +76315,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76293,6 +76341,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76321,6 +76370,7 @@ cont { scale: 13 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76329,6 +76379,7 @@ cont { scale: 14 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76355,6 +76406,7 @@ cont { scale: 15 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76380,6 +76432,7 @@ cont { scale: 16 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76405,6 +76458,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76430,6 +76484,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76455,6 +76510,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76483,6 +76539,7 @@ cont { scale: 13 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76491,6 +76548,7 @@ cont { scale: 14 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76517,6 +76575,7 @@ cont { scale: 15 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76542,6 +76601,7 @@ cont { scale: 16 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76567,6 +76627,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76592,6 +76653,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76617,6 +76679,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76645,6 +76708,7 @@ cont { scale: 13 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76653,6 +76717,7 @@ cont { scale: 14 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76679,6 +76744,7 @@ cont { scale: 15 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76704,6 +76770,7 @@ cont { scale: 16 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76729,6 +76796,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76754,6 +76822,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76779,6 +76848,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76807,6 +76877,7 @@ cont { scale: 12 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76815,6 +76886,7 @@ cont { scale: 13 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76823,6 +76895,7 @@ cont { scale: 14 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76849,6 +76922,7 @@ cont { scale: 15 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76874,6 +76948,7 @@ cont { scale: 16 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76899,6 +76974,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76924,6 +77000,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76949,6 +77026,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76977,6 +77055,7 @@ cont { scale: 13 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76985,6 +77064,7 @@ cont { scale: 14 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77011,6 +77091,7 @@ cont { scale: 15 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77036,6 +77117,7 @@ cont { scale: 16 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77061,6 +77143,7 @@ cont { scale: 17 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77086,6 +77169,7 @@ cont { scale: 18 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77111,6 +77195,7 @@ cont { scale: 19 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77139,6 +77224,7 @@ cont { scale: 12 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77147,6 +77233,7 @@ cont { scale: 13 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77155,6 +77242,7 @@ cont { scale: 14 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77181,6 +77269,7 @@ cont { scale: 15 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77206,6 +77295,7 @@ cont { scale: 16 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77231,6 +77321,7 @@ cont { scale: 17 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77256,6 +77347,7 @@ cont { scale: 18 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77281,6 +77373,7 @@ cont { scale: 19 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77309,6 +77402,7 @@ cont { scale: 13 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77317,6 +77411,7 @@ cont { scale: 14 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77343,6 +77438,7 @@ cont { scale: 15 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77368,6 +77464,7 @@ cont { scale: 16 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77393,6 +77490,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77418,6 +77516,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77443,6 +77542,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77471,6 +77571,7 @@ cont { scale: 13 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77479,6 +77580,7 @@ cont { scale: 14 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77505,6 +77607,7 @@ cont { scale: 15 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77530,6 +77633,7 @@ cont { scale: 16 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77555,6 +77659,7 @@ cont { scale: 17 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77580,6 +77685,7 @@ cont { scale: 18 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77605,6 +77711,7 @@ cont { scale: 19 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77633,6 +77740,7 @@ cont { scale: 13 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77641,6 +77749,7 @@ cont { scale: 14 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77667,6 +77776,7 @@ cont { scale: 15 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77692,6 +77802,7 @@ cont { scale: 16 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77717,6 +77828,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77742,6 +77854,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77767,6 +77880,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77795,6 +77909,7 @@ cont { scale: 13 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77803,6 +77918,7 @@ cont { scale: 14 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77829,6 +77945,7 @@ cont { scale: 15 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77854,6 +77971,7 @@ cont { scale: 16 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77879,6 +77997,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77904,6 +78023,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77929,6 +78049,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77957,6 +78078,7 @@ cont { scale: 13 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77965,6 +78087,7 @@ cont { scale: 14 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77991,6 +78114,7 @@ cont { scale: 15 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -78016,6 +78140,7 @@ cont { scale: 16 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -78041,6 +78166,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -78066,6 +78192,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -78091,6 +78218,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -78120,7 +78248,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -78129,7 +78257,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -78138,7 +78266,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -78147,7 +78275,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -78156,7 +78284,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -78164,7 +78292,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -78173,7 +78301,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -78181,7 +78309,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -78190,7 +78318,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -78198,7 +78326,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -78207,7 +78335,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -78218,7 +78346,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -78229,13 +78357,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -78246,13 +78374,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -78263,7 +78391,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -78271,13 +78399,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -78286,7 +78414,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -78296,7 +78424,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -78304,13 +78432,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -78319,7 +78447,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -78329,7 +78457,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -78337,13 +78465,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -78352,7 +78480,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -78362,7 +78490,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -78370,13 +78498,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -78385,7 +78513,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -78408,14 +78536,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78433,14 +78562,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78458,14 +78588,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78483,7 +78614,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78506,14 +78637,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-adana-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78531,14 +78663,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-adana-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78556,14 +78689,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-adana-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78581,7 +78715,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78604,14 +78738,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-algeria-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78629,14 +78764,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-algeria-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78654,14 +78790,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-algeria-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78679,7 +78816,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78702,14 +78839,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-almaty-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78727,14 +78865,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-almaty-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78752,14 +78891,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-almaty-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78777,7 +78917,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78800,14 +78940,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-amsterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78825,14 +78966,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-amsterdam-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78850,14 +78992,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-amsterdam-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78875,7 +79018,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78898,14 +79041,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ankara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78923,14 +79067,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ankara-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78948,14 +79093,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ankara-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78973,7 +79119,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78996,14 +79142,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-athens-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79021,14 +79168,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-athens-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79046,14 +79194,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-athens-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79071,7 +79220,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79094,14 +79243,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-baku-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79119,14 +79269,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-baku-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79144,14 +79295,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-baku-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79169,7 +79321,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79192,14 +79344,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bangkok-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79217,14 +79370,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bangkok-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79242,14 +79396,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bangkok-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79267,7 +79422,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79290,14 +79445,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-barcelona-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79315,14 +79471,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-barcelona-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79340,14 +79497,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-barcelona-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79365,7 +79523,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79388,14 +79546,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-beijing-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79413,14 +79572,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-beijing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79438,14 +79598,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-beijing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79463,7 +79624,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79486,14 +79647,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79511,14 +79673,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79536,14 +79699,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79561,7 +79725,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79584,14 +79748,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79609,14 +79774,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79634,14 +79800,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79659,7 +79826,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79682,14 +79849,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79707,14 +79875,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79732,14 +79901,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79757,7 +79927,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79780,14 +79950,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79805,14 +79976,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79830,14 +80002,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79855,7 +80028,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79878,14 +80051,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brussel-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79903,14 +80077,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brussel-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79928,14 +80103,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brussel-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79953,7 +80129,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79976,14 +80152,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bucharest-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80001,14 +80178,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bucharest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80026,14 +80204,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bucharest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80051,7 +80230,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80074,14 +80253,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-budapest-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80099,14 +80279,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-budapest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80124,14 +80305,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-budapest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80149,7 +80331,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80172,14 +80354,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-buenosaires-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80197,14 +80380,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-buenosaires-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80222,14 +80406,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-buenosaires-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80247,7 +80432,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80270,14 +80455,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bursaray-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80295,14 +80481,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bursaray-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80320,14 +80507,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bursaray-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80345,7 +80533,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80368,14 +80556,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-cairo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80393,14 +80582,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-cairo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80418,14 +80608,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-cairo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80443,7 +80634,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80466,14 +80657,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-caracas-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80491,14 +80683,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-caracas-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80516,14 +80709,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-caracas-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80541,7 +80735,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80564,14 +80758,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-catania-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80589,14 +80784,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-catania-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80614,14 +80810,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-catania-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80639,7 +80836,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80662,14 +80859,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-changchun-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80687,14 +80885,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-changchun-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80712,14 +80911,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-changchun-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80737,7 +80937,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80760,14 +80960,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chengdu-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80785,14 +80986,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chengdu-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80810,14 +81012,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chengdu-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80835,7 +81038,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80858,14 +81061,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chicago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80883,14 +81087,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chicago-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80908,14 +81113,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chicago-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80933,7 +81139,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80956,14 +81162,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chongqing-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80981,14 +81188,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chongqing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81006,14 +81214,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chongqing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81031,7 +81240,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81054,14 +81263,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dalian-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81079,14 +81289,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dalian-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81104,14 +81315,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dalian-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81129,7 +81341,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81152,14 +81364,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-delhi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81177,14 +81390,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81202,14 +81416,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81227,7 +81442,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81250,14 +81465,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dnepro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81275,14 +81491,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dnepro-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81300,14 +81517,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dnepro-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81325,7 +81543,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81348,14 +81566,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dubai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81373,14 +81592,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dubai-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81398,14 +81618,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dubai-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81423,7 +81644,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81446,14 +81667,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ekb-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81471,14 +81693,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ekb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81496,14 +81719,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ekb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81521,7 +81745,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81544,14 +81768,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-fukuoka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81569,14 +81794,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-fukuoka-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81594,14 +81820,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-fukuoka-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81619,7 +81846,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81642,14 +81869,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-glasgow-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81667,14 +81895,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-glasgow-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81692,14 +81921,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-glasgow-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81717,7 +81947,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81740,14 +81970,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-guangzhou-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81765,14 +81996,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-guangzhou-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81790,14 +82022,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-guangzhou-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81815,7 +82048,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81838,14 +82071,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81863,14 +82097,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81888,14 +82123,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81913,7 +82149,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81936,14 +82172,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-helsinki-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81961,14 +82198,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-helsinki-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81986,14 +82224,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-helsinki-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82011,7 +82250,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82034,14 +82273,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-hirosima-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82059,14 +82299,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-hirosima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82084,14 +82325,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-hirosima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82109,7 +82351,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82132,14 +82374,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-isfahan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82157,14 +82400,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-isfahan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82182,14 +82426,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-isfahan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82207,7 +82452,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82230,14 +82475,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-istanbul-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82255,14 +82501,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-istanbul-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82280,14 +82527,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-istanbul-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82305,7 +82553,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82328,14 +82576,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-izmir-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82353,14 +82602,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-izmir-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82378,14 +82628,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-izmir-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82403,7 +82654,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82426,14 +82677,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kazan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82451,14 +82703,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kazan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82476,14 +82729,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kazan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82501,7 +82755,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82524,14 +82778,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kharkiv-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82549,14 +82804,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kharkiv-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82574,14 +82830,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kharkiv-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82599,7 +82856,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82622,14 +82879,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82647,14 +82905,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82672,14 +82931,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82697,7 +82957,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82720,14 +82980,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kobe-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82745,14 +83006,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kobe-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82770,14 +83032,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kobe-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82795,7 +83058,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82818,14 +83081,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kolkata-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82843,14 +83107,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kolkata-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82868,14 +83133,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kolkata-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82893,7 +83159,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82916,14 +83182,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kunming-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82941,14 +83208,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kunming-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82966,14 +83234,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kunming-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82991,7 +83260,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83014,14 +83283,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kyoto-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83039,14 +83309,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kyoto-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83064,14 +83335,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kyoto-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83089,7 +83361,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83112,14 +83384,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-losangeles-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83137,14 +83410,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-losangeles-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83162,14 +83436,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-losangeles-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83187,7 +83462,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83210,14 +83485,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lausanne-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83235,14 +83511,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lausanne-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83260,14 +83537,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lausanne-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83285,7 +83563,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83308,14 +83586,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lille-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83333,14 +83612,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lille-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83358,14 +83638,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lille-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83383,7 +83664,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83406,14 +83687,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lima-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83431,14 +83713,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83456,14 +83739,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83481,7 +83765,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83504,14 +83788,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lisboa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83529,14 +83814,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lisboa-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83554,14 +83840,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lisboa-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83579,7 +83866,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83602,14 +83889,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-london-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83627,14 +83915,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-london-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83652,14 +83941,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-london-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83677,7 +83967,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83700,14 +83990,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lyon-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83725,14 +84016,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lyon-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83750,14 +84042,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lyon-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83775,7 +84068,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83798,14 +84091,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-madrid-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83823,14 +84117,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-madrid-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83848,14 +84143,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-madrid-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83873,7 +84169,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83896,14 +84192,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-malaga-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83921,14 +84218,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-malaga-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83946,14 +84244,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-malaga-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83971,7 +84270,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83994,14 +84293,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-manila-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84019,14 +84319,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-manila-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84044,14 +84345,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-manila-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84069,7 +84371,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84092,14 +84394,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-maracaibo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84117,14 +84420,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-maracaibo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84142,14 +84446,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-maracaibo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84167,7 +84472,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84190,14 +84495,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mashhad-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84215,14 +84521,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mashhad-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84240,14 +84547,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mashhad-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84265,7 +84573,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84288,14 +84596,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mecca-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84313,14 +84622,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mecca-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84338,14 +84648,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mecca-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84363,7 +84674,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84386,14 +84697,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-medellin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84411,14 +84723,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-medellin-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84436,14 +84749,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-medellin-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84461,7 +84775,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84484,14 +84798,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mexico-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84509,14 +84824,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mexico-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84534,14 +84850,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mexico-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84559,7 +84876,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84582,14 +84899,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-milan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84607,14 +84925,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-milan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84632,14 +84951,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-milan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84657,7 +84977,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84680,14 +85000,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84705,14 +85026,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84730,14 +85052,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84755,7 +85078,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84778,14 +85101,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-montreal-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84803,14 +85127,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-montreal-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84828,14 +85153,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-montreal-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84853,7 +85179,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84863,6 +85189,7 @@ cont { scale: 15 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 } caption { @@ -84888,6 +85215,7 @@ cont { scale: 16 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84913,6 +85241,7 @@ cont { scale: 17 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84938,6 +85267,7 @@ cont { scale: 18 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84963,6 +85293,7 @@ cont { scale: 19 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -85004,14 +85335,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85029,14 +85361,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85054,14 +85387,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85079,7 +85413,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85102,14 +85436,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-nagoya-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85127,14 +85462,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-nagoya-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85152,14 +85488,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-nagoya-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85177,7 +85514,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85200,14 +85537,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85225,14 +85563,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85250,14 +85589,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85275,7 +85615,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85298,14 +85638,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85323,14 +85664,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85348,14 +85690,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85373,7 +85716,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85396,14 +85739,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85421,14 +85765,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85446,14 +85791,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85471,7 +85817,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85494,14 +85840,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85519,14 +85866,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85544,14 +85892,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85569,7 +85918,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85592,14 +85941,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85617,14 +85967,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85642,14 +85993,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85667,7 +86019,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85690,14 +86042,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85715,14 +86068,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85740,14 +86094,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85765,7 +86120,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85788,14 +86143,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85813,14 +86169,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85838,14 +86195,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85863,7 +86221,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85886,14 +86244,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85911,14 +86270,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85936,14 +86296,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85961,7 +86322,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85984,14 +86345,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86009,14 +86371,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86034,14 +86397,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86059,7 +86423,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86082,14 +86446,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86107,14 +86472,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86132,14 +86498,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86157,7 +86524,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86180,14 +86547,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86205,14 +86573,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86230,14 +86599,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86255,7 +86625,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86278,14 +86648,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86303,14 +86674,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86328,14 +86700,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86353,7 +86726,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86376,14 +86749,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86401,14 +86775,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86426,14 +86801,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86451,7 +86827,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86474,14 +86850,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86499,14 +86876,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86524,14 +86902,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86549,7 +86928,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86572,14 +86951,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86597,14 +86977,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86622,14 +87003,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86647,7 +87029,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86670,14 +87052,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86695,14 +87078,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86720,14 +87104,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86745,7 +87130,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86768,14 +87153,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86793,14 +87179,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86818,14 +87205,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86843,7 +87231,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86866,14 +87254,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86891,14 +87280,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86916,14 +87306,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86941,7 +87332,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86964,14 +87355,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86989,14 +87381,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87014,14 +87407,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87039,7 +87433,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87062,14 +87456,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87087,14 +87482,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87112,14 +87508,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87137,7 +87534,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87160,14 +87557,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87185,14 +87583,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87210,14 +87609,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87235,7 +87635,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87258,14 +87658,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87283,14 +87684,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87308,14 +87710,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87333,7 +87736,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87356,14 +87759,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87381,14 +87785,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87406,14 +87811,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87431,7 +87837,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87454,14 +87860,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87479,14 +87886,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87504,14 +87912,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87529,7 +87938,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87539,7 +87948,8 @@ cont { scale: 16 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87557,14 +87967,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87582,14 +87993,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87607,14 +88019,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87632,7 +88045,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87655,14 +88068,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87680,14 +88094,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87705,14 +88120,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87730,7 +88146,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87753,14 +88169,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87778,14 +88195,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87803,14 +88221,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87828,7 +88247,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87851,14 +88270,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87876,14 +88296,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87901,14 +88322,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87926,7 +88348,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87949,14 +88371,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87974,14 +88397,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87999,14 +88423,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88024,7 +88449,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88047,14 +88472,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88072,14 +88498,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88097,14 +88524,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88122,7 +88550,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88145,14 +88573,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88170,14 +88599,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88195,14 +88625,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88220,7 +88651,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88243,14 +88674,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88268,14 +88700,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88293,14 +88726,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88318,7 +88752,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88341,14 +88775,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88366,14 +88801,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88391,14 +88827,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88416,7 +88853,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88439,14 +88876,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88464,14 +88902,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88489,14 +88928,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88514,7 +88954,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88537,14 +88977,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88562,14 +89003,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88587,14 +89029,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88612,7 +89055,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88635,14 +89078,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88660,14 +89104,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88685,14 +89130,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88710,7 +89156,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88733,14 +89179,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88758,14 +89205,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88783,14 +89231,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88808,7 +89257,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88831,14 +89280,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88856,14 +89306,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88881,14 +89332,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88906,7 +89358,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88929,14 +89381,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88954,14 +89407,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88979,14 +89433,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -89004,7 +89459,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -89027,14 +89482,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -89052,14 +89508,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -89077,14 +89534,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -89102,7 +89560,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -89113,7 +89571,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89122,7 +89580,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89131,7 +89589,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89140,7 +89598,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1457 + priority: 1471 } } element { @@ -89148,7 +89606,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -89156,7 +89614,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -89164,7 +89622,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } } @@ -89175,7 +89633,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89184,7 +89642,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89193,7 +89651,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89202,7 +89660,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1457 + priority: 1471 } } element { @@ -89210,7 +89668,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -89218,7 +89676,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -89226,7 +89684,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } } @@ -89237,7 +89695,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89246,7 +89704,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89255,7 +89713,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -89264,7 +89722,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1457 + priority: 1471 } } element { @@ -89272,7 +89730,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -89280,7 +89738,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -89288,7 +89746,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } } @@ -89298,28 +89756,29 @@ cont { scale: 14 symbol { name: "tram-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } } element { scale: 15 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } } element { scale: 16 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } } element { scale: 17 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -89337,14 +89796,14 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 18 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -89362,14 +89821,14 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 19 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -89387,7 +89846,7 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } } @@ -89398,7 +89857,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89408,7 +89867,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89418,7 +89877,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89427,7 +89886,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89436,7 +89895,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89445,7 +89904,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89454,7 +89913,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89462,7 +89921,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89471,7 +89930,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89479,7 +89938,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89488,7 +89947,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89496,7 +89955,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89505,7 +89964,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89516,7 +89975,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89526,7 +89985,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89536,7 +89995,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89547,13 +90006,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89564,13 +90023,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89581,7 +90040,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89589,13 +90048,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89604,7 +90063,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89614,7 +90073,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89622,13 +90081,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89637,7 +90096,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89647,7 +90106,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89655,13 +90114,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89670,7 +90129,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89680,7 +90139,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89688,13 +90147,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89703,7 +90162,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89714,7 +90173,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89724,7 +90183,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89734,7 +90193,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89747,13 +90206,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89766,13 +90225,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89785,13 +90244,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89800,7 +90259,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89812,13 +90271,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89827,7 +90286,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89839,13 +90298,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89854,7 +90313,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89866,13 +90325,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89881,7 +90340,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89896,7 +90355,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89905,7 +90364,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89917,7 +90376,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89926,7 +90385,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89938,7 +90397,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89947,7 +90406,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89959,7 +90418,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89967,7 +90426,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89979,7 +90438,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89987,7 +90446,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89999,7 +90458,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -90007,7 +90466,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -90019,14 +90478,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -90038,14 +90497,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -90057,14 +90516,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -90076,14 +90535,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 4495803 } - priority: 16180 + priority: 16198 } } } @@ -90091,31 +90550,41 @@ cont { name: "shop" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90124,14 +90593,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90140,7 +90609,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90150,7 +90619,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90159,14 +90628,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90176,14 +90645,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90193,14 +90662,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90210,7 +90679,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90218,31 +90687,41 @@ cont { name: "shop-antiques" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90251,14 +90730,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90267,7 +90746,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90275,31 +90754,41 @@ cont { name: "shop-art" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90308,14 +90797,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90324,7 +90813,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90332,31 +90821,41 @@ cont { name: "shop-baby_goods" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90365,14 +90864,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90381,7 +90880,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90389,31 +90888,41 @@ cont { name: "shop-bag" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90422,14 +90931,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90438,7 +90947,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90448,7 +90957,7 @@ cont { scale: 16 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90457,14 +90966,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90474,14 +90983,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90491,14 +91000,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90508,7 +91017,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90518,7 +91027,7 @@ cont { scale: 16 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90527,14 +91036,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90544,14 +91053,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90561,14 +91070,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90578,7 +91087,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90588,7 +91097,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90597,14 +91106,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90614,14 +91123,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90631,14 +91140,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90648,7 +91157,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90658,7 +91167,7 @@ cont { scale: 16 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90667,14 +91176,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90684,14 +91193,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90701,14 +91210,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90718,7 +91227,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90728,7 +91237,7 @@ cont { scale: 16 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90737,14 +91246,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90754,14 +91263,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90771,14 +91280,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90788,7 +91297,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90798,7 +91307,7 @@ cont { scale: 16 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90807,14 +91316,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90824,14 +91333,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90841,14 +91350,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90858,7 +91367,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90866,31 +91375,41 @@ cont { name: "shop-boutique" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90899,14 +91418,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90915,7 +91434,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90925,7 +91444,7 @@ cont { scale: 16 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90934,14 +91453,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90951,14 +91470,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90968,14 +91487,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90985,7 +91504,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90995,7 +91514,7 @@ cont { scale: 16 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91004,14 +91523,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91021,14 +91540,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91038,14 +91557,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91055,7 +91574,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91065,7 +91584,7 @@ cont { scale: 16 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91074,14 +91593,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91091,14 +91610,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91108,14 +91627,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91125,7 +91644,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91135,7 +91654,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91144,14 +91663,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91161,14 +91680,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91178,14 +91697,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91195,7 +91714,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91205,7 +91724,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16657 + priority: 16669 min_distance: 20 } caption { @@ -91221,7 +91740,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -91237,7 +91756,7 @@ cont { scale: 17 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -91254,7 +91773,7 @@ cont { scale: 18 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -91271,7 +91790,7 @@ cont { scale: 19 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -91291,7 +91810,7 @@ cont { scale: 16 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -91300,14 +91819,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -91317,14 +91836,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -91334,14 +91853,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -91351,7 +91870,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -91361,7 +91880,7 @@ cont { scale: 16 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 10 } caption { @@ -91370,14 +91889,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15735 } } element { scale: 17 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -91387,14 +91906,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 18 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -91404,14 +91923,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 19 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -91421,7 +91940,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } } @@ -91429,31 +91948,41 @@ cont { name: "shop-cheese" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91462,14 +91991,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91478,7 +92007,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91488,7 +92017,7 @@ cont { scale: 16 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91497,14 +92026,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91514,14 +92043,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91531,14 +92060,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91548,7 +92077,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91558,7 +92087,7 @@ cont { scale: 16 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91567,14 +92096,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91584,14 +92113,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91601,14 +92130,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91618,7 +92147,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91628,7 +92157,7 @@ cont { scale: 16 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91637,14 +92166,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91654,14 +92183,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91671,14 +92200,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91688,7 +92217,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91696,31 +92225,41 @@ cont { name: "shop-coffee" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91729,14 +92268,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91745,7 +92284,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91755,7 +92294,7 @@ cont { scale: 16 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91764,14 +92303,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91781,14 +92320,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91798,14 +92337,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91815,7 +92354,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91825,7 +92364,7 @@ cont { scale: 16 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91834,14 +92373,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91851,14 +92390,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91868,14 +92407,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91885,7 +92424,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91895,7 +92434,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91904,14 +92443,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91921,14 +92460,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91938,14 +92477,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91955,7 +92494,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91965,7 +92504,7 @@ cont { scale: 16 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91974,14 +92513,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91991,14 +92530,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92008,14 +92547,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92025,7 +92564,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92035,7 +92574,7 @@ cont { scale: 16 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92044,14 +92583,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92061,14 +92600,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92078,14 +92617,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92095,7 +92634,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92103,31 +92642,41 @@ cont { name: "shop-craft" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92136,14 +92685,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92152,7 +92701,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92160,31 +92709,41 @@ cont { name: "shop-dairy" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92193,14 +92752,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92209,7 +92768,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92219,7 +92778,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92228,14 +92787,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92245,14 +92804,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92262,14 +92821,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92279,7 +92838,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92289,7 +92848,7 @@ cont { scale: 16 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92298,14 +92857,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92315,14 +92874,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92332,14 +92891,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92349,7 +92908,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92359,7 +92918,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92368,14 +92927,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92385,14 +92944,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92402,14 +92961,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92419,7 +92978,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92429,7 +92988,7 @@ cont { scale: 16 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92438,14 +92997,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92455,14 +93014,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92472,14 +93031,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92489,7 +93048,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92497,31 +93056,41 @@ cont { name: "shop-electrical" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92530,14 +93099,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92546,7 +93115,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92556,7 +93125,7 @@ cont { scale: 16 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92565,14 +93134,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92582,14 +93151,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92599,14 +93168,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92616,7 +93185,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92626,7 +93195,7 @@ cont { scale: 16 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92635,14 +93204,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92652,14 +93221,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92669,14 +93238,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92686,7 +93255,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92696,7 +93265,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92705,14 +93274,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92721,14 +93290,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92737,14 +93306,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92753,7 +93322,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92763,7 +93332,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92772,14 +93341,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92789,14 +93358,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92806,14 +93375,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92823,7 +93392,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92831,31 +93400,41 @@ cont { name: "shop-fishing" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92864,14 +93443,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92880,7 +93459,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92890,7 +93469,7 @@ cont { scale: 16 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92899,14 +93478,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92916,14 +93495,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92933,14 +93512,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92950,7 +93529,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92960,7 +93539,7 @@ cont { scale: 16 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92969,14 +93548,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92986,14 +93565,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93003,14 +93582,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93020,7 +93599,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93030,7 +93609,7 @@ cont { scale: 16 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93039,14 +93618,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93056,14 +93635,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93073,14 +93652,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93090,7 +93669,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93100,7 +93679,7 @@ cont { scale: 16 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93109,14 +93688,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93126,14 +93705,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93143,14 +93722,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93160,7 +93739,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93170,7 +93749,7 @@ cont { scale: 16 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93179,14 +93758,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93196,14 +93775,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93213,14 +93792,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93230,7 +93809,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93240,7 +93819,7 @@ cont { scale: 16 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93249,14 +93828,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93266,14 +93845,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93283,14 +93862,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93300,7 +93879,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93310,7 +93889,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93319,14 +93898,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93336,14 +93915,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93353,14 +93932,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93370,7 +93949,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93380,7 +93959,7 @@ cont { scale: 16 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93389,14 +93968,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93406,14 +93985,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93423,14 +94002,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93440,7 +94019,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93450,7 +94029,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93459,14 +94038,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93476,14 +94055,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93493,14 +94072,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93510,7 +94089,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93520,7 +94099,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93529,14 +94108,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93546,14 +94125,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93563,14 +94142,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93580,7 +94159,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93590,7 +94169,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93599,14 +94178,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93616,14 +94195,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93633,14 +94212,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93650,7 +94229,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93658,31 +94237,41 @@ cont { name: "shop-interior_decoration" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93691,14 +94280,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93707,7 +94296,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93717,7 +94306,7 @@ cont { scale: 16 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93726,14 +94315,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93743,14 +94332,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93760,14 +94349,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93777,7 +94366,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93787,7 +94376,7 @@ cont { scale: 16 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93796,14 +94385,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93813,14 +94402,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93830,14 +94419,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93847,7 +94436,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93857,7 +94446,7 @@ cont { scale: 16 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93866,14 +94455,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93883,14 +94472,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93900,14 +94489,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93917,7 +94506,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93927,7 +94516,7 @@ cont { scale: 16 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93936,14 +94525,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93953,14 +94542,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93970,14 +94559,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93987,7 +94576,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93995,31 +94584,41 @@ cont { name: "shop-lottery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94028,14 +94627,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94044,7 +94643,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94054,7 +94653,7 @@ cont { scale: 14 symbol { name: "shop-s" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -94063,14 +94662,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 15 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -94079,14 +94678,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 16 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -94095,14 +94694,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 17 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -94111,14 +94710,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 18 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -94127,14 +94726,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 19 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -94143,7 +94742,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } } @@ -94151,20 +94750,9 @@ cont { name: "shop-massage" element { scale: 16 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15600 - } - } - element { - scale: 17 symbol { - name: "sauna-m" - priority: 16600 + name: "shop-m" + priority: 16613 min_distance: 10 } caption { @@ -94172,16 +94760,31 @@ cont { height: 10 color: 4473924 offset_y: 1 - is_optional: true } - priority: 15600 + priority: 15613 + } + } + element { + scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15613 } } element { scale: 18 symbol { name: "sauna-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94191,14 +94794,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sauna-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94208,7 +94811,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94216,31 +94819,41 @@ cont { name: "shop-medical_supply" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94249,14 +94862,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94265,7 +94878,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94275,7 +94888,7 @@ cont { scale: 16 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94284,14 +94897,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94301,14 +94914,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94318,14 +94931,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94335,7 +94948,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94343,20 +94956,25 @@ cont { name: "shop-money_lender" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -94366,14 +94984,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -94383,14 +95001,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -94400,7 +95018,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94410,7 +95028,7 @@ cont { scale: 16 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94419,14 +95037,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94436,14 +95054,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94453,14 +95071,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94470,7 +95088,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94479,8 +95097,8 @@ cont { element { scale: 16 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 10 } caption { @@ -94489,14 +95107,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94506,14 +95124,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94523,14 +95141,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94540,7 +95158,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94549,8 +95167,8 @@ cont { element { scale: 16 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 10 } caption { @@ -94559,14 +95177,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94576,14 +95194,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94593,14 +95211,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94610,7 +95228,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94618,20 +95236,25 @@ cont { name: "shop-newsagent" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94641,14 +95264,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94658,14 +95281,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94675,7 +95298,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94683,31 +95306,41 @@ cont { name: "shop-nutrition_supplements" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94716,14 +95349,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94732,7 +95365,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94742,7 +95375,7 @@ cont { scale: 16 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94751,14 +95384,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94768,14 +95401,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94785,14 +95418,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94802,7 +95435,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94812,7 +95445,7 @@ cont { scale: 16 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94821,14 +95454,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94838,14 +95471,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94855,14 +95488,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94872,7 +95505,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94880,31 +95513,41 @@ cont { name: "shop-paint" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94913,14 +95556,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94929,7 +95572,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94939,7 +95582,7 @@ cont { scale: 16 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94948,14 +95591,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94965,14 +95608,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94982,14 +95625,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94999,7 +95642,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95007,20 +95650,25 @@ cont { name: "shop-pawnbroker" element { scale: 16 + symbol { + name: "shop-m" + priority: 16650 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -95030,14 +95678,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -95047,14 +95695,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -95064,7 +95712,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -95072,31 +95720,41 @@ cont { name: "shop-perfumery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95105,14 +95763,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95121,7 +95779,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95131,7 +95789,7 @@ cont { scale: 16 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95140,14 +95798,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95157,14 +95815,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95174,14 +95832,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95191,7 +95849,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95201,7 +95859,7 @@ cont { scale: 16 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95210,14 +95868,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95227,14 +95885,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95244,14 +95902,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95261,7 +95919,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95271,7 +95929,7 @@ cont { scale: 16 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95280,14 +95938,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95297,14 +95955,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95314,14 +95972,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95331,7 +95989,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95341,7 +95999,7 @@ cont { scale: 16 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 10 } caption { @@ -95350,14 +96008,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15735 } } element { scale: 17 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -95367,14 +96025,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 18 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -95384,14 +96042,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 19 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -95401,7 +96059,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } } @@ -95409,31 +96067,41 @@ cont { name: "shop-sewing" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95442,14 +96110,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95458,7 +96126,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95468,7 +96136,7 @@ cont { scale: 16 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95477,14 +96145,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95494,14 +96162,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95511,14 +96179,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95528,7 +96196,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95538,7 +96206,7 @@ cont { scale: 16 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95547,14 +96215,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95564,14 +96232,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95581,14 +96249,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95598,7 +96266,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95606,20 +96274,25 @@ cont { name: "shop-stationery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95629,14 +96302,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95646,14 +96319,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95663,7 +96336,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95671,31 +96344,41 @@ cont { name: "shop-storage_rental" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95704,14 +96387,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95720,7 +96403,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95730,7 +96413,7 @@ cont { scale: 14 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 16 } caption { @@ -95739,14 +96422,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 15 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 16 } caption { @@ -95755,14 +96438,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 16 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 16 } caption { @@ -95771,14 +96454,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95787,14 +96470,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95803,14 +96486,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95819,7 +96502,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -95829,7 +96512,7 @@ cont { scale: 16 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95838,14 +96521,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95855,14 +96538,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95872,14 +96555,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95889,7 +96572,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95897,31 +96580,41 @@ cont { name: "shop-tea" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95930,14 +96623,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95946,7 +96639,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95956,7 +96649,7 @@ cont { scale: 16 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95965,14 +96658,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95982,14 +96675,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95999,14 +96692,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96016,7 +96709,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96024,31 +96717,41 @@ cont { name: "shop-tobacco" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96057,14 +96760,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96073,7 +96776,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96083,7 +96786,7 @@ cont { scale: 16 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96092,14 +96795,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96109,14 +96812,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96126,14 +96829,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96143,7 +96846,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96151,31 +96854,41 @@ cont { name: "shop-trade" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96184,14 +96897,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96200,7 +96913,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96208,31 +96921,41 @@ cont { name: "shop-travel_agency" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96241,14 +96964,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96257,7 +96980,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96267,7 +96990,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96276,14 +96999,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96293,14 +97016,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96310,14 +97033,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96327,7 +97050,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96335,31 +97058,41 @@ cont { name: "shop-variety_store" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 8 + } caption { primary { height: 11 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 8 } caption { @@ -96368,14 +97101,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 8 } caption { @@ -96384,7 +97117,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96394,7 +97127,7 @@ cont { scale: 16 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96403,14 +97136,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96420,14 +97153,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96437,14 +97170,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96454,7 +97187,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96463,8 +97196,8 @@ cont { element { scale: 16 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 10 } caption { @@ -96473,14 +97206,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -96490,14 +97223,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -96507,14 +97240,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -96524,7 +97257,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96532,31 +97265,41 @@ cont { name: "shop-watches" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96565,14 +97308,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96581,7 +97324,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96589,31 +97332,41 @@ cont { name: "shop-wholesale" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96622,14 +97375,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96638,7 +97391,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96648,7 +97401,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96657,14 +97410,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96674,14 +97427,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96691,14 +97444,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96708,7 +97461,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96718,7 +97471,7 @@ cont { scale: 17 symbol { name: "bowling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96727,14 +97480,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96744,14 +97497,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } element { scale: 19 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96761,7 +97514,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } } @@ -96771,7 +97524,7 @@ cont { scale: 17 symbol { name: "bowling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96780,14 +97533,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96797,14 +97550,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } element { scale: 19 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96814,7 +97567,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } } @@ -96824,7 +97577,7 @@ cont { scale: 17 symbol { name: "america-football-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96833,14 +97586,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "america-football-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96850,14 +97603,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "america-football-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96867,7 +97620,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96877,7 +97630,7 @@ cont { scale: 17 symbol { name: "archery-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96886,14 +97639,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96903,14 +97656,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96920,7 +97673,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96930,7 +97683,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96939,14 +97692,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96956,14 +97709,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96973,7 +97726,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96983,7 +97736,7 @@ cont { scale: 17 symbol { name: "australian-football-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96992,14 +97745,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "australian-football-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97009,14 +97762,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "australian-football-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97026,7 +97779,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97036,7 +97789,7 @@ cont { scale: 17 symbol { name: "badminton-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97045,14 +97798,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "badminton-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97062,14 +97815,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "badminton-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97079,7 +97832,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97089,7 +97842,7 @@ cont { scale: 17 symbol { name: "baseball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97098,14 +97851,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "baseball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97115,14 +97868,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "baseball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97132,7 +97885,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97142,7 +97895,7 @@ cont { scale: 17 symbol { name: "basketball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97151,14 +97904,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "basketball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97168,14 +97921,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "basketball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97185,7 +97938,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97195,7 +97948,7 @@ cont { scale: 17 symbol { name: "volleyball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97204,14 +97957,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97221,14 +97974,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97238,7 +97991,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97248,7 +98001,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97257,14 +98010,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97274,14 +98027,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97291,7 +98044,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97301,7 +98054,7 @@ cont { scale: 17 symbol { name: "chess-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97310,14 +98063,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "chess-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97327,14 +98080,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "chess-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97344,7 +98097,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97354,7 +98107,7 @@ cont { scale: 17 symbol { name: "climbing-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97363,14 +98116,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "climbing-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97380,14 +98133,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "climbing-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97397,7 +98150,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97407,7 +98160,7 @@ cont { scale: 17 symbol { name: "cricket-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97416,14 +98169,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "cricket-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97433,14 +98186,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "cricket-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97450,7 +98203,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97460,7 +98213,7 @@ cont { scale: 17 symbol { name: "curling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97469,14 +98222,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "curling-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97486,14 +98239,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "curling-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97503,7 +98256,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97513,7 +98266,7 @@ cont { scale: 17 symbol { name: "diving-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97522,14 +98275,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97539,14 +98292,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97556,7 +98309,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97566,7 +98319,7 @@ cont { scale: 17 symbol { name: "equestrian-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97575,14 +98328,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "equestrian-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97592,14 +98345,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "equestrian-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97609,7 +98362,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97619,7 +98372,7 @@ cont { scale: 17 symbol { name: "hockey-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97628,14 +98381,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97645,14 +98398,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97662,7 +98415,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97672,7 +98425,7 @@ cont { scale: 17 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97681,14 +98434,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97698,14 +98451,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97715,7 +98468,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97725,7 +98478,7 @@ cont { scale: 17 symbol { name: "golf-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97734,14 +98487,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "golf-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97751,14 +98504,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "golf-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97768,7 +98521,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97778,7 +98531,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97787,14 +98540,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97804,14 +98557,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97821,7 +98574,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97831,7 +98584,7 @@ cont { scale: 17 symbol { name: "handball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97840,14 +98593,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "handball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97857,14 +98610,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "handball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97874,7 +98627,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97884,7 +98637,7 @@ cont { scale: 17 symbol { name: "hockey-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97893,14 +98646,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97910,14 +98663,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97927,7 +98680,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97937,25 +98690,25 @@ cont { scale: 15 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 16 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 17 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97964,18 +98717,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97985,18 +98738,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98006,7 +98759,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -98016,7 +98769,7 @@ cont { scale: 17 symbol { name: "padel-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98025,14 +98778,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "padel-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98042,14 +98795,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "padel-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98059,7 +98812,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98069,7 +98822,7 @@ cont { scale: 17 symbol { name: "pelota-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98078,14 +98831,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pelota-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98095,14 +98848,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pelota-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98112,7 +98865,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98122,7 +98875,7 @@ cont { scale: 17 symbol { name: "diving-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98131,14 +98884,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -98148,14 +98901,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -98165,7 +98918,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -98175,7 +98928,7 @@ cont { scale: 17 symbol { name: "archery-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98184,14 +98937,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -98201,14 +98954,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -98218,7 +98971,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -98228,7 +98981,7 @@ cont { scale: 17 symbol { name: "skateboard-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98237,14 +98990,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "skateboard-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98254,14 +99007,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "skateboard-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98271,7 +99024,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98281,7 +99034,7 @@ cont { scale: 17 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98290,14 +99043,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98307,14 +99060,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98324,7 +99077,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -98334,25 +99087,25 @@ cont { scale: 15 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 16 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 17 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98361,18 +99114,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98382,18 +99135,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98403,7 +99156,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -98413,7 +99166,7 @@ cont { scale: 17 symbol { name: "swimming-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98422,14 +99175,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "swimming-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98439,14 +99192,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "swimming-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98456,7 +99209,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98466,7 +99219,7 @@ cont { scale: 17 symbol { name: "table-tennis-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98475,14 +99228,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "table-tennis-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98492,14 +99245,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "table-tennis-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98509,7 +99262,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98519,7 +99272,7 @@ cont { scale: 17 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98528,14 +99281,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98545,14 +99298,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98562,7 +99315,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -98572,7 +99325,7 @@ cont { scale: 17 symbol { name: "volleyball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98581,14 +99334,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98598,14 +99351,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98615,7 +99368,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98625,7 +99378,7 @@ cont { scale: 17 symbol { name: "yoga-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98634,14 +99387,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "yoga-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98651,14 +99404,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "yoga-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98668,7 +99421,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98678,7 +99431,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 24 } caption { @@ -98687,14 +99440,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98703,14 +99456,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98720,14 +99473,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98737,7 +99490,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } } @@ -98747,7 +99500,7 @@ cont { scale: 16 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -98756,14 +99509,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 } caption { primary { @@ -98771,14 +99524,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -98788,14 +99541,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -98805,7 +99558,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -98815,7 +99568,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98825,14 +99578,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98842,14 +99595,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98859,14 +99612,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98876,14 +99629,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98893,7 +99646,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } } @@ -98903,7 +99656,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98913,14 +99666,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98930,14 +99683,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98947,14 +99700,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98964,14 +99717,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98981,7 +99734,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98991,7 +99744,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -99001,14 +99754,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -99018,14 +99771,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -99035,14 +99788,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -99052,14 +99805,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -99069,7 +99822,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -99079,7 +99832,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -99089,14 +99842,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -99106,14 +99859,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -99123,14 +99876,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -99140,14 +99893,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -99157,7 +99910,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -99167,7 +99920,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -99177,14 +99930,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -99194,14 +99947,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -99211,14 +99964,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -99228,14 +99981,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -99245,7 +99998,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -99255,7 +100008,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -99265,14 +100018,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -99282,14 +100035,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99299,14 +100052,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99316,14 +100069,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99333,14 +100086,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99350,7 +100103,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -99360,7 +100113,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -99370,14 +100123,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -99387,14 +100140,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99404,14 +100157,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99421,14 +100174,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99438,14 +100191,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99455,7 +100208,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -99465,7 +100218,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -99475,14 +100228,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -99492,14 +100245,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99509,14 +100262,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99526,14 +100279,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99543,14 +100296,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99560,7 +100313,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -99570,7 +100323,7 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99579,14 +100332,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99595,14 +100348,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99611,14 +100364,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99628,14 +100381,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99645,7 +100398,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -99655,7 +100408,7 @@ cont { scale: 16 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -99664,14 +100417,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99680,14 +100433,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99697,14 +100450,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99714,7 +100467,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99724,7 +100477,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -99733,14 +100486,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99749,14 +100502,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99766,14 +100519,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99783,7 +100536,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -99793,7 +100546,8 @@ cont { scale: 15 symbol { name: "gallery-m" - priority: 16828 + apply_for_type: 1 + priority: 16830 min_distance: 8 } caption { @@ -99803,14 +100557,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 16 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99820,14 +100574,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 17 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99837,14 +100591,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 18 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99854,14 +100608,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 19 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99871,7 +100625,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } } @@ -99881,7 +100635,7 @@ cont { scale: 16 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -99890,14 +100644,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 } caption { primary { @@ -99905,14 +100659,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99922,14 +100676,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99939,7 +100693,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -99949,7 +100703,8 @@ cont { scale: 16 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 24 } caption { @@ -99958,14 +100713,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15761 + priority: 15773 } } element { scale: 17 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99974,14 +100730,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15761 + priority: 15773 } } element { scale: 18 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99991,14 +100748,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15761 + priority: 15773 } } element { scale: 19 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -100008,7 +100766,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15761 + priority: 15773 } } } @@ -100018,7 +100776,8 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 24 } caption { @@ -100027,14 +100786,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15790 + priority: 15801 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -100043,14 +100803,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15790 + priority: 15801 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -100060,14 +100821,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15790 + priority: 15801 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -100077,7 +100839,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15790 + priority: 15801 } } } @@ -100087,7 +100849,8 @@ cont { scale: 16 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100097,14 +100860,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100114,14 +100878,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "information-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100131,14 +100896,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "information-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100148,7 +100914,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -100158,7 +100924,8 @@ cont { scale: 16 symbol { name: "board" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100168,14 +100935,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "board" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100185,14 +100953,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "board" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100202,14 +100971,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "board" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100219,7 +100989,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -100229,7 +100999,8 @@ cont { scale: 16 symbol { name: "guidepost" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100239,14 +101010,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "guidepost" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100256,14 +101028,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "guidepost" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100273,14 +101046,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "guidepost" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100290,7 +101064,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -100300,7 +101074,8 @@ cont { scale: 16 symbol { name: "map" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100310,14 +101085,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "map" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100327,14 +101103,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "map" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100344,14 +101121,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "map" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -100361,7 +101139,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -100371,7 +101149,8 @@ cont { scale: 16 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100381,14 +101160,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -100398,14 +101178,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { - name: "information-m" - priority: 16600 + name: "office-m" + priority: 16650 min_distance: 10 } caption { @@ -100415,14 +101195,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15650 } } element { scale: 19 symbol { - name: "information-m" - priority: 16600 + name: "office-m" + priority: 16650 min_distance: 10 } caption { @@ -100432,7 +101212,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15650 } } } @@ -100442,7 +101222,7 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 24 } caption { @@ -100451,14 +101231,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15771 + priority: 15783 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -100467,14 +101247,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15771 + priority: 15783 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -100484,14 +101264,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15771 + priority: 15783 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -100501,7 +101281,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15771 + priority: 15783 } } } @@ -100511,7 +101291,7 @@ cont { scale: 13 symbol { name: "museum-s" - priority: 16838 + priority: 16839 min_distance: 16 } caption { @@ -100521,14 +101301,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 14 symbol { name: "museum-s" - priority: 16838 + priority: 16839 min_distance: 16 } caption { @@ -100538,14 +101318,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 15 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 24 } caption { @@ -100555,14 +101335,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 16 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100572,14 +101352,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 17 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100589,14 +101369,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 18 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100606,14 +101386,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 19 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100623,7 +101403,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } } @@ -100633,7 +101413,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100642,14 +101422,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100658,14 +101438,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100675,14 +101455,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100692,7 +101472,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -100702,7 +101482,7 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 24 } caption { @@ -100711,14 +101491,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15780 + priority: 15792 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100727,14 +101507,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15780 + priority: 15792 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100744,14 +101524,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15780 + priority: 15792 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100761,7 +101541,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15780 + priority: 15792 } } } @@ -100771,7 +101551,7 @@ cont { scale: 14 symbol { name: "theme_park-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -100781,14 +101561,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -100798,14 +101578,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100815,14 +101595,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100832,14 +101612,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100849,14 +101629,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100866,7 +101646,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -100876,7 +101656,8 @@ cont { scale: 14 symbol { name: "viewpoint-s" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100886,14 +101667,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 15 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100903,14 +101685,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 16 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100920,14 +101703,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 17 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100937,14 +101721,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100954,14 +101739,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100971,7 +101757,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -100981,7 +101767,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 24 } caption { @@ -100990,14 +101776,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -101006,14 +101792,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -101023,14 +101809,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -101040,7 +101826,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } } @@ -101050,7 +101836,7 @@ cont { scale: 13 symbol { name: "zoo-s" - priority: 16866 + priority: 16867 min_distance: 12 } caption { @@ -101060,14 +101846,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 14 symbol { name: "zoo-s" - priority: 16866 + priority: 16867 min_distance: 12 } caption { @@ -101077,14 +101863,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 15 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -101094,14 +101880,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -101111,14 +101897,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 17 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -101128,14 +101914,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 18 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -101145,14 +101931,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 19 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -101162,7 +101948,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } } @@ -101694,28 +102480,32 @@ cont { scale: 16 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 17 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 18 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 19 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } } @@ -102588,7 +103378,7 @@ cont { scale: 11 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 min_distance: 15 } caption { @@ -102598,14 +103388,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102614,14 +103404,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102630,14 +103420,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102646,14 +103436,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102662,14 +103452,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102678,14 +103468,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102694,14 +103484,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102710,14 +103500,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102726,7 +103516,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -102746,7 +103536,7 @@ cont { lines { width: 2.0 color: 1304608947 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -102754,7 +103544,7 @@ cont { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102762,14 +103552,14 @@ cont { lines { width: 3.0 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102777,14 +103567,14 @@ cont { lines { width: 4.5 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102792,14 +103582,14 @@ cont { lines { width: 6.0 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102807,14 +103597,14 @@ cont { lines { width: 8.0 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index b820147384..5f6f802477 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 6ff00151d0..72542edde4 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -9,20 +9,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -35,18 +36,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -59,18 +61,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -82,18 +85,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -103,7 +107,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -115,16 +119,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -134,7 +139,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -146,16 +151,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -165,7 +171,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -177,16 +183,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -196,7 +203,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -208,16 +215,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -227,7 +235,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -242,20 +250,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -268,18 +277,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -292,18 +302,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -315,18 +326,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -336,7 +348,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -348,16 +360,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -367,7 +380,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -379,16 +392,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -398,7 +412,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -410,16 +424,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -429,7 +444,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -441,16 +456,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -460,7 +476,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -475,14 +491,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -496,13 +512,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -515,13 +531,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -534,18 +550,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -555,7 +572,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -567,16 +584,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -586,7 +604,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -598,16 +616,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -617,7 +636,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -629,16 +648,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -648,7 +668,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -660,16 +680,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -679,7 +700,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -694,20 +715,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -720,18 +742,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -744,18 +767,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -767,18 +791,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -788,7 +813,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -800,16 +825,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -819,7 +845,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -831,16 +857,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -850,7 +877,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -862,16 +889,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -881,7 +909,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -893,16 +921,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -912,7 +941,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -927,14 +956,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -948,13 +977,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -967,13 +996,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -986,18 +1015,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1007,7 +1037,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1019,16 +1049,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1038,7 +1069,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1050,16 +1081,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1069,7 +1101,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1081,16 +1113,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1100,7 +1133,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1112,16 +1145,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1131,7 +1165,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1146,14 +1180,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1167,13 +1201,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1186,13 +1220,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1205,18 +1239,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1226,7 +1261,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1238,16 +1273,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1257,7 +1293,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1269,16 +1305,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1288,7 +1325,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1300,16 +1337,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1319,7 +1357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1331,16 +1369,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1350,7 +1389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1365,20 +1404,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -1391,18 +1431,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -1415,18 +1456,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -1438,18 +1480,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1459,7 +1502,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1471,16 +1514,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1490,7 +1534,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1502,16 +1546,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1521,7 +1566,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1533,16 +1578,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1552,7 +1598,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1564,16 +1610,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1583,7 +1630,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1598,14 +1645,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1619,13 +1666,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1638,13 +1685,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1657,18 +1704,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1678,7 +1726,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1690,16 +1738,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1709,7 +1758,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1721,16 +1770,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1740,7 +1790,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1752,16 +1802,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1771,7 +1822,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1783,16 +1834,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1802,7 +1854,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1817,14 +1869,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1838,13 +1890,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1857,13 +1909,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1876,18 +1928,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1897,7 +1950,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1909,16 +1962,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1928,7 +1982,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1940,16 +1994,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1959,7 +2014,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1971,16 +2026,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1990,7 +2046,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2002,16 +2058,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2021,7 +2078,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2031,7 +2088,8 @@ cont { scale: 12 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -2039,7 +2097,8 @@ cont { scale: 13 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -2047,14 +2106,16 @@ cont { scale: 14 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 15 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2064,14 +2125,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 16 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2081,14 +2143,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2098,14 +2161,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2115,14 +2179,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2132,7 +2197,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2147,14 +2212,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -2168,13 +2233,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -2187,13 +2252,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -2206,18 +2271,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 4473924 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2227,7 +2293,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2239,16 +2305,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2258,7 +2325,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2270,16 +2337,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2289,7 +2357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2301,16 +2369,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2320,7 +2389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2332,16 +2401,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 4473924 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2351,7 +2421,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2363,6 +2433,15 @@ cont { color: 13942770 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + priority: 15009 + } } element { scale: 11 @@ -2370,6 +2449,15 @@ cont { color: 13942770 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + priority: 15009 + } } element { scale: 12 @@ -2377,6 +2465,23 @@ cont { color: 13746411 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15009 + } } element { scale: 13 @@ -2384,6 +2489,23 @@ cont { color: 13615592 priority: -15991 } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15009 + } } element { scale: 14 @@ -2566,21 +2688,21 @@ cont { scale: 7 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { scale: 8 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { scale: 9 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { @@ -2612,7 +2734,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2633,7 +2755,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2662,7 +2784,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2864,7 +2986,7 @@ cont { scale: 17 symbol { name: "gate-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -2872,14 +2994,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "gate-m" - priority: 16980 + priority: 16981 } caption { primary { @@ -2887,14 +3009,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15980 + priority: 15981 } } element { scale: 19 symbol { name: "gate-m" - priority: 16980 + priority: 16981 } caption { primary { @@ -2902,7 +3024,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15980 + priority: 15981 } } } @@ -2912,7 +3034,7 @@ cont { scale: 16 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2921,14 +3043,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2937,14 +3059,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2953,14 +3075,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2969,7 +3091,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2980,7 +3102,7 @@ cont { lines { width: 1.0 color: 2164260863 - priority: 1142 + priority: 1160 join: BEVELJOIN cap: BUTTCAP } @@ -2990,7 +3112,7 @@ cont { lines { width: 1.5 color: 872415231 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -2999,7 +3121,7 @@ cont { lines { width: 2.4 color: 16777215 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3008,7 +3130,7 @@ cont { lines { width: 2.4 color: 16777215 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3017,7 +3139,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } element { @@ -3025,7 +3147,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } element { @@ -3033,7 +3155,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } element { @@ -3041,7 +3163,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1142 + priority: 1160 } } } @@ -3052,7 +3174,7 @@ cont { lines { width: 0.6 color: 1728053247 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3061,7 +3183,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3070,7 +3192,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } element { @@ -3078,7 +3200,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } element { @@ -3086,7 +3208,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } element { @@ -3094,7 +3216,7 @@ cont { lines { width: 1.2 color: 1728053247 - priority: 1142 + priority: 1160 } } } @@ -3108,7 +3230,7 @@ cont { width: 1.0 color: 10592406 } - priority: -15762 + priority: -15746 } } element { @@ -3119,14 +3241,14 @@ cont { width: 1.0 color: 10592406 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3137,14 +3259,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3155,14 +3277,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3173,14 +3295,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } element { @@ -3191,14 +3313,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 6381914 } - priority: 15238 + priority: 15254 } } } @@ -3276,7 +3398,7 @@ cont { scale: 18 symbol { name: "atm-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -3285,14 +3407,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "atm-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -3301,7 +3423,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3311,7 +3433,7 @@ cont { scale: 16 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3319,14 +3441,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3334,14 +3456,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3349,14 +3471,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3364,7 +3486,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -3373,8 +3495,8 @@ cont { element { scale: 15 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 28 } caption { @@ -3383,14 +3505,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 16 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3399,14 +3521,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 17 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3415,14 +3537,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 18 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3432,14 +3554,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15695 + priority: 15707 } } element { scale: 19 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3449,7 +3571,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15695 + priority: 15707 } } } @@ -3459,7 +3581,7 @@ cont { scale: 18 symbol { name: "bbq-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -3475,7 +3597,7 @@ cont { scale: 19 symbol { name: "bbq-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -3494,14 +3616,16 @@ cont { scale: 18 symbol { name: "bench" - priority: 16590 + apply_for_type: 1 + priority: 16603 } } element { scale: 19 symbol { name: "bench" - priority: 16590 + apply_for_type: 1 + priority: 16603 } caption { primary { @@ -3509,7 +3633,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -3519,7 +3643,7 @@ cont { scale: 17 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3529,14 +3653,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3546,14 +3670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3563,7 +3687,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -3573,7 +3697,7 @@ cont { scale: 17 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3582,14 +3706,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3598,14 +3722,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3614,7 +3738,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3624,7 +3748,7 @@ cont { scale: 17 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3633,14 +3757,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3649,14 +3773,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3665,7 +3789,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3675,7 +3799,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 28 } caption { @@ -3684,14 +3808,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 16 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3700,14 +3824,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 17 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3716,14 +3840,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 18 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3733,14 +3857,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } element { scale: 19 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3750,7 +3874,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } } @@ -3774,14 +3898,16 @@ cont { scale: 17 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } } element { scale: 18 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -3790,14 +3916,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -3806,7 +3933,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3977,7 +4104,7 @@ cont { scale: 15 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -3986,14 +4113,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 16 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4002,14 +4129,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 17 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4018,14 +4145,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 18 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4035,14 +4162,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 19 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4052,7 +4179,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } } @@ -4062,7 +4189,7 @@ cont { scale: 18 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -4071,14 +4198,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -4087,7 +4214,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -4097,7 +4224,7 @@ cont { scale: 18 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16613 } caption { primary { @@ -4106,14 +4233,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15613 } } element { scale: 19 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16613 } caption { primary { @@ -4122,7 +4249,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15613 } } } @@ -4132,7 +4259,7 @@ cont { scale: 17 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4142,14 +4269,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4159,14 +4286,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4176,7 +4303,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -4186,7 +4313,7 @@ cont { scale: 17 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4196,14 +4323,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4213,14 +4340,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4230,7 +4357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -4240,7 +4367,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -4257,7 +4384,7 @@ cont { scale: 17 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4266,14 +4393,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4282,14 +4409,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4298,7 +4425,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -4308,7 +4435,7 @@ cont { scale: 14 symbol { name: "charging-station-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -4325,7 +4452,7 @@ cont { scale: 15 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -4342,7 +4469,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -4359,7 +4486,7 @@ cont { scale: 17 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4368,14 +4495,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4384,14 +4511,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4400,7 +4527,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -4410,7 +4537,7 @@ cont { scale: 17 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4418,14 +4545,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4434,14 +4561,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4450,7 +4577,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -4460,7 +4587,7 @@ cont { scale: 17 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4469,14 +4596,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4485,14 +4612,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4501,7 +4628,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4511,7 +4638,7 @@ cont { scale: 17 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 min_distance: 4 } caption { @@ -4521,14 +4648,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4537,14 +4664,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4553,7 +4680,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4563,18 +4690,18 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4589,11 +4716,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4608,11 +4735,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4628,11 +4755,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4651,7 +4778,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16800 + priority: 16811 min_distance: 8 } caption { @@ -4661,14 +4788,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 24 } caption { @@ -4678,14 +4805,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4695,14 +4822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4712,14 +4839,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4729,14 +4856,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4746,7 +4873,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } } @@ -4756,7 +4883,7 @@ cont { scale: 17 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4765,14 +4892,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4781,14 +4908,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4797,7 +4924,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4807,7 +4934,7 @@ cont { scale: 17 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4815,14 +4942,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4831,14 +4958,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4847,7 +4974,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } } @@ -4857,32 +4984,32 @@ cont { scale: 14 area { color: 16308697 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 16308697 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 16308697 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 16308697 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 min_distance: 4 } caption { @@ -4892,18 +5019,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 16308697 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4912,18 +5039,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 16308697 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4932,7 +5059,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4942,7 +5069,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4950,7 +5077,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4958,7 +5085,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4966,7 +5093,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4974,7 +5101,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } caption { @@ -4984,7 +5111,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -5030,7 +5157,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { @@ -5041,7 +5168,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { @@ -5052,7 +5179,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -5062,7 +5189,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 28 } caption { @@ -5071,14 +5198,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5087,14 +5214,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 17 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5103,14 +5230,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 18 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5120,14 +5247,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } element { scale: 19 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5137,7 +5264,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } } @@ -5147,6 +5274,7 @@ cont { scale: 11 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 min_distance: 12 } @@ -5155,6 +5283,7 @@ cont { scale: 12 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 min_distance: 12 } @@ -5163,6 +5292,7 @@ cont { scale: 13 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 } } @@ -5170,6 +5300,7 @@ cont { scale: 14 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 } } @@ -5177,6 +5308,7 @@ cont { scale: 15 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } } @@ -5184,6 +5316,7 @@ cont { scale: 16 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5201,6 +5334,7 @@ cont { scale: 17 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5218,6 +5352,7 @@ cont { scale: 18 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5235,6 +5370,7 @@ cont { scale: 19 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5255,7 +5391,7 @@ cont { scale: 18 symbol { name: "fire_station-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -5264,14 +5400,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "fire_station-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -5280,7 +5416,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -5290,7 +5426,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 28 } caption { @@ -5299,14 +5435,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5315,14 +5451,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 17 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5331,14 +5467,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 18 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5348,14 +5484,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } element { scale: 19 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5365,7 +5501,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } } @@ -5375,11 +5511,11 @@ cont { scale: 16 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5388,18 +5524,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 17 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5408,18 +5544,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 18 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5428,18 +5564,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 19 area { color: 9163744 - priority: -15429 + priority: -15416 } symbol { name: "fountain-m" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5448,7 +5584,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15571 + priority: 15584 } } } @@ -5458,7 +5594,7 @@ cont { scale: 14 symbol { name: "fuel-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5475,7 +5611,7 @@ cont { scale: 15 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5492,7 +5628,7 @@ cont { scale: 16 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -5509,7 +5645,7 @@ cont { scale: 17 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5518,14 +5654,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5534,14 +5670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5550,7 +5686,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -5560,32 +5696,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5593,18 +5729,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5612,18 +5748,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5631,7 +5767,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -5641,32 +5777,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5674,18 +5810,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5693,18 +5829,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5712,7 +5848,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -5722,11 +5858,11 @@ cont { scale: 14 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-s" - priority: 16019 + priority: 16018 min_distance: 8 } } @@ -5734,11 +5870,12 @@ cont { scale: 15 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 6 } caption { @@ -5754,11 +5891,12 @@ cont { scale: 16 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5775,11 +5913,12 @@ cont { scale: 17 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5796,11 +5935,12 @@ cont { scale: 18 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5817,11 +5957,12 @@ cont { scale: 19 area { color: 16308697 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5841,7 +5982,7 @@ cont { scale: 18 symbol { name: "hunting-tower-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -5850,14 +5991,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "hunting-tower-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -5866,7 +6007,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -5876,14 +6017,14 @@ cont { scale: 16 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 } } element { scale: 17 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } } @@ -5891,7 +6032,7 @@ cont { scale: 18 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } } @@ -5899,7 +6040,7 @@ cont { scale: 19 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } caption { @@ -5909,7 +6050,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15300 } } } @@ -5919,6 +6060,7 @@ cont { scale: 18 symbol { name: "internet_cafe-m" + apply_for_type: 1 priority: 16000 } } @@ -5926,6 +6068,7 @@ cont { scale: 19 symbol { name: "internet_cafe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -5944,25 +6087,25 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -5977,11 +6120,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -5997,11 +6140,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -6052,7 +6195,8 @@ cont { scale: 18 symbol { name: "library-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -6061,14 +6205,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "library-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -6077,7 +6222,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -6087,7 +6232,8 @@ cont { scale: 18 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -6096,14 +6242,15 @@ cont { offset_x: 1 text: "ref" } - priority: 15038 + priority: 15056 } } element { scale: 19 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -6122,7 +6269,7 @@ cont { scale: 16 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 24 } caption { @@ -6131,14 +6278,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 17 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6147,14 +6294,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6163,14 +6310,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6179,7 +6326,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15613 } } } @@ -6274,8 +6421,8 @@ cont { element { scale: 16 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6283,14 +6430,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 17 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6298,14 +6445,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 18 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6313,14 +6460,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 19 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6328,7 +6475,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15650 } } } @@ -6389,7 +6536,7 @@ cont { scale: 17 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6398,14 +6545,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6414,14 +6561,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6430,7 +6577,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -6440,18 +6587,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6459,22 +6606,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6490,11 +6637,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6513,18 +6660,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6532,22 +6679,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6563,11 +6710,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6586,18 +6733,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6605,22 +6752,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6636,11 +6783,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6659,18 +6806,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6678,22 +6825,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6709,11 +6856,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6732,18 +6879,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6751,22 +6898,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6782,11 +6929,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6805,18 +6952,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6824,22 +6971,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6855,11 +7002,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6878,18 +7025,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6897,22 +7044,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6928,11 +7075,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6951,18 +7098,18 @@ cont { scale: 15 area { color: 15921852 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6970,22 +7117,22 @@ cont { scale: 17 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -7001,11 +7148,11 @@ cont { scale: 19 area { color: 15921852 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -7255,7 +7402,7 @@ cont { scale: 16 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } } @@ -7263,7 +7410,7 @@ cont { scale: 17 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7273,14 +7420,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } element { scale: 18 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7290,14 +7437,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } element { scale: 19 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7307,7 +7454,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } } @@ -7317,7 +7464,7 @@ cont { scale: 14 symbol { name: "place-of-worship-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7327,14 +7474,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7344,18 +7491,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7365,18 +7512,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7386,18 +7533,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7407,18 +7554,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7428,7 +7575,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7438,7 +7585,7 @@ cont { scale: 14 symbol { name: "buddhist-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7448,14 +7595,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7465,18 +7612,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7486,18 +7633,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7507,18 +7654,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7528,18 +7675,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7549,7 +7696,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7559,7 +7706,7 @@ cont { scale: 14 symbol { name: "christian-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7569,14 +7716,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7586,18 +7733,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7607,18 +7754,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7628,18 +7775,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7649,18 +7796,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7670,7 +7817,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7680,7 +7827,7 @@ cont { scale: 14 symbol { name: "hindu-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7690,14 +7837,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7707,18 +7854,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7728,18 +7875,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7749,18 +7896,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7770,18 +7917,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7791,7 +7938,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7801,7 +7948,7 @@ cont { scale: 14 symbol { name: "jewish-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7811,14 +7958,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7828,18 +7975,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7849,18 +7996,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7870,18 +8017,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7891,18 +8038,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7912,7 +8059,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7922,7 +8069,7 @@ cont { scale: 14 symbol { name: "muslim-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7932,14 +8079,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7949,18 +8096,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7970,18 +8117,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7991,18 +8138,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8012,18 +8159,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8033,7 +8180,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8043,7 +8190,7 @@ cont { scale: 14 symbol { name: "shinto-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8053,14 +8200,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8070,18 +8217,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8091,18 +8238,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8112,18 +8259,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8133,18 +8280,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8154,7 +8301,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8164,7 +8311,7 @@ cont { scale: 14 symbol { name: "taoist-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8174,14 +8321,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8191,18 +8338,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8212,18 +8359,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8233,18 +8380,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8254,18 +8401,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 15591638 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8275,7 +8422,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8285,7 +8432,7 @@ cont { scale: 17 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8294,14 +8441,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8310,14 +8457,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8326,7 +8473,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -8336,7 +8483,7 @@ cont { scale: 18 symbol { name: "postbox-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -8345,14 +8492,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "postbox-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -8361,7 +8508,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -8371,7 +8518,7 @@ cont { scale: 17 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8380,14 +8527,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8396,14 +8543,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8412,7 +8559,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } } @@ -8422,7 +8569,7 @@ cont { scale: 17 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8430,14 +8577,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8446,14 +8593,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8462,7 +8609,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -8472,7 +8619,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 28 } caption { @@ -8481,14 +8628,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 16 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8497,14 +8644,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 17 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8513,14 +8660,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 18 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8530,14 +8677,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } element { scale: 19 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8547,7 +8694,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } } @@ -8571,7 +8718,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8579,7 +8726,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8587,7 +8734,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8596,7 +8743,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8606,7 +8753,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8614,7 +8761,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8622,7 +8769,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8631,7 +8778,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8641,7 +8788,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8649,7 +8796,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8657,7 +8804,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8666,7 +8813,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8676,7 +8823,7 @@ cont { scale: 15 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 28 } caption { @@ -8685,14 +8832,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 16 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8701,14 +8848,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 17 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8717,14 +8864,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 18 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8734,14 +8881,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15714 + priority: 15726 } } element { scale: 19 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8751,7 +8898,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15714 + priority: 15726 } } } @@ -8761,7 +8908,7 @@ cont { scale: 15 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8771,14 +8918,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8788,14 +8935,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8805,14 +8952,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8822,14 +8969,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8839,7 +8986,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -8849,25 +8996,25 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } } element { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -8882,11 +9029,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -8902,11 +9049,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -8925,7 +9072,7 @@ cont { scale: 16 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8934,14 +9081,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8950,14 +9097,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8966,14 +9113,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8982,7 +9129,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -8992,7 +9139,7 @@ cont { scale: 17 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9001,14 +9148,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9017,14 +9164,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9033,7 +9180,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9043,7 +9190,7 @@ cont { scale: 16 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -9052,14 +9199,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9068,14 +9215,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9084,14 +9231,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9100,7 +9247,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -9110,7 +9257,8 @@ cont { scale: 17 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } } @@ -9118,7 +9266,8 @@ cont { scale: 18 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } } @@ -9126,7 +9275,8 @@ cont { scale: 19 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } caption { @@ -9135,7 +9285,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9145,7 +9295,7 @@ cont { scale: 14 symbol { name: "theatre-s" - priority: 16723 + priority: 16735 min_distance: 8 } caption { @@ -9155,7 +9305,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { @@ -9167,14 +9317,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 16 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9184,14 +9334,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 17 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9201,14 +9351,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 18 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9218,14 +9368,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 19 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9235,7 +9385,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } } @@ -9245,7 +9395,7 @@ cont { scale: 18 symbol { name: "toilets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -9254,14 +9404,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "toilets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -9270,7 +9420,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -9294,11 +9444,11 @@ cont { scale: 14 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-s" - priority: 16019 + priority: 16018 min_distance: 12 } caption { @@ -9315,11 +9465,11 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 12 } caption { @@ -9336,7 +9486,7 @@ cont { scale: 15 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9352,11 +9502,11 @@ cont { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 11 } caption { @@ -9373,7 +9523,7 @@ cont { scale: 16 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9389,11 +9539,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 10 } caption { @@ -9410,7 +9560,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9426,11 +9576,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9447,7 +9597,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9463,11 +9613,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9484,7 +9634,7 @@ cont { scale: 19 area { color: 16311482 - priority: -15981 + priority: -15982 } caption { primary { @@ -9503,7 +9653,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9512,14 +9662,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9528,14 +9678,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9544,7 +9694,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9554,7 +9704,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9563,14 +9713,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9579,14 +9729,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9595,7 +9745,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9605,7 +9755,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9614,14 +9764,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9630,14 +9780,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9646,7 +9796,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9656,7 +9806,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9665,14 +9815,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9681,14 +9831,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9697,7 +9847,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9707,7 +9857,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9716,14 +9866,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9732,14 +9882,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9748,7 +9898,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9758,7 +9908,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9767,14 +9917,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9783,14 +9933,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9799,7 +9949,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9809,7 +9959,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9818,14 +9968,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9834,14 +9984,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9850,7 +10000,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9860,7 +10010,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16590 + priority: 16603 min_distance: 20 } } @@ -9868,7 +10018,7 @@ cont { scale: 18 symbol { name: "fuel-dispenser-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9877,14 +10027,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "fuel-dispenser-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9893,7 +10043,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9903,7 +10053,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9912,14 +10062,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9928,14 +10078,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9944,7 +10094,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9954,7 +10104,7 @@ cont { scale: 17 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9963,14 +10113,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9979,14 +10129,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9995,7 +10145,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10005,7 +10155,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10014,14 +10164,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10030,14 +10180,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10046,7 +10196,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10056,7 +10206,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10065,14 +10215,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10081,14 +10231,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10097,7 +10247,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10107,7 +10257,7 @@ cont { scale: 16 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10115,14 +10265,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10130,14 +10280,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10146,14 +10296,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10162,7 +10312,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -10172,14 +10322,16 @@ cont { scale: 18 symbol { name: "waste-basket-s" - priority: 16580 + apply_for_type: 1 + priority: 16594 } } element { scale: 19 symbol { name: "waste-basket-s" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -10187,7 +10339,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15580 + priority: 15594 } } } @@ -10197,7 +10349,7 @@ cont { scale: 18 symbol { name: "waste-basket-m" - priority: 16580 + priority: 16594 } caption { primary { @@ -10205,14 +10357,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "waste-basket-m" - priority: 16580 + priority: 16594 } caption { primary { @@ -10220,7 +10372,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15580 + priority: 15594 } } } @@ -10230,7 +10382,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -10238,7 +10390,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -10246,7 +10398,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -10255,7 +10407,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10265,7 +10417,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10273,7 +10425,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10281,7 +10433,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10289,7 +10441,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10297,7 +10449,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } caption { @@ -10307,7 +10459,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -10317,77 +10469,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 16 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } } @@ -10397,42 +10549,42 @@ cont { scale: 14 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 16 area { color: 15920858 - priority: -15886 + priority: -15868 } } element { scale: 17 area { color: 15920858 - priority: -15886 + priority: -15868 } } element { scale: 18 area { color: 15920858 - priority: -15886 + priority: -15868 } } element { scale: 19 area { color: 15920858 - priority: -15886 + priority: -15868 } } } @@ -10442,77 +10594,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 16 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15920858 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 6710886 } - priority: 15114 + priority: 15132 } } } @@ -10522,6 +10674,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10537,6 +10690,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10552,6 +10706,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10567,6 +10722,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10585,6 +10741,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10600,6 +10757,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10615,6 +10773,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10630,6 +10789,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10648,7 +10808,8 @@ cont { scale: 15 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10656,14 +10817,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10671,14 +10833,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10686,14 +10849,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10701,14 +10865,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 19 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10716,7 +10881,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } } @@ -10726,6 +10891,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10741,6 +10907,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10756,6 +10923,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10771,6 +10939,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10790,7 +10959,7 @@ cont { lines { width: 2.0 color: 12763315 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -10799,7 +10968,7 @@ cont { lines { width: 2.8 color: 12763315 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -10814,7 +10983,7 @@ cont { dd: 1.5 dd: 3.0 } - priority: 1457 + priority: 1471 } } element { @@ -10828,7 +10997,7 @@ cont { dd: 1.9 dd: 4.0 } - priority: 1457 + priority: 1471 } } element { @@ -10842,7 +11011,7 @@ cont { dd: 2.5 dd: 6.0 } - priority: 1457 + priority: 1471 } } element { @@ -10856,7 +11025,7 @@ cont { dd: 3.0 dd: 8.0 } - priority: 1457 + priority: 1471 } } } @@ -10871,7 +11040,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } element { @@ -10883,7 +11052,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } element { @@ -10895,7 +11064,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } } @@ -10905,6 +11074,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10920,6 +11090,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10935,6 +11106,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10950,6 +11122,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10969,7 +11142,7 @@ cont { lines { width: 1.0 color: 1300793480 - priority: 1457 + priority: 1471 } } element { @@ -10977,7 +11150,7 @@ cont { lines { width: 1.3 color: 864585864 - priority: 1457 + priority: 1471 } } element { @@ -10985,7 +11158,7 @@ cont { lines { width: 2.0 color: 8947848 - priority: 1457 + priority: 1471 } } element { @@ -10993,7 +11166,7 @@ cont { lines { width: 3.0 color: 8947848 - priority: 1457 + priority: 1471 } } } @@ -11003,6 +11176,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11018,6 +11192,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11033,6 +11208,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11048,6 +11224,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11067,7 +11244,7 @@ cont { lines { width: 1.6 color: 1720563840 - priority: 1457 + priority: 1471 } } element { @@ -11075,7 +11252,7 @@ cont { lines { width: 2.2 color: 1301133440 - priority: 1457 + priority: 1471 } } element { @@ -11083,7 +11260,7 @@ cont { lines { width: 3.0 color: 864925824 - priority: 1457 + priority: 1471 } } element { @@ -11091,7 +11268,7 @@ cont { lines { width: 4.0 color: 9287808 - priority: 1457 + priority: 1471 } } } @@ -11101,6 +11278,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11116,6 +11294,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11131,6 +11310,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11146,6 +11326,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11164,7 +11345,7 @@ cont { scale: 16 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -11173,14 +11354,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11190,14 +11371,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11207,14 +11388,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11224,7 +11405,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -11241,7 +11422,7 @@ cont { dd: 1.4 dd: 1.0 } - priority: 1219 + priority: 1235 } } element { @@ -11255,7 +11436,7 @@ cont { dd: 2.0 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -11269,7 +11450,7 @@ cont { dd: 3.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -11283,7 +11464,7 @@ cont { dd: 4.0 dd: 2.0 } - priority: 1219 + priority: 1235 } } } @@ -11293,6 +11474,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11308,6 +11490,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11323,6 +11506,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11338,6 +11522,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11426,7 +11611,7 @@ cont { scale: 12 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } } @@ -11434,7 +11619,7 @@ cont { scale: 13 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } } @@ -11442,7 +11627,7 @@ cont { scale: 14 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11451,14 +11636,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15895 + priority: 15896 } } element { scale: 15 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11468,14 +11653,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 16 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11485,14 +11670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 17 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11502,14 +11687,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 18 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11519,14 +11704,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 19 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11536,7 +11721,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } } @@ -11547,7 +11732,7 @@ cont { lines { width: 1.0 color: 1300793480 - priority: 1457 + priority: 1471 } } element { @@ -11555,7 +11740,7 @@ cont { lines { width: 1.3 color: 864585864 - priority: 1457 + priority: 1471 } } element { @@ -11563,7 +11748,7 @@ cont { lines { width: 2.0 color: 8947848 - priority: 1457 + priority: 1471 } } element { @@ -11571,7 +11756,7 @@ cont { lines { width: 3.0 color: 8947848 - priority: 1457 + priority: 1471 } } } @@ -11582,7 +11767,7 @@ cont { lines { width: 0.5 color: 1298359132 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11592,7 +11777,7 @@ cont { lines { width: 0.5 color: 862151516 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11602,7 +11787,7 @@ cont { lines { width: 0.6 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11612,7 +11797,7 @@ cont { lines { width: 0.8 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11622,7 +11807,7 @@ cont { lines { width: 0.85 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11632,7 +11817,7 @@ cont { lines { width: 1.0 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11642,7 +11827,7 @@ cont { lines { width: 1.1 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11652,7 +11837,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11662,7 +11847,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11672,7 +11857,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11682,7 +11867,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11692,7 +11877,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11701,7 +11886,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11710,7 +11895,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11719,7 +11904,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } element { @@ -11727,7 +11912,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } element { @@ -11735,7 +11920,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } element { @@ -11743,7 +11928,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1200 + priority: 1216 } } } @@ -11758,7 +11943,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11775,7 +11960,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11789,7 +11974,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11803,7 +11988,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11817,7 +12002,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11831,7 +12016,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11845,7 +12030,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11859,7 +12044,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11873,7 +12058,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11887,7 +12072,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11900,7 +12085,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11913,7 +12098,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11926,7 +12111,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -11938,7 +12123,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -11950,7 +12135,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -11962,7 +12147,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } } @@ -11977,7 +12162,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -11991,7 +12176,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12005,7 +12190,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12019,7 +12204,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12032,7 +12217,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12045,7 +12230,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12058,7 +12243,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12070,7 +12255,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12082,7 +12267,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12094,7 +12279,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } } @@ -12104,18 +12289,18 @@ cont { scale: 10 area { color: 3431500856 - priority: -15334 + priority: -15321 } } element { scale: 11 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 20 } } @@ -12123,11 +12308,11 @@ cont { scale: 12 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -12137,18 +12322,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 13 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -12158,18 +12343,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 14 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 } caption { primary { @@ -12178,18 +12363,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12198,18 +12383,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12218,18 +12403,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12238,18 +12423,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12259,18 +12444,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } element { scale: 19 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12280,7 +12465,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } } @@ -12290,14 +12475,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1724500155 - priority: 1267 + priority: 1284 } } element { @@ -12308,7 +12493,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12321,7 +12506,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12332,7 +12517,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12345,7 +12530,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12356,7 +12541,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12369,7 +12554,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12380,7 +12565,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12393,7 +12578,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12412,7 +12597,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12428,7 +12613,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12444,7 +12629,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12460,7 +12645,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12470,14 +12655,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1724500155 - priority: 1267 + priority: 1284 } } element { @@ -12488,7 +12673,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12501,7 +12686,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12512,7 +12697,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12525,7 +12710,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12536,7 +12721,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12549,7 +12734,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12560,7 +12745,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12573,7 +12758,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12583,14 +12768,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1724500155 - priority: 1267 + priority: 1284 } } element { @@ -12601,7 +12786,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12614,7 +12799,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12625,7 +12810,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12638,7 +12823,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12649,7 +12834,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12662,7 +12847,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12673,7 +12858,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12686,7 +12871,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12696,14 +12881,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1962 + priority: 1963 } } element { scale: 15 area { color: 1724500155 - priority: 1962 + priority: 1963 } } element { @@ -12714,7 +12899,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12727,7 +12912,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12738,7 +12923,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12751,7 +12936,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12762,7 +12947,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12775,7 +12960,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12786,7 +12971,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12799,7 +12984,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12813,7 +12998,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1229 + priority: 1246 } } element { @@ -12824,7 +13009,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -12835,7 +13020,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -12846,7 +13031,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } } @@ -12856,7 +13041,7 @@ cont { scale: 17 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -12864,14 +13049,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -12879,14 +13064,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -12894,7 +13079,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -12911,7 +13096,7 @@ cont { scale: 18 symbol { name: "beekeeper-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12920,14 +13105,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beekeeper-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12936,7 +13121,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -12953,7 +13138,7 @@ cont { scale: 18 symbol { name: "blacksmith-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12962,14 +13147,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "blacksmith-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12978,7 +13163,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -12995,7 +13180,7 @@ cont { scale: 18 symbol { name: "brewery-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13004,14 +13189,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "brewery-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13020,7 +13205,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13037,7 +13222,7 @@ cont { scale: 18 symbol { name: "carpenter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13046,14 +13231,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "carpenter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13062,7 +13247,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13079,7 +13264,7 @@ cont { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13088,14 +13273,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13104,7 +13289,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13121,7 +13306,7 @@ cont { scale: 18 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13130,14 +13315,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13146,7 +13331,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13163,7 +13348,7 @@ cont { scale: 18 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13172,14 +13357,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13188,7 +13373,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13205,7 +13390,7 @@ cont { scale: 18 symbol { name: "florist-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13214,14 +13399,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "florist-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13230,7 +13415,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13240,7 +13425,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13249,14 +13434,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13265,7 +13450,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13275,7 +13460,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13284,14 +13469,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13300,7 +13485,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13310,7 +13495,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13319,14 +13504,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13335,7 +13520,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13352,7 +13537,7 @@ cont { scale: 18 symbol { name: "painter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13361,14 +13546,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "painter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13377,7 +13562,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13394,7 +13579,7 @@ cont { scale: 18 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13403,14 +13588,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13419,7 +13604,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13436,7 +13621,7 @@ cont { scale: 18 symbol { name: "plumber-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13445,14 +13630,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "plumber-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13461,7 +13646,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13478,7 +13663,7 @@ cont { scale: 18 symbol { name: "sawmill-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13487,14 +13672,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sawmill-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13503,7 +13688,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13520,7 +13705,7 @@ cont { scale: 18 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13529,14 +13714,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13545,7 +13730,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13562,7 +13747,7 @@ cont { scale: 18 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13571,14 +13756,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13587,7 +13772,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13597,7 +13782,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13606,14 +13791,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13622,7 +13807,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13701,35 +13886,56 @@ cont { element { scale: 17 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } element { scale: 18 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } element { scale: 19 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } } cont { name: "entrance" + element { + scale: 18 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16056 + } + caption { + primary { + height: 10 + color: 6381914 + offset_x: 1 + text: "ref" + } + priority: 15056 + } + } element { scale: 19 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -13743,197 +13949,7 @@ cont { offset_y: 10 text: "addr:flats" } - priority: 15038 - } - } -} -cont { - name: "entrance-main" - element { - scale: 18 - symbol { - name: "main_entrance-s" - priority: 16038 - } - caption { - primary { - height: 10 - color: 6381914 - offset_x: 1 - text: "ref" - } - priority: 15038 - } - } - element { - scale: 19 - symbol { - name: "main_entrance-s" - priority: 16038 - } - caption { - primary { - height: 10 - color: 6381914 - offset_x: 1 - text: "ref" - } - secondary { - height: 12 - offset_y: 10 - text: "addr:flats" - } - priority: 15038 - } - } -} -cont { - name: "healthcare-alternative" - element { - scale: 17 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-audiologist" - element { - scale: 17 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-blood_donation" - element { - scale: 17 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15056 } } } @@ -13942,23 +13958,25 @@ cont { element { scale: 17 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 + min_distance: 4 } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 } caption { primary { @@ -13967,14 +13985,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 } caption { primary { @@ -13983,57 +14001,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 - } - } -} -cont { - name: "healthcare-optometrist" - element { - scale: 17 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15669 } } } @@ -14043,7 +14011,7 @@ cont { scale: 17 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14051,14 +14019,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14067,14 +14035,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14083,207 +14051,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 - } - } -} -cont { - name: "healthcare-podiatrist" - element { - scale: 17 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-psychotherapist" - element { - scale: 17 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-sample_collection" - element { - scale: 17 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-speech_therapist" - element { - scale: 17 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15669 } } } @@ -14298,7 +14066,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14311,7 +14079,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14320,7 +14088,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14332,7 +14100,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14340,7 +14108,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14352,7 +14120,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14360,7 +14128,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14372,7 +14140,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14380,7 +14148,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14392,7 +14160,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14400,7 +14168,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14415,7 +14183,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14428,7 +14196,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14437,7 +14205,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14449,7 +14217,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14457,7 +14225,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14469,7 +14237,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14477,7 +14245,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14489,7 +14257,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14497,7 +14265,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14509,7 +14277,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14517,7 +14285,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14532,7 +14300,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14545,7 +14313,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14554,7 +14322,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14566,7 +14334,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14574,7 +14342,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14586,7 +14354,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14594,7 +14362,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14606,7 +14374,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14614,7 +14382,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14626,7 +14394,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14634,7 +14402,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14649,7 +14417,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14662,7 +14430,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14671,7 +14439,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14683,7 +14451,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14691,7 +14459,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14703,7 +14471,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14711,7 +14479,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14723,7 +14491,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14731,7 +14499,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } element { @@ -14743,7 +14511,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14751,7 +14519,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16304 + priority: 16320 } } } @@ -14761,14 +14529,14 @@ cont { scale: 16 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } } element { scale: 17 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -14786,14 +14554,14 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -14811,14 +14579,14 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -14836,235 +14604,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 - } - } -} -cont { - name: "highway-busway" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } -} -cont { - name: "highway-busway-bridge" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } -} -cont { - name: "highway-busway-tunnel" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 + priority: 15915 } } } @@ -15079,7 +14619,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1295 + priority: 1311 cap: BUTTCAP } } @@ -15092,7 +14632,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1295 + priority: 1311 cap: BUTTCAP } } @@ -15105,7 +14645,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1295 + priority: 1311 cap: BUTTCAP } path_text { @@ -15114,7 +14654,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15126,7 +14666,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15134,7 +14674,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15146,7 +14686,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15154,7 +14694,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15166,7 +14706,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15174,7 +14714,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } element { @@ -15186,7 +14726,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15194,7 +14734,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16295 + priority: 16311 } } } @@ -15205,7 +14745,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15214,7 +14754,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15223,7 +14763,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15232,7 +14772,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15240,7 +14780,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15248,7 +14788,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15256,7 +14796,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15264,7 +14804,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15272,7 +14812,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15280,7 +14820,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15288,7 +14828,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15296,7 +14836,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15307,7 +14847,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15316,7 +14856,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15325,7 +14865,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15334,7 +14874,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15342,7 +14882,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15350,7 +14890,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15358,7 +14898,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15366,7 +14906,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15374,7 +14914,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15382,7 +14922,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15390,7 +14930,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15398,7 +14938,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15409,7 +14949,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15418,7 +14958,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15427,7 +14967,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15436,7 +14976,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15444,7 +14984,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15452,7 +14992,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15460,7 +15000,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15468,7 +15008,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15476,7 +15016,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15484,7 +15024,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15492,7 +15032,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15500,7 +15040,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15511,7 +15051,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15520,7 +15060,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15529,7 +15069,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15538,7 +15078,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15546,7 +15086,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15554,7 +15094,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15562,7 +15102,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15570,7 +15110,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15578,7 +15118,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15586,7 +15126,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -15594,7 +15134,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15602,7 +15142,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -15612,21 +15152,21 @@ cont { scale: 17 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } element { scale: 18 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } element { scale: 19 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } } @@ -15641,7 +15181,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -15650,7 +15190,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15662,7 +15202,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15670,7 +15210,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15682,7 +15222,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15690,7 +15230,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15702,7 +15242,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15710,7 +15250,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15722,7 +15262,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15730,7 +15270,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -15745,7 +15285,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -15758,7 +15298,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -15767,7 +15307,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15779,7 +15319,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15787,7 +15327,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15799,7 +15339,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15807,7 +15347,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15819,7 +15359,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15827,7 +15367,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15839,7 +15379,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15847,7 +15387,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -15857,7 +15397,7 @@ cont { scale: 14 area { color: 15591638 - priority: -15686 + priority: -15670 } } element { @@ -15869,12 +15409,12 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } area { color: 15591638 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15882,7 +15422,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15894,11 +15434,11 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15906,7 +15446,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15918,11 +15458,11 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15930,7 +15470,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15942,11 +15482,11 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15954,7 +15494,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -15966,11 +15506,11 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } area { color: 15920858 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15978,7 +15518,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -15993,7 +15533,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16002,7 +15542,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16014,7 +15554,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16022,7 +15562,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16034,7 +15574,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16042,7 +15582,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16054,7 +15594,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16062,7 +15602,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16074,7 +15614,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16082,7 +15622,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16097,7 +15637,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16110,7 +15650,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16119,7 +15659,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16131,7 +15671,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16139,7 +15679,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16151,7 +15691,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16159,7 +15699,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16171,7 +15711,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16179,7 +15719,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16191,7 +15731,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16199,7 +15739,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16214,7 +15754,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16227,7 +15767,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16236,7 +15776,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16248,7 +15788,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16256,7 +15796,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16268,7 +15808,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16276,7 +15816,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16288,7 +15828,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16296,7 +15836,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16308,7 +15848,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16316,7 +15856,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16331,7 +15871,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16344,7 +15884,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16353,7 +15893,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16365,7 +15905,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16373,7 +15913,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16385,7 +15925,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16393,7 +15933,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16405,7 +15945,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16413,7 +15953,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16425,7 +15965,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16433,7 +15973,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16448,7 +15988,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16461,7 +16001,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16470,7 +16010,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16482,7 +16022,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16490,7 +16030,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16502,7 +16042,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16510,7 +16050,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16522,7 +16062,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16530,7 +16070,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16542,7 +16082,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16550,7 +16090,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16565,7 +16105,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16578,7 +16118,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16587,7 +16127,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16599,7 +16139,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16607,7 +16147,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16619,7 +16159,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16627,7 +16167,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16639,7 +16179,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16647,7 +16187,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16659,7 +16199,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16667,7 +16207,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16682,7 +16222,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16691,7 +16231,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16703,7 +16243,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16711,7 +16251,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16723,7 +16263,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16731,7 +16271,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16743,7 +16283,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16751,7 +16291,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16763,7 +16303,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16771,7 +16311,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16786,7 +16326,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16795,7 +16335,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16807,7 +16347,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16815,7 +16355,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16827,7 +16367,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -16835,7 +16375,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -16845,7 +16385,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16853,7 +16393,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16865,7 +16405,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -16873,7 +16413,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -16883,7 +16423,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16891,7 +16431,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -16903,7 +16443,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -16911,7 +16451,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -16921,7 +16461,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16929,7 +16469,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -16944,7 +16484,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -16957,7 +16497,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -16970,7 +16510,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -16983,11 +16523,12 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -16995,7 +16536,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -17007,11 +16548,12 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17019,7 +16561,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -17031,11 +16573,12 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17043,7 +16586,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -17055,11 +16598,12 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17067,7 +16611,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } } @@ -17078,7 +16622,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17088,7 +16632,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17097,7 +16641,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17106,7 +16650,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17114,7 +16658,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17123,7 +16667,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17131,7 +16675,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17139,7 +16683,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17147,7 +16691,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17155,7 +16699,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17163,7 +16707,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17171,7 +16715,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -17179,7 +16723,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17187,7 +16731,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -17198,7 +16742,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17208,7 +16752,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17217,7 +16761,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17226,7 +16770,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17234,7 +16778,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17243,7 +16787,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17251,7 +16795,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17259,7 +16803,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17267,7 +16811,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17275,7 +16819,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17283,7 +16827,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17291,7 +16835,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -17299,7 +16843,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17307,7 +16851,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -17318,7 +16862,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17328,7 +16872,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17337,7 +16881,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17346,7 +16890,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17354,7 +16898,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17363,7 +16907,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -17375,13 +16919,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17389,7 +16933,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17401,13 +16945,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17415,7 +16959,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -17427,13 +16971,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17441,7 +16985,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -17453,13 +16997,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17467,7 +17011,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -17478,7 +17022,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17488,7 +17032,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17498,7 +17042,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17508,7 +17052,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17518,12 +17062,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -17532,7 +17076,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17542,12 +17086,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -17556,7 +17100,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17566,12 +17110,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -17580,7 +17124,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17589,12 +17133,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -17603,7 +17147,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17612,12 +17156,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -17626,7 +17170,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17635,12 +17179,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -17649,7 +17193,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17657,12 +17201,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17671,7 +17215,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17679,12 +17223,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17693,7 +17237,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17701,12 +17245,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17715,7 +17259,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17723,12 +17267,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -17740,7 +17284,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17750,7 +17294,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17760,7 +17304,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17770,7 +17314,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17780,12 +17324,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -17794,7 +17338,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17804,12 +17348,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -17818,7 +17362,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17828,12 +17372,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -17844,7 +17388,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17852,13 +17396,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17867,12 +17411,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -17883,7 +17427,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17891,13 +17435,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17906,12 +17450,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -17922,7 +17466,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17930,13 +17474,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17945,12 +17489,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -17961,7 +17505,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17969,13 +17513,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17983,12 +17527,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -17999,7 +17543,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18007,13 +17551,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18021,12 +17565,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18037,7 +17581,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18045,13 +17589,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18059,12 +17603,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18075,7 +17619,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18083,13 +17627,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18097,12 +17641,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -18114,7 +17658,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18124,7 +17668,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18134,7 +17678,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18144,7 +17688,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18154,12 +17698,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -18168,7 +17712,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18178,12 +17722,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -18196,13 +17740,13 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18212,12 +17756,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -18230,13 +17774,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18245,12 +17789,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -18263,13 +17807,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18278,12 +17822,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -18296,13 +17840,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18311,12 +17855,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -18329,13 +17873,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18343,12 +17887,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18361,13 +17905,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18375,12 +17919,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18393,13 +17937,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18407,12 +17951,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -18425,13 +17969,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18439,12 +17983,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -18458,7 +18002,7 @@ cont { height: 9 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18468,7 +18012,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18478,7 +18022,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18488,7 +18032,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -18498,7 +18042,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } } @@ -18509,7 +18053,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18519,12 +18063,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -18533,7 +18077,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18543,12 +18087,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -18557,7 +18101,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18567,12 +18111,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -18581,7 +18125,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18590,12 +18134,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -18604,7 +18148,7 @@ cont { lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18613,12 +18157,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -18627,7 +18171,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18636,12 +18180,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -18650,7 +18194,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18658,12 +18202,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18672,7 +18216,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18680,12 +18224,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18694,7 +18238,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18702,12 +18246,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18716,7 +18260,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18724,12 +18268,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -18741,7 +18285,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18751,12 +18295,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -18765,7 +18309,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18775,12 +18319,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -18789,7 +18333,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18799,12 +18343,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -18813,7 +18357,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18822,12 +18366,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -18838,7 +18382,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18846,13 +18390,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18861,12 +18405,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -18877,7 +18421,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18885,13 +18429,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18900,12 +18444,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -18916,7 +18460,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18924,13 +18468,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18938,12 +18482,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18954,7 +18498,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18962,13 +18506,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18976,12 +18520,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -18992,7 +18536,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19000,13 +18544,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19014,12 +18558,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19030,7 +18574,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19038,13 +18582,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19052,12 +18596,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -19069,7 +18613,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19079,12 +18623,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -19093,7 +18637,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19103,12 +18647,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -19119,13 +18663,13 @@ cont { color: 8421504 dashdot { } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19135,12 +18679,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -19153,13 +18697,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19168,12 +18712,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -19186,13 +18730,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.0 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19201,12 +18745,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -19219,13 +18763,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19234,12 +18778,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -19252,13 +18796,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19266,12 +18810,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19284,13 +18828,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19298,12 +18842,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19316,13 +18860,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19330,12 +18874,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -19348,13 +18892,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19362,12 +18906,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -19383,7 +18927,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19396,7 +18940,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19405,7 +18949,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19417,7 +18961,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19425,7 +18969,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19437,7 +18981,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19445,7 +18989,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19457,7 +19001,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19465,7 +19009,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19477,7 +19021,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19485,7 +19029,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19500,7 +19044,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19513,7 +19057,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19522,7 +19066,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19534,7 +19078,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19542,7 +19086,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19554,7 +19098,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19562,7 +19106,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19574,7 +19118,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19582,7 +19126,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19594,7 +19138,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19602,7 +19146,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19617,7 +19161,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19630,7 +19174,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19639,7 +19183,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19651,7 +19195,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19659,7 +19203,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19671,7 +19215,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19679,7 +19223,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19691,7 +19235,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19699,7 +19243,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19711,7 +19255,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19719,7 +19263,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19734,7 +19278,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19747,7 +19291,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19756,7 +19300,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19768,7 +19312,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19776,7 +19320,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19788,7 +19332,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19796,7 +19340,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19808,7 +19352,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19816,7 +19360,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19828,7 +19372,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19836,7 +19380,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19851,7 +19395,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19864,7 +19408,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19873,7 +19417,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19885,7 +19429,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19893,7 +19437,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19905,7 +19449,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19913,7 +19457,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19925,7 +19469,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19933,7 +19477,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -19945,7 +19489,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19953,7 +19497,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -19968,7 +19512,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19981,7 +19525,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19990,7 +19534,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20002,7 +19546,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20010,7 +19554,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20022,7 +19566,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20030,7 +19574,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20042,7 +19586,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20050,7 +19594,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20062,7 +19606,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20070,7 +19614,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20085,7 +19629,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20098,7 +19642,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20107,7 +19651,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20119,7 +19663,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20127,7 +19671,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20139,7 +19683,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20147,7 +19691,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20159,7 +19703,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20167,7 +19711,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20179,7 +19723,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20187,7 +19731,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20202,7 +19746,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20215,7 +19759,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20224,7 +19768,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20236,7 +19780,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20244,7 +19788,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20256,7 +19800,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20264,7 +19808,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20276,7 +19820,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20284,7 +19828,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20296,7 +19840,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20304,7 +19848,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20319,7 +19863,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20332,7 +19876,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20341,7 +19885,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20353,7 +19897,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20361,7 +19905,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20373,7 +19917,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20381,7 +19925,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20393,7 +19937,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20401,7 +19945,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20413,7 +19957,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20421,7 +19965,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20436,7 +19980,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20449,7 +19993,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20458,7 +20002,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20470,7 +20014,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20478,7 +20022,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20490,7 +20034,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20498,7 +20042,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20510,7 +20054,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20518,7 +20062,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20530,7 +20074,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20538,7 +20082,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20553,7 +20097,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20566,7 +20110,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20575,7 +20119,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20587,7 +20131,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20595,7 +20139,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20607,7 +20151,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20615,7 +20159,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20627,7 +20171,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20635,7 +20179,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20647,7 +20191,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20655,7 +20199,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20670,7 +20214,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20683,7 +20227,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20692,7 +20236,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20704,7 +20248,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20712,7 +20256,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20724,7 +20268,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20732,7 +20276,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20742,7 +20286,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20750,7 +20294,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20762,7 +20306,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20770,7 +20314,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20780,7 +20324,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20788,7 +20332,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -20800,7 +20344,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20808,7 +20352,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20818,7 +20362,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20826,7 +20370,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -20841,7 +20385,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -20854,7 +20398,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -20863,7 +20407,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -20875,7 +20419,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -20884,7 +20428,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -20896,7 +20440,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20904,7 +20448,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -20916,7 +20460,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20924,7 +20468,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -20936,7 +20480,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20944,7 +20488,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -20956,7 +20500,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20964,7 +20508,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -20979,7 +20523,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -20992,12 +20536,12 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } area { color: 15591638 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21005,7 +20549,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21017,12 +20561,12 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } area { color: 15591638 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21030,7 +20574,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21042,11 +20586,11 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21054,7 +20598,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21066,11 +20610,11 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21078,7 +20622,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21090,11 +20634,11 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21102,7 +20646,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21114,11 +20658,11 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } area { color: 15920858 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21126,7 +20670,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21139,7 +20683,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21149,7 +20693,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21160,7 +20704,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21168,7 +20712,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21178,7 +20722,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21187,7 +20731,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21197,7 +20741,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21205,7 +20749,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21215,7 +20759,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21224,7 +20768,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21234,7 +20778,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21242,7 +20786,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21252,7 +20796,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21260,7 +20804,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21270,7 +20814,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21278,7 +20822,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21288,7 +20832,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21296,7 +20840,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21306,7 +20850,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21314,7 +20858,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21324,7 +20868,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21332,7 +20876,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21342,7 +20886,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21350,7 +20894,7 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21360,7 +20904,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21368,7 +20912,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21383,7 +20927,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21396,7 +20940,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21405,7 +20949,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21417,7 +20961,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21426,7 +20970,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16333 + priority: 16349 } } element { @@ -21438,7 +20982,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21448,7 +20992,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21456,7 +21000,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21468,7 +21012,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21478,7 +21022,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21486,7 +21030,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16333 + priority: 16349 } } element { @@ -21498,7 +21042,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21508,7 +21052,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21516,7 +21060,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } element { @@ -21528,7 +21072,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21538,7 +21082,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21546,7 +21090,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16349 } } } @@ -21557,7 +21101,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21567,7 +21111,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21577,7 +21121,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21587,12 +21131,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 85 } } @@ -21601,7 +21145,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21611,12 +21155,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -21625,7 +21169,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21635,12 +21179,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -21649,7 +21193,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21658,12 +21202,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 120 } } @@ -21672,7 +21216,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21681,12 +21225,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 175 } } @@ -21695,7 +21239,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21704,12 +21248,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 250 } } @@ -21718,7 +21262,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21726,12 +21270,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -21740,7 +21284,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21748,12 +21292,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -21762,7 +21306,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21770,12 +21314,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -21784,7 +21328,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21792,12 +21336,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 11 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 350 } } @@ -21809,7 +21353,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21819,7 +21363,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21829,7 +21373,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21839,12 +21383,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 85 } } @@ -21853,7 +21397,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21863,12 +21407,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -21877,7 +21421,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21887,12 +21431,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -21901,7 +21445,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21910,12 +21454,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 120 } } @@ -21926,7 +21470,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21934,13 +21478,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21949,12 +21493,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 175 } } @@ -21965,7 +21509,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21973,13 +21517,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21988,12 +21532,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 250 } } @@ -22004,7 +21548,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22012,13 +21556,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22026,12 +21570,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22042,7 +21586,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22050,13 +21594,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22064,12 +21608,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22080,7 +21624,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22088,13 +21632,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22102,12 +21646,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22118,7 +21662,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22126,13 +21670,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22140,12 +21684,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 11 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 350 } } @@ -22157,7 +21701,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22167,7 +21711,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22177,7 +21721,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22187,12 +21731,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 85 } } @@ -22201,7 +21745,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22211,12 +21755,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -22225,7 +21769,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22235,12 +21779,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 90 } } @@ -22249,7 +21793,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22258,12 +21802,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 120 } } @@ -22276,13 +21820,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22291,12 +21835,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 175 } } @@ -22309,13 +21853,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22324,12 +21868,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 250 } } @@ -22342,13 +21886,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22356,12 +21900,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 9 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22374,13 +21918,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22388,12 +21932,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22406,13 +21950,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22420,12 +21964,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 10 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 300 } } @@ -22438,13 +21982,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22452,12 +21996,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16428 + priority: 16443 } shield { height: 11 color: 16777215 - priority: 16428 + priority: 16443 min_distance: 350 } } @@ -22472,7 +22016,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } } element { @@ -22480,7 +22024,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22490,12 +22034,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22504,7 +22048,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22514,12 +22058,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22528,7 +22072,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22537,12 +22081,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 120 } } @@ -22551,7 +22095,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22560,12 +22104,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 175 } } @@ -22574,7 +22118,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22583,12 +22127,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 250 } } @@ -22597,7 +22141,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22605,12 +22149,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22619,7 +22163,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22627,12 +22171,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22641,7 +22185,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22649,12 +22193,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22663,7 +22207,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22671,12 +22215,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 11 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 350 } } @@ -22691,7 +22235,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } } element { @@ -22699,7 +22243,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22709,12 +22253,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22723,7 +22267,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22733,12 +22277,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -22747,7 +22291,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22756,12 +22300,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 120 } } @@ -22772,7 +22316,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22780,13 +22324,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22795,12 +22339,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 175 } } @@ -22811,7 +22355,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22819,13 +22363,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22834,12 +22378,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 250 } } @@ -22850,7 +22394,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22858,13 +22402,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22872,12 +22416,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22888,7 +22432,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22896,13 +22440,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22910,12 +22454,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22926,7 +22470,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22934,13 +22478,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22948,12 +22492,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -22964,7 +22508,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22972,13 +22516,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22986,12 +22530,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 11 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 350 } } @@ -23006,7 +22550,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } } element { @@ -23014,7 +22558,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -23024,12 +22568,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -23038,7 +22582,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -23048,12 +22592,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 90 } } @@ -23062,7 +22606,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23071,12 +22615,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 120 } } @@ -23089,13 +22633,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23104,12 +22648,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 175 } } @@ -23122,13 +22666,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23137,12 +22681,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 250 } } @@ -23155,13 +22699,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23169,12 +22713,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 9 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23187,13 +22731,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23201,12 +22745,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23219,13 +22763,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23233,12 +22777,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 10 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 300 } } @@ -23251,13 +22795,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23265,12 +22809,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16419 + priority: 16433 } shield { height: 11 color: 16777215 - priority: 16419 + priority: 16433 min_distance: 350 } } @@ -23282,7 +22826,7 @@ cont { lines { width: 1.0 color: 6510384 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -23291,7 +22835,7 @@ cont { lines { width: 1.5 color: 6510384 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -23300,7 +22844,7 @@ cont { lines { width: 1.8 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23308,7 +22852,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -23316,7 +22860,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23324,7 +22868,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -23332,7 +22876,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23340,7 +22884,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -23348,7 +22892,7 @@ cont { lines { width: 4.0 color: 6510384 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23356,7 +22900,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -23367,7 +22911,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23377,7 +22921,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23386,7 +22930,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23394,7 +22938,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23403,7 +22947,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23411,7 +22955,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23420,7 +22964,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23428,7 +22972,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23436,7 +22980,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23444,7 +22988,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23452,7 +22996,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23460,7 +23004,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23468,12 +23012,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -23482,7 +23026,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23490,12 +23034,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -23507,7 +23051,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23517,7 +23061,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23526,7 +23070,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23534,7 +23078,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23543,7 +23087,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23551,7 +23095,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23560,7 +23104,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23568,7 +23112,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23576,7 +23120,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23584,7 +23128,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23592,7 +23136,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23600,7 +23144,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23608,12 +23152,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -23622,7 +23166,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23630,12 +23174,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -23647,7 +23191,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23657,7 +23201,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23666,7 +23210,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23676,7 +23220,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23684,13 +23228,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23699,7 +23243,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23709,7 +23253,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23717,13 +23261,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23732,7 +23276,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23742,7 +23286,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23750,13 +23294,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23764,7 +23308,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23774,7 +23318,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23782,13 +23326,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23796,7 +23340,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23806,7 +23350,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23814,13 +23358,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23828,12 +23372,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -23844,7 +23388,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23852,13 +23396,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23866,12 +23410,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -23883,7 +23427,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23893,7 +23437,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23902,7 +23446,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -23910,7 +23454,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23919,7 +23463,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23927,7 +23471,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23936,7 +23480,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -23948,13 +23492,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23962,7 +23506,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -23974,13 +23518,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23988,7 +23532,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } } element { @@ -24000,13 +23544,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24014,12 +23558,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -24032,13 +23576,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24046,12 +23590,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -24062,7 +23606,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24071,14 +23615,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 17 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24087,14 +23631,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 18 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24103,14 +23647,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 19 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24119,7 +23663,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 16638 + priority: 16650 } } } @@ -24130,7 +23674,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24140,7 +23684,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24149,7 +23693,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24158,7 +23702,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24166,7 +23710,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24175,7 +23719,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24183,7 +23727,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24191,7 +23735,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24199,7 +23743,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24207,7 +23751,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24215,7 +23759,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24223,7 +23767,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -24231,7 +23775,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24239,7 +23783,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -24250,7 +23794,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24260,7 +23804,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24269,7 +23813,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24278,7 +23822,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24286,7 +23830,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24295,7 +23839,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24305,7 +23849,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24313,13 +23857,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24327,7 +23871,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24337,7 +23881,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24345,13 +23889,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24359,7 +23903,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24369,7 +23913,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24377,13 +23921,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24391,7 +23935,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -24401,7 +23945,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24409,13 +23953,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24423,7 +23967,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -24434,7 +23978,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24444,7 +23988,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24453,7 +23997,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24462,7 +24006,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24470,7 +24014,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24479,7 +24023,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -24487,7 +24031,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24495,7 +24039,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24503,7 +24047,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24511,7 +24055,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -24519,7 +24063,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24527,7 +24071,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -24535,7 +24079,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24543,7 +24087,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -24554,7 +24098,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24564,7 +24108,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -24572,7 +24116,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24582,7 +24126,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -24590,7 +24134,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24600,12 +24144,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 90 } } @@ -24614,7 +24158,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24623,12 +24167,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 120 } } @@ -24637,7 +24181,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24646,12 +24190,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 175 } } @@ -24660,7 +24204,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24669,12 +24213,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 250 } } @@ -24683,7 +24227,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24691,12 +24235,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24705,7 +24249,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24713,12 +24257,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24727,7 +24271,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24735,12 +24279,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24749,7 +24293,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24757,12 +24301,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 11 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 350 } } @@ -24774,7 +24318,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24784,7 +24328,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -24792,7 +24336,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24802,7 +24346,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -24810,7 +24354,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24820,12 +24364,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 90 } } @@ -24834,7 +24378,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24843,12 +24387,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 120 } } @@ -24859,7 +24403,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24867,13 +24411,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24882,12 +24426,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 175 } } @@ -24898,7 +24442,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24906,13 +24450,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24921,12 +24465,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 250 } } @@ -24937,7 +24481,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24945,13 +24489,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24959,12 +24503,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -24975,7 +24519,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24983,13 +24527,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24997,12 +24541,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25013,7 +24557,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25021,13 +24565,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25035,12 +24579,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25051,7 +24595,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25059,13 +24603,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25073,12 +24617,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 11 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 350 } } @@ -25090,7 +24634,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25100,7 +24644,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -25108,7 +24652,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25118,7 +24662,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } } element { @@ -25126,7 +24670,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25136,12 +24680,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 90 } } @@ -25150,7 +24694,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25159,12 +24703,12 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 120 } } @@ -25173,7 +24717,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25182,12 +24726,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 175 } } @@ -25196,7 +24740,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25205,12 +24749,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 250 } } @@ -25223,13 +24767,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25237,12 +24781,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 9 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25255,13 +24799,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25269,12 +24813,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25287,13 +24831,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25301,12 +24845,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 10 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 300 } } @@ -25319,13 +24863,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25333,12 +24877,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16400 + priority: 16415 } shield { height: 11 color: 16777215 - priority: 16400 + priority: 16415 min_distance: 350 } } @@ -25350,7 +24894,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25359,7 +24903,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25368,7 +24912,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25376,7 +24920,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25384,7 +24928,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25392,7 +24936,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25400,7 +24944,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25408,7 +24952,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } element { @@ -25416,7 +24960,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25424,7 +24968,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } } @@ -25437,7 +24981,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25445,13 +24989,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25462,7 +25006,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25470,13 +25014,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25487,7 +25031,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25495,13 +25039,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25509,7 +25053,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25519,7 +25063,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25527,13 +25071,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25541,7 +25085,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25551,7 +25095,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25559,13 +25103,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25573,7 +25117,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } element { @@ -25583,7 +25127,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25591,13 +25135,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25605,7 +25149,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } } @@ -25616,7 +25160,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25625,7 +25169,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25638,13 +25182,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25652,7 +25196,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25664,13 +25208,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25678,7 +25222,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16390 + priority: 16405 } } element { @@ -25690,13 +25234,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25704,7 +25248,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } element { @@ -25716,13 +25260,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25730,7 +25274,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16390 + priority: 16405 } } } @@ -25741,7 +25285,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25750,7 +25294,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25758,7 +25302,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -25766,7 +25310,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25774,7 +25318,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -25782,7 +25326,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25790,7 +25334,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -25798,7 +25342,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25806,7 +25350,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -25817,7 +25361,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25826,7 +25370,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25834,7 +25378,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -25842,7 +25386,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25850,7 +25394,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -25858,7 +25402,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25866,7 +25410,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -25874,7 +25418,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25882,7 +25426,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -25893,7 +25437,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25904,7 +25448,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25912,13 +25456,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25926,7 +25470,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -25936,7 +25480,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25944,13 +25488,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25958,7 +25502,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -25968,7 +25512,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25976,13 +25520,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25990,7 +25534,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26000,7 +25544,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26008,13 +25552,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26022,83 +25566,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 - } - } -} -cont { - name: "highway-service-busway" - element { - scale: 15 - lines { - width: 1.2 - color: 16777215 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16777215 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16323 + priority: 16339 } } } @@ -26109,7 +25577,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26117,7 +25585,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26125,7 +25593,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26133,7 +25601,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26141,7 +25609,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26149,7 +25617,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26157,7 +25625,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26165,7 +25633,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26176,7 +25644,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26185,7 +25653,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26193,7 +25661,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26201,7 +25669,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26209,7 +25677,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26217,7 +25685,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26225,7 +25693,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26233,7 +25701,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26241,7 +25709,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26252,7 +25720,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26261,7 +25729,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26269,7 +25737,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26277,7 +25745,7 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26285,7 +25753,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16323 + priority: 16339 } } element { @@ -26293,7 +25761,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26301,7 +25769,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } element { @@ -26309,7 +25777,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26317,7 +25785,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16323 + priority: 16339 } } } @@ -26327,7 +25795,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16657 + priority: 16669 min_distance: 20 } path_text { @@ -26343,7 +25811,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26358,7 +25826,7 @@ cont { scale: 17 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26373,7 +25841,7 @@ cont { scale: 18 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26388,7 +25856,7 @@ cont { scale: 19 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26411,7 +25879,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26424,7 +25892,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26432,7 +25900,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26444,7 +25912,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26452,7 +25920,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26464,7 +25932,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26472,7 +25940,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26484,7 +25952,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26492,7 +25960,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -26507,7 +25975,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26520,7 +25988,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26528,7 +25996,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26540,7 +26008,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26548,7 +26016,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26560,7 +26028,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26568,7 +26036,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26580,7 +26048,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26588,7 +26056,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -26603,7 +26071,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26616,7 +26084,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26624,7 +26092,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26636,7 +26104,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -26644,7 +26112,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -26654,7 +26122,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26662,7 +26130,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26674,7 +26142,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -26682,7 +26150,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -26692,7 +26160,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26700,7 +26168,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } element { @@ -26712,7 +26180,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -26720,7 +26188,7 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -26730,7 +26198,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26738,7 +26206,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16476 + priority: 16490 } } } @@ -26749,7 +26217,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -26759,7 +26227,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -26769,7 +26237,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -26777,7 +26245,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26786,7 +26254,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -26794,7 +26262,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26803,7 +26271,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -26811,7 +26279,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26820,12 +26288,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 250 } } @@ -26834,7 +26302,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26842,12 +26310,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -26856,7 +26324,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26864,12 +26332,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -26878,7 +26346,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26886,12 +26354,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -26900,7 +26368,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26908,12 +26376,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -26925,7 +26393,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -26935,7 +26403,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -26945,7 +26413,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -26953,7 +26421,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26962,7 +26430,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -26972,7 +26440,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26980,13 +26448,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26995,7 +26463,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -27005,7 +26473,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27013,13 +26481,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27028,12 +26496,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 250 } } @@ -27044,7 +26512,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27052,13 +26520,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27066,12 +26534,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27082,7 +26550,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27090,13 +26558,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27104,12 +26572,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27120,7 +26588,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27128,13 +26596,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27142,12 +26610,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27158,7 +26626,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27166,13 +26634,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27180,12 +26648,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -27197,7 +26665,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27207,7 +26675,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27217,7 +26685,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27225,7 +26693,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27234,7 +26702,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16380 + priority: 16396 } } element { @@ -27242,7 +26710,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27251,7 +26719,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } } element { @@ -27259,7 +26727,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27268,12 +26736,12 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 250 } } @@ -27286,13 +26754,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27300,12 +26768,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 9 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27318,13 +26786,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27332,12 +26800,12 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27350,13 +26818,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27364,12 +26832,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 10 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 300 } } @@ -27382,13 +26850,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27396,12 +26864,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16380 + priority: 16396 } shield { height: 11 color: 16777215 - priority: 16380 + priority: 16396 min_distance: 350 } } @@ -27413,7 +26881,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27422,7 +26890,7 @@ cont { lines { width: 4.4 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27430,7 +26898,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27438,7 +26906,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27446,7 +26914,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } element { @@ -27454,7 +26922,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27462,7 +26930,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } } @@ -27475,7 +26943,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27483,13 +26951,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 16777215 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27500,7 +26968,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27508,13 +26976,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27524,7 +26992,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27532,13 +27000,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27548,7 +27016,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27556,13 +27024,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27570,7 +27038,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } element { @@ -27580,7 +27048,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27588,13 +27056,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27602,7 +27070,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } } @@ -27613,7 +27081,7 @@ cont { lines { width: 3.2 color: 16777215 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27626,13 +27094,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27644,13 +27112,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1371 + priority: 1386 } } element { @@ -27662,13 +27130,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27676,7 +27144,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } element { @@ -27688,13 +27156,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27702,7 +27170,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16371 + priority: 16386 } } } @@ -27717,7 +27185,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -27730,7 +27198,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -27739,7 +27207,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27751,7 +27219,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27759,7 +27227,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27771,7 +27239,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27779,7 +27247,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27791,7 +27259,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27799,7 +27267,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27811,7 +27279,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27819,7 +27287,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -27834,7 +27302,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -27847,7 +27315,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -27856,7 +27324,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27868,7 +27336,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27876,7 +27344,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27888,7 +27356,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27896,7 +27364,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27908,7 +27376,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27916,7 +27384,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27928,7 +27396,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27936,7 +27404,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -27951,7 +27419,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -27964,7 +27432,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -27973,7 +27441,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -27985,7 +27453,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27993,7 +27461,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28005,7 +27473,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28013,7 +27481,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28025,7 +27493,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28033,7 +27501,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28045,7 +27513,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28053,7 +27521,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28068,7 +27536,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28081,7 +27549,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28090,7 +27558,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28102,7 +27570,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28110,7 +27578,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28122,7 +27590,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28130,7 +27598,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28142,7 +27610,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28150,7 +27618,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28162,7 +27630,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28170,7 +27638,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28185,7 +27653,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28198,7 +27666,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28207,7 +27675,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28219,7 +27687,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28227,7 +27695,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28239,7 +27707,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28247,7 +27715,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28259,7 +27727,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28267,7 +27735,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28279,7 +27747,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28287,7 +27755,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28302,7 +27770,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28315,7 +27783,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28324,7 +27792,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28336,7 +27804,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28344,7 +27812,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28356,7 +27824,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28364,7 +27832,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28376,7 +27844,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28384,7 +27852,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28396,7 +27864,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28404,7 +27872,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28419,7 +27887,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28432,7 +27900,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28441,7 +27909,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28453,7 +27921,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28461,7 +27929,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28473,7 +27941,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28481,7 +27949,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28493,7 +27961,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28501,7 +27969,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28513,7 +27981,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28521,7 +27989,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28536,7 +28004,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28549,7 +28017,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28558,7 +28026,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28570,7 +28038,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28578,7 +28046,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28590,7 +28058,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28598,7 +28066,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28610,7 +28078,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28618,7 +28086,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28630,7 +28098,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28638,7 +28106,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28653,7 +28121,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28666,7 +28134,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28675,7 +28143,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28687,7 +28155,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28695,7 +28163,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28707,7 +28175,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28715,7 +28183,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28727,7 +28195,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28735,7 +28203,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28747,7 +28215,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28755,7 +28223,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28770,7 +28238,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28783,7 +28251,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28792,7 +28260,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28804,7 +28272,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28812,7 +28280,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28824,7 +28292,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28832,7 +28300,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28844,7 +28312,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28852,7 +28320,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28864,7 +28332,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28872,7 +28340,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -28887,7 +28355,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28900,7 +28368,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28909,7 +28377,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28921,7 +28389,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28929,7 +28397,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28941,7 +28409,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28949,7 +28417,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28961,7 +28429,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28969,7 +28437,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } element { @@ -28981,7 +28449,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28989,7 +28457,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16314 + priority: 16330 } } } @@ -29000,7 +28468,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29010,7 +28478,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29020,7 +28488,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29030,7 +28498,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29040,12 +28508,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -29054,7 +28522,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29064,12 +28532,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29078,7 +28546,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29088,12 +28556,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29102,7 +28570,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29111,12 +28579,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -29125,7 +28593,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29134,12 +28602,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -29148,7 +28616,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29157,12 +28625,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -29171,7 +28639,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29179,12 +28647,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29193,7 +28661,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29201,12 +28669,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29215,7 +28683,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29223,12 +28691,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29237,7 +28705,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29245,12 +28713,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -29262,7 +28730,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29272,7 +28740,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29282,7 +28750,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29292,7 +28760,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29302,12 +28770,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -29316,7 +28784,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29326,12 +28794,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29340,7 +28808,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29350,12 +28818,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29366,7 +28834,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29374,13 +28842,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29389,12 +28857,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -29405,7 +28873,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29413,13 +28881,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29428,12 +28896,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -29444,7 +28912,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29452,13 +28920,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29467,12 +28935,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -29483,7 +28951,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29491,13 +28959,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29505,12 +28973,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29521,7 +28989,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29529,13 +28997,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29543,12 +29011,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29559,7 +29027,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29567,13 +29035,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29581,12 +29049,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29597,7 +29065,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29605,13 +29073,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29619,12 +29087,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -29636,7 +29104,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29646,7 +29114,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29656,7 +29124,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29666,7 +29134,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29676,12 +29144,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 85 } } @@ -29690,7 +29158,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29700,12 +29168,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29718,13 +29186,13 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29734,12 +29202,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 90 } } @@ -29752,13 +29220,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29767,12 +29235,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 120 } } @@ -29785,13 +29253,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29800,12 +29268,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 175 } } @@ -29818,13 +29286,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29833,12 +29301,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 250 } } @@ -29851,13 +29319,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29865,12 +29333,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 9 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29883,13 +29351,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29897,12 +29365,12 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29915,13 +29383,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29929,12 +29397,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 10 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 300 } } @@ -29947,13 +29415,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29961,12 +29429,12 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16447 + priority: 16462 } shield { height: 11 color: 16777215 - priority: 16447 + priority: 16462 min_distance: 350 } } @@ -29978,7 +29446,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -29988,12 +29456,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -30002,7 +29470,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30012,12 +29480,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30026,7 +29494,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30036,12 +29504,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30050,7 +29518,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30059,12 +29527,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -30073,7 +29541,7 @@ cont { lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30082,12 +29550,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -30096,7 +29564,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30105,12 +29573,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -30119,7 +29587,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30127,12 +29595,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30141,7 +29609,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30149,12 +29617,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30163,7 +29631,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30171,12 +29639,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30185,7 +29653,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30193,12 +29661,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -30210,7 +29678,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30220,12 +29688,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -30234,7 +29702,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30244,12 +29712,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30258,7 +29726,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30268,12 +29736,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30282,7 +29750,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30291,12 +29759,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -30307,7 +29775,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30315,13 +29783,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30330,12 +29798,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -30346,7 +29814,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30354,13 +29822,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30369,12 +29837,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -30385,7 +29853,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30393,13 +29861,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30407,12 +29875,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30423,7 +29891,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30431,13 +29899,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30445,12 +29913,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30461,7 +29929,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30469,13 +29937,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30483,12 +29951,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30499,7 +29967,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30507,13 +29975,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30521,12 +29989,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -30538,7 +30006,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30548,12 +30016,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 85 } } @@ -30562,7 +30030,7 @@ cont { lines { width: 1.0 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30572,12 +30040,12 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30588,13 +30056,13 @@ cont { color: 8421504 dashdot { } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.2 color: 16742950 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30604,12 +30072,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 90 } } @@ -30622,13 +30090,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30637,12 +30105,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 120 } } @@ -30655,13 +30123,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.0 color: 16557154 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30670,12 +30138,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 175 } } @@ -30688,13 +30156,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30703,12 +30171,12 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 250 } } @@ -30721,13 +30189,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30735,12 +30203,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 9 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30753,13 +30221,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30767,12 +30235,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30785,13 +30253,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30799,12 +30267,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 10 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 300 } } @@ -30817,13 +30285,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30831,12 +30299,12 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16438 + priority: 16452 } shield { height: 11 color: 16777215 - priority: 16438 + priority: 16452 min_distance: 350 } } @@ -30848,7 +30316,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -30858,7 +30326,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -30868,7 +30336,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -30877,7 +30345,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -30885,7 +30353,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -30894,7 +30362,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -30902,7 +30370,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -30911,7 +30379,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -30919,7 +30387,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -30927,7 +30395,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -30935,7 +30403,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -30943,7 +30411,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -30951,7 +30419,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -30959,7 +30427,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -30967,7 +30435,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -30975,7 +30443,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -30986,7 +30454,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -30996,7 +30464,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31006,7 +30474,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31015,7 +30483,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31023,7 +30491,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31032,7 +30500,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31040,7 +30508,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31049,7 +30517,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31057,7 +30525,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31065,7 +30533,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31073,7 +30541,7 @@ cont { lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31081,7 +30549,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31089,7 +30557,7 @@ cont { lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31097,7 +30565,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31105,7 +30573,7 @@ cont { lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31113,7 +30581,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31124,7 +30592,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31134,7 +30602,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31144,7 +30612,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31153,7 +30621,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31163,7 +30631,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31171,13 +30639,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31186,7 +30654,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31196,7 +30664,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31204,13 +30672,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31219,7 +30687,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31229,7 +30697,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31237,13 +30705,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31251,7 +30719,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31261,7 +30729,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31269,13 +30737,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31283,7 +30751,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31293,7 +30761,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31301,13 +30769,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31315,7 +30783,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31325,7 +30793,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31333,13 +30801,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31347,7 +30815,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31358,7 +30826,7 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31368,7 +30836,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31378,7 +30846,7 @@ cont { lines { width: 1.2 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31387,7 +30855,7 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16361 + priority: 16377 } } element { @@ -31395,7 +30863,7 @@ cont { lines { width: 1.8 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31404,7 +30872,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31412,7 +30880,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31421,7 +30889,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16361 + priority: 16377 } } element { @@ -31433,13 +30901,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31447,7 +30915,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31459,13 +30927,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31473,7 +30941,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16361 + priority: 16377 } } element { @@ -31485,13 +30953,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31499,7 +30967,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } element { @@ -31511,13 +30979,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31525,7 +30993,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16361 + priority: 16377 } } } @@ -31536,7 +31004,7 @@ cont { lines { width: 0.5 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31546,7 +31014,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31556,7 +31024,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31566,7 +31034,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31576,7 +31044,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31586,7 +31054,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31599,7 +31067,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31609,7 +31077,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31619,7 +31087,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31629,7 +31097,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31641,7 +31109,7 @@ cont { scale: 17 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -31650,14 +31118,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -31666,14 +31134,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -31682,7 +31150,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -31692,7 +31160,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -31702,14 +31170,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31719,14 +31187,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31736,14 +31204,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31753,14 +31221,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31770,7 +31238,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -31780,7 +31248,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31790,14 +31258,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31807,14 +31275,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31824,14 +31292,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31841,7 +31309,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -31851,7 +31319,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -31861,14 +31329,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -31878,14 +31346,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -31895,14 +31363,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -31912,14 +31380,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -31928,14 +31396,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -31944,14 +31412,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -31960,14 +31428,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -31976,7 +31444,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -31986,7 +31454,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -31996,14 +31464,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32013,14 +31481,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32030,14 +31498,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32047,14 +31515,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32063,14 +31531,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32079,14 +31547,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32095,14 +31563,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32111,7 +31579,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32121,7 +31589,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32131,14 +31599,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32148,14 +31616,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32165,14 +31633,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32182,14 +31650,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32198,14 +31666,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32214,14 +31682,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32230,14 +31698,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32246,7 +31714,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32256,7 +31724,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32266,14 +31734,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32283,14 +31751,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32300,14 +31768,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32317,14 +31785,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32333,14 +31801,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32349,14 +31817,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32365,14 +31833,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32381,7 +31849,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32391,7 +31859,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32401,14 +31869,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32418,14 +31886,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32435,14 +31903,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32452,14 +31920,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32468,14 +31936,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32484,14 +31952,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32500,14 +31968,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32516,7 +31984,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32526,7 +31994,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32536,14 +32004,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32553,14 +32021,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32570,14 +32038,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32587,14 +32055,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32603,14 +32071,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32619,14 +32087,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32635,14 +32103,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32651,7 +32119,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32661,7 +32129,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32671,14 +32139,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32688,14 +32156,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32705,14 +32173,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32722,14 +32190,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32738,14 +32206,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32754,14 +32222,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32770,14 +32238,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32786,7 +32254,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32796,7 +32264,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32806,14 +32274,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32823,14 +32291,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32840,14 +32308,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32857,14 +32325,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32873,14 +32341,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32889,14 +32357,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32905,14 +32373,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32921,7 +32389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32931,7 +32399,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32941,14 +32409,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32958,14 +32426,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32975,14 +32443,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32992,14 +32460,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33008,14 +32476,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33024,14 +32492,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33040,14 +32508,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33056,7 +32524,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33066,7 +32534,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33076,14 +32544,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33093,14 +32561,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33110,14 +32578,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33127,14 +32595,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33143,14 +32611,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33159,14 +32627,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33175,14 +32643,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33191,7 +32659,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33201,7 +32669,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33211,14 +32679,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33228,14 +32696,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33245,14 +32713,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33262,14 +32730,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33278,14 +32746,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33294,14 +32762,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33310,14 +32778,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33326,7 +32794,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33336,7 +32804,7 @@ cont { scale: 13 symbol { name: "remains-s" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33346,14 +32814,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "remains-s" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33363,14 +32831,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 24 } caption { @@ -33380,14 +32848,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33397,14 +32865,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33414,14 +32882,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33431,14 +32899,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33448,7 +32916,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -33459,7 +32927,7 @@ cont { lines { width: 2.0 color: 12763315 - priority: 1590 + priority: 1603 cap: BUTTCAP } } @@ -33468,7 +32936,7 @@ cont { lines { width: 2.8 color: 12763315 - priority: 1590 + priority: 1603 cap: BUTTCAP } } @@ -33483,7 +32951,7 @@ cont { dd: 1.5 dd: 3.0 } - priority: 1590 + priority: 1603 } } element { @@ -33497,7 +32965,7 @@ cont { dd: 1.9 dd: 4.0 } - priority: 1590 + priority: 1603 } } element { @@ -33511,7 +32979,7 @@ cont { dd: 2.5 dd: 6.0 } - priority: 1590 + priority: 1603 } } element { @@ -33525,7 +32993,7 @@ cont { dd: 3.0 dd: 8.0 } - priority: 1590 + priority: 1603 } } } @@ -33535,7 +33003,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33545,14 +33013,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33562,14 +33030,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33579,14 +33047,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33596,14 +33064,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33612,14 +33080,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33628,14 +33096,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33644,14 +33112,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33660,7 +33128,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33670,7 +33138,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -33678,7 +33146,7 @@ cont { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -33688,14 +33156,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -33705,14 +33173,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -33722,7 +33190,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -33732,7 +33200,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -33742,14 +33210,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33759,14 +33227,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33776,14 +33244,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33793,14 +33261,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33810,7 +33278,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -33820,7 +33288,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16733 + priority: 16745 min_distance: 24 } } @@ -33828,7 +33296,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16733 + priority: 16745 min_distance: 12 } } @@ -33836,7 +33304,7 @@ cont { scale: 17 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33846,14 +33314,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33863,14 +33331,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33880,7 +33348,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -33890,7 +33358,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 24 } } @@ -33898,7 +33366,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -33906,7 +33374,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -33914,7 +33382,7 @@ cont { scale: 18 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -33924,14 +33392,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -33941,7 +33409,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -33951,7 +33419,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -33961,14 +33429,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33978,14 +33446,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33995,14 +33463,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34012,14 +33480,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34029,7 +33497,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34039,7 +33507,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34049,14 +33517,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34066,14 +33534,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34083,14 +33551,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34100,14 +33568,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34117,7 +33585,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34127,7 +33595,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 24 } } @@ -34135,7 +33603,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34143,7 +33611,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34151,7 +33619,7 @@ cont { scale: 18 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34159,7 +33627,7 @@ cont { scale: 19 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34169,7 +33637,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -34179,7 +33647,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34189,14 +33657,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34206,14 +33674,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34223,14 +33691,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34240,14 +33708,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34257,7 +33725,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34267,7 +33735,7 @@ cont { scale: 13 symbol { name: "monument-s" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34277,14 +33745,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 14 symbol { name: "monument-s" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34294,14 +33762,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34311,14 +33779,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34328,14 +33796,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34345,14 +33813,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34362,14 +33830,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34379,7 +33847,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34389,7 +33857,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -34397,7 +33865,7 @@ cont { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34407,14 +33875,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34424,14 +33892,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34441,7 +33909,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34451,7 +33919,7 @@ cont { scale: 17 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34460,7 +33928,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34468,7 +33936,7 @@ cont { scale: 18 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34477,7 +33945,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34485,7 +33953,7 @@ cont { scale: 19 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34494,7 +33962,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34502,7 +33970,7 @@ cont { scale: 19 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34511,7 +33979,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "!name" } @@ -34522,7 +33990,7 @@ cont { scale: 16 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34532,14 +34000,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 17 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34549,14 +34017,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 18 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34566,14 +34034,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 19 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34583,7 +34051,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } } @@ -34593,7 +34061,7 @@ cont { scale: 16 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34603,14 +34071,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34620,14 +34088,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34637,14 +34105,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34654,7 +34122,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34664,7 +34132,7 @@ cont { scale: 16 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34674,14 +34142,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34691,14 +34159,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34708,14 +34176,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34725,7 +34193,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34735,7 +34203,7 @@ cont { scale: 16 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -34743,7 +34211,7 @@ cont { scale: 17 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34753,14 +34221,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34770,14 +34238,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34787,7 +34255,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34796,7 +34264,7 @@ cont { element { scale: 15 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-xs" step: 44.0 @@ -34807,7 +34275,7 @@ cont { element { scale: 16 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-s" step: 54.0 @@ -34818,7 +34286,7 @@ cont { element { scale: 17 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-s" step: 64.0 @@ -34829,7 +34297,7 @@ cont { element { scale: 18 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-m" step: 74.0 @@ -34840,7 +34308,7 @@ cont { element { scale: 19 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-m" step: 74.0 @@ -34856,7 +34324,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -34865,7 +34333,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -34873,14 +34341,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -34888,14 +34356,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -34903,14 +34371,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -34921,7 +34389,7 @@ cont { lines { width: 1.0 color: 2152292681 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -34930,7 +34398,7 @@ cont { lines { width: 1.3 color: 1716085065 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -34939,7 +34407,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -34947,7 +34415,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -34955,14 +34423,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -34970,14 +34438,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -34985,14 +34453,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35000,14 +34468,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35018,7 +34486,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35027,7 +34495,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35035,7 +34503,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35044,7 +34512,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35052,7 +34520,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35060,7 +34528,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35068,7 +34536,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35076,7 +34544,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35084,7 +34552,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35092,7 +34560,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35100,14 +34568,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35115,14 +34583,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35130,14 +34598,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35145,14 +34613,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35163,7 +34631,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35172,7 +34640,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35180,14 +34648,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35195,14 +34663,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35210,14 +34678,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35228,7 +34696,7 @@ cont { lines { width: 1.0 color: 2152292681 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35238,7 +34706,7 @@ cont { lines { width: 1.3 color: 1716085065 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35247,7 +34715,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35255,7 +34723,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35263,7 +34731,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35271,7 +34739,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35279,7 +34747,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35287,7 +34755,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35295,7 +34763,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35303,14 +34771,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35318,14 +34786,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35333,14 +34801,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35348,14 +34816,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35366,7 +34834,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35375,7 +34843,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35383,14 +34851,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35398,14 +34866,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35413,14 +34881,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35433,7 +34901,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35443,7 +34911,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35453,7 +34921,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } } @@ -35466,7 +34934,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35476,7 +34944,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } element { @@ -35486,7 +34954,7 @@ cont { height: 10 color: 3355443 } - priority: 15476 + priority: 15490 } } } @@ -35496,91 +34964,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -35590,56 +35058,56 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } } } @@ -35649,18 +35117,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35668,18 +35136,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35687,18 +35155,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35706,18 +35174,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35725,18 +35193,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35744,7 +35212,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -35754,18 +35222,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 12372094 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35773,18 +35241,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 16 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35792,18 +35260,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 17 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35811,18 +35279,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35830,18 +35298,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 11781233 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35849,7 +35317,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -36041,105 +35509,105 @@ cont { scale: 10 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 11 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 12 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -36149,105 +35617,105 @@ cont { scale: 10 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 11 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 12 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 15459493 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 15459493 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -36257,56 +35725,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } } } @@ -36316,21 +35784,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -36338,7 +35806,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36346,7 +35814,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36354,11 +35822,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -36368,7 +35836,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36376,7 +35844,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36384,11 +35852,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36398,7 +35866,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36406,7 +35874,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36414,11 +35882,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36428,7 +35896,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36436,7 +35904,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36444,11 +35912,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36465,7 +35933,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36473,7 +35941,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36481,11 +35949,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36502,7 +35970,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36510,7 +35978,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36518,11 +35986,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36539,7 +36007,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36547,11 +36015,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36559,11 +36027,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36580,7 +36048,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36588,11 +36056,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36603,21 +36071,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -36625,7 +36093,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36633,7 +36101,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36641,11 +36109,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -36655,7 +36123,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36663,7 +36131,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36671,11 +36139,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36685,7 +36153,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36693,7 +36161,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36701,11 +36169,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36715,7 +36183,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36723,7 +36191,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36731,11 +36199,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36752,7 +36220,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36760,7 +36228,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36768,11 +36236,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36789,7 +36257,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36797,7 +36265,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36805,11 +36273,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36826,7 +36294,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36834,11 +36302,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36846,11 +36314,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36867,7 +36335,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36875,11 +36343,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36890,21 +36358,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -36912,7 +36380,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36920,7 +36388,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36928,11 +36396,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -36942,7 +36410,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36950,7 +36418,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36958,11 +36426,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36972,7 +36440,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36980,7 +36448,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36988,11 +36456,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37002,7 +36470,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37010,7 +36478,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37018,11 +36486,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37039,7 +36507,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37047,7 +36515,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37055,11 +36523,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37076,7 +36544,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37084,7 +36552,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37092,11 +36560,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37113,7 +36581,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37121,11 +36589,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37133,11 +36601,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37154,7 +36622,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37162,11 +36630,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37177,21 +36645,21 @@ cont { scale: 10 area { color: 13029267 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 12372094 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } caption { primary { @@ -37199,7 +36667,7 @@ cont { color: 3832097 stroke_color: 872415231 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37207,7 +36675,7 @@ cont { scale: 12 area { color: 12372094 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37215,11 +36683,11 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -37229,7 +36697,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37237,7 +36705,7 @@ cont { scale: 13 area { color: 11781233 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37245,11 +36713,11 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37259,7 +36727,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37267,7 +36735,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37275,11 +36743,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37289,7 +36757,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37297,7 +36765,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37305,11 +36773,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37326,7 +36794,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37334,7 +36802,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37342,11 +36810,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37363,7 +36831,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37371,7 +36839,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37379,11 +36847,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37400,7 +36868,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37408,11 +36876,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37420,11 +36888,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37441,7 +36909,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37449,11 +36917,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37464,14 +36932,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1229 + priority: 1246 } } element { scale: 15 area { color: 1724500155 - priority: 1229 + priority: 1246 } } element { @@ -37482,7 +36950,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1229 + priority: 1246 } } element { @@ -37493,7 +36961,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -37504,7 +36972,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } element { @@ -37515,7 +36983,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1229 + priority: 1246 } } } @@ -37525,56 +36993,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 13029267 - priority: -15877 + priority: -15859 } } } @@ -37657,11 +37125,11 @@ cont { scale: 15 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37669,18 +37137,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 16 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37688,18 +37156,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37707,18 +37175,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37726,18 +37194,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 area { color: 15000299 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37745,7 +37213,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -37755,56 +37223,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } } } @@ -37814,39 +37282,39 @@ cont { scale: 12 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 14 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 15 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 16 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 min_distance: 10 } } @@ -37854,11 +37322,11 @@ cont { scale: 17 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -37866,18 +37334,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 18 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -37885,18 +37353,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 19 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -37904,7 +37372,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } } @@ -37914,53 +37382,53 @@ cont { scale: 10 area { color: 15022389 - priority: -15524 + priority: -15510 } } element { scale: 11 area { color: 15022389 - priority: -15524 + priority: -15510 } } element { scale: 12 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 14 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 15 area { color: 2162506037 - priority: -15524 + priority: -15510 } } element { scale: 16 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 min_distance: 10 } } @@ -37968,11 +37436,11 @@ cont { scale: 17 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -37980,18 +37448,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 18 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -37999,18 +37467,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 19 area { color: 2162506037 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38018,7 +37486,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15476 + priority: 15490 } } } @@ -38028,91 +37496,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -38268,91 +37736,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -38365,7 +37833,7 @@ cont { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38376,7 +37844,7 @@ cont { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38384,14 +37852,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38399,7 +37867,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38407,14 +37875,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38422,7 +37890,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38430,14 +37898,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38445,7 +37913,7 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38453,14 +37921,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38468,7 +37936,7 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38476,14 +37944,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38491,7 +37959,7 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38499,14 +37967,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38514,7 +37982,7 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38522,14 +37990,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38537,7 +38005,7 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38545,14 +38013,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38560,7 +38028,7 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38621,140 +38089,140 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } } } @@ -38764,56 +38232,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } } } @@ -38823,91 +38291,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 13620648 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 13029267 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 13029267 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 4473924 } - priority: 15076 + priority: 15094 } } } @@ -38984,11 +38452,11 @@ cont { scale: 17 area { color: 16575614 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -38997,18 +38465,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 + priority: 15047 } } element { scale: 18 area { color: 16575614 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39017,18 +38485,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 + priority: 15047 } } element { scale: 19 area { color: 16575614 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39037,58 +38505,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 - } - } -} -cont { - name: "leisure-bowling_alley" - element { - scale: 17 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15047 } } } @@ -39170,7 +38587,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -39179,14 +38596,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39196,14 +38613,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39213,14 +38630,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39230,7 +38647,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -39240,7 +38657,8 @@ cont { scale: 17 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39256,7 +38674,8 @@ cont { scale: 18 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39272,7 +38691,8 @@ cont { scale: 19 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39291,7 +38711,8 @@ cont { scale: 17 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39307,7 +38728,8 @@ cont { scale: 18 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39323,7 +38745,8 @@ cont { scale: 19 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39342,39 +38765,39 @@ cont { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } } element { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } } element { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39391,7 +38814,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39399,7 +38822,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -39407,11 +38830,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39428,7 +38851,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39436,7 +38859,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39444,7 +38867,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39452,11 +38875,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39473,7 +38896,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39481,11 +38904,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -39493,11 +38916,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39514,7 +38937,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39522,11 +38945,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "garden-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -39537,35 +38960,35 @@ cont { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } } element { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } } element { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -39573,7 +38996,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39581,7 +39004,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39589,7 +39012,7 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39597,7 +39020,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39605,7 +39028,7 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39613,7 +39036,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39621,7 +39044,7 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39629,7 +39052,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39637,7 +39060,7 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -39645,7 +39068,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39656,46 +39079,46 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -39704,18 +39127,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15142 + priority: 15160 } } element { scale: 18 area { color: 13029267 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -39724,18 +39147,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15142 + priority: 15160 } } element { scale: 19 area { color: 13029267 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -39744,7 +39167,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15142 + priority: 15160 } } } @@ -39754,7 +39177,8 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39770,7 +39194,8 @@ cont { scale: 18 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39786,7 +39211,8 @@ cont { scale: 19 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39841,7 +39267,7 @@ cont { scale: 16 symbol { name: "marina-m" - priority: 16095 + priority: 16113 min_distance: 30 } caption { @@ -39850,14 +39276,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15095 + priority: 15113 } } element { scale: 17 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -39867,14 +39293,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } element { scale: 18 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -39884,14 +39310,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } element { scale: 19 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -39901,7 +39327,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } } @@ -39911,18 +39337,18 @@ cont { scale: 10 area { color: 3431500856 - priority: -15334 + priority: -15321 } } element { scale: 11 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 20 } } @@ -39930,11 +39356,11 @@ cont { scale: 12 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -39944,18 +39370,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 13 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -39965,18 +39391,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 14 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 } caption { primary { @@ -39985,18 +39411,18 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40005,18 +39431,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40025,18 +39451,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40045,18 +39471,18 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40066,18 +39492,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } element { scale: 19 area { color: 3431500856 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40087,7 +39513,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } } @@ -40097,39 +39523,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40139,7 +39565,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40147,7 +39573,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40155,11 +39581,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40169,7 +39595,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40177,7 +39603,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40185,11 +39611,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40206,7 +39632,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40214,7 +39640,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40222,11 +39648,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40243,7 +39669,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40251,7 +39677,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -40259,7 +39685,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40267,11 +39693,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40288,7 +39714,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40296,11 +39722,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40308,11 +39734,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40329,7 +39755,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40337,11 +39763,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40352,39 +39778,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40394,7 +39820,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40402,7 +39828,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40410,11 +39836,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40424,7 +39850,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40432,7 +39858,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40440,11 +39866,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40461,7 +39887,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40469,7 +39895,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40477,11 +39903,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40498,7 +39924,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40506,7 +39932,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -40514,7 +39940,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40522,11 +39948,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40543,7 +39969,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40551,11 +39977,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40563,11 +39989,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40584,7 +40010,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40592,11 +40018,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40607,39 +40033,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40649,7 +40075,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40657,7 +40083,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40665,11 +40091,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40679,7 +40105,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40687,7 +40113,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40695,11 +40121,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40716,7 +40142,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40724,7 +40150,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40732,11 +40158,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40753,7 +40179,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40761,7 +40187,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -40769,7 +40195,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40777,11 +40203,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40798,7 +40224,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40806,11 +40232,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40818,11 +40244,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40839,7 +40265,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40847,11 +40273,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40862,39 +40288,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 12372094 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 11781233 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40904,7 +40330,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40912,7 +40338,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40920,11 +40346,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40934,7 +40360,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40942,7 +40368,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40950,11 +40376,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40971,7 +40397,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40979,7 +40405,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40987,11 +40413,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41008,7 +40434,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41016,7 +40442,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15934 + priority: -15916 } caption { primary { @@ -41024,7 +40450,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -41032,11 +40458,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41053,7 +40479,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41061,11 +40487,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41073,11 +40499,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41094,7 +40520,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41102,11 +40528,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41117,7 +40543,7 @@ cont { scale: 16 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41126,14 +40552,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41142,14 +40568,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41158,14 +40584,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41174,7 +40600,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -41184,25 +40610,26 @@ cont { scale: 15 area { color: 13749671 - priority: -15924 + priority: -15963 } } element { scale: 16 area { color: 13749671 - priority: -15924 + priority: -15963 } } element { scale: 17 area { color: 13749671 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41218,11 +40645,12 @@ cont { scale: 18 area { color: 13749671 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41238,11 +40666,12 @@ cont { scale: 19 area { color: 13749671 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41261,18 +40690,19 @@ cont { scale: 16 area { color: 13749671 - priority: -15924 + priority: -15963 } } element { scale: 17 area { color: 13749671 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41281,18 +40711,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 area { color: 13749671 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41301,18 +40732,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 area { color: 13749671 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41321,7 +40753,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -41367,7 +40799,8 @@ cont { scale: 17 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41383,7 +40816,8 @@ cont { scale: 18 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41399,7 +40833,8 @@ cont { scale: 19 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41454,7 +40889,8 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41470,7 +40906,8 @@ cont { scale: 18 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41486,7 +40923,8 @@ cont { scale: 19 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41505,7 +40943,8 @@ cont { scale: 13 symbol { name: "stadium-s" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 16 } caption { @@ -41514,14 +40953,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 14 symbol { name: "stadium-s" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 16 } caption { @@ -41530,18 +40970,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 15 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41550,18 +40991,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 16 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41570,18 +41012,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 17 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41590,18 +41033,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 18 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41610,18 +41054,19 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 19 area { color: 13749671 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41630,7 +41075,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15847 + priority: 15849 } } } @@ -41640,39 +41085,39 @@ cont { scale: 13 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 14 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41681,18 +41126,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41701,18 +41146,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41721,7 +41166,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -41731,39 +41176,39 @@ cont { scale: 13 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 14 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 9163744 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41772,18 +41217,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41792,18 +41237,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 9163744 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41812,7 +41257,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -41823,7 +41268,7 @@ cont { lines { width: 1.5 color: 13749671 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -41832,7 +41277,7 @@ cont { lines { width: 1.8 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -41840,7 +41285,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 15314 + priority: 15330 } } element { @@ -41848,7 +41293,7 @@ cont { lines { width: 3.0 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -41857,7 +41302,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { @@ -41865,7 +41310,7 @@ cont { lines { width: 3.0 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -41874,7 +41319,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { @@ -41882,7 +41327,7 @@ cont { lines { width: 4.0 color: 13749671 - priority: 1314 + priority: 1330 } caption { primary { @@ -41891,7 +41336,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } } @@ -41901,14 +41346,14 @@ cont { scale: 15 area { color: 13749671 - priority: -15686 + priority: -15670 } } element { scale: 16 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -41916,14 +41361,14 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 15314 + priority: 15330 } } element { scale: 17 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -41932,14 +41377,14 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { scale: 18 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -41948,14 +41393,14 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { scale: 19 area { color: 13749671 - priority: -15686 + priority: -15670 } caption { primary { @@ -41964,7 +41409,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15314 + priority: 15330 } } } @@ -41974,7 +41419,7 @@ cont { scale: 16 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -41983,14 +41428,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42000,14 +41445,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42017,14 +41462,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42034,7 +41479,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -42044,14 +41489,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42059,12 +41504,12 @@ cont { lines { width: 1.5 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42072,12 +41517,12 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42085,11 +41530,11 @@ cont { lines { width: 3.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42097,7 +41542,7 @@ cont { lines { width: 4.5 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42108,7 +41553,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42116,7 +41561,7 @@ cont { lines { width: 6.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42127,7 +41572,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42135,7 +41580,7 @@ cont { lines { width: 8.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42146,7 +41591,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } } @@ -42156,21 +41601,21 @@ cont { scale: 16 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } } element { scale: 17 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } } element { scale: 18 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -42178,14 +41623,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -42193,7 +41638,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -42204,7 +41649,7 @@ cont { lines { width: 1.0 color: 1724896680 - priority: 1180 + priority: 1198 cap: BUTTCAP } } @@ -42213,7 +41658,7 @@ cont { lines { width: 1.5 color: 1724896680 - priority: 1180 + priority: 1198 cap: BUTTCAP } } @@ -42222,7 +41667,7 @@ cont { lines { width: 2.0 color: 1724896680 - priority: 1180 + priority: 1198 } } element { @@ -42230,7 +41675,7 @@ cont { lines { width: 3.0 color: 1724896680 - priority: 1180 + priority: 1198 } } element { @@ -42238,7 +41683,7 @@ cont { lines { width: 4.5 color: 1724896680 - priority: 1180 + priority: 1198 } } element { @@ -42246,7 +41691,7 @@ cont { lines { width: 6.0 color: 1724896680 - priority: 1180 + priority: 1198 } } } @@ -42263,7 +41708,7 @@ cont { dd: 2.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -42277,7 +41722,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1219 + priority: 1235 } } element { @@ -42291,7 +41736,7 @@ cont { dd: 4.0 dd: 3.0 } - priority: 1219 + priority: 1235 } } element { @@ -42305,7 +41750,7 @@ cont { dd: 5.0 dd: 4.0 } - priority: 1219 + priority: 1235 } } } @@ -42315,6 +41760,7 @@ cont { scale: 15 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42322,6 +41768,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42329,6 +41776,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42336,6 +41784,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42343,6 +41792,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42353,7 +41803,7 @@ cont { scale: 14 symbol { name: "lighthouse-s" - priority: 16666 + priority: 16679 min_distance: 5 } caption { @@ -42362,14 +41812,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42377,14 +41827,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42392,14 +41842,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42407,14 +41857,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42422,14 +41872,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 19 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42437,7 +41887,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15666 + priority: 15679 } } } @@ -42447,6 +41897,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42454,6 +41905,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42461,6 +41913,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42468,6 +41921,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42478,14 +41932,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42493,12 +41947,12 @@ cont { lines { width: 1.5 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42506,12 +41960,12 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42519,11 +41973,11 @@ cont { lines { width: 3.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 - priority: -15524 + priority: -15510 } } element { @@ -42531,7 +41985,7 @@ cont { lines { width: 4.5 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42542,7 +41996,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42550,7 +42004,7 @@ cont { lines { width: 6.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42561,7 +42015,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } element { @@ -42569,7 +42023,7 @@ cont { lines { width: 8.0 color: 14934482 - priority: 1476 + priority: 1490 } area { color: 14934482 @@ -42580,7 +42034,7 @@ cont { height: 10 color: 4473924 } - priority: 15476 + priority: 15490 } } } @@ -42684,7 +42138,8 @@ cont { scale: 16 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42693,14 +42148,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42709,14 +42165,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42725,14 +42182,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42741,7 +42199,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -42751,7 +42209,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42759,7 +42217,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42767,7 +42225,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42775,7 +42233,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42783,7 +42241,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42794,7 +42252,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42802,7 +42260,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42810,7 +42268,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42818,7 +42276,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42826,7 +42284,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42837,7 +42295,7 @@ cont { scale: 16 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -42846,14 +42304,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42863,14 +42321,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42880,14 +42338,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42897,7 +42355,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -42954,7 +42412,7 @@ cont { scale: 14 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -42963,14 +42421,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -42979,14 +42437,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -42995,14 +42453,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43011,14 +42469,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43027,14 +42485,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43043,7 +42501,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -43053,21 +42511,21 @@ cont { scale: 12 area { color: 15590876 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 15590876 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43076,14 +42534,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 15 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43092,14 +42550,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43108,14 +42566,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43124,14 +42582,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43140,14 +42598,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 15590876 - priority: -15924 + priority: -15906 } caption { primary { @@ -43156,7 +42614,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } } @@ -43640,7 +43098,7 @@ cont { scale: 11 symbol { name: "cave-s" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -43650,14 +43108,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -43666,14 +43124,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -43682,14 +43140,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -43698,14 +43156,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43714,14 +43172,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43730,14 +43188,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43746,14 +43204,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43762,14 +43220,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43778,7 +43236,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -43793,7 +43251,7 @@ cont { dd: 1.4 dd: 1.4 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -43806,7 +43264,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -43821,7 +43279,7 @@ cont { dd: 4.5 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -43835,7 +43293,7 @@ cont { dd: 6.0 dd: 1.4 } - priority: 1219 + priority: 1235 } } element { @@ -43849,7 +43307,7 @@ cont { dd: 8.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -43863,7 +43321,7 @@ cont { dd: 10.0 dd: 1.9 } - priority: 1219 + priority: 1235 } } } @@ -44204,7 +43662,7 @@ cont { dd: 1.4 dd: 1.4 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44217,7 +43675,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44232,7 +43690,7 @@ cont { dd: 4.5 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -44246,7 +43704,7 @@ cont { dd: 6.0 dd: 1.4 } - priority: 1219 + priority: 1235 } } element { @@ -44260,7 +43718,7 @@ cont { dd: 8.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -44274,7 +43732,7 @@ cont { dd: 10.0 dd: 1.9 } - priority: 1219 + priority: 1235 } } } @@ -44284,7 +43742,7 @@ cont { scale: 14 symbol { name: "geyser-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44294,14 +43752,14 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44311,14 +43769,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44328,14 +43786,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44345,14 +43803,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44362,14 +43820,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44379,7 +43837,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -44531,56 +43989,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 13029267 - priority: -15877 + priority: -15859 } } } @@ -44590,56 +44048,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 13620648 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 13029267 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 13029267 - priority: -15877 + priority: -15859 } } } @@ -44649,7 +44107,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44659,65 +44117,65 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44727,14 +44185,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44744,7 +44202,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -44896,7 +44354,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 min_distance: 10 } caption { @@ -44906,7 +44364,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -44918,7 +44376,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "!name" } @@ -44926,7 +44384,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -44935,7 +44393,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -44947,7 +44405,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "!name" } @@ -44955,7 +44413,7 @@ cont { scale: 14 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -44964,7 +44422,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -44972,7 +44430,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44981,14 +44439,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -44997,14 +44455,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45013,14 +44471,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45029,14 +44487,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45045,7 +44503,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45093,7 +44551,7 @@ cont { scale: 14 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45102,14 +44560,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45118,14 +44576,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45134,14 +44592,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45150,14 +44608,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45166,14 +44624,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45182,7 +44640,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45192,42 +44650,42 @@ cont { scale: 14 area { color: 11453035 - priority: -15867 + priority: -15850 } } element { scale: 15 area { color: 11584112 - priority: -15867 + priority: -15850 } } element { scale: 16 area { color: 11190117 - priority: -15867 + priority: -15850 } } element { scale: 17 area { color: 11190117 - priority: -15867 + priority: -15850 } } element { scale: 18 area { color: 11190117 - priority: -15867 + priority: -15850 } } element { scale: 19 area { color: 11190117 - priority: -15867 + priority: -15850 } } } @@ -45237,7 +44695,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45247,65 +44705,65 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45315,14 +44773,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45332,7 +44790,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -45453,7 +44911,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45462,14 +44920,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45478,14 +44936,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45494,14 +44952,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45510,14 +44968,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45526,14 +44984,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45542,14 +45000,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45558,14 +45016,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45574,14 +45032,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45590,14 +45048,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45606,7 +45064,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45615,84 +45073,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45700,7 +45158,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45708,14 +45166,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45723,7 +45181,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45731,14 +45189,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45746,7 +45204,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45754,14 +45212,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45769,7 +45227,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45777,14 +45235,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45792,14 +45250,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45807,14 +45265,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45822,14 +45280,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45837,14 +45295,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45852,14 +45310,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45867,14 +45325,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45882,14 +45340,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45897,14 +45355,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45912,14 +45370,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45927,14 +45385,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45942,14 +45400,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45959,84 +45417,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46044,7 +45502,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46052,14 +45510,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46067,7 +45525,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46075,14 +45533,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46090,7 +45548,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46098,14 +45556,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46113,7 +45571,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46121,14 +45579,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46136,14 +45594,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46151,14 +45609,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46166,14 +45624,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46181,14 +45639,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46196,14 +45654,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46211,14 +45669,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46226,14 +45684,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46241,14 +45699,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46256,14 +45714,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46271,14 +45729,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46286,14 +45744,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46303,84 +45761,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46388,7 +45846,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46396,14 +45854,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46411,7 +45869,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46419,14 +45877,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46434,7 +45892,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46442,14 +45900,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46457,7 +45915,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46465,14 +45923,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46480,14 +45938,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46495,14 +45953,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46510,14 +45968,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46525,14 +45983,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46540,14 +45998,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46555,14 +46013,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46570,14 +46028,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46585,14 +46043,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46600,14 +46058,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46615,14 +46073,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46630,14 +46088,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46647,84 +46105,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46732,7 +46190,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46740,14 +46198,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46755,7 +46213,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46763,14 +46221,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46778,7 +46236,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46786,14 +46244,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46801,7 +46259,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46809,14 +46267,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46824,14 +46282,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46839,14 +46297,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46854,14 +46312,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46869,14 +46327,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46884,14 +46342,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46899,14 +46357,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46914,14 +46372,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46929,14 +46387,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46944,14 +46402,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46959,14 +46417,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46974,14 +46432,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46991,84 +46449,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47076,7 +46534,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47084,14 +46542,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47099,7 +46557,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47107,14 +46565,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47122,7 +46580,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47130,14 +46588,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47145,7 +46603,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47153,14 +46611,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47168,14 +46626,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47183,14 +46641,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47198,14 +46656,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47213,14 +46671,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47228,14 +46686,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47243,14 +46701,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47258,14 +46716,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47273,14 +46731,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47288,14 +46746,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47303,14 +46761,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47318,14 +46776,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47335,84 +46793,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47420,7 +46878,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47428,14 +46886,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47443,7 +46901,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47451,14 +46909,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47466,7 +46924,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47474,14 +46932,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47489,7 +46947,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47497,14 +46955,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47512,14 +46970,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47527,14 +46985,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47542,14 +47000,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47557,14 +47015,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47572,14 +47030,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47587,14 +47045,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47602,14 +47060,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47617,14 +47075,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47632,14 +47090,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47647,14 +47105,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47662,14 +47120,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47679,84 +47137,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47764,7 +47222,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47772,14 +47230,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47787,7 +47245,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47795,14 +47253,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47810,7 +47268,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47818,14 +47276,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47833,7 +47291,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47841,14 +47299,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47856,14 +47314,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47871,14 +47329,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47886,14 +47344,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47901,14 +47359,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47916,14 +47374,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47931,14 +47389,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47946,14 +47404,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47961,14 +47419,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47976,14 +47434,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47991,14 +47449,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48006,14 +47464,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48023,84 +47481,84 @@ cont { element { area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 9163744 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48108,7 +47566,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48116,14 +47574,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48131,7 +47589,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48139,14 +47597,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48154,7 +47612,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48162,14 +47620,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48177,7 +47635,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48185,14 +47643,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48200,14 +47658,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48215,14 +47673,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48230,14 +47688,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48245,14 +47703,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48260,14 +47718,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48275,14 +47733,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48290,14 +47748,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48305,14 +47763,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48320,14 +47778,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48335,14 +47793,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48350,14 +47808,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 4495803 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48368,91 +47826,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } } @@ -48462,91 +47920,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } } @@ -48556,91 +48014,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 13229526 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 13229526 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 4495803 } - priority: 15095 + priority: 15113 } } } @@ -48650,7 +48108,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48659,14 +48117,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48675,7 +48133,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48685,7 +48143,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48694,14 +48152,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48710,7 +48168,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48720,7 +48178,7 @@ cont { scale: 17 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -48729,14 +48187,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -48745,14 +48203,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -48761,7 +48219,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -48771,7 +48229,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48780,14 +48238,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48796,7 +48254,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48806,7 +48264,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48815,14 +48273,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48831,7 +48289,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48841,7 +48299,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48850,14 +48308,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48866,7 +48324,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48876,7 +48334,7 @@ cont { scale: 17 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -48886,14 +48344,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -48903,14 +48361,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -48920,7 +48378,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -48930,7 +48388,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48939,14 +48397,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48955,7 +48413,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48965,7 +48423,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48974,14 +48432,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48990,7 +48448,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49001,7 +48459,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49010,7 +48468,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49019,7 +48477,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49027,7 +48485,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49035,7 +48493,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49043,7 +48501,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } } @@ -49054,7 +48512,7 @@ cont { lines { width: 1.0 color: 657933 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49063,7 +48521,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49072,7 +48530,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1247 + priority: 1264 } } element { @@ -49080,7 +48538,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1247 + priority: 1264 } } element { @@ -49088,7 +48546,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1247 + priority: 1264 } } element { @@ -49096,7 +48554,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1247 + priority: 1264 } } } @@ -49107,7 +48565,7 @@ cont { lines { width: 1.0 color: 731131 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49116,7 +48574,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49125,7 +48583,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49133,7 +48591,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49141,7 +48599,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49149,7 +48607,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } } @@ -49160,7 +48618,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49169,7 +48627,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49178,7 +48636,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49186,7 +48644,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49194,7 +48652,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49202,7 +48660,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } } @@ -49213,7 +48671,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49222,7 +48680,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49231,7 +48689,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49239,7 +48697,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49247,7 +48705,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } element { @@ -49255,7 +48713,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1247 + priority: 1264 } } } @@ -49266,7 +48724,7 @@ cont { lines { width: 1.0 color: 16518683 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49275,7 +48733,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49284,7 +48742,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49292,7 +48750,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49300,7 +48758,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49308,7 +48766,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } } @@ -49319,7 +48777,7 @@ cont { lines { width: 1.0 color: 6286126 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49328,7 +48786,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49337,7 +48795,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49345,7 +48803,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49353,7 +48811,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49361,7 +48819,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } } @@ -49372,7 +48830,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49381,7 +48839,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49390,7 +48848,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49398,7 +48856,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49406,7 +48864,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49414,7 +48872,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } } @@ -49425,7 +48883,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49434,7 +48892,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49443,7 +48901,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49451,7 +48909,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49459,7 +48917,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } element { @@ -49467,7 +48925,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1247 + priority: 1264 } } } @@ -49545,7 +49003,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49564,7 +49022,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49583,7 +49041,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49602,7 +49060,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49640,7 +49098,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49659,7 +49117,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49697,7 +49155,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49716,7 +49174,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49754,7 +49212,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49773,7 +49231,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49792,7 +49250,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49811,7 +49269,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49830,7 +49288,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49849,7 +49307,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49868,7 +49326,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49887,7 +49345,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49966,7 +49424,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49985,7 +49443,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50004,7 +49462,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50023,7 +49481,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50061,7 +49519,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50080,7 +49538,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50118,7 +49576,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50137,7 +49595,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50175,7 +49633,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50194,7 +49652,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50213,7 +49671,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50232,7 +49690,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50251,7 +49709,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50270,7 +49728,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50289,7 +49747,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50308,7 +49766,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50387,7 +49845,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50406,7 +49864,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50425,7 +49883,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50444,7 +49902,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50482,7 +49940,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50501,7 +49959,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50539,7 +49997,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50558,7 +50016,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50596,7 +50054,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50615,7 +50073,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50634,7 +50092,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50653,7 +50111,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50672,7 +50130,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50691,7 +50149,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50710,7 +50168,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50729,7 +50187,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50808,7 +50266,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50827,7 +50285,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50846,7 +50304,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50865,7 +50323,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50903,7 +50361,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50922,7 +50380,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50960,7 +50418,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50979,7 +50437,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51017,7 +50475,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51036,7 +50494,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51055,7 +50513,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51074,7 +50532,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51093,7 +50551,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51112,7 +50570,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51131,7 +50589,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51150,7 +50608,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51161,7 +50619,8 @@ cont { scale: 4 symbol { name: "star-s" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51170,7 +50629,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51192,7 +50651,8 @@ cont { scale: 5 symbol { name: "star-m" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51201,7 +50661,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51223,7 +50683,8 @@ cont { scale: 6 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51232,7 +50693,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51254,7 +50715,8 @@ cont { scale: 7 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51263,7 +50725,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51285,7 +50747,8 @@ cont { scale: 8 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51294,7 +50757,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51316,7 +50779,8 @@ cont { scale: 9 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51325,7 +50789,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51347,7 +50811,8 @@ cont { scale: 10 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51356,7 +50821,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51378,7 +50843,8 @@ cont { scale: 11 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51387,7 +50853,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51409,7 +50875,8 @@ cont { scale: 12 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51418,7 +50885,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51440,7 +50907,8 @@ cont { scale: 13 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51449,7 +50917,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51471,7 +50939,8 @@ cont { scale: 14 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51480,7 +50949,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51502,7 +50971,8 @@ cont { scale: 15 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51511,7 +50981,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51533,7 +51003,8 @@ cont { scale: 16 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51542,7 +51013,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51564,7 +51035,8 @@ cont { scale: 17 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51573,7 +51045,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51595,7 +51067,8 @@ cont { scale: 18 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51604,7 +51077,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51626,7 +51099,8 @@ cont { scale: 19 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51635,7 +51109,7 @@ cont { stroke_color: 16777215 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51728,7 +51202,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51747,7 +51221,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51766,7 +51240,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51785,7 +51259,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51823,7 +51297,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51842,7 +51316,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51880,7 +51354,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51899,7 +51373,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51937,7 +51411,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51956,7 +51430,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51975,7 +51449,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51994,7 +51468,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52013,7 +51487,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52032,7 +51506,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52051,7 +51525,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52070,7 +51544,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52149,7 +51623,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52168,7 +51642,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52187,7 +51661,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52206,7 +51680,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52244,7 +51718,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52263,7 +51737,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52301,7 +51775,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52320,7 +51794,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52358,7 +51832,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52377,7 +51851,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52396,7 +51870,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52415,7 +51889,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52434,7 +51908,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52453,7 +51927,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52472,7 +51946,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52491,7 +51965,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52570,7 +52044,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52589,7 +52063,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52608,7 +52082,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52627,7 +52101,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52665,7 +52139,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52684,7 +52158,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52722,7 +52196,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52741,7 +52215,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52779,7 +52253,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52798,7 +52272,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52817,7 +52291,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52836,7 +52310,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52855,7 +52329,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52874,7 +52348,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52893,7 +52367,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52912,7 +52386,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52991,7 +52465,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53010,7 +52484,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53029,7 +52503,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53048,7 +52522,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53086,7 +52560,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53105,7 +52579,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53143,7 +52617,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53162,7 +52636,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53200,7 +52674,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53219,7 +52693,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53238,7 +52712,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53257,7 +52731,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53276,7 +52750,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53295,7 +52769,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53314,7 +52788,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53333,7 +52807,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53412,7 +52886,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53431,7 +52905,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53450,7 +52924,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53469,7 +52943,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53507,7 +52981,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53526,7 +53000,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53564,7 +53038,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53583,7 +53057,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53621,7 +53095,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53640,7 +53114,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53659,7 +53133,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53678,7 +53152,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53697,7 +53171,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53716,7 +53190,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53735,7 +53209,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53754,7 +53228,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53833,7 +53307,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53852,7 +53326,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53871,7 +53345,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53890,7 +53364,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53928,7 +53402,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53947,7 +53421,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53985,7 +53459,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54004,7 +53478,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54042,7 +53516,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54061,7 +53535,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54080,7 +53554,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54099,7 +53573,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54118,7 +53592,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54137,7 +53611,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54156,7 +53630,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54175,7 +53649,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54254,7 +53728,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54273,7 +53747,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54292,7 +53766,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54311,7 +53785,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54349,7 +53823,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54368,7 +53842,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54406,7 +53880,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54425,7 +53899,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54463,7 +53937,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54482,7 +53956,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54501,7 +53975,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54520,7 +53994,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54539,7 +54013,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54558,7 +54032,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54577,7 +54051,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54596,7 +54070,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -55008,7 +54482,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55019,7 +54493,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55030,7 +54504,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55041,7 +54515,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55052,7 +54526,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55063,7 +54537,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } element { @@ -55074,22 +54548,12 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15495 + priority: 15509 } } } cont { name: "place-island" - element { - scale: 9 - caption { - primary { - height: 8 - color: 8355711 - } - priority: 15000 - } - } element { scale: 10 caption { @@ -55644,7 +55108,7 @@ cont { height: 14 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55654,7 +55118,7 @@ cont { height: 14 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55664,7 +55128,7 @@ cont { height: 15 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55674,7 +55138,7 @@ cont { height: 16 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55684,7 +55148,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55694,7 +55158,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55704,7 +55168,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55714,7 +55178,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55724,7 +55188,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55734,7 +55198,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55744,7 +55208,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55754,7 +55218,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55764,7 +55228,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55774,7 +55238,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55784,7 +55248,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55794,7 +55258,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55804,7 +55268,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55814,7 +55278,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55824,7 +55288,7 @@ cont { height: 18 color: 4495803 } - priority: 15961 + priority: 15962 } } } @@ -55837,7 +55301,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55847,7 +55311,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55857,7 +55321,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55867,7 +55331,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55877,7 +55341,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55887,7 +55351,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55897,7 +55361,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55907,7 +55371,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55917,7 +55381,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55927,7 +55391,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55937,7 +55401,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55947,7 +55411,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55957,7 +55421,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55967,7 +55431,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55977,7 +55441,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } element { @@ -55987,7 +55451,7 @@ cont { height: 12 color: 4495803 } - priority: 15961 + priority: 15962 } } } @@ -55997,7 +55461,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -56007,14 +55471,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -56024,14 +55488,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56041,14 +55505,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56058,14 +55522,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56075,14 +55539,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56092,7 +55556,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -56105,7 +55569,7 @@ cont { height: 11 color: 9211020 } - priority: 15485 + priority: 15500 } } element { @@ -56121,7 +55585,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56137,7 +55601,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56153,7 +55617,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56169,7 +55633,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } } @@ -56182,7 +55646,7 @@ cont { height: 11 color: 9211020 } - priority: 15485 + priority: 15500 } } element { @@ -56192,7 +55656,7 @@ cont { height: 11 color: 9211020 } - priority: 15485 + priority: 15500 } } element { @@ -56208,7 +55672,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56224,7 +55688,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56240,7 +55704,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56256,7 +55720,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } } @@ -56340,7 +55804,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=40000" } @@ -56357,7 +55821,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=20000" } @@ -56376,7 +55840,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=0" } @@ -56395,7 +55859,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=0" } @@ -56414,7 +55878,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56433,7 +55897,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56452,7 +55916,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56471,7 +55935,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56490,7 +55954,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56509,7 +55973,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56528,7 +55992,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56547,7 +56011,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56569,7 +56033,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56587,7 +56051,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56605,7 +56069,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56623,7 +56087,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56641,7 +56105,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56659,7 +56123,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56677,7 +56141,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56695,7 +56159,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56713,7 +56177,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } } @@ -56724,7 +56188,7 @@ cont { lines { width: 1.0 color: 1721144710 - priority: 1571 + priority: 1584 } } } @@ -56734,7 +56198,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56743,14 +56207,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56759,14 +56223,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56775,7 +56239,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -56785,7 +56249,7 @@ cont { scale: 19 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56794,7 +56258,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -56804,6 +56268,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56811,6 +56276,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56818,6 +56284,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56825,6 +56292,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56835,49 +56303,49 @@ cont { scale: 16 area { color: 15591638 - priority: -15886 + priority: -15868 } } element { scale: 17 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } } @@ -56892,7 +56360,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -56904,7 +56372,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -56916,7 +56384,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -56928,7 +56396,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -56950,7 +56418,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -56969,7 +56437,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -56988,7 +56456,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57007,7 +56475,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57022,7 +56490,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57034,7 +56502,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57046,7 +56514,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57058,7 +56526,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57073,7 +56541,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57085,7 +56553,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57097,7 +56565,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57109,7 +56577,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } } @@ -57124,7 +56592,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57136,7 +56604,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57148,7 +56616,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57160,7 +56628,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } } @@ -57386,7 +56854,8 @@ cont { scale: 13 symbol { name: "train-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57404,14 +56873,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 14 symbol { name: "train-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57429,14 +56899,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 15 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57454,14 +56925,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 16 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57479,14 +56951,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 17 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57504,14 +56977,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 18 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57529,14 +57003,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 19 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57554,7 +57029,7 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } } @@ -57564,21 +57039,24 @@ cont { scale: 17 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 18 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 19 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } } @@ -57589,7 +57067,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57598,7 +57076,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57607,7 +57085,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57616,7 +57094,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -57625,7 +57103,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -57633,7 +57111,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57642,7 +57120,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -57650,7 +57128,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57659,7 +57137,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -57667,7 +57145,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57676,7 +57154,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -57687,7 +57165,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57698,13 +57176,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57715,13 +57193,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57732,7 +57210,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57740,13 +57218,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -57755,7 +57233,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -57765,7 +57243,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57773,13 +57251,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57788,7 +57266,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -57798,7 +57276,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57806,13 +57284,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57821,7 +57299,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -57831,7 +57309,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57839,13 +57317,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57854,7 +57332,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -57865,7 +57343,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57874,7 +57352,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57883,7 +57361,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57891,7 +57369,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57899,7 +57377,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57907,7 +57385,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -57918,7 +57396,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57927,7 +57405,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57936,7 +57414,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57944,7 +57422,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57952,7 +57430,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57960,7 +57438,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -57971,7 +57449,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57980,7 +57458,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57989,7 +57467,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -57997,7 +57475,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58005,7 +57483,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58013,7 +57491,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58024,7 +57502,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58033,7 +57511,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58041,7 +57519,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58049,7 +57527,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58057,7 +57535,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58068,7 +57546,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58077,7 +57555,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58085,7 +57563,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58093,7 +57571,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58101,7 +57579,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58112,7 +57590,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58121,7 +57599,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58129,7 +57607,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58137,7 +57615,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } element { @@ -58145,7 +57623,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1457 + priority: 1471 } } } @@ -58155,56 +57633,56 @@ cont { scale: 16 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 15591638 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 6381914 } - priority: 15114 + priority: 15132 } } } @@ -58219,7 +57697,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58231,7 +57709,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58243,7 +57721,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58255,7 +57733,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58277,7 +57755,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58296,7 +57774,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58315,7 +57793,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58334,7 +57812,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58349,7 +57827,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58361,7 +57839,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58373,7 +57851,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58385,7 +57863,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58396,7 +57874,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58406,7 +57884,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58416,7 +57894,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58425,7 +57903,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58434,7 +57912,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58443,7 +57921,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58452,7 +57930,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58460,7 +57938,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58469,7 +57947,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58477,7 +57955,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58486,7 +57964,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58494,7 +57972,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58503,7 +57981,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58514,7 +57992,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58524,7 +58002,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58534,7 +58012,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58545,13 +58023,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58562,13 +58040,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58579,7 +58057,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58587,13 +58065,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58602,7 +58080,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58612,7 +58090,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58620,13 +58098,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58635,7 +58113,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58645,7 +58123,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58653,13 +58131,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58668,7 +58146,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58678,7 +58156,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58686,13 +58164,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58701,7 +58179,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58712,7 +58190,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58722,7 +58200,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58732,7 +58210,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58741,7 +58219,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58750,7 +58228,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58759,7 +58237,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58768,7 +58246,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58776,7 +58254,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58785,7 +58263,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58793,7 +58271,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58802,7 +58280,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58810,7 +58288,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58819,7 +58297,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58830,7 +58308,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58840,7 +58318,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58850,7 +58328,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58863,13 +58341,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58882,13 +58360,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58901,13 +58379,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58916,7 +58394,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58928,13 +58406,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58943,7 +58421,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58955,13 +58433,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58970,7 +58448,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58982,13 +58460,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58997,7 +58475,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -59007,6 +58485,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59032,6 +58511,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59057,6 +58537,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59082,6 +58563,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59107,6 +58589,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59132,6 +58615,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59157,6 +58641,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59182,6 +58667,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59210,6 +58696,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59235,6 +58722,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59260,6 +58748,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59285,6 +58774,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59310,6 +58800,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59335,6 +58826,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59360,6 +58852,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59385,6 +58878,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59413,6 +58907,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59438,6 +58933,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59463,6 +58959,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59488,6 +58985,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59513,6 +59011,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59538,6 +59037,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59563,6 +59063,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59588,6 +59089,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59616,6 +59118,7 @@ cont { scale: 13 symbol { name: "subway-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59624,6 +59127,7 @@ cont { scale: 14 symbol { name: "subway-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59650,6 +59154,7 @@ cont { scale: 15 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59675,6 +59180,7 @@ cont { scale: 16 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59700,6 +59206,7 @@ cont { scale: 17 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59725,6 +59232,7 @@ cont { scale: 18 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59750,6 +59258,7 @@ cont { scale: 19 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59778,6 +59287,7 @@ cont { scale: 12 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59786,6 +59296,7 @@ cont { scale: 13 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59794,6 +59305,7 @@ cont { scale: 14 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59820,6 +59332,7 @@ cont { scale: 15 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59845,6 +59358,7 @@ cont { scale: 16 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59870,6 +59384,7 @@ cont { scale: 17 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59895,6 +59410,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59920,6 +59436,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59948,6 +59465,7 @@ cont { scale: 12 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59956,6 +59474,7 @@ cont { scale: 13 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59964,6 +59483,7 @@ cont { scale: 14 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59990,6 +59510,7 @@ cont { scale: 15 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60015,6 +59536,7 @@ cont { scale: 16 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60040,6 +59562,7 @@ cont { scale: 17 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60065,6 +59588,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60090,6 +59614,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60118,6 +59643,7 @@ cont { scale: 12 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60126,6 +59652,7 @@ cont { scale: 13 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60134,6 +59661,7 @@ cont { scale: 14 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60160,6 +59688,7 @@ cont { scale: 15 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60185,6 +59714,7 @@ cont { scale: 16 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60210,6 +59740,7 @@ cont { scale: 17 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60235,6 +59766,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60260,6 +59792,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60288,6 +59821,7 @@ cont { scale: 12 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60296,6 +59830,7 @@ cont { scale: 13 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60304,6 +59839,7 @@ cont { scale: 14 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60330,6 +59866,7 @@ cont { scale: 15 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60355,6 +59892,7 @@ cont { scale: 16 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60380,6 +59918,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60405,6 +59944,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60430,6 +59970,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60458,6 +59999,7 @@ cont { scale: 13 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60466,6 +60008,7 @@ cont { scale: 14 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60492,6 +60035,7 @@ cont { scale: 15 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60517,6 +60061,7 @@ cont { scale: 16 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60542,6 +60087,7 @@ cont { scale: 17 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60567,6 +60113,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60592,6 +60139,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60620,6 +60168,7 @@ cont { scale: 13 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60628,6 +60177,7 @@ cont { scale: 14 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60654,6 +60204,7 @@ cont { scale: 15 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60679,6 +60230,7 @@ cont { scale: 16 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60704,6 +60256,7 @@ cont { scale: 17 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60729,6 +60282,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60754,6 +60308,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60782,6 +60337,7 @@ cont { scale: 13 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60790,6 +60346,7 @@ cont { scale: 14 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60816,6 +60373,7 @@ cont { scale: 15 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60841,6 +60399,7 @@ cont { scale: 16 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60866,6 +60425,7 @@ cont { scale: 17 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60891,6 +60451,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60916,6 +60477,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60944,6 +60506,7 @@ cont { scale: 13 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60952,6 +60515,7 @@ cont { scale: 14 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60978,6 +60542,7 @@ cont { scale: 15 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61003,6 +60568,7 @@ cont { scale: 16 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61028,6 +60594,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61053,6 +60620,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61078,6 +60646,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61106,6 +60675,7 @@ cont { scale: 12 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61114,6 +60684,7 @@ cont { scale: 13 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61122,6 +60693,7 @@ cont { scale: 14 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61148,6 +60720,7 @@ cont { scale: 15 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61173,6 +60746,7 @@ cont { scale: 16 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61198,6 +60772,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61223,6 +60798,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61248,6 +60824,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61276,6 +60853,7 @@ cont { scale: 12 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61284,6 +60862,7 @@ cont { scale: 13 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61292,6 +60871,7 @@ cont { scale: 14 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61318,6 +60898,7 @@ cont { scale: 15 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61343,6 +60924,7 @@ cont { scale: 16 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61368,6 +60950,7 @@ cont { scale: 17 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61393,6 +60976,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61418,6 +61002,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61446,6 +61031,7 @@ cont { scale: 13 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61454,6 +61040,7 @@ cont { scale: 14 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61480,6 +61067,7 @@ cont { scale: 15 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61505,6 +61093,7 @@ cont { scale: 16 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61530,6 +61119,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61555,6 +61145,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61580,6 +61171,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61608,6 +61200,7 @@ cont { scale: 12 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61616,6 +61209,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61624,6 +61218,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61650,6 +61245,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61675,6 +61271,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61700,6 +61297,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61725,6 +61323,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61750,168 +61349,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } -} -cont { - name: "railway-station-subway-bilbao" - element { - scale: 13 - symbol { - name: "subway-bilbao-s" - priority: 16952 - min_distance: 1 - } - } - element { - scale: 14 - symbol { - name: "subway-bilbao-s" - priority: 16952 - min_distance: 1 - } - caption { - primary { - height: 11 - color: 2236962 - stroke_color: 1308622847 - offset_y: 1 - is_optional: true - } - secondary { - height: 9 - color: 2236962 - stroke_color: 1308622847 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 15 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 12 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - secondary { - height: 10 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 16 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 872415231 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 17 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 18 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 2236962 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 19 - symbol { - name: "subway-bilbao-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61940,6 +61378,7 @@ cont { scale: 13 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61948,6 +61387,7 @@ cont { scale: 14 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61974,6 +61414,7 @@ cont { scale: 15 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61999,6 +61440,7 @@ cont { scale: 16 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62024,6 +61466,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62049,6 +61492,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62074,6 +61518,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62102,6 +61547,7 @@ cont { scale: 13 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62110,6 +61556,7 @@ cont { scale: 14 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62136,6 +61583,7 @@ cont { scale: 15 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62161,6 +61609,7 @@ cont { scale: 16 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62186,6 +61635,7 @@ cont { scale: 17 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62211,6 +61661,7 @@ cont { scale: 18 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62236,6 +61687,7 @@ cont { scale: 19 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62264,6 +61716,7 @@ cont { scale: 13 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62272,6 +61725,7 @@ cont { scale: 14 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62298,6 +61752,7 @@ cont { scale: 15 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62323,6 +61778,7 @@ cont { scale: 16 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62348,6 +61804,7 @@ cont { scale: 17 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62373,6 +61830,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62398,6 +61856,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62426,6 +61885,7 @@ cont { scale: 13 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62434,6 +61894,7 @@ cont { scale: 14 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62460,6 +61921,7 @@ cont { scale: 15 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62485,6 +61947,7 @@ cont { scale: 16 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62510,6 +61973,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62535,6 +61999,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62560,6 +62025,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62588,6 +62054,7 @@ cont { scale: 13 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62596,6 +62063,7 @@ cont { scale: 14 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62622,6 +62090,7 @@ cont { scale: 15 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62647,6 +62116,7 @@ cont { scale: 16 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62672,6 +62142,7 @@ cont { scale: 17 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62697,6 +62168,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62722,6 +62194,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62750,6 +62223,7 @@ cont { scale: 12 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62758,6 +62232,7 @@ cont { scale: 13 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62766,6 +62241,7 @@ cont { scale: 14 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62792,6 +62268,7 @@ cont { scale: 15 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62817,6 +62294,7 @@ cont { scale: 16 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62842,6 +62320,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62867,6 +62346,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62892,6 +62372,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62920,6 +62401,7 @@ cont { scale: 13 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62928,6 +62410,7 @@ cont { scale: 14 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62954,6 +62437,7 @@ cont { scale: 15 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62979,6 +62463,7 @@ cont { scale: 16 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63004,6 +62489,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63029,6 +62515,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63054,6 +62541,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63082,6 +62570,7 @@ cont { scale: 13 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63090,6 +62579,7 @@ cont { scale: 14 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63116,6 +62606,7 @@ cont { scale: 15 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63141,6 +62632,7 @@ cont { scale: 16 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63166,6 +62658,7 @@ cont { scale: 17 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63191,6 +62684,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63216,6 +62710,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63244,6 +62739,7 @@ cont { scale: 13 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63252,6 +62748,7 @@ cont { scale: 14 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63278,6 +62775,7 @@ cont { scale: 15 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63303,6 +62801,7 @@ cont { scale: 16 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63328,6 +62827,7 @@ cont { scale: 17 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63353,6 +62853,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63378,6 +62879,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63406,6 +62908,7 @@ cont { scale: 13 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63414,6 +62917,7 @@ cont { scale: 14 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63440,6 +62944,7 @@ cont { scale: 15 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63465,6 +62970,7 @@ cont { scale: 16 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63490,6 +62996,7 @@ cont { scale: 17 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63515,6 +63022,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63540,6 +63048,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63568,6 +63077,7 @@ cont { scale: 13 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63576,6 +63086,7 @@ cont { scale: 14 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63602,6 +63113,7 @@ cont { scale: 15 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63627,6 +63139,7 @@ cont { scale: 16 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63652,6 +63165,7 @@ cont { scale: 17 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63677,6 +63191,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63702,6 +63217,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63730,6 +63246,7 @@ cont { scale: 13 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63738,6 +63255,7 @@ cont { scale: 14 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63764,6 +63282,7 @@ cont { scale: 15 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63789,6 +63308,7 @@ cont { scale: 16 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63814,6 +63334,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63839,6 +63360,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63864,6 +63386,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63892,6 +63415,7 @@ cont { scale: 13 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63900,6 +63424,7 @@ cont { scale: 14 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63926,6 +63451,7 @@ cont { scale: 15 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63951,6 +63477,7 @@ cont { scale: 16 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63976,6 +63503,7 @@ cont { scale: 17 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64001,6 +63529,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64026,6 +63555,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64054,6 +63584,7 @@ cont { scale: 13 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64062,6 +63593,7 @@ cont { scale: 14 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64088,6 +63620,7 @@ cont { scale: 15 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64113,6 +63646,7 @@ cont { scale: 16 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64138,6 +63672,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64163,6 +63698,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64188,6 +63724,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64216,6 +63753,7 @@ cont { scale: 13 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64224,6 +63762,7 @@ cont { scale: 14 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64250,6 +63789,7 @@ cont { scale: 15 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64275,6 +63815,7 @@ cont { scale: 16 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64300,6 +63841,7 @@ cont { scale: 17 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64325,6 +63867,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64350,6 +63893,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64378,6 +63922,7 @@ cont { scale: 13 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64386,6 +63931,7 @@ cont { scale: 14 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64412,6 +63958,7 @@ cont { scale: 15 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64437,6 +63984,7 @@ cont { scale: 16 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64462,6 +64010,7 @@ cont { scale: 17 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64487,6 +64036,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64512,6 +64062,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64540,6 +64091,7 @@ cont { scale: 13 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64548,6 +64100,7 @@ cont { scale: 14 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64574,6 +64127,7 @@ cont { scale: 15 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64599,6 +64153,7 @@ cont { scale: 16 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64624,6 +64179,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64649,6 +64205,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64674,6 +64231,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64702,6 +64260,7 @@ cont { scale: 13 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64710,6 +64269,7 @@ cont { scale: 14 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64736,6 +64296,7 @@ cont { scale: 15 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64761,6 +64322,7 @@ cont { scale: 16 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64786,6 +64348,7 @@ cont { scale: 17 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64811,6 +64374,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64836,6 +64400,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64864,6 +64429,7 @@ cont { scale: 13 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64872,6 +64438,7 @@ cont { scale: 14 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64898,6 +64465,7 @@ cont { scale: 15 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64923,6 +64491,7 @@ cont { scale: 16 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64948,6 +64517,7 @@ cont { scale: 17 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64973,6 +64543,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64998,6 +64569,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65026,6 +64598,7 @@ cont { scale: 13 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65034,6 +64607,7 @@ cont { scale: 14 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65060,6 +64634,7 @@ cont { scale: 15 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65085,6 +64660,7 @@ cont { scale: 16 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65110,6 +64686,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65135,6 +64712,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65160,6 +64738,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65188,6 +64767,7 @@ cont { scale: 13 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65196,6 +64776,7 @@ cont { scale: 14 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65222,6 +64803,7 @@ cont { scale: 15 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65247,6 +64829,7 @@ cont { scale: 16 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65272,6 +64855,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65297,6 +64881,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65322,6 +64907,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65350,6 +64936,7 @@ cont { scale: 13 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65358,6 +64945,7 @@ cont { scale: 14 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65384,6 +64972,7 @@ cont { scale: 15 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65409,6 +64998,7 @@ cont { scale: 16 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65434,6 +65024,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65459,6 +65050,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65484,6 +65076,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65512,6 +65105,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65520,6 +65114,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65546,6 +65141,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65571,6 +65167,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65596,6 +65193,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65621,6 +65219,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65646,6 +65245,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65674,6 +65274,7 @@ cont { scale: 13 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65682,6 +65283,7 @@ cont { scale: 14 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65708,6 +65310,7 @@ cont { scale: 15 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65733,6 +65336,7 @@ cont { scale: 16 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65758,6 +65362,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65783,6 +65388,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65808,6 +65414,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65836,6 +65443,7 @@ cont { scale: 13 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65844,6 +65452,7 @@ cont { scale: 14 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65870,6 +65479,7 @@ cont { scale: 15 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65895,6 +65505,7 @@ cont { scale: 16 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65920,6 +65531,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65945,6 +65557,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65970,6 +65583,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65998,6 +65612,7 @@ cont { scale: 13 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66006,6 +65621,7 @@ cont { scale: 14 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66032,6 +65648,7 @@ cont { scale: 15 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66057,6 +65674,7 @@ cont { scale: 16 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66082,6 +65700,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66107,6 +65726,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66132,6 +65752,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66160,6 +65781,7 @@ cont { scale: 12 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66168,6 +65790,7 @@ cont { scale: 13 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66176,6 +65799,7 @@ cont { scale: 14 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66202,6 +65826,7 @@ cont { scale: 15 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66227,6 +65852,7 @@ cont { scale: 16 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66252,6 +65878,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66277,6 +65904,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66302,6 +65930,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66330,6 +65959,7 @@ cont { scale: 13 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66338,6 +65968,7 @@ cont { scale: 14 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66364,6 +65995,7 @@ cont { scale: 15 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66389,6 +66021,7 @@ cont { scale: 16 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66414,6 +66047,7 @@ cont { scale: 17 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66439,6 +66073,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66464,6 +66099,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66492,6 +66128,7 @@ cont { scale: 13 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66500,6 +66137,7 @@ cont { scale: 14 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66526,6 +66164,7 @@ cont { scale: 15 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66551,6 +66190,7 @@ cont { scale: 16 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66576,6 +66216,7 @@ cont { scale: 17 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66601,6 +66242,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66626,6 +66268,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66654,6 +66297,7 @@ cont { scale: 13 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66662,6 +66306,7 @@ cont { scale: 14 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66688,6 +66333,7 @@ cont { scale: 15 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66713,6 +66359,7 @@ cont { scale: 16 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66738,6 +66385,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66763,6 +66411,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66788,6 +66437,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66816,6 +66466,7 @@ cont { scale: 12 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66833,6 +66484,7 @@ cont { scale: 13 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66851,6 +66503,7 @@ cont { scale: 14 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66877,6 +66530,7 @@ cont { scale: 15 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66902,6 +66556,7 @@ cont { scale: 16 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66927,6 +66582,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -66950,6 +66606,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -66973,6 +66630,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -66999,6 +66657,7 @@ cont { scale: 13 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67007,6 +66666,7 @@ cont { scale: 14 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67033,6 +66693,7 @@ cont { scale: 15 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67058,6 +66719,7 @@ cont { scale: 16 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67083,6 +66745,7 @@ cont { scale: 17 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67108,6 +66771,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67133,6 +66797,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67161,6 +66826,7 @@ cont { scale: 13 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67169,6 +66835,7 @@ cont { scale: 14 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67195,6 +66862,7 @@ cont { scale: 15 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67220,6 +66888,7 @@ cont { scale: 16 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67245,6 +66914,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67270,6 +66940,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67295,6 +66966,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67323,6 +66995,7 @@ cont { scale: 13 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67331,6 +67004,7 @@ cont { scale: 14 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67357,6 +67031,7 @@ cont { scale: 15 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67382,6 +67057,7 @@ cont { scale: 16 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67407,6 +67083,7 @@ cont { scale: 17 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67432,6 +67109,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67457,6 +67135,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67485,6 +67164,7 @@ cont { scale: 13 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67493,6 +67173,7 @@ cont { scale: 14 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67519,6 +67200,7 @@ cont { scale: 15 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67544,6 +67226,7 @@ cont { scale: 16 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67569,6 +67252,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67594,6 +67278,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67619,6 +67304,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67647,6 +67333,7 @@ cont { scale: 12 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67655,6 +67342,7 @@ cont { scale: 13 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67663,6 +67351,7 @@ cont { scale: 14 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67689,6 +67378,7 @@ cont { scale: 15 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67714,6 +67404,7 @@ cont { scale: 16 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67739,6 +67430,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67764,6 +67456,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67789,6 +67482,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67817,6 +67511,7 @@ cont { scale: 13 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67825,6 +67520,7 @@ cont { scale: 14 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67851,6 +67547,7 @@ cont { scale: 15 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67876,6 +67573,7 @@ cont { scale: 16 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67901,6 +67599,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67926,6 +67625,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67951,6 +67651,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67979,6 +67680,7 @@ cont { scale: 13 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67987,6 +67689,7 @@ cont { scale: 14 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68013,6 +67716,7 @@ cont { scale: 15 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68038,6 +67742,7 @@ cont { scale: 16 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68063,6 +67768,7 @@ cont { scale: 17 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68088,6 +67794,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68113,6 +67820,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68141,6 +67849,7 @@ cont { scale: 13 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68149,6 +67858,7 @@ cont { scale: 14 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68175,6 +67885,7 @@ cont { scale: 15 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68200,6 +67911,7 @@ cont { scale: 16 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68225,6 +67937,7 @@ cont { scale: 17 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68250,6 +67963,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68275,6 +67989,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68303,6 +68018,7 @@ cont { scale: 12 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68311,6 +68027,7 @@ cont { scale: 13 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68319,6 +68036,7 @@ cont { scale: 14 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68345,6 +68063,7 @@ cont { scale: 15 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68370,6 +68089,7 @@ cont { scale: 16 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68395,6 +68115,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68420,6 +68141,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68445,6 +68167,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68473,6 +68196,7 @@ cont { scale: 12 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68481,6 +68205,7 @@ cont { scale: 13 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68489,6 +68214,7 @@ cont { scale: 14 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68515,6 +68241,7 @@ cont { scale: 15 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68540,6 +68267,7 @@ cont { scale: 16 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68565,6 +68293,7 @@ cont { scale: 17 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68590,6 +68319,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68615,6 +68345,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68643,6 +68374,7 @@ cont { scale: 13 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68651,6 +68383,7 @@ cont { scale: 14 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68677,6 +68410,7 @@ cont { scale: 15 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68702,6 +68436,7 @@ cont { scale: 16 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68727,6 +68462,7 @@ cont { scale: 17 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68752,6 +68488,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68777,6 +68514,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68805,6 +68543,7 @@ cont { scale: 12 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68813,6 +68552,7 @@ cont { scale: 13 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68821,6 +68561,7 @@ cont { scale: 14 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68847,6 +68588,7 @@ cont { scale: 15 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68872,6 +68614,7 @@ cont { scale: 16 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68897,6 +68640,7 @@ cont { scale: 17 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68922,6 +68666,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68947,6 +68692,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68975,6 +68721,7 @@ cont { scale: 13 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68983,6 +68730,7 @@ cont { scale: 14 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69009,6 +68757,7 @@ cont { scale: 15 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69034,6 +68783,7 @@ cont { scale: 16 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69059,6 +68809,7 @@ cont { scale: 17 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69084,6 +68835,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69109,6 +68861,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69137,6 +68890,7 @@ cont { scale: 13 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69145,6 +68899,7 @@ cont { scale: 14 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69171,6 +68926,7 @@ cont { scale: 15 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69196,6 +68952,7 @@ cont { scale: 16 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69221,6 +68978,7 @@ cont { scale: 17 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69246,6 +69004,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69271,6 +69030,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69299,6 +69059,7 @@ cont { scale: 13 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69307,6 +69068,7 @@ cont { scale: 14 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69333,6 +69095,7 @@ cont { scale: 15 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69358,6 +69121,7 @@ cont { scale: 16 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69383,6 +69147,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69408,6 +69173,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69433,6 +69199,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69461,6 +69228,7 @@ cont { scale: 13 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69469,6 +69237,7 @@ cont { scale: 14 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69495,6 +69264,7 @@ cont { scale: 15 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69520,6 +69290,7 @@ cont { scale: 16 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69545,6 +69316,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69570,6 +69342,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69595,6 +69368,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69623,6 +69397,7 @@ cont { scale: 13 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69631,6 +69406,7 @@ cont { scale: 14 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69657,6 +69433,7 @@ cont { scale: 15 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69682,6 +69459,7 @@ cont { scale: 16 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69707,6 +69485,7 @@ cont { scale: 17 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69732,6 +69511,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69757,6 +69537,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69785,6 +69566,7 @@ cont { scale: 13 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69793,6 +69575,7 @@ cont { scale: 14 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69819,6 +69602,7 @@ cont { scale: 15 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69844,6 +69628,7 @@ cont { scale: 16 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69869,6 +69654,7 @@ cont { scale: 17 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69894,6 +69680,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69919,6 +69706,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69947,6 +69735,7 @@ cont { scale: 12 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69955,6 +69744,7 @@ cont { scale: 13 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69963,6 +69753,7 @@ cont { scale: 14 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69989,6 +69780,7 @@ cont { scale: 15 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70014,6 +69806,7 @@ cont { scale: 16 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70039,6 +69832,7 @@ cont { scale: 17 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70064,6 +69858,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70089,6 +69884,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70117,6 +69913,7 @@ cont { scale: 13 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70125,6 +69922,7 @@ cont { scale: 14 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70151,6 +69949,7 @@ cont { scale: 15 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70176,6 +69975,7 @@ cont { scale: 16 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70201,6 +70001,7 @@ cont { scale: 17 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70226,6 +70027,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70251,6 +70053,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70279,6 +70082,7 @@ cont { scale: 12 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70296,6 +70100,7 @@ cont { scale: 13 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70314,6 +70119,7 @@ cont { scale: 14 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70340,6 +70146,7 @@ cont { scale: 15 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70365,6 +70172,7 @@ cont { scale: 16 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70388,6 +70196,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70411,6 +70220,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70434,6 +70244,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70460,6 +70271,7 @@ cont { scale: 13 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70468,6 +70280,7 @@ cont { scale: 14 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70494,6 +70307,7 @@ cont { scale: 15 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70519,6 +70333,7 @@ cont { scale: 16 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70544,6 +70359,7 @@ cont { scale: 17 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70569,6 +70385,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70594,6 +70411,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70622,6 +70440,7 @@ cont { scale: 11 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70630,6 +70449,7 @@ cont { scale: 12 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70656,6 +70476,7 @@ cont { scale: 13 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70682,6 +70503,7 @@ cont { scale: 14 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70708,6 +70530,7 @@ cont { scale: 15 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70733,6 +70556,7 @@ cont { scale: 16 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70740,6 +70564,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70747,6 +70572,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70754,6 +70580,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70764,6 +70591,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70772,6 +70600,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70798,6 +70627,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70823,6 +70653,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70848,6 +70679,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70873,6 +70705,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70898,6 +70731,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70926,6 +70760,7 @@ cont { scale: 13 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70934,6 +70769,7 @@ cont { scale: 14 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70960,6 +70796,7 @@ cont { scale: 15 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70985,6 +70822,7 @@ cont { scale: 16 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71010,6 +70848,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71035,6 +70874,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71060,6 +70900,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71088,6 +70929,7 @@ cont { scale: 12 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71096,6 +70938,7 @@ cont { scale: 13 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71104,6 +70947,7 @@ cont { scale: 14 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71130,6 +70974,7 @@ cont { scale: 15 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71155,6 +71000,7 @@ cont { scale: 16 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71180,6 +71026,7 @@ cont { scale: 17 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71205,6 +71052,7 @@ cont { scale: 18 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71230,6 +71078,7 @@ cont { scale: 19 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71258,6 +71107,7 @@ cont { scale: 13 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71266,6 +71116,7 @@ cont { scale: 14 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71292,6 +71143,7 @@ cont { scale: 15 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71317,6 +71169,7 @@ cont { scale: 16 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71342,6 +71195,7 @@ cont { scale: 17 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71367,6 +71221,7 @@ cont { scale: 18 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71392,6 +71247,7 @@ cont { scale: 19 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71420,6 +71276,7 @@ cont { scale: 13 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71428,6 +71285,7 @@ cont { scale: 14 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71454,6 +71312,7 @@ cont { scale: 15 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71479,6 +71338,7 @@ cont { scale: 16 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71504,6 +71364,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71529,6 +71390,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71554,6 +71416,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71582,6 +71445,7 @@ cont { scale: 13 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71590,6 +71454,7 @@ cont { scale: 14 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71616,6 +71481,7 @@ cont { scale: 15 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71641,6 +71507,7 @@ cont { scale: 16 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71666,6 +71533,7 @@ cont { scale: 17 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71691,6 +71559,7 @@ cont { scale: 18 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71716,6 +71585,7 @@ cont { scale: 19 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71744,6 +71614,7 @@ cont { scale: 13 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71752,6 +71623,7 @@ cont { scale: 14 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71778,6 +71650,7 @@ cont { scale: 15 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71803,6 +71676,7 @@ cont { scale: 16 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71828,6 +71702,7 @@ cont { scale: 17 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71853,6 +71728,7 @@ cont { scale: 18 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71878,6 +71754,7 @@ cont { scale: 19 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71906,6 +71783,7 @@ cont { scale: 13 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71914,6 +71792,7 @@ cont { scale: 14 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71940,6 +71819,7 @@ cont { scale: 15 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71965,6 +71845,7 @@ cont { scale: 16 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71990,6 +71871,7 @@ cont { scale: 17 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72015,6 +71897,7 @@ cont { scale: 18 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72040,6 +71923,7 @@ cont { scale: 19 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72068,6 +71952,7 @@ cont { scale: 13 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72076,6 +71961,7 @@ cont { scale: 14 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72102,6 +71988,7 @@ cont { scale: 15 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72127,6 +72014,7 @@ cont { scale: 16 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72152,6 +72040,7 @@ cont { scale: 17 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72177,6 +72066,7 @@ cont { scale: 18 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72202,6 +72092,7 @@ cont { scale: 19 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72230,6 +72121,7 @@ cont { scale: 12 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72238,6 +72130,7 @@ cont { scale: 13 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72246,6 +72139,7 @@ cont { scale: 14 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72272,6 +72166,7 @@ cont { scale: 15 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72297,6 +72192,7 @@ cont { scale: 16 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72322,6 +72218,7 @@ cont { scale: 17 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72347,6 +72244,7 @@ cont { scale: 18 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72372,6 +72270,7 @@ cont { scale: 19 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72400,6 +72299,7 @@ cont { scale: 13 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72408,6 +72308,7 @@ cont { scale: 14 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72434,6 +72335,7 @@ cont { scale: 15 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72459,6 +72361,7 @@ cont { scale: 16 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72484,6 +72387,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72509,6 +72413,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72534,6 +72439,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72562,6 +72468,7 @@ cont { scale: 13 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72570,6 +72477,7 @@ cont { scale: 14 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72596,6 +72504,7 @@ cont { scale: 15 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72621,6 +72530,7 @@ cont { scale: 16 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72646,6 +72556,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72671,6 +72582,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72696,6 +72608,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72724,6 +72637,7 @@ cont { scale: 13 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72732,6 +72646,7 @@ cont { scale: 14 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72758,6 +72673,7 @@ cont { scale: 15 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72783,6 +72699,7 @@ cont { scale: 16 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72808,6 +72725,7 @@ cont { scale: 17 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72833,6 +72751,7 @@ cont { scale: 18 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72858,6 +72777,7 @@ cont { scale: 19 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72886,6 +72806,7 @@ cont { scale: 13 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72894,6 +72815,7 @@ cont { scale: 14 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72920,6 +72842,7 @@ cont { scale: 15 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72945,6 +72868,7 @@ cont { scale: 16 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72970,6 +72894,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72995,6 +72920,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73020,6 +72946,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73048,6 +72975,7 @@ cont { scale: 12 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73056,6 +72984,7 @@ cont { scale: 13 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73064,6 +72993,7 @@ cont { scale: 14 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73090,6 +73020,7 @@ cont { scale: 15 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73115,6 +73046,7 @@ cont { scale: 16 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73140,6 +73072,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73163,6 +73096,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73186,6 +73120,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73212,6 +73147,7 @@ cont { scale: 13 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73220,6 +73156,7 @@ cont { scale: 14 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73246,6 +73183,7 @@ cont { scale: 15 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73271,6 +73209,7 @@ cont { scale: 16 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73296,6 +73235,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73321,6 +73261,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73346,6 +73287,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73374,6 +73316,7 @@ cont { scale: 13 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73382,6 +73325,7 @@ cont { scale: 14 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73408,6 +73352,7 @@ cont { scale: 15 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73433,6 +73378,7 @@ cont { scale: 16 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73458,6 +73404,7 @@ cont { scale: 17 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73483,6 +73430,7 @@ cont { scale: 18 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73508,6 +73456,7 @@ cont { scale: 19 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73536,6 +73485,7 @@ cont { scale: 13 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73544,6 +73494,7 @@ cont { scale: 14 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73570,6 +73521,7 @@ cont { scale: 15 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73595,6 +73547,7 @@ cont { scale: 16 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73620,6 +73573,7 @@ cont { scale: 17 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73645,6 +73599,7 @@ cont { scale: 18 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73670,6 +73625,7 @@ cont { scale: 19 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73698,6 +73654,7 @@ cont { scale: 13 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73706,6 +73663,7 @@ cont { scale: 14 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73732,6 +73690,7 @@ cont { scale: 15 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73757,6 +73716,7 @@ cont { scale: 16 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73782,6 +73742,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73807,6 +73768,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73832,6 +73794,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73860,6 +73823,7 @@ cont { scale: 13 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73868,6 +73832,7 @@ cont { scale: 14 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73894,6 +73859,7 @@ cont { scale: 15 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73919,6 +73885,7 @@ cont { scale: 16 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73944,6 +73911,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73969,6 +73937,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73994,6 +73963,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74022,6 +73992,7 @@ cont { scale: 13 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74030,6 +74001,7 @@ cont { scale: 14 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74056,6 +74028,7 @@ cont { scale: 15 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74081,6 +74054,7 @@ cont { scale: 16 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74106,6 +74080,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74131,6 +74106,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74156,6 +74132,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74184,6 +74161,7 @@ cont { scale: 13 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74192,6 +74170,7 @@ cont { scale: 14 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74218,6 +74197,7 @@ cont { scale: 15 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74243,6 +74223,7 @@ cont { scale: 16 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74268,6 +74249,7 @@ cont { scale: 17 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74293,6 +74275,7 @@ cont { scale: 18 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74318,6 +74301,7 @@ cont { scale: 19 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74346,6 +74330,7 @@ cont { scale: 12 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74354,6 +74339,7 @@ cont { scale: 13 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74362,6 +74348,7 @@ cont { scale: 14 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74388,6 +74375,7 @@ cont { scale: 15 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74413,6 +74401,7 @@ cont { scale: 16 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74438,6 +74427,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74463,6 +74453,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74488,6 +74479,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74516,6 +74508,7 @@ cont { scale: 12 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74524,6 +74517,7 @@ cont { scale: 13 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74532,6 +74526,7 @@ cont { scale: 14 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74558,6 +74553,7 @@ cont { scale: 15 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74583,6 +74579,7 @@ cont { scale: 16 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74608,6 +74605,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74633,6 +74631,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74658,6 +74657,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74686,6 +74686,7 @@ cont { scale: 13 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74694,6 +74695,7 @@ cont { scale: 14 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74720,6 +74722,7 @@ cont { scale: 15 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74745,6 +74748,7 @@ cont { scale: 16 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74770,6 +74774,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74795,6 +74800,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74820,6 +74826,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74848,6 +74855,7 @@ cont { scale: 13 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74856,6 +74864,7 @@ cont { scale: 14 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74882,6 +74891,7 @@ cont { scale: 15 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74907,6 +74917,7 @@ cont { scale: 16 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74932,6 +74943,7 @@ cont { scale: 17 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74957,6 +74969,7 @@ cont { scale: 18 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74982,6 +74995,7 @@ cont { scale: 19 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75010,6 +75024,7 @@ cont { scale: 11 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75018,6 +75033,7 @@ cont { scale: 12 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 } caption { @@ -75043,6 +75059,7 @@ cont { scale: 13 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75069,6 +75086,7 @@ cont { scale: 14 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75095,6 +75113,7 @@ cont { scale: 15 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75120,6 +75139,7 @@ cont { scale: 16 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75143,6 +75163,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75150,6 +75171,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75157,6 +75179,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75167,6 +75190,7 @@ cont { scale: 12 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75175,6 +75199,7 @@ cont { scale: 13 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75183,6 +75208,7 @@ cont { scale: 14 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75209,6 +75235,7 @@ cont { scale: 15 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75234,6 +75261,7 @@ cont { scale: 16 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75259,6 +75287,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75284,6 +75313,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75309,6 +75339,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75337,6 +75368,7 @@ cont { scale: 13 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75345,6 +75377,7 @@ cont { scale: 14 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75371,6 +75404,7 @@ cont { scale: 15 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75396,6 +75430,7 @@ cont { scale: 16 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75421,6 +75456,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75446,6 +75482,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75471,6 +75508,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75499,6 +75537,7 @@ cont { scale: 13 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75507,6 +75546,7 @@ cont { scale: 14 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75533,6 +75573,7 @@ cont { scale: 15 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75558,6 +75599,7 @@ cont { scale: 16 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75583,6 +75625,7 @@ cont { scale: 17 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75608,6 +75651,7 @@ cont { scale: 18 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75633,6 +75677,7 @@ cont { scale: 19 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75661,6 +75706,7 @@ cont { scale: 13 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75669,6 +75715,7 @@ cont { scale: 14 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75695,6 +75742,7 @@ cont { scale: 15 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75720,6 +75768,7 @@ cont { scale: 16 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75745,6 +75794,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75770,6 +75820,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75795,6 +75846,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75823,6 +75875,7 @@ cont { scale: 13 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75831,6 +75884,7 @@ cont { scale: 14 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75857,6 +75911,7 @@ cont { scale: 15 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75882,6 +75937,7 @@ cont { scale: 16 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75907,6 +75963,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75932,6 +75989,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75957,6 +76015,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75985,6 +76044,7 @@ cont { scale: 13 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75993,6 +76053,7 @@ cont { scale: 14 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76019,6 +76080,7 @@ cont { scale: 15 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76044,6 +76106,7 @@ cont { scale: 16 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76069,6 +76132,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76094,6 +76158,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76119,6 +76184,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76147,6 +76213,7 @@ cont { scale: 13 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76155,6 +76222,7 @@ cont { scale: 14 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76181,6 +76249,7 @@ cont { scale: 15 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76206,6 +76275,7 @@ cont { scale: 16 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76231,6 +76301,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76256,6 +76327,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76281,6 +76353,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76309,6 +76382,7 @@ cont { scale: 12 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76317,6 +76391,7 @@ cont { scale: 13 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76325,6 +76400,7 @@ cont { scale: 14 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76351,6 +76427,7 @@ cont { scale: 15 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76376,6 +76453,7 @@ cont { scale: 16 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76401,6 +76479,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76426,6 +76505,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76451,6 +76531,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76479,6 +76560,7 @@ cont { scale: 13 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76487,6 +76569,7 @@ cont { scale: 14 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76513,6 +76596,7 @@ cont { scale: 15 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76538,6 +76622,7 @@ cont { scale: 16 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76563,6 +76648,7 @@ cont { scale: 17 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76588,6 +76674,7 @@ cont { scale: 18 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76613,6 +76700,7 @@ cont { scale: 19 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76641,6 +76729,7 @@ cont { scale: 12 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76649,6 +76738,7 @@ cont { scale: 13 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76657,6 +76747,7 @@ cont { scale: 14 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76683,6 +76774,7 @@ cont { scale: 15 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76708,6 +76800,7 @@ cont { scale: 16 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76733,6 +76826,7 @@ cont { scale: 17 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76758,6 +76852,7 @@ cont { scale: 18 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76783,6 +76878,7 @@ cont { scale: 19 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76811,6 +76907,7 @@ cont { scale: 13 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76819,6 +76916,7 @@ cont { scale: 14 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76845,6 +76943,7 @@ cont { scale: 15 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76870,6 +76969,7 @@ cont { scale: 16 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76895,6 +76995,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76920,6 +77021,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76945,6 +77047,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76973,6 +77076,7 @@ cont { scale: 13 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76981,6 +77085,7 @@ cont { scale: 14 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77007,6 +77112,7 @@ cont { scale: 15 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77032,6 +77138,7 @@ cont { scale: 16 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77057,6 +77164,7 @@ cont { scale: 17 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77082,6 +77190,7 @@ cont { scale: 18 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77107,6 +77216,7 @@ cont { scale: 19 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77135,6 +77245,7 @@ cont { scale: 13 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77143,6 +77254,7 @@ cont { scale: 14 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77169,6 +77281,7 @@ cont { scale: 15 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77194,6 +77307,7 @@ cont { scale: 16 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77219,6 +77333,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77244,6 +77359,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77269,6 +77385,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77297,6 +77414,7 @@ cont { scale: 13 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77305,6 +77423,7 @@ cont { scale: 14 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77331,6 +77450,7 @@ cont { scale: 15 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77356,6 +77476,7 @@ cont { scale: 16 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77381,6 +77502,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77406,6 +77528,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77431,6 +77554,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77459,6 +77583,7 @@ cont { scale: 13 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77467,6 +77592,7 @@ cont { scale: 14 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77493,6 +77619,7 @@ cont { scale: 15 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77518,6 +77645,7 @@ cont { scale: 16 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77543,6 +77671,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77568,6 +77697,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77593,6 +77723,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77622,7 +77753,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77631,7 +77762,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77640,7 +77771,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77649,7 +77780,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -77658,7 +77789,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -77666,7 +77797,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77675,7 +77806,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -77683,7 +77814,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77692,7 +77823,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -77700,7 +77831,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77709,7 +77840,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -77720,7 +77851,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77731,13 +77862,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77748,13 +77879,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77765,7 +77896,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77773,13 +77904,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -77788,7 +77919,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -77798,7 +77929,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77806,13 +77937,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77821,7 +77952,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -77831,7 +77962,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77839,13 +77970,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77854,7 +77985,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -77864,7 +77995,7 @@ cont { color: 8421504 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77872,13 +78003,13 @@ cont { color: 15592411 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77887,7 +78018,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -77910,14 +78041,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -77935,14 +78067,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -77960,14 +78093,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -77985,7 +78119,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78008,14 +78142,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-adana-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78033,14 +78168,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-adana-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78058,14 +78194,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-adana-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78083,7 +78220,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78106,14 +78243,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-algeria-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78131,14 +78269,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-algeria-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78156,14 +78295,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-algeria-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78181,7 +78321,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78204,14 +78344,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-almaty-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78229,14 +78370,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-almaty-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78254,14 +78396,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-almaty-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78279,7 +78422,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78302,14 +78445,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-amsterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78327,14 +78471,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-amsterdam-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78352,14 +78497,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-amsterdam-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78377,7 +78523,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78400,14 +78546,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ankara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78425,14 +78572,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ankara-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78450,14 +78598,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ankara-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78475,7 +78624,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78498,14 +78647,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-athens-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78523,14 +78673,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-athens-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78548,14 +78699,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-athens-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78573,7 +78725,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78596,14 +78748,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-baku-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78621,14 +78774,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-baku-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78646,14 +78800,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-baku-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78671,7 +78826,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78694,14 +78849,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bangkok-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78719,14 +78875,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bangkok-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78744,14 +78901,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bangkok-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78769,7 +78927,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78792,14 +78950,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-barcelona-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78817,14 +78976,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-barcelona-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78842,14 +79002,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-barcelona-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78867,7 +79028,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78890,14 +79051,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-beijing-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78915,14 +79077,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-beijing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78940,14 +79103,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-beijing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78965,7 +79129,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78988,14 +79152,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79013,14 +79178,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79038,14 +79204,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79063,7 +79230,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79086,14 +79253,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79111,14 +79279,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79136,14 +79305,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79161,7 +79331,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79184,14 +79354,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79209,14 +79380,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79234,14 +79406,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79259,7 +79432,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79282,14 +79455,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79307,14 +79481,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79332,14 +79507,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79357,7 +79533,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79380,14 +79556,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brussel-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79405,14 +79582,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brussel-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79430,14 +79608,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brussel-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79455,7 +79634,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79478,14 +79657,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bucharest-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79503,14 +79683,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bucharest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79528,14 +79709,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bucharest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79553,7 +79735,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79576,14 +79758,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-budapest-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79601,14 +79784,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-budapest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79626,14 +79810,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-budapest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79651,7 +79836,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79674,14 +79859,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-buenosaires-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79699,14 +79885,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-buenosaires-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79724,14 +79911,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-buenosaires-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79749,7 +79937,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79772,14 +79960,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bursaray-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79797,14 +79986,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bursaray-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79822,14 +80012,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bursaray-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79847,7 +80038,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79870,14 +80061,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-cairo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79895,14 +80087,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-cairo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79920,14 +80113,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-cairo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79945,7 +80139,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79968,14 +80162,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-caracas-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79993,14 +80188,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-caracas-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80018,14 +80214,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-caracas-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80043,7 +80240,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80066,14 +80263,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-catania-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80091,14 +80289,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-catania-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80116,14 +80315,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-catania-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80141,7 +80341,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80164,14 +80364,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-changchun-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80189,14 +80390,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-changchun-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80214,14 +80416,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-changchun-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80239,7 +80442,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80262,14 +80465,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chengdu-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80287,14 +80491,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chengdu-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80312,14 +80517,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chengdu-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80337,7 +80543,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80360,14 +80566,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chicago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80385,14 +80592,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chicago-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80410,14 +80618,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chicago-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80435,7 +80644,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80458,14 +80667,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chongqing-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80483,14 +80693,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chongqing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80508,14 +80719,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chongqing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80533,7 +80745,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80556,14 +80768,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dalian-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80581,14 +80794,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dalian-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80606,14 +80820,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dalian-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80631,7 +80846,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80654,14 +80869,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-delhi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80679,14 +80895,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80704,14 +80921,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80729,7 +80947,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80752,14 +80970,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dnepro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80777,14 +80996,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dnepro-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80802,14 +81022,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dnepro-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80827,7 +81048,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80850,14 +81071,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dubai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80875,14 +81097,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dubai-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80900,14 +81123,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dubai-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80925,7 +81149,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80948,14 +81172,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ekb-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80973,14 +81198,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ekb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80998,14 +81224,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ekb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81023,7 +81250,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81046,14 +81273,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-fukuoka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81071,14 +81299,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-fukuoka-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81096,14 +81325,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-fukuoka-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81121,7 +81351,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81144,14 +81374,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-glasgow-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81169,14 +81400,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-glasgow-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81194,14 +81426,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-glasgow-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81219,7 +81452,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81242,14 +81475,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-guangzhou-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81267,14 +81501,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-guangzhou-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81292,14 +81527,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-guangzhou-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81317,7 +81553,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81340,14 +81576,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81365,14 +81602,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81390,14 +81628,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81415,7 +81654,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81438,14 +81677,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-helsinki-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81463,14 +81703,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-helsinki-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81488,14 +81729,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-helsinki-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81513,7 +81755,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81536,14 +81778,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-hirosima-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81561,14 +81804,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-hirosima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81586,14 +81830,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-hirosima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81611,7 +81856,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81634,14 +81879,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-isfahan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81659,14 +81905,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-isfahan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81684,14 +81931,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-isfahan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81709,7 +81957,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81732,14 +81980,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-istanbul-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81757,14 +82006,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-istanbul-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81782,14 +82032,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-istanbul-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81807,7 +82058,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81830,14 +82081,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-izmir-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81855,14 +82107,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-izmir-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81880,14 +82133,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-izmir-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81905,7 +82159,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81928,14 +82182,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kazan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81953,14 +82208,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kazan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81978,14 +82234,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kazan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82003,7 +82260,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82026,14 +82283,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kharkiv-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82051,14 +82309,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kharkiv-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82076,14 +82335,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kharkiv-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82101,7 +82361,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82124,14 +82384,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82149,14 +82410,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82174,14 +82436,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82199,7 +82462,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82222,14 +82485,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kobe-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82247,14 +82511,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kobe-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82272,14 +82537,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kobe-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82297,7 +82563,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82320,14 +82586,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kolkata-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82345,14 +82612,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kolkata-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82370,14 +82638,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kolkata-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82395,7 +82664,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82418,14 +82687,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kunming-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82443,14 +82713,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kunming-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82468,14 +82739,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kunming-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82493,7 +82765,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82516,14 +82788,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kyoto-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82541,14 +82814,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kyoto-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82566,14 +82840,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kyoto-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82591,7 +82866,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82614,14 +82889,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-losangeles-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82639,14 +82915,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-losangeles-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82664,14 +82941,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-losangeles-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82689,7 +82967,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82712,14 +82990,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lausanne-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82737,14 +83016,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lausanne-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82762,14 +83042,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lausanne-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82787,7 +83068,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82810,14 +83091,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lille-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82835,14 +83117,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lille-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82860,14 +83143,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lille-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82885,7 +83169,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82908,14 +83192,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lima-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82933,14 +83218,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82958,14 +83244,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82983,7 +83270,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83006,14 +83293,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lisboa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83031,14 +83319,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lisboa-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83056,14 +83345,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lisboa-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83081,7 +83371,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83104,14 +83394,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-london-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83129,14 +83420,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-london-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83154,14 +83446,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-london-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83179,7 +83472,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83202,14 +83495,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lyon-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83227,14 +83521,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lyon-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83252,14 +83547,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lyon-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83277,7 +83573,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83300,14 +83596,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-madrid-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83325,14 +83622,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-madrid-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83350,14 +83648,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-madrid-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83375,7 +83674,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83398,14 +83697,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-malaga-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83423,14 +83723,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-malaga-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83448,14 +83749,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-malaga-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83473,7 +83775,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83496,14 +83798,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-manila-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83521,14 +83824,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-manila-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83546,14 +83850,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-manila-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83571,7 +83876,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83594,14 +83899,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-maracaibo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83619,14 +83925,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-maracaibo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83644,14 +83951,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-maracaibo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83669,7 +83977,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83692,14 +84000,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mashhad-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83717,14 +84026,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mashhad-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83742,14 +84052,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mashhad-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83767,7 +84078,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83790,14 +84101,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mecca-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83815,14 +84127,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mecca-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83840,14 +84153,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mecca-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83865,7 +84179,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83888,14 +84202,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-medellin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83913,14 +84228,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-medellin-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83938,14 +84254,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-medellin-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83963,7 +84280,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83986,14 +84303,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mexico-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84011,14 +84329,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mexico-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84036,14 +84355,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mexico-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84061,7 +84381,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84084,14 +84404,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-milan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84109,14 +84430,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-milan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84134,14 +84456,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-milan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84159,7 +84482,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84182,14 +84505,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84207,14 +84531,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84232,14 +84557,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84257,7 +84583,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84280,14 +84606,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-montreal-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84305,14 +84632,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-montreal-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84330,14 +84658,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-montreal-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84355,7 +84684,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84365,6 +84694,7 @@ cont { scale: 15 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 } caption { @@ -84390,6 +84720,7 @@ cont { scale: 16 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84415,6 +84746,7 @@ cont { scale: 17 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84440,6 +84772,7 @@ cont { scale: 18 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84465,6 +84798,7 @@ cont { scale: 19 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84506,14 +84840,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84531,14 +84866,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84556,14 +84892,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84581,7 +84918,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84604,14 +84941,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-nagoya-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84629,14 +84967,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-nagoya-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84654,14 +84993,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-nagoya-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84679,7 +85019,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84702,14 +85042,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84727,14 +85068,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84752,14 +85094,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84777,7 +85120,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84800,14 +85143,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84825,14 +85169,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84850,14 +85195,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84875,7 +85221,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84898,14 +85244,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84923,14 +85270,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84948,14 +85296,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84973,7 +85322,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84996,14 +85345,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85021,14 +85371,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85046,14 +85397,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85071,7 +85423,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85094,14 +85446,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85119,14 +85472,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85144,14 +85498,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85169,7 +85524,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85192,14 +85547,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85217,14 +85573,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85242,14 +85599,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85267,7 +85625,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85290,14 +85648,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85315,14 +85674,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85340,14 +85700,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85365,7 +85726,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85388,14 +85749,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85413,14 +85775,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85438,14 +85801,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85463,7 +85827,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85486,14 +85850,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85511,14 +85876,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85536,14 +85902,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85561,7 +85928,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85584,14 +85951,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85609,14 +85977,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85634,14 +86003,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85659,7 +86029,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85682,14 +86052,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85707,14 +86078,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85732,14 +86104,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85757,7 +86130,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85780,14 +86153,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85805,14 +86179,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85830,14 +86205,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85855,7 +86231,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85878,14 +86254,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85903,14 +86280,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85928,14 +86306,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85953,7 +86332,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85976,14 +86355,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86001,14 +86381,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86026,14 +86407,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86051,7 +86433,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86074,14 +86456,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86099,14 +86482,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86124,14 +86508,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86149,7 +86534,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86172,14 +86557,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86197,14 +86583,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86222,14 +86609,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86247,7 +86635,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86270,14 +86658,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86295,14 +86684,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86320,14 +86710,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86345,7 +86736,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86368,14 +86759,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86393,14 +86785,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86418,14 +86811,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86443,7 +86837,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86466,14 +86860,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86491,14 +86886,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86516,14 +86912,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86541,7 +86938,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86564,14 +86961,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86589,14 +86987,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86614,14 +87013,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86639,7 +87039,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86662,14 +87062,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86687,14 +87088,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86712,14 +87114,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86737,7 +87140,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86760,14 +87163,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86785,14 +87189,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86810,14 +87215,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86835,7 +87241,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86858,14 +87264,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86883,14 +87290,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86908,14 +87316,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86933,7 +87342,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86956,14 +87365,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86981,14 +87391,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87006,14 +87417,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87031,7 +87443,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87041,7 +87453,8 @@ cont { scale: 16 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87059,14 +87472,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87084,14 +87498,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87109,14 +87524,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87134,7 +87550,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87157,14 +87573,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87182,14 +87599,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87207,14 +87625,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87232,7 +87651,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87255,14 +87674,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87280,14 +87700,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87305,14 +87726,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87330,7 +87752,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87353,14 +87775,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87378,14 +87801,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87403,14 +87827,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87428,7 +87853,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87451,14 +87876,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87476,14 +87902,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87501,14 +87928,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87526,7 +87954,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87549,14 +87977,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87574,14 +88003,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87599,14 +88029,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87624,7 +88055,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87647,14 +88078,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87672,14 +88104,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87697,14 +88130,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87722,7 +88156,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87745,14 +88179,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87770,14 +88205,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87795,14 +88231,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87820,7 +88257,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87843,14 +88280,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87868,14 +88306,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87893,14 +88332,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87918,7 +88358,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87941,14 +88381,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87966,14 +88407,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87991,14 +88433,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88016,7 +88459,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88039,14 +88482,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88064,14 +88508,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88089,14 +88534,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88114,7 +88560,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88137,14 +88583,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88162,14 +88609,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88187,14 +88635,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88212,7 +88661,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88235,14 +88684,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88260,14 +88710,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88285,14 +88736,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88310,7 +88762,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88333,14 +88785,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88358,14 +88811,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88383,14 +88837,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88408,7 +88863,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88431,14 +88886,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88456,14 +88912,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88481,14 +88938,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88506,7 +88964,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88529,14 +88987,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88554,14 +89013,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88579,14 +89039,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88604,7 +89065,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88615,7 +89076,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88624,7 +89085,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88633,7 +89094,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88642,7 +89103,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1457 + priority: 1471 } } element { @@ -88650,7 +89111,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -88658,7 +89119,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -88666,7 +89127,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } } @@ -88677,7 +89138,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88686,7 +89147,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88695,7 +89156,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88704,7 +89165,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1457 + priority: 1471 } } element { @@ -88712,7 +89173,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -88720,7 +89181,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -88728,7 +89189,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } } @@ -88739,7 +89200,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88748,7 +89209,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88757,7 +89218,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88766,7 +89227,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1457 + priority: 1471 } } element { @@ -88774,7 +89235,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -88782,7 +89243,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } element { @@ -88790,7 +89251,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1457 + priority: 1471 } } } @@ -88800,28 +89261,29 @@ cont { scale: 14 symbol { name: "tram-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } } element { scale: 15 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } } element { scale: 16 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } } element { scale: 17 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -88839,14 +89301,14 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 18 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -88864,14 +89326,14 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 19 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -88889,7 +89351,7 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } } @@ -88900,7 +89362,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -88910,7 +89372,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -88920,7 +89382,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -88929,7 +89391,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -88938,7 +89400,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -88947,7 +89409,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -88956,7 +89418,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -88964,7 +89426,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -88973,7 +89435,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -88981,7 +89443,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -88990,7 +89452,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -88998,7 +89460,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89007,7 +89469,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89018,7 +89480,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89028,7 +89490,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89038,7 +89500,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89049,13 +89511,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89066,13 +89528,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89083,7 +89545,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89091,13 +89553,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89106,7 +89568,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89116,7 +89578,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89124,13 +89586,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89139,7 +89601,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89149,7 +89611,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89157,13 +89619,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89172,7 +89634,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89182,7 +89644,7 @@ cont { color: 8421504 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89190,13 +89652,13 @@ cont { color: 15592411 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89205,7 +89667,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89216,7 +89678,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89226,7 +89688,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89236,7 +89698,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89249,13 +89711,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89268,13 +89730,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89287,13 +89749,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89302,7 +89764,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89314,13 +89776,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89329,7 +89791,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89341,13 +89803,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89356,7 +89818,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89368,13 +89830,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89383,7 +89845,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89398,7 +89860,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89407,7 +89869,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89419,7 +89881,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89428,7 +89890,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89440,7 +89902,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89449,7 +89911,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89461,7 +89923,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89469,7 +89931,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89481,7 +89943,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89489,7 +89951,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89501,7 +89963,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89509,7 +89971,7 @@ cont { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89521,14 +89983,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 9 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89540,14 +90002,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89559,14 +90021,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 4495803 } - priority: 16180 + priority: 16198 } } element { @@ -89578,14 +90040,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 4495803 } - priority: 16180 + priority: 16198 } } } @@ -89593,31 +90055,41 @@ cont { name: "shop" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89626,14 +90098,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89642,7 +90114,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89652,7 +90124,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89661,14 +90133,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89678,14 +90150,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89695,14 +90167,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89712,7 +90184,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -89720,31 +90192,41 @@ cont { name: "shop-antiques" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89753,14 +90235,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89769,7 +90251,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89777,31 +90259,41 @@ cont { name: "shop-art" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89810,14 +90302,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89826,7 +90318,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89834,31 +90326,41 @@ cont { name: "shop-baby_goods" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89867,14 +90369,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89883,7 +90385,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89891,31 +90393,41 @@ cont { name: "shop-bag" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89924,14 +90436,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89940,7 +90452,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89950,7 +90462,7 @@ cont { scale: 16 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89959,14 +90471,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89976,14 +90488,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89993,14 +90505,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90010,7 +90522,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90020,7 +90532,7 @@ cont { scale: 16 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90029,14 +90541,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90046,14 +90558,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90063,14 +90575,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90080,7 +90592,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90090,7 +90602,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90099,14 +90611,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90116,14 +90628,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90133,14 +90645,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90150,7 +90662,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90160,7 +90672,7 @@ cont { scale: 16 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90169,14 +90681,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90186,14 +90698,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90203,14 +90715,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90220,7 +90732,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90230,7 +90742,7 @@ cont { scale: 16 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90239,14 +90751,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90256,14 +90768,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90273,14 +90785,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90290,7 +90802,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90300,7 +90812,7 @@ cont { scale: 16 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90309,14 +90821,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90326,14 +90838,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90343,14 +90855,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90360,7 +90872,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90368,31 +90880,41 @@ cont { name: "shop-boutique" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90401,14 +90923,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90417,7 +90939,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90427,7 +90949,7 @@ cont { scale: 16 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90436,14 +90958,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90453,14 +90975,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90470,14 +90992,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90487,7 +91009,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90497,7 +91019,7 @@ cont { scale: 16 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90506,14 +91028,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90523,14 +91045,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90540,14 +91062,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90557,7 +91079,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90567,7 +91089,7 @@ cont { scale: 16 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90576,14 +91098,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90593,14 +91115,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90610,14 +91132,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90627,7 +91149,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90637,7 +91159,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90646,14 +91168,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90663,14 +91185,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90680,14 +91202,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90697,7 +91219,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90707,7 +91229,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16657 + priority: 16669 min_distance: 20 } caption { @@ -90723,7 +91245,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -90739,7 +91261,7 @@ cont { scale: 17 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90756,7 +91278,7 @@ cont { scale: 18 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90773,7 +91295,7 @@ cont { scale: 19 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90793,7 +91315,7 @@ cont { scale: 16 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -90802,14 +91324,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90819,14 +91341,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90836,14 +91358,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90853,7 +91375,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -90863,7 +91385,7 @@ cont { scale: 16 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 10 } caption { @@ -90872,14 +91394,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15735 } } element { scale: 17 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -90889,14 +91411,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 18 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -90906,14 +91428,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 19 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -90923,7 +91445,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } } @@ -90931,31 +91453,41 @@ cont { name: "shop-cheese" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90964,14 +91496,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90980,7 +91512,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90990,7 +91522,7 @@ cont { scale: 16 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90999,14 +91531,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91016,14 +91548,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91033,14 +91565,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91050,7 +91582,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91060,7 +91592,7 @@ cont { scale: 16 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91069,14 +91601,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91086,14 +91618,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91103,14 +91635,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91120,7 +91652,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91130,7 +91662,7 @@ cont { scale: 16 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91139,14 +91671,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91156,14 +91688,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91173,14 +91705,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91190,7 +91722,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91198,31 +91730,41 @@ cont { name: "shop-coffee" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91231,14 +91773,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91247,7 +91789,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91257,7 +91799,7 @@ cont { scale: 16 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91266,14 +91808,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91283,14 +91825,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91300,14 +91842,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91317,7 +91859,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91327,7 +91869,7 @@ cont { scale: 16 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91336,14 +91878,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91353,14 +91895,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91370,14 +91912,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91387,7 +91929,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91397,7 +91939,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91406,14 +91948,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91423,14 +91965,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91440,14 +91982,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91457,7 +91999,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91467,7 +92009,7 @@ cont { scale: 16 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91476,14 +92018,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91493,14 +92035,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91510,14 +92052,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91527,7 +92069,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91537,7 +92079,7 @@ cont { scale: 16 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91546,14 +92088,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91563,14 +92105,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91580,14 +92122,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91597,7 +92139,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91605,31 +92147,41 @@ cont { name: "shop-craft" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91638,14 +92190,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91654,7 +92206,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91662,31 +92214,41 @@ cont { name: "shop-dairy" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91695,14 +92257,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91711,7 +92273,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91721,7 +92283,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91730,14 +92292,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91747,14 +92309,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91764,14 +92326,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91781,7 +92343,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91791,7 +92353,7 @@ cont { scale: 16 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91800,14 +92362,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91817,14 +92379,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91834,14 +92396,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91851,7 +92413,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91861,7 +92423,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91870,14 +92432,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91887,14 +92449,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91904,14 +92466,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91921,7 +92483,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91931,7 +92493,7 @@ cont { scale: 16 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91940,14 +92502,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91957,14 +92519,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91974,14 +92536,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91991,7 +92553,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91999,31 +92561,41 @@ cont { name: "shop-electrical" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92032,14 +92604,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92048,7 +92620,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92058,7 +92630,7 @@ cont { scale: 16 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92067,14 +92639,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92084,14 +92656,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92101,14 +92673,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92118,7 +92690,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92128,7 +92700,7 @@ cont { scale: 16 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92137,14 +92709,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92154,14 +92726,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92171,14 +92743,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92188,7 +92760,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92198,7 +92770,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92207,14 +92779,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92223,14 +92795,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92239,14 +92811,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92255,7 +92827,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92265,7 +92837,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92274,14 +92846,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92291,14 +92863,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92308,14 +92880,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92325,7 +92897,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92333,31 +92905,41 @@ cont { name: "shop-fishing" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92366,14 +92948,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92382,7 +92964,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92392,7 +92974,7 @@ cont { scale: 16 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92401,14 +92983,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92418,14 +93000,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92435,14 +93017,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92452,7 +93034,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92462,7 +93044,7 @@ cont { scale: 16 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92471,14 +93053,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92488,14 +93070,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92505,14 +93087,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92522,7 +93104,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92532,7 +93114,7 @@ cont { scale: 16 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92541,14 +93123,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92558,14 +93140,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92575,14 +93157,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92592,7 +93174,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92602,7 +93184,7 @@ cont { scale: 16 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92611,14 +93193,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92628,14 +93210,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92645,14 +93227,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92662,7 +93244,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92672,7 +93254,7 @@ cont { scale: 16 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92681,14 +93263,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92698,14 +93280,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92715,14 +93297,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92732,7 +93314,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92742,7 +93324,7 @@ cont { scale: 16 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92751,14 +93333,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92768,14 +93350,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92785,14 +93367,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92802,7 +93384,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92812,7 +93394,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92821,14 +93403,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92838,14 +93420,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92855,14 +93437,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92872,7 +93454,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92882,7 +93464,7 @@ cont { scale: 16 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92891,14 +93473,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92908,14 +93490,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92925,14 +93507,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92942,7 +93524,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92952,7 +93534,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92961,14 +93543,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92978,14 +93560,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92995,14 +93577,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93012,7 +93594,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93022,7 +93604,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93031,14 +93613,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93048,14 +93630,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93065,14 +93647,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93082,7 +93664,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93092,7 +93674,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93101,14 +93683,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93118,14 +93700,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93135,14 +93717,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93152,7 +93734,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93160,31 +93742,41 @@ cont { name: "shop-interior_decoration" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93193,14 +93785,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93209,7 +93801,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93219,7 +93811,7 @@ cont { scale: 16 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93228,14 +93820,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93245,14 +93837,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93262,14 +93854,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93279,7 +93871,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93289,7 +93881,7 @@ cont { scale: 16 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93298,14 +93890,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93315,14 +93907,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93332,14 +93924,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93349,7 +93941,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93359,7 +93951,7 @@ cont { scale: 16 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93368,14 +93960,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93385,14 +93977,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93402,14 +93994,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93419,7 +94011,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93429,7 +94021,7 @@ cont { scale: 16 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93438,14 +94030,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93455,14 +94047,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93472,14 +94064,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93489,7 +94081,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93497,31 +94089,41 @@ cont { name: "shop-lottery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93530,14 +94132,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93546,7 +94148,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93556,7 +94158,7 @@ cont { scale: 14 symbol { name: "shop-s" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -93565,14 +94167,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 15 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -93581,14 +94183,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 16 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -93597,14 +94199,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 17 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -93613,14 +94215,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 18 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -93629,14 +94231,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 19 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -93645,7 +94247,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15904 + priority: 15905 } } } @@ -93653,20 +94255,9 @@ cont { name: "shop-massage" element { scale: 16 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15600 - } - } - element { - scale: 17 symbol { - name: "sauna-m" - priority: 16600 + name: "shop-m" + priority: 16613 min_distance: 10 } caption { @@ -93674,16 +94265,31 @@ cont { height: 10 color: 4473924 offset_y: 1 - is_optional: true } - priority: 15600 + priority: 15613 + } + } + element { + scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15613 } } element { scale: 18 symbol { name: "sauna-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93693,14 +94299,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sauna-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93710,7 +94316,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93718,31 +94324,41 @@ cont { name: "shop-medical_supply" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93751,14 +94367,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93767,7 +94383,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93777,7 +94393,7 @@ cont { scale: 16 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93786,14 +94402,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93803,14 +94419,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93820,14 +94436,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93837,7 +94453,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93845,20 +94461,25 @@ cont { name: "shop-money_lender" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -93868,14 +94489,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -93885,14 +94506,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -93902,7 +94523,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93912,7 +94533,7 @@ cont { scale: 16 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93921,14 +94542,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93938,14 +94559,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93955,14 +94576,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93972,7 +94593,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93981,8 +94602,8 @@ cont { element { scale: 16 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 10 } caption { @@ -93991,14 +94612,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94008,14 +94629,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94025,14 +94646,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94042,7 +94663,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94051,8 +94672,8 @@ cont { element { scale: 16 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 10 } caption { @@ -94061,14 +94682,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94078,14 +94699,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94095,14 +94716,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94112,7 +94733,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94120,20 +94741,25 @@ cont { name: "shop-newsagent" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94143,14 +94769,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94160,14 +94786,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94177,7 +94803,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94185,31 +94811,41 @@ cont { name: "shop-nutrition_supplements" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94218,14 +94854,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94234,7 +94870,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94244,7 +94880,7 @@ cont { scale: 16 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94253,14 +94889,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94270,14 +94906,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94287,14 +94923,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94304,7 +94940,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94314,7 +94950,7 @@ cont { scale: 16 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94323,14 +94959,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94340,14 +94976,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94357,14 +94993,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94374,7 +95010,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94382,31 +95018,41 @@ cont { name: "shop-paint" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94415,14 +95061,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94431,7 +95077,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94441,7 +95087,7 @@ cont { scale: 16 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94450,14 +95096,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94467,14 +95113,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94484,14 +95130,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94501,7 +95147,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94509,20 +95155,25 @@ cont { name: "shop-pawnbroker" element { scale: 16 + symbol { + name: "shop-m" + priority: 16650 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -94532,14 +95183,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -94549,14 +95200,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -94566,7 +95217,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -94574,31 +95225,41 @@ cont { name: "shop-perfumery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94607,14 +95268,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94623,7 +95284,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94633,7 +95294,7 @@ cont { scale: 16 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94642,14 +95303,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94659,14 +95320,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94676,14 +95337,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94693,7 +95354,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94703,7 +95364,7 @@ cont { scale: 16 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94712,14 +95373,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94729,14 +95390,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94746,14 +95407,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94763,7 +95424,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94773,7 +95434,7 @@ cont { scale: 16 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94782,14 +95443,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94799,14 +95460,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94816,14 +95477,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94833,7 +95494,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94843,7 +95504,7 @@ cont { scale: 16 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 10 } caption { @@ -94852,14 +95513,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15735 } } element { scale: 17 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -94869,14 +95530,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 18 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -94886,14 +95547,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 19 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -94903,7 +95564,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } } @@ -94911,31 +95572,41 @@ cont { name: "shop-sewing" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94944,14 +95615,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94960,7 +95631,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94970,7 +95641,7 @@ cont { scale: 16 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94979,14 +95650,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94996,14 +95667,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95013,14 +95684,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95030,7 +95701,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95040,7 +95711,7 @@ cont { scale: 16 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95049,14 +95720,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95066,14 +95737,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95083,14 +95754,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95100,7 +95771,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95108,20 +95779,25 @@ cont { name: "shop-stationery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95131,14 +95807,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95148,14 +95824,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95165,7 +95841,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95173,31 +95849,41 @@ cont { name: "shop-storage_rental" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95206,14 +95892,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95222,7 +95908,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95232,7 +95918,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 16 } caption { @@ -95241,14 +95927,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95257,14 +95943,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95273,14 +95959,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95289,7 +95975,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -95299,7 +95985,7 @@ cont { scale: 16 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95308,14 +95994,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95325,14 +96011,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95342,14 +96028,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95359,7 +96045,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95367,31 +96053,41 @@ cont { name: "shop-tea" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95400,14 +96096,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95416,7 +96112,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95426,7 +96122,7 @@ cont { scale: 16 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95435,14 +96131,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95452,14 +96148,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95469,14 +96165,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95486,7 +96182,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95494,31 +96190,41 @@ cont { name: "shop-tobacco" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95527,14 +96233,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95543,7 +96249,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95553,7 +96259,7 @@ cont { scale: 16 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95562,14 +96268,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95579,14 +96285,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95596,14 +96302,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95613,7 +96319,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95621,31 +96327,41 @@ cont { name: "shop-trade" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95654,14 +96370,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95670,7 +96386,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95678,31 +96394,41 @@ cont { name: "shop-travel_agency" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95711,14 +96437,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95727,7 +96453,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95737,7 +96463,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95746,14 +96472,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95763,14 +96489,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95780,14 +96506,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95797,7 +96523,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95805,31 +96531,41 @@ cont { name: "shop-variety_store" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 8 + } caption { primary { height: 11 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 8 } caption { @@ -95838,14 +96574,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 8 } caption { @@ -95854,7 +96590,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95864,7 +96600,7 @@ cont { scale: 16 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95873,14 +96609,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95890,14 +96626,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95907,14 +96643,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95924,7 +96660,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95933,8 +96669,8 @@ cont { element { scale: 16 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 10 } caption { @@ -95943,14 +96679,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -95960,14 +96696,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -95977,14 +96713,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -95994,7 +96730,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96002,31 +96738,41 @@ cont { name: "shop-watches" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96035,14 +96781,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96051,7 +96797,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96059,31 +96805,41 @@ cont { name: "shop-wholesale" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96092,14 +96848,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96108,7 +96864,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96118,7 +96874,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96127,14 +96883,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96144,14 +96900,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96161,14 +96917,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96178,7 +96934,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96188,7 +96944,7 @@ cont { scale: 17 symbol { name: "bowling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96197,14 +96953,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96214,14 +96970,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } element { scale: 19 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96231,7 +96987,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } } @@ -96241,7 +96997,7 @@ cont { scale: 17 symbol { name: "bowling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96250,14 +97006,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96267,14 +97023,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } element { scale: 19 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96284,7 +97040,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } } @@ -96294,7 +97050,7 @@ cont { scale: 17 symbol { name: "america-football-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96303,14 +97059,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "america-football-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96320,14 +97076,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "america-football-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96337,7 +97093,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96347,7 +97103,7 @@ cont { scale: 17 symbol { name: "archery-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96356,14 +97112,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96373,14 +97129,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96390,7 +97146,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96400,7 +97156,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96409,14 +97165,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96426,14 +97182,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96443,7 +97199,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96453,7 +97209,7 @@ cont { scale: 17 symbol { name: "australian-football-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96462,14 +97218,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "australian-football-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96479,14 +97235,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "australian-football-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96496,7 +97252,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96506,7 +97262,7 @@ cont { scale: 17 symbol { name: "badminton-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96515,14 +97271,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "badminton-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96532,14 +97288,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "badminton-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96549,7 +97305,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96559,7 +97315,7 @@ cont { scale: 17 symbol { name: "baseball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96568,14 +97324,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "baseball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96585,14 +97341,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "baseball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96602,7 +97358,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96612,7 +97368,7 @@ cont { scale: 17 symbol { name: "basketball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96621,14 +97377,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "basketball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96638,14 +97394,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "basketball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96655,7 +97411,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96665,7 +97421,7 @@ cont { scale: 17 symbol { name: "volleyball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96674,14 +97430,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96691,14 +97447,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96708,7 +97464,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96718,7 +97474,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96727,14 +97483,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96744,14 +97500,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96761,7 +97517,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96771,7 +97527,7 @@ cont { scale: 17 symbol { name: "chess-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96780,14 +97536,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "chess-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96797,14 +97553,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "chess-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96814,7 +97570,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96824,7 +97580,7 @@ cont { scale: 17 symbol { name: "climbing-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96833,14 +97589,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "climbing-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96850,14 +97606,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "climbing-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96867,7 +97623,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96877,7 +97633,7 @@ cont { scale: 17 symbol { name: "cricket-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96886,14 +97642,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "cricket-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96903,14 +97659,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "cricket-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96920,7 +97676,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96930,7 +97686,7 @@ cont { scale: 17 symbol { name: "curling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96939,14 +97695,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "curling-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96956,14 +97712,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "curling-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96973,7 +97729,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96983,7 +97739,7 @@ cont { scale: 17 symbol { name: "diving-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96992,14 +97748,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97009,14 +97765,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97026,7 +97782,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97036,7 +97792,7 @@ cont { scale: 17 symbol { name: "equestrian-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97045,14 +97801,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "equestrian-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97062,14 +97818,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "equestrian-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97079,7 +97835,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97089,7 +97845,7 @@ cont { scale: 17 symbol { name: "hockey-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97098,14 +97854,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97115,14 +97871,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97132,7 +97888,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97142,7 +97898,7 @@ cont { scale: 17 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97151,14 +97907,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97168,14 +97924,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97185,7 +97941,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97195,7 +97951,7 @@ cont { scale: 17 symbol { name: "golf-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97204,14 +97960,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "golf-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97221,14 +97977,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "golf-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97238,7 +97994,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97248,7 +98004,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97257,14 +98013,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97274,14 +98030,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97291,7 +98047,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97301,7 +98057,7 @@ cont { scale: 17 symbol { name: "handball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97310,14 +98066,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "handball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97327,14 +98083,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "handball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97344,7 +98100,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97354,7 +98110,7 @@ cont { scale: 17 symbol { name: "hockey-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97363,14 +98119,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97380,14 +98136,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97397,7 +98153,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97407,25 +98163,25 @@ cont { scale: 15 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 16 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 17 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97434,18 +98190,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97455,18 +98211,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97476,7 +98232,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97486,7 +98242,7 @@ cont { scale: 17 symbol { name: "padel-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97495,14 +98251,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "padel-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97512,14 +98268,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "padel-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97529,7 +98285,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97539,7 +98295,7 @@ cont { scale: 17 symbol { name: "pelota-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97548,14 +98304,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pelota-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97565,14 +98321,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pelota-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97582,7 +98338,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97592,7 +98348,7 @@ cont { scale: 17 symbol { name: "diving-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97601,14 +98357,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97618,14 +98374,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97635,7 +98391,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97645,7 +98401,7 @@ cont { scale: 17 symbol { name: "archery-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97654,14 +98410,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97671,14 +98427,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97688,7 +98444,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97698,7 +98454,7 @@ cont { scale: 17 symbol { name: "skateboard-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97707,14 +98463,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "skateboard-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97724,14 +98480,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "skateboard-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97741,7 +98497,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97751,7 +98507,7 @@ cont { scale: 17 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97760,14 +98516,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97777,14 +98533,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97794,7 +98550,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -97804,25 +98560,25 @@ cont { scale: 15 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 16 area { color: 13749671 - priority: -15391 + priority: -15378 } } element { scale: 17 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97831,18 +98587,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97852,18 +98608,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 area { color: 13749671 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97873,7 +98629,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97883,7 +98639,7 @@ cont { scale: 17 symbol { name: "swimming-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97892,14 +98648,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "swimming-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97909,14 +98665,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "swimming-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97926,7 +98682,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97936,7 +98692,7 @@ cont { scale: 17 symbol { name: "table-tennis-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97945,14 +98701,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "table-tennis-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97962,14 +98718,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "table-tennis-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97979,7 +98735,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97989,7 +98745,7 @@ cont { scale: 17 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97998,14 +98754,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98015,14 +98771,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98032,7 +98788,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -98042,7 +98798,7 @@ cont { scale: 17 symbol { name: "volleyball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98051,14 +98807,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98068,14 +98824,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98085,7 +98841,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98095,7 +98851,7 @@ cont { scale: 17 symbol { name: "yoga-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98104,14 +98860,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "yoga-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98121,14 +98877,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "yoga-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98138,7 +98894,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98148,7 +98904,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 24 } caption { @@ -98157,14 +98913,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98173,14 +98929,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98190,14 +98946,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98207,7 +98963,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } } @@ -98217,7 +98973,7 @@ cont { scale: 16 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -98226,14 +98982,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 } caption { primary { @@ -98241,14 +98997,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -98258,14 +99014,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -98275,7 +99031,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -98285,7 +99041,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98295,14 +99051,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98312,14 +99068,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98329,14 +99085,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98346,14 +99102,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98363,7 +99119,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } } @@ -98373,7 +99129,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98383,14 +99139,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98400,14 +99156,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98417,14 +99173,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98434,14 +99190,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98451,7 +99207,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98461,7 +99217,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98471,14 +99227,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98488,14 +99244,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98505,14 +99261,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98522,14 +99278,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98539,7 +99295,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98549,7 +99305,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98559,14 +99315,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98576,14 +99332,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -98593,14 +99349,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -98610,14 +99366,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -98627,7 +99383,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -98637,7 +99393,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98647,14 +99403,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98664,14 +99420,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98681,14 +99437,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98698,14 +99454,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98715,7 +99471,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98725,7 +99481,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -98735,14 +99491,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -98752,14 +99508,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98769,14 +99525,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98786,14 +99542,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98803,14 +99559,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98820,7 +99576,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -98830,7 +99586,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -98840,14 +99596,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -98857,14 +99613,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98874,14 +99630,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98891,14 +99647,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98908,14 +99664,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98925,7 +99681,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -98935,7 +99691,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -98945,14 +99701,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -98962,14 +99718,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98979,14 +99735,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98996,14 +99752,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99013,14 +99769,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99030,7 +99786,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -99040,7 +99796,7 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99049,14 +99805,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99065,14 +99821,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99081,14 +99837,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99098,14 +99854,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99115,7 +99871,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -99125,7 +99881,7 @@ cont { scale: 16 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -99134,14 +99890,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99150,14 +99906,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99167,14 +99923,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99184,7 +99940,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99194,7 +99950,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -99203,14 +99959,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99219,14 +99975,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99236,14 +99992,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99253,7 +100009,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -99263,7 +100019,8 @@ cont { scale: 15 symbol { name: "gallery-m" - priority: 16828 + apply_for_type: 1 + priority: 16830 min_distance: 8 } caption { @@ -99273,14 +100030,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 16 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99290,14 +100047,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 17 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99307,14 +100064,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 18 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99324,14 +100081,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 19 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99341,7 +100098,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } } @@ -99351,7 +100108,7 @@ cont { scale: 16 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -99360,14 +100117,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 } caption { primary { @@ -99375,14 +100132,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99392,14 +100149,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99409,7 +100166,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -99419,7 +100176,8 @@ cont { scale: 16 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 24 } caption { @@ -99428,14 +100186,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15761 + priority: 15773 } } element { scale: 17 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99444,14 +100203,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15761 + priority: 15773 } } element { scale: 18 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99461,14 +100221,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15761 + priority: 15773 } } element { scale: 19 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99478,7 +100239,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15761 + priority: 15773 } } } @@ -99488,7 +100249,8 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 24 } caption { @@ -99497,14 +100259,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15790 + priority: 15801 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -99513,14 +100276,15 @@ cont { color: 4473924 offset_y: 1 } - priority: 15790 + priority: 15801 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -99530,14 +100294,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15790 + priority: 15801 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -99547,7 +100312,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15790 + priority: 15801 } } } @@ -99557,7 +100322,8 @@ cont { scale: 16 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99567,14 +100333,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99584,14 +100351,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "information-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99601,14 +100369,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "information-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99618,7 +100387,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99628,7 +100397,8 @@ cont { scale: 16 symbol { name: "board" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99638,14 +100408,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "board" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99655,14 +100426,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "board" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99672,14 +100444,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "board" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99689,7 +100462,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99699,7 +100472,8 @@ cont { scale: 16 symbol { name: "guidepost" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99709,14 +100483,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "guidepost" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99726,14 +100501,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "guidepost" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99743,14 +100519,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "guidepost" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99760,7 +100537,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99770,7 +100547,8 @@ cont { scale: 16 symbol { name: "map" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99780,14 +100558,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "map" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99797,14 +100576,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "map" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99814,14 +100594,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "map" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99831,7 +100612,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99841,7 +100622,8 @@ cont { scale: 16 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99851,14 +100633,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99868,14 +100651,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { - name: "information-m" - priority: 16600 + name: "office-m" + priority: 16650 min_distance: 10 } caption { @@ -99885,14 +100668,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15650 } } element { scale: 19 symbol { - name: "information-m" - priority: 16600 + name: "office-m" + priority: 16650 min_distance: 10 } caption { @@ -99902,7 +100685,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15650 } } } @@ -99912,7 +100695,7 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 24 } caption { @@ -99921,14 +100704,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15771 + priority: 15783 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -99937,14 +100720,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15771 + priority: 15783 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -99954,14 +100737,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15771 + priority: 15783 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -99971,7 +100754,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15771 + priority: 15783 } } } @@ -99981,7 +100764,7 @@ cont { scale: 13 symbol { name: "museum-s" - priority: 16838 + priority: 16839 min_distance: 16 } caption { @@ -99991,14 +100774,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 14 symbol { name: "museum-s" - priority: 16838 + priority: 16839 min_distance: 16 } caption { @@ -100008,14 +100791,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 15 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 24 } caption { @@ -100025,14 +100808,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 16 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100042,14 +100825,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 17 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100059,14 +100842,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 18 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100076,14 +100859,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 19 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100093,7 +100876,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } } @@ -100103,7 +100886,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100112,14 +100895,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100128,14 +100911,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100145,14 +100928,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100162,7 +100945,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -100172,7 +100955,7 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 24 } caption { @@ -100181,14 +100964,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15780 + priority: 15792 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100197,14 +100980,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15780 + priority: 15792 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100214,14 +100997,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15780 + priority: 15792 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100231,7 +101014,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15780 + priority: 15792 } } } @@ -100241,7 +101024,7 @@ cont { scale: 14 symbol { name: "theme_park-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -100251,14 +101034,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -100268,14 +101051,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100285,14 +101068,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100302,14 +101085,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100319,14 +101102,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100336,7 +101119,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -100346,7 +101129,8 @@ cont { scale: 14 symbol { name: "viewpoint-s" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100356,14 +101140,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 15 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100373,14 +101158,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 16 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100390,14 +101176,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 17 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100407,14 +101194,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100424,14 +101212,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100441,7 +101230,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -100451,7 +101240,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 24 } caption { @@ -100460,14 +101249,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -100476,14 +101265,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -100493,14 +101282,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -100510,7 +101299,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } } @@ -100520,7 +101309,7 @@ cont { scale: 13 symbol { name: "zoo-s" - priority: 16866 + priority: 16867 min_distance: 12 } caption { @@ -100530,14 +101319,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 14 symbol { name: "zoo-s" - priority: 16866 + priority: 16867 min_distance: 12 } caption { @@ -100547,14 +101336,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 15 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100564,14 +101353,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100581,14 +101370,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 17 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100598,14 +101387,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 18 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100615,14 +101404,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 19 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100632,7 +101421,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } } @@ -101101,28 +101890,32 @@ cont { scale: 16 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 17 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 18 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 19 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } } @@ -101912,7 +102705,7 @@ cont { scale: 11 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 min_distance: 15 } caption { @@ -101922,14 +102715,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -101938,14 +102731,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -101954,14 +102747,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -101970,14 +102763,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -101986,14 +102779,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102002,14 +102795,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102018,14 +102811,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102034,14 +102827,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102050,7 +102843,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -102070,7 +102863,7 @@ cont { lines { width: 2.0 color: 1304608947 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -102078,7 +102871,7 @@ cont { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102086,14 +102879,14 @@ cont { lines { width: 3.0 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102101,14 +102894,14 @@ cont { lines { width: 4.5 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102116,14 +102909,14 @@ cont { lines { width: 6.0 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } element { @@ -102131,14 +102924,14 @@ cont { lines { width: 8.0 color: 1304608947 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 4473924 } - priority: 16476 + priority: 16490 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 78eaaea5db..21c6ea2e13 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index b1a36850f3..f61c3a5cf6 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -9,20 +9,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -35,18 +36,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -59,18 +61,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -82,18 +85,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -103,7 +107,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -115,16 +119,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -134,7 +139,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -146,16 +151,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -165,7 +171,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -177,16 +183,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -196,7 +203,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -208,16 +215,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -227,7 +235,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -242,20 +250,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -268,18 +277,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -292,18 +302,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -315,18 +326,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -336,7 +348,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -348,16 +360,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -367,7 +380,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -379,16 +392,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -398,7 +412,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -410,16 +424,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -429,7 +444,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -441,16 +456,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -460,7 +476,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -475,14 +491,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -496,13 +512,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -515,13 +531,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -534,18 +550,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -555,7 +572,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -567,16 +584,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -586,7 +604,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -598,16 +616,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -617,7 +636,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -629,16 +648,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -648,7 +668,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -660,16 +680,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -679,7 +700,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -694,20 +715,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -720,18 +742,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -744,18 +767,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -767,18 +791,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -788,7 +813,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -800,16 +825,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -819,7 +845,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -831,16 +857,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -850,7 +877,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -862,16 +889,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -881,7 +909,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -893,16 +921,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -912,7 +941,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -927,14 +956,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -948,13 +977,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -967,13 +996,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -986,18 +1015,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1007,7 +1037,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1019,16 +1049,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1038,7 +1069,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1050,16 +1081,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1069,7 +1101,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1081,16 +1113,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1100,7 +1133,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1112,16 +1145,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1131,7 +1165,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1146,14 +1180,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1167,13 +1201,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1186,13 +1220,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1205,18 +1239,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1226,7 +1261,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1238,16 +1273,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1257,7 +1293,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1269,16 +1305,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1288,7 +1325,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1300,16 +1337,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1319,7 +1357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1331,16 +1369,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1350,7 +1389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1365,20 +1404,21 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -1391,18 +1431,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -1415,18 +1456,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { @@ -1438,18 +1480,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1459,7 +1502,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1471,16 +1514,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1490,7 +1534,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1502,16 +1546,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1521,7 +1566,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1533,16 +1578,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1552,7 +1598,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1564,16 +1610,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1583,7 +1630,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1598,14 +1645,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1619,13 +1666,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1638,13 +1685,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1657,18 +1704,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1678,7 +1726,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1690,16 +1738,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1709,7 +1758,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1721,16 +1770,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1740,7 +1790,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1752,16 +1802,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1771,7 +1822,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1783,16 +1834,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1802,7 +1854,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -1817,14 +1869,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -1838,13 +1890,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1857,13 +1909,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -1876,18 +1928,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1897,7 +1950,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1909,16 +1962,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1928,7 +1982,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1940,16 +1994,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1959,7 +2014,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -1971,16 +2026,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -1990,7 +2046,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2002,16 +2058,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2021,7 +2078,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2031,7 +2088,8 @@ cont { scale: 12 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -2039,7 +2097,8 @@ cont { scale: 13 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 min_distance: 10 } } @@ -2047,14 +2106,16 @@ cont { scale: 14 symbol { name: "cable-car-s" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 15 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2064,14 +2125,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 16 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2081,14 +2143,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2098,14 +2161,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2115,14 +2179,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2132,7 +2197,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2147,14 +2212,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 join: BEVELJOIN cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 join: BEVELJOIN cap: BUTTCAP } @@ -2168,13 +2233,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -2187,13 +2252,13 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1514 + priority: 1528 cap: BUTTCAP } } @@ -2206,18 +2271,19 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 cap: BUTTCAP } lines { width: 0.5 color: 5131837 - priority: 1657 + priority: 1669 cap: BUTTCAP } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2227,7 +2293,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2239,16 +2305,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2258,7 +2325,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2270,16 +2337,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2289,7 +2357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2301,16 +2369,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2320,7 +2389,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { @@ -2332,16 +2401,17 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1504 + priority: 1518 } lines { width: 1.0 color: 5131837 - priority: 1657 + priority: 1669 } symbol { name: "cable-car-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } caption { primary { @@ -2351,7 +2421,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2363,6 +2433,15 @@ cont { color: 3681605 priority: -15991 } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + is_optional: true + } + priority: 15009 + } } element { scale: 11 @@ -2370,6 +2449,15 @@ cont { color: 3418688 priority: -15991 } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + is_optional: true + } + priority: 15009 + } } element { scale: 12 @@ -2377,6 +2465,23 @@ cont { color: 3155515 priority: -15991 } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15009 + } } element { scale: 13 @@ -2384,6 +2489,23 @@ cont { color: 3155515 priority: -15991 } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15009 + } } element { scale: 14 @@ -2566,21 +2688,21 @@ cont { scale: 7 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { scale: 8 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { scale: 9 symbol { name: "airport-s" - priority: 16009 + priority: 10000 } } element { @@ -2612,7 +2734,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2633,7 +2755,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2662,7 +2784,7 @@ cont { } symbol { name: "airport-m" - priority: 16009 + priority: 3100 } caption { primary { @@ -2864,7 +2986,7 @@ cont { scale: 17 symbol { name: "gate-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -2872,14 +2994,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "gate-m" - priority: 16980 + priority: 16981 } caption { primary { @@ -2887,14 +3009,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15980 + priority: 15981 } } element { scale: 19 symbol { name: "gate-m" - priority: 16980 + priority: 16981 } caption { primary { @@ -2902,7 +3024,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15980 + priority: 15981 } } } @@ -2912,7 +3034,7 @@ cont { scale: 16 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2921,14 +3043,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2937,14 +3059,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2953,14 +3075,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "helipad-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -2969,7 +3091,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -2980,7 +3102,7 @@ cont { lines { width: 1.0 color: 2152416835 - priority: 1142 + priority: 1160 join: BEVELJOIN cap: BUTTCAP } @@ -2990,7 +3112,7 @@ cont { lines { width: 1.5 color: 860571203 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -2999,7 +3121,7 @@ cont { lines { width: 2.4 color: 4933187 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3008,7 +3130,7 @@ cont { lines { width: 2.4 color: 4933187 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3017,7 +3139,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1142 + priority: 1160 } } element { @@ -3025,7 +3147,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1142 + priority: 1160 } } element { @@ -3033,7 +3155,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1142 + priority: 1160 } } element { @@ -3041,7 +3163,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1142 + priority: 1160 } } } @@ -3052,7 +3174,7 @@ cont { lines { width: 0.6 color: 1716209219 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3061,7 +3183,7 @@ cont { lines { width: 1.2 color: 1716209219 - priority: 1142 + priority: 1160 cap: BUTTCAP } } @@ -3070,7 +3192,7 @@ cont { lines { width: 1.2 color: 1716209219 - priority: 1142 + priority: 1160 } } element { @@ -3078,7 +3200,7 @@ cont { lines { width: 1.2 color: 1716209219 - priority: 1142 + priority: 1160 } } element { @@ -3086,7 +3208,7 @@ cont { lines { width: 1.2 color: 1716209219 - priority: 1142 + priority: 1160 } } element { @@ -3094,7 +3216,7 @@ cont { lines { width: 1.2 color: 1716209219 - priority: 1142 + priority: 1160 } } } @@ -3108,7 +3230,7 @@ cont { width: 1.0 color: 3158064 } - priority: -15762 + priority: -15746 } } element { @@ -3119,14 +3241,14 @@ cont { width: 1.0 color: 3158064 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 5592405 } - priority: 15238 + priority: 15254 } } element { @@ -3137,14 +3259,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 5592405 } - priority: 15238 + priority: 15254 } } element { @@ -3155,14 +3277,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 5592405 } - priority: 15238 + priority: 15254 } } element { @@ -3173,14 +3295,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 5592405 } - priority: 15238 + priority: 15254 } } element { @@ -3191,14 +3313,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15762 + priority: -15746 } caption { primary { height: 9 color: 5592405 } - priority: 15238 + priority: 15254 } } } @@ -3276,7 +3398,7 @@ cont { scale: 18 symbol { name: "atm-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -3285,14 +3407,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "atm-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -3301,7 +3423,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3311,7 +3433,7 @@ cont { scale: 16 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3319,14 +3441,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3334,14 +3456,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3349,14 +3471,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "bank-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -3364,7 +3486,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -3373,8 +3495,8 @@ cont { element { scale: 15 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 28 } caption { @@ -3383,14 +3505,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 16 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3399,14 +3521,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 17 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3415,14 +3537,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15695 + priority: 15707 } } element { scale: 18 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3432,14 +3554,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15695 + priority: 15707 } } element { scale: 19 symbol { - name: "bar-m" - priority: 16695 + name: "beer-m" + priority: 16707 min_distance: 12 } caption { @@ -3449,7 +3571,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15695 + priority: 15707 } } } @@ -3459,7 +3581,7 @@ cont { scale: 18 symbol { name: "bbq-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -3475,7 +3597,7 @@ cont { scale: 19 symbol { name: "bbq-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -3494,14 +3616,16 @@ cont { scale: 18 symbol { name: "bench" - priority: 16590 + apply_for_type: 1 + priority: 16603 } } element { scale: 19 symbol { name: "bench" - priority: 16590 + apply_for_type: 1 + priority: 16603 } caption { primary { @@ -3509,7 +3633,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -3519,7 +3643,7 @@ cont { scale: 17 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3529,14 +3653,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3546,14 +3670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bike-parking-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -3563,7 +3687,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -3573,7 +3697,7 @@ cont { scale: 17 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3582,14 +3706,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3598,14 +3722,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bicycle-rental" - priority: 16638 + priority: 16650 } caption { primary { @@ -3614,7 +3738,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3624,7 +3748,7 @@ cont { scale: 17 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3633,14 +3757,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3649,14 +3773,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bicycle-repair-station" - priority: 16638 + priority: 16650 } caption { primary { @@ -3665,7 +3789,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3675,7 +3799,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 28 } caption { @@ -3684,14 +3808,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 16 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3700,14 +3824,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 17 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3716,14 +3840,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 18 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3733,14 +3857,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } element { scale: 19 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -3750,7 +3874,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } } @@ -3774,14 +3898,16 @@ cont { scale: 17 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } } element { scale: 18 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -3790,14 +3916,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "banknote-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -3806,7 +3933,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -3977,7 +4104,7 @@ cont { scale: 15 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -3986,14 +4113,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 16 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4002,14 +4129,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 17 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4018,14 +4145,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15723 + priority: 15735 } } element { scale: 18 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4035,14 +4162,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 19 symbol { name: "cafe-m" - priority: 16723 + priority: 16735 min_distance: 12 } caption { @@ -4052,7 +4179,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } } @@ -4062,7 +4189,7 @@ cont { scale: 18 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -4071,14 +4198,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -4087,7 +4214,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -4097,7 +4224,7 @@ cont { scale: 18 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16613 } caption { primary { @@ -4106,14 +4233,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15613 } } element { scale: 19 symbol { name: "car_sharing-m" - priority: 16638 + priority: 16613 } caption { primary { @@ -4122,7 +4249,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15613 } } } @@ -4132,7 +4259,7 @@ cont { scale: 17 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4142,14 +4269,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4159,14 +4286,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "car-wash-m" - priority: 16638 + priority: 16650 min_distance: 24 } caption { @@ -4176,7 +4303,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -4186,7 +4313,7 @@ cont { scale: 17 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4196,14 +4323,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4213,14 +4340,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "casino-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -4230,7 +4357,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -4240,7 +4367,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -4257,7 +4384,7 @@ cont { scale: 17 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4266,14 +4393,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4282,14 +4409,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4298,7 +4425,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -4308,7 +4435,7 @@ cont { scale: 14 symbol { name: "charging-station-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -4325,7 +4452,7 @@ cont { scale: 15 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -4342,7 +4469,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -4359,7 +4486,7 @@ cont { scale: 17 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4368,14 +4495,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4384,14 +4511,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "charging-station-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -4400,7 +4527,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -4410,7 +4537,7 @@ cont { scale: 17 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4418,14 +4545,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4434,14 +4561,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "kindergarten-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -4450,7 +4577,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -4460,7 +4587,7 @@ cont { scale: 17 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4469,14 +4596,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4485,14 +4612,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "cinema-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4501,7 +4628,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4511,7 +4638,7 @@ cont { scale: 17 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 min_distance: 4 } caption { @@ -4521,14 +4648,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4537,14 +4664,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4553,7 +4680,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4563,18 +4690,18 @@ cont { scale: 15 area { color: 2498323 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4589,11 +4716,11 @@ cont { scale: 17 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4608,11 +4735,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4628,11 +4755,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -4651,7 +4778,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16800 + priority: 16811 min_distance: 8 } caption { @@ -4661,14 +4788,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 24 } caption { @@ -4678,14 +4805,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4695,14 +4822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4712,14 +4839,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4729,14 +4856,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16800 + priority: 16811 min_distance: 16 } caption { @@ -4746,7 +4873,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15800 + priority: 15811 } } } @@ -4756,7 +4883,7 @@ cont { scale: 17 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4765,14 +4892,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4781,14 +4908,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "public-building-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4797,7 +4924,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4807,7 +4934,7 @@ cont { scale: 17 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4815,14 +4942,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4831,14 +4958,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "dentist-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -4847,7 +4974,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } } @@ -4857,32 +4984,32 @@ cont { scale: 14 area { color: 2496790 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 2496790 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 2496790 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 2496790 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 min_distance: 4 } caption { @@ -4892,18 +5019,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 2496790 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4912,18 +5039,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 2496790 - priority: -15343 + priority: -15331 } symbol { name: "hospital-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -4932,7 +5059,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -4942,7 +5069,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4950,7 +5077,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4958,7 +5085,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4966,7 +5093,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -4974,7 +5101,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } caption { @@ -4984,7 +5111,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -5030,7 +5157,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { @@ -5041,7 +5168,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { @@ -5052,7 +5179,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -5062,7 +5189,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 28 } caption { @@ -5071,14 +5198,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5087,14 +5214,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 17 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5103,14 +5230,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 18 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5120,14 +5247,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } element { scale: 19 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5137,7 +5264,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } } @@ -5147,6 +5274,7 @@ cont { scale: 11 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 min_distance: 12 } @@ -5155,6 +5283,7 @@ cont { scale: 12 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 min_distance: 12 } @@ -5163,6 +5292,7 @@ cont { scale: 13 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 } } @@ -5170,6 +5300,7 @@ cont { scale: 14 symbol { name: "ship-s" + apply_for_type: 1 priority: 16952 } } @@ -5177,6 +5308,7 @@ cont { scale: 15 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } } @@ -5184,6 +5316,7 @@ cont { scale: 16 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5201,6 +5334,7 @@ cont { scale: 17 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5218,6 +5352,7 @@ cont { scale: 18 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5235,6 +5370,7 @@ cont { scale: 19 symbol { name: "ship-m" + apply_for_type: 1 priority: 16952 } caption { @@ -5255,7 +5391,7 @@ cont { scale: 18 symbol { name: "fire_station-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -5264,14 +5400,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "fire_station-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -5280,7 +5416,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -5290,7 +5426,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 28 } caption { @@ -5299,14 +5435,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5315,14 +5451,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 17 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5331,14 +5467,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15704 + priority: 15716 } } element { scale: 18 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5348,14 +5484,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } element { scale: 19 symbol { name: "fastfood-m" - priority: 16704 + priority: 16716 min_distance: 12 } caption { @@ -5365,7 +5501,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15704 + priority: 15716 } } } @@ -5375,11 +5511,11 @@ cont { scale: 16 area { color: 8738 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5388,18 +5524,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 17 area { color: 8738 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5408,18 +5544,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 18 area { color: 8738 - priority: -15429 + priority: -15416 } symbol { name: "fountain-s" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5428,18 +5564,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15571 + priority: 15584 } } element { scale: 19 area { color: 8738 - priority: -15429 + priority: -15416 } symbol { name: "fountain-m" - priority: 16571 + priority: 16584 min_distance: 20 } caption { @@ -5448,7 +5584,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15571 + priority: 15584 } } } @@ -5458,7 +5594,7 @@ cont { scale: 14 symbol { name: "fuel-s" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5475,7 +5611,7 @@ cont { scale: 15 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 min_distance: 20 } caption { @@ -5492,7 +5628,7 @@ cont { scale: 16 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 min_distance: 10 } caption { @@ -5509,7 +5645,7 @@ cont { scale: 17 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5518,14 +5654,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 18 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5534,14 +5670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } element { scale: 19 symbol { name: "fuel-m" - priority: 16647 + priority: 16660 } caption { primary { @@ -5550,7 +5686,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15647 + priority: 15660 } } } @@ -5560,32 +5696,32 @@ cont { scale: 14 area { color: 655629312 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 1317888 - priority: -15600 + priority: -15585 } } element { scale: 16 area { color: 1317888 - priority: -15600 + priority: -15585 } } element { scale: 17 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5593,18 +5729,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5612,18 +5748,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5631,7 +5767,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -5641,32 +5777,32 @@ cont { scale: 14 area { color: 655629312 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 1317888 - priority: -15600 + priority: -15585 } } element { scale: 16 area { color: 1317888 - priority: -15600 + priority: -15585 } } element { scale: 17 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5674,18 +5810,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5693,18 +5829,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -5712,7 +5848,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -5722,11 +5858,11 @@ cont { scale: 14 area { color: 2496790 - priority: -15981 + priority: -15982 } symbol { name: "hospital-s" - priority: 16019 + priority: 16018 min_distance: 8 } } @@ -5734,11 +5870,12 @@ cont { scale: 15 area { color: 2496790 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 6 } caption { @@ -5754,11 +5891,12 @@ cont { scale: 16 area { color: 2496790 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5775,11 +5913,12 @@ cont { scale: 17 area { color: 2496790 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5796,11 +5935,12 @@ cont { scale: 18 area { color: 2496790 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5817,11 +5957,12 @@ cont { scale: 19 area { color: 2496790 - priority: -15981 + priority: -15982 } symbol { name: "hospital-m" - priority: 16019 + apply_for_type: 1 + priority: 16018 min_distance: 4 } caption { @@ -5841,7 +5982,7 @@ cont { scale: 18 symbol { name: "hunting-tower-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -5850,14 +5991,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "hunting-tower-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -5866,7 +6007,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -5876,14 +6017,14 @@ cont { scale: 16 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 } } element { scale: 17 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } } @@ -5891,7 +6032,7 @@ cont { scale: 18 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } } @@ -5899,7 +6040,7 @@ cont { scale: 19 symbol { name: "ice_cream-m" - priority: 16685 + priority: 16000 min_distance: 24 } caption { @@ -5909,7 +6050,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15300 } } } @@ -5919,6 +6060,7 @@ cont { scale: 18 symbol { name: "internet_cafe-m" + apply_for_type: 1 priority: 16000 } } @@ -5926,6 +6068,7 @@ cont { scale: 19 symbol { name: "internet_cafe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -5944,25 +6087,25 @@ cont { scale: 15 area { color: 2498323 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 2498323 - priority: -15981 + priority: -15982 } } element { scale: 17 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -5977,11 +6120,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -5997,11 +6140,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "kindergarten-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -6052,7 +6195,8 @@ cont { scale: 18 symbol { name: "library-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -6061,14 +6205,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "library-m" - priority: 16638 + apply_for_type: 1 + priority: 16650 } caption { primary { @@ -6077,7 +6222,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -6087,7 +6232,8 @@ cont { scale: 18 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -6096,14 +6242,15 @@ cont { offset_x: 1 text: "ref" } - priority: 15038 + priority: 15056 } } element { scale: 19 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -6122,7 +6269,7 @@ cont { scale: 16 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 24 } caption { @@ -6131,14 +6278,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 17 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6147,14 +6294,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6163,14 +6310,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "marketplace-m" - priority: 16657 + priority: 16613 min_distance: 8 } caption { @@ -6179,7 +6326,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15613 } } } @@ -6274,8 +6421,8 @@ cont { element { scale: 16 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6283,14 +6430,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 17 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6298,14 +6445,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 18 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6313,14 +6460,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15650 } } element { scale: 19 symbol { - name: "nightclub-m" - priority: 16657 + name: "bar-m" + priority: 16650 } caption { primary { @@ -6328,7 +6475,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15650 } } } @@ -6389,7 +6536,7 @@ cont { scale: 17 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6398,14 +6545,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6414,14 +6561,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mail-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -6430,7 +6577,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -6440,18 +6587,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6459,22 +6606,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6490,11 +6637,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6513,18 +6660,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6532,22 +6679,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6563,11 +6710,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6586,18 +6733,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6605,22 +6752,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6636,11 +6783,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6659,18 +6806,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6678,22 +6825,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6709,11 +6856,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6732,18 +6879,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6751,22 +6898,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6782,11 +6929,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6805,18 +6952,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6824,22 +6971,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6855,11 +7002,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6878,18 +7025,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6897,22 +7044,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "zero-icon" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6928,11 +7075,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -6951,18 +7098,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15896 + priority: -15878 } } element { scale: 16 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-s" - priority: 16104 + priority: 16122 min_distance: 25 } } @@ -6970,22 +7117,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } } element { scale: 18 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -7001,11 +7148,11 @@ cont { scale: 19 area { color: 2038555 - priority: -15896 + priority: -15878 } symbol { name: "parking-m" - priority: 16104 + priority: 16122 } caption { primary { @@ -7255,7 +7402,7 @@ cont { scale: 16 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } } @@ -7263,7 +7410,7 @@ cont { scale: 17 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7273,14 +7420,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } element { scale: 18 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7290,14 +7437,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } element { scale: 19 symbol { name: "pharmacy-m" - priority: 16885 + priority: 16886 min_distance: 20 } caption { @@ -7307,7 +7454,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15885 + priority: 15886 } } } @@ -7317,7 +7464,7 @@ cont { scale: 14 symbol { name: "place-of-worship-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7327,14 +7474,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7344,18 +7491,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7365,18 +7512,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7386,18 +7533,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7407,18 +7554,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "place-of-worship-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7428,7 +7575,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7438,7 +7585,7 @@ cont { scale: 14 symbol { name: "buddhist-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7448,14 +7595,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7465,18 +7612,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7486,18 +7633,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7507,18 +7654,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7528,18 +7675,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "buddhist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7549,7 +7696,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7559,7 +7706,7 @@ cont { scale: 14 symbol { name: "christian-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7569,14 +7716,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7586,18 +7733,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7607,18 +7754,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7628,18 +7775,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7649,18 +7796,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "christian-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7670,7 +7817,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7680,7 +7827,7 @@ cont { scale: 14 symbol { name: "hindu-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7690,14 +7837,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7707,18 +7854,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7728,18 +7875,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7749,18 +7896,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7770,18 +7917,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "hindu-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7791,7 +7938,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7801,7 +7948,7 @@ cont { scale: 14 symbol { name: "jewish-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7811,14 +7958,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7828,18 +7975,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7849,18 +7996,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7870,18 +8017,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7891,18 +8038,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "jewish-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7912,7 +8059,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -7922,7 +8069,7 @@ cont { scale: 14 symbol { name: "muslim-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -7932,14 +8079,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7949,18 +8096,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7970,18 +8117,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -7991,18 +8138,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8012,18 +8159,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "muslim-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8033,7 +8180,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8043,7 +8190,7 @@ cont { scale: 14 symbol { name: "shinto-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8053,14 +8200,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8070,18 +8217,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8091,18 +8238,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8112,18 +8259,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8133,18 +8280,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "shinto-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8154,7 +8301,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8164,7 +8311,7 @@ cont { scale: 14 symbol { name: "taoist-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -8174,14 +8321,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8191,18 +8338,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8212,18 +8359,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8233,18 +8380,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8254,18 +8401,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 area { color: 2499106 - priority: -15191 + priority: -15180 } symbol { name: "taoist-m" - priority: 16809 + priority: 16820 min_distance: 10 } caption { @@ -8275,7 +8422,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -8285,7 +8432,7 @@ cont { scale: 17 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8294,14 +8441,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8310,14 +8457,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "police-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8326,7 +8473,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -8336,7 +8483,7 @@ cont { scale: 18 symbol { name: "postbox-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -8345,14 +8492,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "postbox-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -8361,7 +8508,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -8371,7 +8518,7 @@ cont { scale: 17 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8380,14 +8527,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 18 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8396,14 +8543,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } element { scale: 19 symbol { name: "mail-m" - priority: 16657 + priority: 16613 } caption { primary { @@ -8412,7 +8559,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15613 } } } @@ -8422,7 +8569,7 @@ cont { scale: 17 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8430,14 +8577,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8446,14 +8593,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "prison-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -8462,7 +8609,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -8472,7 +8619,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 28 } caption { @@ -8481,14 +8628,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 16 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8497,14 +8644,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 17 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8513,14 +8660,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15685 + priority: 15698 } } element { scale: 18 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8530,14 +8677,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } element { scale: 19 symbol { name: "beer-m" - priority: 16685 + priority: 16698 min_distance: 12 } caption { @@ -8547,7 +8694,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15685 + priority: 15698 } } } @@ -8571,7 +8718,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8579,7 +8726,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8587,7 +8734,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8596,7 +8743,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8606,7 +8753,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8614,7 +8761,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8622,7 +8769,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8631,7 +8778,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8641,7 +8788,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8649,7 +8796,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -8657,7 +8804,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -8666,7 +8813,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -8676,7 +8823,7 @@ cont { scale: 15 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 28 } caption { @@ -8685,14 +8832,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 16 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8701,14 +8848,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 17 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8717,14 +8864,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15714 + priority: 15726 } } element { scale: 18 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8734,14 +8881,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15714 + priority: 15726 } } element { scale: 19 symbol { name: "restaurant-m" - priority: 16714 + priority: 16726 min_distance: 12 } caption { @@ -8751,7 +8898,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15714 + priority: 15726 } } } @@ -8761,7 +8908,7 @@ cont { scale: 15 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8771,14 +8918,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8788,14 +8935,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8805,14 +8952,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8822,14 +8969,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "dump-station-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -8839,7 +8986,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -8849,25 +8996,25 @@ cont { scale: 15 area { color: 2498323 - priority: -15981 + priority: -15982 } } element { scale: 16 area { color: 2498323 - priority: -15981 + priority: -15982 } } element { scale: 17 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -8882,11 +9029,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -8902,11 +9049,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "school-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -8925,7 +9072,7 @@ cont { scale: 16 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8934,14 +9081,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8950,14 +9097,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8966,14 +9113,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "shelter-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -8982,7 +9129,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -8992,7 +9139,7 @@ cont { scale: 17 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9001,14 +9148,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9017,14 +9164,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "shower-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9033,7 +9180,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9043,7 +9190,7 @@ cont { scale: 16 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -9052,14 +9199,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9068,14 +9215,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9084,14 +9231,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "taxi-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -9100,7 +9247,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -9110,7 +9257,8 @@ cont { scale: 17 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } } @@ -9118,7 +9266,8 @@ cont { scale: 18 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } } @@ -9126,7 +9275,8 @@ cont { scale: 19 symbol { name: "phone-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 30 } caption { @@ -9135,7 +9285,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9145,7 +9295,7 @@ cont { scale: 14 symbol { name: "theatre-s" - priority: 16723 + priority: 16735 min_distance: 8 } caption { @@ -9155,7 +9305,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { @@ -9167,14 +9317,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 16 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9184,14 +9334,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 17 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9201,14 +9351,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 18 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9218,14 +9368,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } element { scale: 19 symbol { name: "theatre-m" - priority: 16723 + priority: 16735 min_distance: 10 } caption { @@ -9235,7 +9385,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15723 + priority: 15735 } } } @@ -9245,7 +9395,7 @@ cont { scale: 18 symbol { name: "toilets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -9254,14 +9404,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "toilets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -9270,7 +9420,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -9294,11 +9444,11 @@ cont { scale: 14 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-s" - priority: 16019 + priority: 16018 min_distance: 12 } caption { @@ -9315,11 +9465,11 @@ cont { scale: 15 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 12 } caption { @@ -9336,7 +9486,7 @@ cont { scale: 15 area { color: 2498323 - priority: -15981 + priority: -15982 } caption { primary { @@ -9352,11 +9502,11 @@ cont { scale: 16 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 11 } caption { @@ -9373,7 +9523,7 @@ cont { scale: 16 area { color: 2498323 - priority: -15981 + priority: -15982 } caption { primary { @@ -9389,11 +9539,11 @@ cont { scale: 17 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 min_distance: 10 } caption { @@ -9410,7 +9560,7 @@ cont { scale: 17 area { color: 2498323 - priority: -15981 + priority: -15982 } caption { primary { @@ -9426,11 +9576,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9447,7 +9597,7 @@ cont { scale: 18 area { color: 2498323 - priority: -15981 + priority: -15982 } caption { primary { @@ -9463,11 +9613,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15981 + priority: -15982 } symbol { name: "college-m" - priority: 16019 + priority: 16018 } caption { primary { @@ -9484,7 +9634,7 @@ cont { scale: 19 area { color: 2498323 - priority: -15981 + priority: -15982 } caption { primary { @@ -9503,7 +9653,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9512,14 +9662,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9528,14 +9678,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9544,7 +9694,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9554,7 +9704,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9563,14 +9713,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9579,14 +9729,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9595,7 +9745,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9605,7 +9755,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9614,14 +9764,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9630,14 +9780,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9646,7 +9796,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9656,7 +9806,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9665,14 +9815,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9681,14 +9831,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9697,7 +9847,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9707,7 +9857,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9716,14 +9866,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9732,14 +9882,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9748,7 +9898,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9758,7 +9908,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9767,14 +9917,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9783,14 +9933,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9799,7 +9949,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9809,7 +9959,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9818,14 +9968,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9834,14 +9984,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9850,7 +10000,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9860,7 +10010,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16590 + priority: 16603 min_distance: 20 } } @@ -9868,7 +10018,7 @@ cont { scale: 18 symbol { name: "fuel-dispenser-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9877,14 +10027,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "fuel-dispenser-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9893,7 +10043,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9903,7 +10053,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9912,14 +10062,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9928,14 +10078,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9944,7 +10094,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -9954,7 +10104,7 @@ cont { scale: 17 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9963,14 +10113,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9979,14 +10129,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "parking-meter-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -9995,7 +10145,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10005,7 +10155,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10014,14 +10164,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10030,14 +10180,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10046,7 +10196,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10056,7 +10206,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10065,14 +10215,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10081,14 +10231,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "vending-m" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -10097,7 +10247,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10107,7 +10257,7 @@ cont { scale: 16 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10115,14 +10265,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10130,14 +10280,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10146,14 +10296,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "veterinary-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -10162,7 +10312,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -10172,14 +10322,16 @@ cont { scale: 18 symbol { name: "waste-basket-s" - priority: 16580 + apply_for_type: 1 + priority: 16594 } } element { scale: 19 symbol { name: "waste-basket-s" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -10187,7 +10339,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15580 + priority: 15594 } } } @@ -10197,7 +10349,7 @@ cont { scale: 18 symbol { name: "waste-basket-m" - priority: 16580 + priority: 16594 } caption { primary { @@ -10205,14 +10357,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "waste-basket-m" - priority: 16580 + priority: 16594 } caption { primary { @@ -10220,7 +10372,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15580 + priority: 15594 } } } @@ -10230,7 +10382,7 @@ cont { scale: 17 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -10238,7 +10390,7 @@ cont { scale: 18 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } } @@ -10246,7 +10398,7 @@ cont { scale: 19 symbol { name: "recycling-m" - priority: 16590 + priority: 16603 min_distance: 30 } caption { @@ -10255,7 +10407,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -10265,7 +10417,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10273,7 +10425,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10281,7 +10433,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10289,7 +10441,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -10297,7 +10449,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } caption { @@ -10307,7 +10459,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -10317,77 +10469,77 @@ cont { scale: 14 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 16 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } } @@ -10397,42 +10549,42 @@ cont { scale: 14 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 16 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 17 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 18 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 19 area { color: 2499106 - priority: -15886 + priority: -15868 } } } @@ -10442,77 +10594,77 @@ cont { scale: 14 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 15 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 16 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 11 color: 10066329 } - priority: 15114 + priority: 15132 } } } @@ -10522,6 +10674,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10537,6 +10690,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10552,6 +10706,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10567,6 +10722,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10585,6 +10741,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10600,6 +10757,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10615,6 +10773,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10630,6 +10789,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10648,7 +10808,8 @@ cont { scale: 15 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10656,14 +10817,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10671,14 +10833,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10686,14 +10849,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10701,14 +10865,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 19 symbol { name: "bcontrol-m" - priority: 16666 + apply_for_type: 1 + priority: 16679 } caption { primary { @@ -10716,7 +10881,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } } @@ -10726,6 +10891,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10741,6 +10907,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10756,6 +10923,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10771,6 +10939,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10790,7 +10959,7 @@ cont { lines { width: 2.0 color: 3881787 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -10799,7 +10968,7 @@ cont { lines { width: 2.8 color: 3881787 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -10814,7 +10983,7 @@ cont { dd: 1.5 dd: 3.0 } - priority: 1457 + priority: 1471 } } element { @@ -10828,7 +10997,7 @@ cont { dd: 1.9 dd: 4.0 } - priority: 1457 + priority: 1471 } } element { @@ -10842,7 +11011,7 @@ cont { dd: 2.5 dd: 6.0 } - priority: 1457 + priority: 1471 } } element { @@ -10856,7 +11025,7 @@ cont { dd: 3.0 dd: 8.0 } - priority: 1457 + priority: 1471 } } } @@ -10871,7 +11040,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } element { @@ -10883,7 +11052,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } element { @@ -10895,7 +11064,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1142 + priority: 1160 } } } @@ -10905,6 +11074,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10920,6 +11090,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10935,6 +11106,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10950,6 +11122,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -10969,7 +11142,7 @@ cont { lines { width: 1.0 color: 1296319556 - priority: 1457 + priority: 1471 } } element { @@ -10977,7 +11150,7 @@ cont { lines { width: 1.3 color: 860111940 - priority: 1457 + priority: 1471 } } element { @@ -10985,7 +11158,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1457 + priority: 1471 } } element { @@ -10993,7 +11166,7 @@ cont { lines { width: 3.0 color: 4473924 - priority: 1457 + priority: 1471 } } } @@ -11003,6 +11176,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11018,6 +11192,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11033,6 +11208,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11048,6 +11224,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11067,7 +11244,7 @@ cont { lines { width: 1.6 color: 1712861720 - priority: 1457 + priority: 1471 } } element { @@ -11075,7 +11252,7 @@ cont { lines { width: 2.2 color: 1293431320 - priority: 1457 + priority: 1471 } } element { @@ -11083,7 +11260,7 @@ cont { lines { width: 3.0 color: 857223704 - priority: 1457 + priority: 1471 } } element { @@ -11091,7 +11268,7 @@ cont { lines { width: 4.0 color: 1585688 - priority: 1457 + priority: 1471 } } } @@ -11101,6 +11278,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11116,6 +11294,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11131,6 +11310,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11146,6 +11326,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11164,7 +11345,7 @@ cont { scale: 16 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -11173,14 +11354,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11190,14 +11371,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11207,14 +11388,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "lift_gate-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -11224,7 +11405,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -11241,7 +11422,7 @@ cont { dd: 1.4 dd: 1.0 } - priority: 1219 + priority: 1235 } } element { @@ -11255,7 +11436,7 @@ cont { dd: 2.0 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -11269,7 +11450,7 @@ cont { dd: 3.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -11283,7 +11464,7 @@ cont { dd: 4.0 dd: 2.0 } - priority: 1219 + priority: 1235 } } } @@ -11293,6 +11474,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11308,6 +11490,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11323,6 +11506,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11338,6 +11522,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } caption { @@ -11426,7 +11611,7 @@ cont { scale: 12 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } } @@ -11434,7 +11619,7 @@ cont { scale: 13 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } } @@ -11442,7 +11627,7 @@ cont { scale: 14 symbol { name: "toll_booth-s" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11451,14 +11636,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15895 + priority: 15896 } } element { scale: 15 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11468,14 +11653,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 16 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11485,14 +11670,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 17 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11502,14 +11687,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 18 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11519,14 +11704,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } element { scale: 19 symbol { name: "toll_booth-m" - priority: 16895 + priority: 16896 min_distance: 8 } caption { @@ -11536,7 +11721,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15895 + priority: 15896 } } } @@ -11547,7 +11732,7 @@ cont { lines { width: 1.0 color: 1296319556 - priority: 1457 + priority: 1471 } } element { @@ -11555,7 +11740,7 @@ cont { lines { width: 1.3 color: 860111940 - priority: 1457 + priority: 1471 } } element { @@ -11563,7 +11748,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1457 + priority: 1471 } } element { @@ -11571,7 +11756,7 @@ cont { lines { width: 3.0 color: 4473924 - priority: 1457 + priority: 1471 } } } @@ -11582,7 +11767,7 @@ cont { lines { width: 0.5 color: 1297438037 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11592,7 +11777,7 @@ cont { lines { width: 0.5 color: 861230421 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11602,7 +11787,7 @@ cont { lines { width: 0.6 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11612,7 +11797,7 @@ cont { lines { width: 0.8 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11622,7 +11807,7 @@ cont { lines { width: 0.85 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11632,7 +11817,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11642,7 +11827,7 @@ cont { lines { width: 1.1 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11652,7 +11837,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11662,7 +11847,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11672,7 +11857,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11682,7 +11867,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11692,7 +11877,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11701,7 +11886,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11710,7 +11895,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11719,7 +11904,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 } } element { @@ -11727,7 +11912,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 } } element { @@ -11735,7 +11920,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 } } element { @@ -11743,7 +11928,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1200 + priority: 1216 } } } @@ -11758,7 +11943,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11775,7 +11960,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11789,7 +11974,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11803,7 +11988,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11817,7 +12002,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11831,7 +12016,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11845,7 +12030,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11859,7 +12044,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11873,7 +12058,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 join: BEVELJOIN cap: BUTTCAP } @@ -11887,7 +12072,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11900,7 +12085,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11913,7 +12098,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 cap: BUTTCAP } } @@ -11926,7 +12111,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -11938,7 +12123,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -11950,7 +12135,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } element { @@ -11962,7 +12147,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1200 + priority: 1216 } } } @@ -11977,7 +12162,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -11991,7 +12176,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12005,7 +12190,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 join: BEVELJOIN cap: BUTTCAP } @@ -12019,7 +12204,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12032,7 +12217,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12045,7 +12230,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 cap: BUTTCAP } } @@ -12058,7 +12243,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12070,7 +12255,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12082,7 +12267,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } element { @@ -12094,7 +12279,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1190 + priority: 1207 } } } @@ -12104,18 +12289,18 @@ cont { scale: 10 area { color: 3425648640 - priority: -15334 + priority: -15321 } } element { scale: 11 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 20 } } @@ -12123,11 +12308,11 @@ cont { scale: 12 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -12137,18 +12322,18 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 13 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -12158,18 +12343,18 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 14 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 } caption { primary { @@ -12178,18 +12363,18 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12198,18 +12383,18 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12218,18 +12403,18 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12238,18 +12423,18 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12259,18 +12444,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } element { scale: 19 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -12280,7 +12465,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } } @@ -12290,14 +12475,14 @@ cont { scale: 14 area { color: 2150246954 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1714039338 - priority: 1267 + priority: 1284 } } element { @@ -12308,7 +12493,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12321,7 +12506,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12332,7 +12517,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12345,7 +12530,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12356,7 +12541,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12369,7 +12554,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12380,7 +12565,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12393,7 +12578,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12412,7 +12597,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12428,7 +12613,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12444,7 +12629,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12460,7 +12645,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12470,14 +12655,14 @@ cont { scale: 14 area { color: 2150246954 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1714039338 - priority: 1267 + priority: 1284 } } element { @@ -12488,7 +12673,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12501,7 +12686,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12512,7 +12697,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12525,7 +12710,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12536,7 +12721,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12549,7 +12734,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12560,7 +12745,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12573,7 +12758,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12583,14 +12768,14 @@ cont { scale: 14 area { color: 2150246954 - priority: 1267 + priority: 1284 } } element { scale: 15 area { color: 1714039338 - priority: 1267 + priority: 1284 } } element { @@ -12601,7 +12786,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12614,7 +12799,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12625,7 +12810,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12638,7 +12823,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12649,7 +12834,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12662,7 +12847,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12673,7 +12858,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12686,7 +12871,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12696,14 +12881,14 @@ cont { scale: 14 area { color: 2150246954 - priority: 1962 + priority: 1963 } } element { scale: 15 area { color: 1714039338 - priority: 1962 + priority: 1963 } } element { @@ -12714,7 +12899,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12727,7 +12912,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12738,7 +12923,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12751,7 +12936,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12762,7 +12947,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12775,7 +12960,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } element { @@ -12786,7 +12971,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1267 + priority: 1284 } caption { primary { @@ -12799,7 +12984,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15266 + priority: 15283 } } } @@ -12813,7 +12998,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1229 + priority: 1246 } } element { @@ -12824,7 +13009,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1229 + priority: 1246 } } element { @@ -12835,7 +13020,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1229 + priority: 1246 } } element { @@ -12846,7 +13031,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1229 + priority: 1246 } } } @@ -12856,7 +13041,7 @@ cont { scale: 17 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -12864,14 +13049,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -12879,14 +13064,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -12894,7 +13079,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -12911,7 +13096,7 @@ cont { scale: 18 symbol { name: "beekeeper-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12920,14 +13105,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beekeeper-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12936,7 +13121,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -12953,7 +13138,7 @@ cont { scale: 18 symbol { name: "blacksmith-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12962,14 +13147,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "blacksmith-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -12978,7 +13163,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -12995,7 +13180,7 @@ cont { scale: 18 symbol { name: "brewery-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13004,14 +13189,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "brewery-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13020,7 +13205,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13037,7 +13222,7 @@ cont { scale: 18 symbol { name: "carpenter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13046,14 +13231,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "carpenter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13062,7 +13247,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13079,7 +13264,7 @@ cont { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13088,14 +13273,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13104,7 +13289,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13121,7 +13306,7 @@ cont { scale: 18 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13130,14 +13315,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13146,7 +13331,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13163,7 +13348,7 @@ cont { scale: 18 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13172,14 +13357,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electrician-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13188,7 +13373,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13205,7 +13390,7 @@ cont { scale: 18 symbol { name: "florist-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13214,14 +13399,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "florist-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13230,7 +13415,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13240,7 +13425,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13249,14 +13434,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13265,7 +13450,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13275,7 +13460,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13284,14 +13469,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13300,7 +13485,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13310,7 +13495,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13319,14 +13504,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13335,7 +13520,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13352,7 +13537,7 @@ cont { scale: 18 symbol { name: "painter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13361,14 +13546,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "painter-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13377,7 +13562,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13394,7 +13579,7 @@ cont { scale: 18 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13403,14 +13588,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13419,7 +13604,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13436,7 +13621,7 @@ cont { scale: 18 symbol { name: "plumber-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13445,14 +13630,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "plumber-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13461,7 +13646,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13478,7 +13663,7 @@ cont { scale: 18 symbol { name: "sawmill-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13487,14 +13672,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sawmill-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13503,7 +13688,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13520,7 +13705,7 @@ cont { scale: 18 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13529,14 +13714,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13545,7 +13730,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13562,7 +13747,7 @@ cont { scale: 18 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13571,14 +13756,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13587,7 +13772,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13597,7 +13782,7 @@ cont { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13606,14 +13791,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -13622,7 +13807,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -13701,35 +13886,56 @@ cont { element { scale: 17 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } element { scale: 18 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } element { scale: 19 symbol { - name: "emergency-phone-m" - priority: 16590 + name: "phone-m" + apply_for_type: 1 + priority: 16603 min_distance: 30 } } } cont { name: "entrance" + element { + scale: 18 + symbol { + name: "entrance-s" + apply_for_type: 1 + priority: 16056 + } + caption { + primary { + height: 10 + color: 5592405 + offset_x: 1 + text: "ref" + } + priority: 15056 + } + } element { scale: 19 symbol { name: "entrance-s" - priority: 16038 + apply_for_type: 1 + priority: 16056 } caption { primary { @@ -13743,197 +13949,7 @@ cont { offset_y: 10 text: "addr:flats" } - priority: 15038 - } - } -} -cont { - name: "entrance-main" - element { - scale: 18 - symbol { - name: "main_entrance-s" - priority: 16038 - } - caption { - primary { - height: 10 - color: 5592405 - offset_x: 1 - text: "ref" - } - priority: 15038 - } - } - element { - scale: 19 - symbol { - name: "main_entrance-s" - priority: 16038 - } - caption { - primary { - height: 10 - color: 5592405 - offset_x: 1 - text: "ref" - } - secondary { - height: 12 - offset_y: 10 - text: "addr:flats" - } - priority: 15038 - } - } -} -cont { - name: "healthcare-alternative" - element { - scale: 17 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "alternative-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-audiologist" - element { - scale: 17 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "audiologist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-blood_donation" - element { - scale: 17 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "blood_donation-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15056 } } } @@ -13942,23 +13958,25 @@ cont { element { scale: 17 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 + min_distance: 4 } caption { primary { height: 10 color: 5592405 offset_y: 1 + is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 } caption { primary { @@ -13967,14 +13985,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { - name: "sample_collection-m" - priority: 16657 + name: "hospital-m" + priority: 16669 } caption { primary { @@ -13983,57 +14001,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 - } - } -} -cont { - name: "healthcare-optometrist" - element { - scale: 17 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "optometrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15669 } } } @@ -14043,7 +14011,7 @@ cont { scale: 17 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14051,14 +14019,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14067,14 +14035,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "physiotherapist-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -14083,207 +14051,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 - } - } -} -cont { - name: "healthcare-podiatrist" - element { - scale: 17 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "podiatrist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-psychotherapist" - element { - scale: 17 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "psychotherapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-sample_collection" - element { - scale: 17 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "sample_collection-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } -} -cont { - name: "healthcare-speech_therapist" - element { - scale: 17 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "speech_therapist-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15669 } } } @@ -14298,7 +14066,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14311,7 +14079,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14320,7 +14088,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14332,7 +14100,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14340,7 +14108,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14352,7 +14120,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14360,7 +14128,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14372,7 +14140,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14380,7 +14148,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14392,7 +14160,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14400,7 +14168,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } } @@ -14415,7 +14183,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14428,7 +14196,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14437,7 +14205,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14449,7 +14217,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14457,7 +14225,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14469,7 +14237,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14477,7 +14245,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14489,7 +14257,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14497,7 +14265,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14509,7 +14277,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14517,7 +14285,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } } @@ -14532,7 +14300,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14545,7 +14313,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14554,7 +14322,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14566,7 +14334,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14574,7 +14342,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14586,7 +14354,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14594,7 +14362,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14606,7 +14374,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14614,7 +14382,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14626,7 +14394,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14634,7 +14402,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } } @@ -14649,7 +14417,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } } @@ -14662,7 +14430,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1304 + priority: 1320 cap: BUTTCAP } path_text { @@ -14671,7 +14439,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14683,7 +14451,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14691,7 +14459,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14703,7 +14471,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14711,7 +14479,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14723,7 +14491,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14731,7 +14499,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } element { @@ -14743,7 +14511,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1304 + priority: 1320 } path_text { primary { @@ -14751,7 +14519,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16304 + priority: 16320 } } } @@ -14761,14 +14529,14 @@ cont { scale: 16 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } } element { scale: 17 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -14786,14 +14554,14 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -14811,14 +14579,14 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "bus-m" - priority: 16914 + priority: 16915 } caption { primary { @@ -14836,235 +14604,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 - } - } -} -cont { - name: "highway-busway" - element { - scale: 15 - lines { - width: 1.2 - color: 4933187 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 - } - } -} -cont { - name: "highway-busway-bridge" - element { - scale: 15 - lines { - width: 1.2 - color: 4933187 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 - } - } -} -cont { - name: "highway-busway-tunnel" - element { - scale: 15 - lines { - width: 1.2 - color: 4933187 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 + priority: 15915 } } } @@ -15079,7 +14619,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1295 + priority: 1311 cap: BUTTCAP } } @@ -15092,7 +14632,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1295 + priority: 1311 cap: BUTTCAP } } @@ -15105,7 +14645,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1295 + priority: 1311 cap: BUTTCAP } path_text { @@ -15114,7 +14654,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16295 + priority: 16311 } } element { @@ -15126,7 +14666,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15134,7 +14674,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16295 + priority: 16311 } } element { @@ -15146,7 +14686,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15154,7 +14694,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16295 + priority: 16311 } } element { @@ -15166,7 +14706,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15174,7 +14714,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16295 + priority: 16311 } } element { @@ -15186,7 +14726,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1295 + priority: 1311 } path_text { primary { @@ -15194,7 +14734,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16295 + priority: 16311 } } } @@ -15205,7 +14745,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15214,7 +14754,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15223,7 +14763,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15232,7 +14772,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15240,7 +14780,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15248,7 +14788,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15256,7 +14796,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15264,7 +14804,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15272,7 +14812,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15280,7 +14820,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15288,7 +14828,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15296,7 +14836,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -15307,7 +14847,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15316,7 +14856,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15325,7 +14865,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15334,7 +14874,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15342,7 +14882,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15350,7 +14890,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15358,7 +14898,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15366,7 +14906,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15374,7 +14914,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15382,7 +14922,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15390,7 +14930,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15398,7 +14938,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -15409,7 +14949,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15418,7 +14958,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15427,7 +14967,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15436,7 +14976,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15444,7 +14984,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15452,7 +14992,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15460,7 +15000,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15468,7 +15008,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15476,7 +15016,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15484,7 +15024,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15492,7 +15032,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15500,7 +15040,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -15511,7 +15051,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15520,7 +15060,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -15529,7 +15069,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -15538,7 +15078,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15546,7 +15086,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15554,7 +15094,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15562,7 +15102,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15570,7 +15110,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15578,7 +15118,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15586,7 +15126,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -15594,7 +15134,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1476 + priority: 1490 } path_text { primary { @@ -15602,7 +15142,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -15612,21 +15152,21 @@ cont { scale: 17 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } element { scale: 18 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } element { scale: 19 symbol { name: "elevator" - priority: 16580 + priority: 16594 } } } @@ -15641,7 +15181,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -15650,7 +15190,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15662,7 +15202,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15670,7 +15210,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15682,7 +15222,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15690,7 +15230,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15702,7 +15242,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15710,7 +15250,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15722,7 +15262,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15730,7 +15270,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -15745,7 +15285,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -15758,7 +15298,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -15767,7 +15307,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15779,7 +15319,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15787,7 +15327,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15799,7 +15339,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15807,7 +15347,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15819,7 +15359,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15827,7 +15367,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15839,7 +15379,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -15847,7 +15387,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -15857,7 +15397,7 @@ cont { scale: 14 area { color: 2499106 - priority: -15686 + priority: -15670 } } element { @@ -15869,12 +15409,12 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } area { color: 2499106 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15882,7 +15422,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15894,11 +15434,11 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } area { color: 2499106 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15906,7 +15446,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15918,11 +15458,11 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } area { color: 2499106 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15930,7 +15470,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15942,11 +15482,11 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } area { color: 2499106 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15954,7 +15494,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -15966,11 +15506,11 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } area { color: 2499106 - priority: -15686 + priority: -15670 } path_text { primary { @@ -15978,7 +15518,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -15993,7 +15533,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16002,7 +15542,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16014,7 +15554,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16022,7 +15562,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16034,7 +15574,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16042,7 +15582,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16054,7 +15594,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16062,7 +15602,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16074,7 +15614,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16082,7 +15622,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16097,7 +15637,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16110,7 +15650,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16119,7 +15659,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16131,7 +15671,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16139,7 +15679,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16151,7 +15691,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16159,7 +15699,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16171,7 +15711,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16179,7 +15719,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16191,7 +15731,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16199,7 +15739,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16214,7 +15754,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16227,7 +15767,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16236,7 +15776,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16248,7 +15788,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16256,7 +15796,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16268,7 +15808,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16276,7 +15816,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16288,7 +15828,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16296,7 +15836,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16308,7 +15848,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16316,7 +15856,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16331,7 +15871,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16344,7 +15884,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16353,7 +15893,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16365,7 +15905,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16373,7 +15913,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16385,7 +15925,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16393,7 +15933,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16405,7 +15945,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16413,7 +15953,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16425,7 +15965,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16433,7 +15973,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16448,7 +15988,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16461,7 +16001,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16470,7 +16010,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16482,7 +16022,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16490,7 +16030,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16502,7 +16042,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16510,7 +16050,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16522,7 +16062,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16530,7 +16070,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16542,7 +16082,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16550,7 +16090,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16565,7 +16105,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -16578,7 +16118,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16587,7 +16127,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16599,7 +16139,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16607,7 +16147,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16619,7 +16159,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16627,7 +16167,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16639,7 +16179,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16647,7 +16187,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16659,7 +16199,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16667,7 +16207,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16682,7 +16222,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16691,7 +16231,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16703,7 +16243,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16711,7 +16251,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16723,7 +16263,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16731,7 +16271,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16743,7 +16283,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16751,7 +16291,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16763,7 +16303,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16771,7 +16311,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16786,7 +16326,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -16795,7 +16335,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16807,7 +16347,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16815,7 +16355,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16827,7 +16367,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -16835,7 +16375,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -16845,7 +16385,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16853,7 +16393,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16865,7 +16405,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -16873,7 +16413,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -16883,7 +16423,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16891,7 +16431,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -16903,7 +16443,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -16911,7 +16451,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -16921,7 +16461,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -16929,7 +16469,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -16944,7 +16484,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -16957,7 +16497,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -16970,7 +16510,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -16983,11 +16523,12 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -16995,7 +16536,7 @@ cont { color: 7829367 stroke_color: 860111940 } - priority: 16333 + priority: 16349 } } element { @@ -17007,11 +16548,12 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17019,7 +16561,7 @@ cont { color: 7829367 stroke_color: 860111940 } - priority: 16333 + priority: 16349 } } element { @@ -17031,11 +16573,12 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17043,7 +16586,7 @@ cont { color: 7829367 stroke_color: 860111940 } - priority: 16333 + priority: 16349 } } element { @@ -17055,11 +16598,12 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } symbol { name: "dot-m" - priority: 16333 + apply_for_type: 1 + priority: 16349 } path_text { primary { @@ -17067,7 +16611,7 @@ cont { color: 7829367 stroke_color: 860111940 } - priority: 16333 + priority: 16349 } } } @@ -17078,7 +16622,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17088,7 +16632,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17097,7 +16641,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17106,7 +16650,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17114,7 +16658,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17123,7 +16667,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17131,7 +16675,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17139,7 +16683,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17147,7 +16691,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17155,7 +16699,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17163,7 +16707,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17171,7 +16715,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -17179,7 +16723,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17187,7 +16731,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -17198,7 +16742,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17208,7 +16752,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17217,7 +16761,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17226,7 +16770,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17234,7 +16778,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17243,7 +16787,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17251,7 +16795,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17259,7 +16803,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17267,7 +16811,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17275,7 +16819,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17283,7 +16827,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17291,7 +16835,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -17299,7 +16843,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17307,7 +16851,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -17318,7 +16862,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -17328,7 +16872,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -17337,7 +16881,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17346,7 +16890,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17354,7 +16898,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -17363,7 +16907,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17374,13 +16918,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 4.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17388,7 +16932,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17399,13 +16943,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17413,7 +16957,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -17424,13 +16968,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17438,7 +16982,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -17449,13 +16993,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -17463,7 +17007,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -17474,7 +17018,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17484,7 +17028,7 @@ cont { lines { width: 1.1 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17494,7 +17038,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17504,7 +17048,7 @@ cont { lines { width: 1.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17514,12 +17058,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 85 text_color: 11711154 } @@ -17529,7 +17073,7 @@ cont { lines { width: 1.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17539,12 +17083,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -17554,7 +17098,7 @@ cont { lines { width: 1.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17564,12 +17108,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -17579,7 +17123,7 @@ cont { lines { width: 2.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17588,12 +17132,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 120 text_color: 11711154 } @@ -17603,7 +17147,7 @@ cont { lines { width: 3.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17612,12 +17156,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 175 text_color: 11711154 } @@ -17627,7 +17171,7 @@ cont { lines { width: 4.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17636,12 +17180,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 250 text_color: 11711154 } @@ -17651,7 +17195,7 @@ cont { lines { width: 6.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17659,12 +17203,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -17674,7 +17218,7 @@ cont { lines { width: 9.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17682,12 +17226,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -17697,7 +17241,7 @@ cont { lines { width: 12.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17705,12 +17249,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -17720,7 +17264,7 @@ cont { lines { width: 15.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17728,12 +17272,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 11 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 350 text_color: 11711154 } @@ -17746,7 +17290,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17756,7 +17300,7 @@ cont { lines { width: 1.1 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17766,7 +17310,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17776,7 +17320,7 @@ cont { lines { width: 1.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17786,12 +17330,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 85 text_color: 11711154 } @@ -17801,7 +17345,7 @@ cont { lines { width: 1.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17811,12 +17355,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -17826,7 +17370,7 @@ cont { lines { width: 1.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -17836,12 +17380,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -17853,7 +17397,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17861,13 +17405,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17876,12 +17420,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 120 text_color: 11711154 } @@ -17893,7 +17437,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17901,13 +17445,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17916,12 +17460,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 175 text_color: 11711154 } @@ -17933,7 +17477,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17941,13 +17485,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -17956,12 +17500,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 250 text_color: 11711154 } @@ -17973,7 +17517,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -17981,13 +17525,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -17995,12 +17539,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -18012,7 +17556,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18020,13 +17564,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18034,12 +17578,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -18051,7 +17595,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18059,13 +17603,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18073,12 +17617,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -18090,7 +17634,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18098,13 +17642,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 15.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18112,12 +17656,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 11 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 350 text_color: 11711154 } @@ -18130,7 +17674,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18140,7 +17684,7 @@ cont { lines { width: 1.1 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18150,7 +17694,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18160,7 +17704,7 @@ cont { lines { width: 1.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18170,12 +17714,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 85 text_color: 11711154 } @@ -18185,7 +17729,7 @@ cont { lines { width: 1.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18195,12 +17739,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -18213,13 +17757,13 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 1.9 color: 3677972 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -18229,12 +17773,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -18247,13 +17791,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 2.8 color: 3677972 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18262,12 +17806,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 120 text_color: 11711154 } @@ -18280,13 +17824,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 3.8 color: 3677972 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18295,12 +17839,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 175 text_color: 11711154 } @@ -18313,13 +17857,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 4.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -18328,12 +17872,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 250 text_color: 11711154 } @@ -18346,13 +17890,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18360,12 +17904,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -18378,13 +17922,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 9.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18392,12 +17936,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -18410,13 +17954,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 12.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18424,12 +17968,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -18442,13 +17986,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 15.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -18456,12 +18000,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 11 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 350 text_color: 11711154 } @@ -18476,7 +18020,7 @@ cont { height: 9 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -18486,7 +18030,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -18496,7 +18040,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -18506,7 +18050,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -18516,7 +18060,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } } @@ -18527,7 +18071,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18537,12 +18081,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 85 text_color: 11711154 } @@ -18552,7 +18096,7 @@ cont { lines { width: 1.0 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18562,12 +18106,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -18577,7 +18121,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18587,12 +18131,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -18602,7 +18146,7 @@ cont { lines { width: 1.8 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18611,12 +18155,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 120 text_color: 11711154 } @@ -18626,7 +18170,7 @@ cont { lines { width: 2.0 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18635,12 +18179,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 175 text_color: 11711154 } @@ -18650,7 +18194,7 @@ cont { lines { width: 2.4 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18659,12 +18203,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 250 text_color: 11711154 } @@ -18674,7 +18218,7 @@ cont { lines { width: 3.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18682,12 +18226,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -18697,7 +18241,7 @@ cont { lines { width: 4.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18705,12 +18249,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -18720,7 +18264,7 @@ cont { lines { width: 6.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18728,12 +18272,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -18743,7 +18287,7 @@ cont { lines { width: 7.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18751,12 +18295,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 11 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 350 text_color: 11711154 } @@ -18769,7 +18313,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18779,12 +18323,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 85 text_color: 11711154 } @@ -18794,7 +18338,7 @@ cont { lines { width: 1.0 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18804,12 +18348,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -18819,7 +18363,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -18829,12 +18373,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -18844,7 +18388,7 @@ cont { lines { width: 1.8 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18853,12 +18397,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 120 text_color: 11711154 } @@ -18870,7 +18414,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18878,13 +18422,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18893,12 +18437,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 175 text_color: 11711154 } @@ -18910,7 +18454,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18918,13 +18462,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.4 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -18933,12 +18477,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 250 text_color: 11711154 } @@ -18950,7 +18494,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18958,13 +18502,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -18972,12 +18516,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -18989,7 +18533,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -18997,13 +18541,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19011,12 +18555,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -19028,7 +18572,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19036,13 +18580,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19050,12 +18594,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -19067,7 +18611,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -19075,13 +18619,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19089,12 +18633,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 11 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 350 text_color: 11711154 } @@ -19107,7 +18651,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19117,12 +18661,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 85 text_color: 11711154 } @@ -19132,7 +18676,7 @@ cont { lines { width: 1.0 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19142,12 +18686,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -19158,13 +18702,13 @@ cont { width: 3.2 dashdot { } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.2 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -19174,12 +18718,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -19192,13 +18736,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.8 color: 3677972 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19207,12 +18751,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 120 text_color: 11711154 } @@ -19225,13 +18769,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.0 color: 3677972 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19240,12 +18784,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 175 text_color: 11711154 } @@ -19258,13 +18802,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.4 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -19273,12 +18817,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 250 text_color: 11711154 } @@ -19291,13 +18835,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 3.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19305,12 +18849,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -19323,13 +18867,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 4.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19337,12 +18881,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -19355,13 +18899,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19369,12 +18913,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -19387,13 +18931,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 7.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -19401,12 +18945,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 11 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 350 text_color: 11711154 } @@ -19423,7 +18967,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19436,7 +18980,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19445,7 +18989,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19457,7 +19001,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19465,7 +19009,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19477,7 +19021,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19485,7 +19029,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19497,7 +19041,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19505,7 +19049,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19517,7 +19061,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19525,7 +19069,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -19540,7 +19084,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19553,7 +19097,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19562,7 +19106,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19574,7 +19118,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19582,7 +19126,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19594,7 +19138,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19602,7 +19146,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19614,7 +19158,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19622,7 +19166,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19634,7 +19178,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19642,7 +19186,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -19657,7 +19201,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19670,7 +19214,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19679,7 +19223,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19691,7 +19235,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19699,7 +19243,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19711,7 +19255,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19719,7 +19263,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19731,7 +19275,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19739,7 +19283,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19751,7 +19295,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19759,7 +19303,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -19774,7 +19318,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19787,7 +19331,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19796,7 +19340,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19808,7 +19352,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19816,7 +19360,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19828,7 +19372,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19836,7 +19380,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19848,7 +19392,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19856,7 +19400,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19868,7 +19412,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19876,7 +19420,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -19891,7 +19435,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -19904,7 +19448,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -19913,7 +19457,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19925,7 +19469,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19933,7 +19477,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19945,7 +19489,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19953,7 +19497,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19965,7 +19509,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19973,7 +19517,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -19985,7 +19529,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -19993,7 +19537,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20008,7 +19552,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20021,7 +19565,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20030,7 +19574,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20042,7 +19586,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20050,7 +19594,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20062,7 +19606,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20070,7 +19614,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20082,7 +19626,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20090,7 +19634,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20102,7 +19646,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20110,7 +19654,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20125,7 +19669,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20138,7 +19682,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20147,7 +19691,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20159,7 +19703,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20167,7 +19711,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20179,7 +19723,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20187,7 +19731,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20199,7 +19743,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20207,7 +19751,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20219,7 +19763,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20227,7 +19771,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20242,7 +19786,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20255,7 +19799,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20264,7 +19808,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20276,7 +19820,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20284,7 +19828,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20296,7 +19840,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20304,7 +19848,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20316,7 +19860,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20324,7 +19868,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20336,7 +19880,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20344,7 +19888,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20359,7 +19903,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20372,7 +19916,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20381,7 +19925,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20393,7 +19937,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20401,7 +19945,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20413,7 +19957,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20421,7 +19965,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20433,7 +19977,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20441,7 +19985,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20453,7 +19997,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20461,7 +20005,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20476,7 +20020,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20489,7 +20033,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20498,7 +20042,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20510,7 +20054,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20518,7 +20062,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20530,7 +20074,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20538,7 +20082,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20550,7 +20094,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20558,7 +20102,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20570,7 +20114,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20578,7 +20122,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20593,7 +20137,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20606,7 +20150,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20615,7 +20159,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20627,7 +20171,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20635,7 +20179,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20647,7 +20191,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20655,7 +20199,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20667,7 +20211,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20675,7 +20219,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20687,7 +20231,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20695,7 +20239,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20710,7 +20254,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -20723,7 +20267,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -20732,7 +20276,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20744,7 +20288,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20752,7 +20296,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20764,7 +20308,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20772,7 +20316,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20782,7 +20326,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20790,7 +20334,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20802,7 +20346,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20810,7 +20354,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20820,7 +20364,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20828,7 +20372,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -20840,7 +20384,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -20848,7 +20392,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -20858,7 +20402,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -20866,7 +20410,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -20881,7 +20425,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -20894,7 +20438,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -20903,7 +20447,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -20915,7 +20459,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -20924,7 +20468,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -20936,7 +20480,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20944,7 +20488,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -20956,7 +20500,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20964,7 +20508,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -20976,7 +20520,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -20984,7 +20528,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } element { @@ -20996,7 +20540,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21004,7 +20548,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } } @@ -21019,7 +20563,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21032,12 +20576,12 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } area { color: 2499106 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21045,7 +20589,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21057,12 +20601,12 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } area { color: 2499106 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21070,7 +20614,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21082,11 +20626,11 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } area { color: 2499106 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21094,7 +20638,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21106,11 +20650,11 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } area { color: 2499106 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21118,7 +20662,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21130,11 +20674,11 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } area { color: 2499106 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21142,7 +20686,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } element { @@ -21154,11 +20698,11 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } area { color: 2499106 - priority: -15667 + priority: -15651 } path_text { primary { @@ -21166,7 +20710,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } } @@ -21179,7 +20723,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21189,7 +20733,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21200,7 +20744,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21208,7 +20752,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21218,7 +20762,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21227,7 +20771,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21237,7 +20781,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21245,7 +20789,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21255,7 +20799,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21264,7 +20808,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21274,7 +20818,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21282,7 +20826,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21292,7 +20836,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21300,7 +20844,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21310,7 +20854,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21318,7 +20862,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21328,7 +20872,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21336,7 +20880,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21346,7 +20890,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21354,7 +20898,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21364,7 +20908,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21372,7 +20916,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } element { @@ -21382,7 +20926,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21390,7 +20934,7 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { @@ -21400,7 +20944,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21408,7 +20952,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } } @@ -21423,7 +20967,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1333 + priority: 1349 cap: BUTTCAP } } @@ -21436,7 +20980,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21445,7 +20989,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21457,7 +21001,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1333 + priority: 1349 cap: BUTTCAP } path_text { @@ -21466,7 +21010,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21477,7 +21021,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21487,7 +21031,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21495,7 +21039,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21506,7 +21050,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21516,7 +21060,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21524,7 +21068,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16333 + priority: 16349 } } element { @@ -21535,7 +21079,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21545,7 +21089,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21553,7 +21097,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } element { @@ -21564,7 +21108,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1348 cap: BUTTCAP } lines { @@ -21574,7 +21118,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1333 + priority: 1349 } path_text { primary { @@ -21582,7 +21126,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16349 } } } @@ -21593,7 +21137,7 @@ cont { lines { width: 0.9 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21603,7 +21147,7 @@ cont { lines { width: 0.8 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21613,7 +21157,7 @@ cont { lines { width: 1.2 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21623,12 +21167,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 85 text_color: 11711154 } @@ -21638,7 +21182,7 @@ cont { lines { width: 1.5 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21648,12 +21192,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 90 text_color: 11711154 } @@ -21663,7 +21207,7 @@ cont { lines { width: 1.7 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21673,12 +21217,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 90 text_color: 11711154 } @@ -21688,7 +21232,7 @@ cont { lines { width: 2.4 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21697,12 +21241,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 120 text_color: 11711154 } @@ -21712,7 +21256,7 @@ cont { lines { width: 3.2 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21721,12 +21265,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 175 text_color: 11711154 } @@ -21736,7 +21280,7 @@ cont { lines { width: 4.2 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21745,12 +21289,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 250 text_color: 11711154 } @@ -21760,7 +21304,7 @@ cont { lines { width: 4.8 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21768,12 +21312,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -21783,7 +21327,7 @@ cont { lines { width: 7.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21791,12 +21335,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 10 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -21806,7 +21350,7 @@ cont { lines { width: 10.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21814,12 +21358,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 10 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -21829,7 +21373,7 @@ cont { lines { width: 13.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -21837,12 +21381,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 11 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 350 text_color: 11711154 } @@ -21855,7 +21399,7 @@ cont { lines { width: 0.9 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21865,7 +21409,7 @@ cont { lines { width: 0.8 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21875,7 +21419,7 @@ cont { lines { width: 1.2 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21885,12 +21429,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 85 text_color: 11711154 } @@ -21900,7 +21444,7 @@ cont { lines { width: 1.5 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21910,12 +21454,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 90 text_color: 11711154 } @@ -21925,7 +21469,7 @@ cont { lines { width: 1.7 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -21935,12 +21479,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 90 text_color: 11711154 } @@ -21950,7 +21494,7 @@ cont { lines { width: 2.4 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21959,12 +21503,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 120 text_color: 11711154 } @@ -21976,7 +21520,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -21984,13 +21528,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -21999,12 +21543,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 175 text_color: 11711154 } @@ -22016,7 +21560,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22024,13 +21568,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.2 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22039,12 +21583,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 250 text_color: 11711154 } @@ -22056,7 +21600,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22064,13 +21608,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22078,12 +21622,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -22095,7 +21639,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22103,13 +21647,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22117,12 +21661,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 10 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -22134,7 +21678,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22142,13 +21686,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22156,12 +21700,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 10 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -22173,7 +21717,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22181,13 +21725,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22195,12 +21739,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 11 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 350 text_color: 11711154 } @@ -22213,7 +21757,7 @@ cont { lines { width: 0.9 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22223,7 +21767,7 @@ cont { lines { width: 0.8 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22233,7 +21777,7 @@ cont { lines { width: 1.2 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22243,12 +21787,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 85 text_color: 11711154 } @@ -22258,7 +21802,7 @@ cont { lines { width: 1.5 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22268,12 +21812,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 90 text_color: 11711154 } @@ -22283,7 +21827,7 @@ cont { lines { width: 1.7 color: 5845795 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -22293,12 +21837,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 90 text_color: 11711154 } @@ -22308,7 +21852,7 @@ cont { lines { width: 2.4 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22317,12 +21861,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 120 text_color: 11711154 } @@ -22335,13 +21879,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 3.2 color: 4991515 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22350,12 +21894,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 175 text_color: 11711154 } @@ -22368,13 +21912,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 4.2 color: 5845795 - priority: 1428 + priority: 1443 cap: BUTTCAP } path_text { @@ -22383,12 +21927,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 250 text_color: 11711154 } @@ -22401,13 +21945,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 4.8 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22415,12 +21959,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 9 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -22433,13 +21977,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 7.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22447,12 +21991,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 10 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -22465,13 +22009,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 10.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22479,12 +22023,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 10 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 300 text_color: 11711154 } @@ -22497,13 +22041,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1427 + priority: 1442 cap: BUTTCAP } lines { width: 13.0 color: 5845795 - priority: 1428 + priority: 1443 } path_text { primary { @@ -22511,12 +22055,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16428 + priority: 16443 } shield { height: 11 stroke_color: 11711154 - priority: 16428 + priority: 16443 min_distance: 350 text_color: 11711154 } @@ -22532,7 +22076,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } } element { @@ -22540,7 +22084,7 @@ cont { lines { width: 1.5 color: 5845795 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22550,12 +22094,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 90 text_color: 11711154 } @@ -22565,7 +22109,7 @@ cont { lines { width: 1.7 color: 5845795 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22575,12 +22119,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 90 text_color: 11711154 } @@ -22590,7 +22134,7 @@ cont { lines { width: 2.4 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22599,12 +22143,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 120 text_color: 11711154 } @@ -22614,7 +22158,7 @@ cont { lines { width: 3.2 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22623,12 +22167,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 175 text_color: 11711154 } @@ -22638,7 +22182,7 @@ cont { lines { width: 4.2 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22647,12 +22191,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 250 text_color: 11711154 } @@ -22662,7 +22206,7 @@ cont { lines { width: 4.8 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22670,12 +22214,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -22685,7 +22229,7 @@ cont { lines { width: 7.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22693,12 +22237,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 10 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -22708,7 +22252,7 @@ cont { lines { width: 10.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22716,12 +22260,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16419 + priority: 16433 } shield { height: 10 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -22731,7 +22275,7 @@ cont { lines { width: 13.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22739,12 +22283,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16419 + priority: 16433 } shield { height: 11 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 350 text_color: 11711154 } @@ -22760,7 +22304,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } } element { @@ -22768,7 +22312,7 @@ cont { lines { width: 1.5 color: 5845795 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22778,12 +22322,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 90 text_color: 11711154 } @@ -22793,7 +22337,7 @@ cont { lines { width: 1.7 color: 5845795 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -22803,12 +22347,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 90 text_color: 11711154 } @@ -22818,7 +22362,7 @@ cont { lines { width: 2.4 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22827,12 +22371,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 120 text_color: 11711154 } @@ -22844,7 +22388,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22852,13 +22396,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22867,12 +22411,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 175 text_color: 11711154 } @@ -22884,7 +22428,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22892,13 +22436,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.2 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -22907,12 +22451,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 250 text_color: 11711154 } @@ -22924,7 +22468,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22932,13 +22476,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22946,12 +22490,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -22963,7 +22507,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -22971,13 +22515,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -22985,12 +22529,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 10 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -23002,7 +22546,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23010,13 +22554,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23024,12 +22568,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16419 + priority: 16433 } shield { height: 10 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -23041,7 +22585,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23049,13 +22593,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23063,12 +22607,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16419 + priority: 16433 } shield { height: 11 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 350 text_color: 11711154 } @@ -23084,7 +22628,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } } element { @@ -23092,7 +22636,7 @@ cont { lines { width: 1.5 color: 5845795 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -23102,12 +22646,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 90 text_color: 11711154 } @@ -23117,7 +22661,7 @@ cont { lines { width: 1.7 color: 5845795 - priority: 1419 + priority: 1433 join: BEVELJOIN cap: BUTTCAP } @@ -23127,12 +22671,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 90 text_color: 11711154 } @@ -23142,7 +22686,7 @@ cont { lines { width: 2.4 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23151,12 +22695,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 120 text_color: 11711154 } @@ -23169,13 +22713,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 3.2 color: 4991515 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23184,12 +22728,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 175 text_color: 11711154 } @@ -23202,13 +22746,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 4.2 color: 5845795 - priority: 1419 + priority: 1433 cap: BUTTCAP } path_text { @@ -23217,12 +22761,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 250 text_color: 11711154 } @@ -23235,13 +22779,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 4.8 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23249,12 +22793,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 9 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -23267,13 +22811,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 7.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23281,12 +22825,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16419 + priority: 16433 } shield { height: 10 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -23299,13 +22843,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 10.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23313,12 +22857,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16419 + priority: 16433 } shield { height: 10 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 300 text_color: 11711154 } @@ -23331,13 +22875,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1418 + priority: 1432 cap: BUTTCAP } lines { width: 13.0 color: 5845795 - priority: 1419 + priority: 1433 } path_text { primary { @@ -23345,12 +22889,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16419 + priority: 16433 } shield { height: 11 stroke_color: 11711154 - priority: 16419 + priority: 16433 min_distance: 350 text_color: 11711154 } @@ -23363,7 +22907,7 @@ cont { lines { width: 1.0 color: 6247213 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -23372,7 +22916,7 @@ cont { lines { width: 1.5 color: 6247213 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -23381,7 +22925,7 @@ cont { lines { width: 1.8 color: 6247213 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23389,7 +22933,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -23397,7 +22941,7 @@ cont { lines { width: 3.0 color: 6247213 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23405,7 +22949,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -23413,7 +22957,7 @@ cont { lines { width: 3.0 color: 6247213 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23421,7 +22965,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -23429,7 +22973,7 @@ cont { lines { width: 4.0 color: 6247213 - priority: 1314 + priority: 1330 } path_text { primary { @@ -23437,7 +22981,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -23448,7 +22992,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23458,7 +23002,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23467,7 +23011,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -23475,7 +23019,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23484,7 +23028,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23492,7 +23036,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23501,7 +23045,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23509,7 +23053,7 @@ cont { lines { width: 4.4 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23517,7 +23061,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23525,7 +23069,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23533,7 +23077,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23541,7 +23085,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23549,12 +23093,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -23564,7 +23108,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23572,12 +23116,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -23590,7 +23134,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23600,7 +23144,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23609,7 +23153,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -23617,7 +23161,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23626,7 +23170,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23634,7 +23178,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23643,7 +23187,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23651,7 +23195,7 @@ cont { lines { width: 4.4 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23659,7 +23203,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23667,7 +23211,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23675,7 +23219,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23683,7 +23227,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23691,12 +23235,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -23706,7 +23250,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23714,12 +23258,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -23732,7 +23276,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23742,7 +23286,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23751,7 +23295,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -23761,7 +23305,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23769,13 +23313,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23784,7 +23328,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23794,7 +23338,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23802,13 +23346,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23817,7 +23361,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23827,7 +23371,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23835,13 +23379,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23849,7 +23393,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23859,7 +23403,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23867,13 +23411,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23881,7 +23425,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -23891,7 +23435,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23899,13 +23443,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23913,12 +23457,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -23930,7 +23474,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -23938,13 +23482,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -23952,12 +23496,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -23970,7 +23514,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -23980,7 +23524,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -23989,7 +23533,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -23997,7 +23541,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -24006,7 +23550,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -24014,7 +23558,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -24023,7 +23567,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -24034,13 +23578,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 4.4 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24048,7 +23592,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -24059,13 +23603,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24073,7 +23617,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -24084,13 +23628,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24098,12 +23642,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -24116,13 +23660,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -24130,12 +23674,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -24147,7 +23691,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24156,14 +23700,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 17 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24172,14 +23716,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 18 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24188,14 +23732,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 16638 + priority: 16650 } } element { scale: 19 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } path_text { @@ -24204,7 +23748,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 16638 + priority: 16650 } } } @@ -24215,7 +23759,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24225,7 +23769,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24234,7 +23778,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24243,7 +23787,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24251,7 +23795,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24260,7 +23804,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24268,7 +23812,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24276,7 +23820,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24284,7 +23828,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24292,7 +23836,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24300,7 +23844,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24308,7 +23852,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -24316,7 +23860,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24324,7 +23868,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -24335,7 +23879,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24345,7 +23889,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24354,7 +23898,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24363,7 +23907,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24371,7 +23915,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24380,7 +23924,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24390,7 +23934,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24398,13 +23942,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24412,7 +23956,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24422,7 +23966,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24430,13 +23974,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24444,7 +23988,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24454,7 +23998,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24462,13 +24006,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24476,7 +24020,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -24486,7 +24030,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24494,13 +24038,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24508,7 +24052,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -24519,7 +24063,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -24529,7 +24073,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } } @@ -24538,7 +24082,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24547,7 +24091,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24555,7 +24099,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -24564,7 +24108,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24572,7 +24116,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24580,7 +24124,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24588,7 +24132,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24596,7 +24140,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -24604,7 +24148,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24612,7 +24156,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -24620,7 +24164,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -24628,7 +24172,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -24639,7 +24183,7 @@ cont { lines { width: 1.0 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24649,7 +24193,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } } element { @@ -24657,7 +24201,7 @@ cont { lines { width: 1.3 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24667,7 +24211,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } } element { @@ -24675,7 +24219,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24685,12 +24229,12 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -24700,7 +24244,7 @@ cont { lines { width: 2.2 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24709,12 +24253,12 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 120 text_color: 11711154 } @@ -24724,7 +24268,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24733,12 +24277,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 175 text_color: 11711154 } @@ -24748,7 +24292,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24757,12 +24301,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 250 text_color: 11711154 } @@ -24772,7 +24316,7 @@ cont { lines { width: 4.8 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24780,12 +24324,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -24795,7 +24339,7 @@ cont { lines { width: 7.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24803,12 +24347,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 10 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -24818,7 +24362,7 @@ cont { lines { width: 10.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24826,12 +24370,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16400 + priority: 16415 } shield { height: 10 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -24841,7 +24385,7 @@ cont { lines { width: 13.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -24849,12 +24393,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16400 + priority: 16415 } shield { height: 11 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 350 text_color: 11711154 } @@ -24867,7 +24411,7 @@ cont { lines { width: 1.0 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24877,7 +24421,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } } element { @@ -24885,7 +24429,7 @@ cont { lines { width: 1.3 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24895,7 +24439,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } } element { @@ -24903,7 +24447,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -24913,12 +24457,12 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -24928,7 +24472,7 @@ cont { lines { width: 2.2 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24937,12 +24481,12 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 120 text_color: 11711154 } @@ -24954,7 +24498,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -24962,13 +24506,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -24977,12 +24521,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 175 text_color: 11711154 } @@ -24994,7 +24538,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25002,13 +24546,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25017,12 +24561,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 250 text_color: 11711154 } @@ -25034,7 +24578,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25042,13 +24586,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25056,12 +24600,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -25073,7 +24617,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25081,13 +24625,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25095,12 +24639,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 10 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -25112,7 +24656,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25120,13 +24664,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25134,12 +24678,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16400 + priority: 16415 } shield { height: 10 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -25151,7 +24695,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25159,13 +24703,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25173,12 +24717,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16400 + priority: 16415 } shield { height: 11 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 350 text_color: 11711154 } @@ -25191,7 +24735,7 @@ cont { lines { width: 1.0 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25201,7 +24745,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } } element { @@ -25209,7 +24753,7 @@ cont { lines { width: 1.3 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25219,7 +24763,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } } element { @@ -25227,7 +24771,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1400 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -25237,12 +24781,12 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -25252,7 +24796,7 @@ cont { lines { width: 2.2 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25261,12 +24805,12 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 120 text_color: 11711154 } @@ -25276,7 +24820,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25285,12 +24829,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 175 text_color: 11711154 } @@ -25300,7 +24844,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1400 + priority: 1415 cap: BUTTCAP } path_text { @@ -25309,12 +24853,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 250 text_color: 11711154 } @@ -25327,13 +24871,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 4.8 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25341,12 +24885,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 9 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -25359,13 +24903,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 7.0 color: 4933187 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25373,12 +24917,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16400 + priority: 16415 } shield { height: 10 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -25391,13 +24935,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 10.0 color: 2828327 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25405,12 +24949,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16400 + priority: 16415 } shield { height: 10 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -25423,13 +24967,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1399 + priority: 1414 cap: BUTTCAP } lines { width: 13.0 color: 2828327 - priority: 1400 + priority: 1415 } path_text { primary { @@ -25437,12 +24981,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16400 + priority: 16415 } shield { height: 11 stroke_color: 11711154 - priority: 16400 + priority: 16415 min_distance: 350 text_color: 11711154 } @@ -25455,7 +24999,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25464,7 +25008,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25473,7 +25017,7 @@ cont { lines { width: 4.8 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25481,7 +25025,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16390 + priority: 16405 } } element { @@ -25489,7 +25033,7 @@ cont { lines { width: 7.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25497,7 +25041,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16390 + priority: 16405 } } element { @@ -25505,7 +25049,7 @@ cont { lines { width: 10.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25513,7 +25057,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16390 + priority: 16405 } } element { @@ -25521,7 +25065,7 @@ cont { lines { width: 13.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25529,7 +25073,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16390 + priority: 16405 } } } @@ -25542,7 +25086,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25550,13 +25094,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 4933187 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25567,7 +25111,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25575,13 +25119,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 4933187 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25592,7 +25136,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25600,13 +25144,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25614,7 +25158,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16390 + priority: 16405 } } element { @@ -25624,7 +25168,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25632,13 +25176,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25646,7 +25190,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16390 + priority: 16405 } } element { @@ -25656,7 +25200,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25664,13 +25208,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 10.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25678,7 +25222,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16390 + priority: 16405 } } element { @@ -25688,7 +25232,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -25696,13 +25240,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 13.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25710,7 +25254,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16390 + priority: 16405 } } } @@ -25721,7 +25265,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25730,7 +25274,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1390 + priority: 1405 cap: BUTTCAP } } @@ -25742,13 +25286,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 4.8 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25756,7 +25300,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16390 + priority: 16405 } } element { @@ -25767,13 +25311,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 7.0 color: 4933187 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25781,7 +25325,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16390 + priority: 16405 } } element { @@ -25792,13 +25336,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 10.0 color: 2828327 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25806,7 +25350,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16390 + priority: 16405 } } element { @@ -25817,13 +25361,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1389 + priority: 1404 cap: BUTTCAP } lines { width: 13.0 color: 2828327 - priority: 1390 + priority: 1405 } path_text { primary { @@ -25831,7 +25375,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16390 + priority: 16405 } } } @@ -25842,7 +25386,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25851,7 +25395,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25859,7 +25403,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -25867,7 +25411,7 @@ cont { lines { width: 2.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25875,7 +25419,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -25883,7 +25427,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25891,7 +25435,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } element { @@ -25899,7 +25443,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25907,7 +25451,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } } @@ -25918,7 +25462,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -25927,7 +25471,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25935,7 +25479,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -25943,7 +25487,7 @@ cont { lines { width: 2.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25951,7 +25495,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -25959,7 +25503,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25967,7 +25511,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } element { @@ -25975,7 +25519,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -25983,7 +25527,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } } @@ -25994,7 +25538,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26005,7 +25549,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26013,13 +25557,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.6 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26027,7 +25571,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26037,7 +25581,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26045,13 +25589,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26059,7 +25603,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26069,7 +25613,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26077,13 +25621,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26091,7 +25635,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } element { @@ -26101,7 +25645,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -26109,13 +25653,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26123,83 +25667,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 - } - } -} -cont { - name: "highway-service-busway" - element { - scale: 15 - lines { - width: 1.2 - color: 4933187 - priority: 1323 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16323 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 4933187 - priority: 1323 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16323 + priority: 16339 } } } @@ -26210,7 +25678,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26218,7 +25686,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26226,7 +25694,7 @@ cont { lines { width: 2.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26234,7 +25702,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26242,7 +25710,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26250,7 +25718,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } element { @@ -26258,7 +25726,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26266,7 +25734,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } } @@ -26277,7 +25745,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26286,7 +25754,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26294,7 +25762,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26302,7 +25770,7 @@ cont { lines { width: 2.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26310,7 +25778,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26318,7 +25786,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26326,7 +25794,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } element { @@ -26334,7 +25802,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26342,7 +25810,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } } @@ -26353,7 +25821,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1323 + priority: 1339 cap: BUTTCAP } } @@ -26362,7 +25830,7 @@ cont { lines { width: 1.6 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26370,7 +25838,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26378,7 +25846,7 @@ cont { lines { width: 2.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26386,7 +25854,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16323 + priority: 16339 } } element { @@ -26394,7 +25862,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26402,7 +25870,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } element { @@ -26410,7 +25878,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1323 + priority: 1339 } path_text { primary { @@ -26418,7 +25886,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16323 + priority: 16339 } } } @@ -26428,7 +25896,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16657 + priority: 16669 min_distance: 20 } path_text { @@ -26444,7 +25912,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26459,7 +25927,7 @@ cont { scale: 17 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26474,7 +25942,7 @@ cont { scale: 18 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26489,7 +25957,7 @@ cont { scale: 19 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 } path_text { primary { @@ -26512,7 +25980,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26525,7 +25993,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26533,7 +26001,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26545,7 +26013,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26553,7 +26021,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26565,7 +26033,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26573,7 +26041,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26585,7 +26053,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26593,7 +26061,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -26608,7 +26076,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26621,7 +26089,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26629,7 +26097,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26641,7 +26109,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26649,7 +26117,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26661,7 +26129,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26669,7 +26137,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26681,7 +26149,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26689,7 +26157,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -26704,7 +26172,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1476 + priority: 1490 cap: BUTTCAP } } @@ -26717,7 +26185,7 @@ cont { dd: 1.8 dd: 1.8 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26725,7 +26193,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26737,7 +26205,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -26745,7 +26213,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -26755,7 +26223,7 @@ cont { dd: 2.5 dd: 2.5 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26763,7 +26231,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26775,7 +26243,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -26783,7 +26251,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -26793,7 +26261,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26801,7 +26269,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } element { @@ -26813,7 +26281,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -26821,7 +26289,7 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { @@ -26831,7 +26299,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1476 + priority: 1490 } path_text { primary { @@ -26839,7 +26307,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16476 + priority: 16490 } } } @@ -26850,7 +26318,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -26860,7 +26328,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -26870,7 +26338,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -26878,7 +26346,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26887,7 +26355,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -26895,7 +26363,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26904,7 +26372,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -26912,7 +26380,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -26921,12 +26389,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 9 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 250 text_color: 11711154 } @@ -26936,7 +26404,7 @@ cont { lines { width: 4.4 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26944,12 +26412,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 9 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -26959,7 +26427,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26967,12 +26435,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -26982,7 +26450,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -26990,12 +26458,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27005,7 +26473,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27013,12 +26481,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -27031,7 +26499,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27041,7 +26509,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27051,7 +26519,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -27059,7 +26527,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27068,7 +26536,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -27078,7 +26546,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27086,13 +26554,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27101,7 +26569,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -27111,7 +26579,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27119,13 +26587,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27134,12 +26602,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 9 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 250 text_color: 11711154 } @@ -27151,7 +26619,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27159,13 +26627,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27173,12 +26641,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 9 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27190,7 +26658,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27198,13 +26666,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27212,12 +26680,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27229,7 +26697,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27237,13 +26705,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27251,12 +26719,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27268,7 +26736,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27276,13 +26744,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4933187 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27290,12 +26758,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -27308,7 +26776,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27318,7 +26786,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -27328,7 +26796,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -27336,7 +26804,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27345,7 +26813,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16380 + priority: 16396 } } element { @@ -27353,7 +26821,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27362,7 +26830,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } } element { @@ -27370,7 +26838,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1380 + priority: 1396 cap: BUTTCAP } path_text { @@ -27379,12 +26847,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 9 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 250 text_color: 11711154 } @@ -27397,13 +26865,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 4.4 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27411,12 +26879,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 9 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27429,13 +26897,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27443,12 +26911,12 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27461,13 +26929,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27475,12 +26943,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 10 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -27493,13 +26961,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1379 + priority: 1395 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1380 + priority: 1396 } path_text { primary { @@ -27507,12 +26975,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16380 + priority: 16396 } shield { height: 11 stroke_color: 11711154 - priority: 16380 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -27525,7 +26993,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27534,7 +27002,7 @@ cont { lines { width: 4.4 color: 4933187 - priority: 1371 + priority: 1386 } } element { @@ -27542,7 +27010,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1371 + priority: 1386 } } element { @@ -27550,7 +27018,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27558,7 +27026,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16371 + priority: 16386 } } element { @@ -27566,7 +27034,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27574,7 +27042,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16371 + priority: 16386 } } } @@ -27587,7 +27055,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27595,13 +27063,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.2 color: 4933187 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27612,7 +27080,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27620,13 +27088,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.4 color: 4933187 - priority: 1371 + priority: 1386 } } element { @@ -27636,7 +27104,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27644,13 +27112,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4933187 - priority: 1371 + priority: 1386 } } element { @@ -27660,7 +27128,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27668,13 +27136,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4933187 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27682,7 +27150,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16371 + priority: 16386 } } element { @@ -27692,7 +27160,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -27700,13 +27168,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4933187 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27714,7 +27182,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16371 + priority: 16386 } } } @@ -27725,7 +27193,7 @@ cont { lines { width: 3.2 color: 4933187 - priority: 1371 + priority: 1386 cap: BUTTCAP } } @@ -27737,13 +27205,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 4.4 color: 2828327 - priority: 1371 + priority: 1386 } } element { @@ -27754,13 +27222,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1371 + priority: 1386 } } element { @@ -27771,13 +27239,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27785,7 +27253,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16371 + priority: 16386 } } element { @@ -27796,13 +27264,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1370 + priority: 1385 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1371 + priority: 1386 } path_text { primary { @@ -27810,7 +27278,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16371 + priority: 16386 } } } @@ -27825,7 +27293,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -27838,7 +27306,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -27847,7 +27315,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -27859,7 +27327,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27867,7 +27335,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -27879,7 +27347,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27887,7 +27355,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -27899,7 +27367,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27907,7 +27375,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -27919,7 +27387,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27927,7 +27395,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -27942,7 +27410,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -27955,7 +27423,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -27964,7 +27432,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -27976,7 +27444,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -27984,7 +27452,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -27996,7 +27464,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28004,7 +27472,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28016,7 +27484,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28024,7 +27492,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28036,7 +27504,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28044,7 +27512,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28059,7 +27527,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28072,7 +27540,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28081,7 +27549,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28093,7 +27561,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28101,7 +27569,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28113,7 +27581,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28121,7 +27589,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28133,7 +27601,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28141,7 +27609,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28153,7 +27621,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28161,7 +27629,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28176,7 +27644,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28189,7 +27657,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28198,7 +27666,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28210,7 +27678,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28218,7 +27686,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28230,7 +27698,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28238,7 +27706,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28250,7 +27718,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28258,7 +27726,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28270,7 +27738,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28278,7 +27746,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28293,7 +27761,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28306,7 +27774,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28315,7 +27783,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28327,7 +27795,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28335,7 +27803,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28347,7 +27815,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28355,7 +27823,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28367,7 +27835,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28375,7 +27843,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28387,7 +27855,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28395,7 +27863,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28410,7 +27878,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28423,7 +27891,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28432,7 +27900,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28444,7 +27912,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28452,7 +27920,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28464,7 +27932,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28472,7 +27940,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28484,7 +27952,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28492,7 +27960,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28504,7 +27972,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28512,7 +27980,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28527,7 +27995,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28540,7 +28008,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28549,7 +28017,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28561,7 +28029,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28569,7 +28037,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28581,7 +28049,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28589,7 +28057,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28601,7 +28069,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28609,7 +28077,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28621,7 +28089,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28629,7 +28097,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28644,7 +28112,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28657,7 +28125,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28666,7 +28134,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28678,7 +28146,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28686,7 +28154,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28698,7 +28166,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28706,7 +28174,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28718,7 +28186,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28726,7 +28194,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28738,7 +28206,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28746,7 +28214,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28761,7 +28229,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28774,7 +28242,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28783,7 +28251,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28795,7 +28263,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28803,7 +28271,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28815,7 +28283,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28823,7 +28291,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28835,7 +28303,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28843,7 +28311,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28855,7 +28323,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28863,7 +28331,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28878,7 +28346,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -28891,7 +28359,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -28900,7 +28368,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28912,7 +28380,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28920,7 +28388,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28932,7 +28400,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28940,7 +28408,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28952,7 +28420,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28960,7 +28428,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -28972,7 +28440,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -28980,7 +28448,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -28995,7 +28463,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -29008,7 +28476,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 1314 + priority: 1330 cap: BUTTCAP } path_text { @@ -29017,7 +28485,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -29029,7 +28497,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29037,7 +28505,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -29049,7 +28517,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29057,7 +28525,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -29069,7 +28537,7 @@ cont { dd: 9.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29077,7 +28545,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } element { @@ -29089,7 +28557,7 @@ cont { dd: 12.0 dd: 3.5 } - priority: 1314 + priority: 1330 } path_text { primary { @@ -29097,7 +28565,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16314 + priority: 16330 } } } @@ -29108,7 +28576,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29118,7 +28586,7 @@ cont { lines { width: 1.1 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29128,7 +28596,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29138,7 +28606,7 @@ cont { lines { width: 1.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29148,12 +28616,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 85 text_color: 11711154 } @@ -29163,7 +28631,7 @@ cont { lines { width: 1.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29173,12 +28641,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -29188,7 +28656,7 @@ cont { lines { width: 1.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29198,12 +28666,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -29213,7 +28681,7 @@ cont { lines { width: 2.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29222,12 +28690,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 120 text_color: 11711154 } @@ -29237,7 +28705,7 @@ cont { lines { width: 3.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29246,12 +28714,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 175 text_color: 11711154 } @@ -29261,7 +28729,7 @@ cont { lines { width: 4.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29270,12 +28738,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 250 text_color: 11711154 } @@ -29285,7 +28753,7 @@ cont { lines { width: 6.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29293,12 +28761,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -29308,7 +28776,7 @@ cont { lines { width: 9.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29316,12 +28784,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -29331,7 +28799,7 @@ cont { lines { width: 12.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29339,12 +28807,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -29354,7 +28822,7 @@ cont { lines { width: 15.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29362,12 +28830,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 11 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 350 text_color: 11711154 } @@ -29380,7 +28848,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29390,7 +28858,7 @@ cont { lines { width: 1.1 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29400,7 +28868,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29410,7 +28878,7 @@ cont { lines { width: 1.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29420,12 +28888,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 85 text_color: 11711154 } @@ -29435,7 +28903,7 @@ cont { lines { width: 1.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29445,12 +28913,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -29460,7 +28928,7 @@ cont { lines { width: 1.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29470,12 +28938,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -29487,7 +28955,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29495,13 +28963,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29510,12 +28978,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 120 text_color: 11711154 } @@ -29527,7 +28995,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29535,13 +29003,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29550,12 +29018,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 175 text_color: 11711154 } @@ -29567,7 +29035,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29575,13 +29043,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29590,12 +29058,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 250 text_color: 11711154 } @@ -29607,7 +29075,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29615,13 +29083,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29629,12 +29097,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -29646,7 +29114,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29654,13 +29122,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29668,12 +29136,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -29685,7 +29153,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29693,13 +29161,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29707,12 +29175,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -29724,7 +29192,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -29732,13 +29200,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 15.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29746,12 +29214,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 11 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 350 text_color: 11711154 } @@ -29764,7 +29232,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29774,7 +29242,7 @@ cont { lines { width: 1.1 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29784,7 +29252,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29794,7 +29262,7 @@ cont { lines { width: 1.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29804,12 +29272,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 85 text_color: 11711154 } @@ -29819,7 +29287,7 @@ cont { lines { width: 1.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29829,12 +29297,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -29847,13 +29315,13 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 1.9 color: 3677972 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -29863,12 +29331,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 90 text_color: 11711154 } @@ -29881,13 +29349,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 2.8 color: 3677972 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29896,12 +29364,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 120 text_color: 11711154 } @@ -29914,13 +29382,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 3.8 color: 3677972 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29929,12 +29397,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 175 text_color: 11711154 } @@ -29947,13 +29415,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 4.8 color: 4794651 - priority: 1447 + priority: 1462 cap: BUTTCAP } path_text { @@ -29962,12 +29430,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 250 text_color: 11711154 } @@ -29980,13 +29448,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -29994,12 +29462,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 9 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -30012,13 +29480,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 9.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30026,12 +29494,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -30044,13 +29512,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 12.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30058,12 +29526,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 10 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 300 text_color: 11711154 } @@ -30076,13 +29544,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1446 + priority: 1461 cap: BUTTCAP } lines { width: 15.0 color: 4794651 - priority: 1447 + priority: 1462 } path_text { primary { @@ -30090,12 +29558,12 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16447 + priority: 16462 } shield { height: 11 stroke_color: 11711154 - priority: 16447 + priority: 16462 min_distance: 350 text_color: 11711154 } @@ -30108,7 +29576,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30118,12 +29586,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 85 text_color: 11711154 } @@ -30133,7 +29601,7 @@ cont { lines { width: 1.0 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30143,12 +29611,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -30158,7 +29626,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30168,12 +29636,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -30183,7 +29651,7 @@ cont { lines { width: 1.8 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30192,12 +29660,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 120 text_color: 11711154 } @@ -30207,7 +29675,7 @@ cont { lines { width: 2.0 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30216,12 +29684,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 175 text_color: 11711154 } @@ -30231,7 +29699,7 @@ cont { lines { width: 2.4 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30240,12 +29708,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 250 text_color: 11711154 } @@ -30255,7 +29723,7 @@ cont { lines { width: 3.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30263,12 +29731,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30278,7 +29746,7 @@ cont { lines { width: 4.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30286,12 +29754,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30301,7 +29769,7 @@ cont { lines { width: 6.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30309,12 +29777,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30324,7 +29792,7 @@ cont { lines { width: 7.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30332,12 +29800,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 11 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 350 text_color: 11711154 } @@ -30350,7 +29818,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30360,12 +29828,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 85 text_color: 11711154 } @@ -30375,7 +29843,7 @@ cont { lines { width: 1.0 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30385,12 +29853,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -30400,7 +29868,7 @@ cont { lines { width: 1.2 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30410,12 +29878,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -30425,7 +29893,7 @@ cont { lines { width: 1.8 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30434,12 +29902,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 120 text_color: 11711154 } @@ -30451,7 +29919,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30459,13 +29927,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.0 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30474,12 +29942,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 175 text_color: 11711154 } @@ -30491,7 +29959,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30499,13 +29967,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.4 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30514,12 +29982,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 250 text_color: 11711154 } @@ -30531,7 +29999,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30539,13 +30007,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30553,12 +30021,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30570,7 +30038,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30578,13 +30046,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30592,12 +30060,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30609,7 +30077,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30617,13 +30085,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30631,12 +30099,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30648,7 +30116,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -30656,13 +30124,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 7.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30670,12 +30138,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 11 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 350 text_color: 11711154 } @@ -30688,7 +30156,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30698,12 +30166,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 85 text_color: 11711154 } @@ -30713,7 +30181,7 @@ cont { lines { width: 1.0 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30723,12 +30191,12 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -30739,13 +30207,13 @@ cont { width: 3.2 dashdot { } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.2 color: 4794651 - priority: 1438 + priority: 1452 join: BEVELJOIN cap: BUTTCAP } @@ -30755,12 +30223,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 90 text_color: 11711154 } @@ -30773,13 +30241,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 1.8 color: 3677972 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30788,12 +30256,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 120 text_color: 11711154 } @@ -30806,13 +30274,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.0 color: 3677972 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30821,12 +30289,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 175 text_color: 11711154 } @@ -30839,13 +30307,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 2.4 color: 4794651 - priority: 1438 + priority: 1452 cap: BUTTCAP } path_text { @@ -30854,12 +30322,12 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 250 text_color: 11711154 } @@ -30872,13 +30340,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 3.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30886,12 +30354,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 9 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30904,13 +30372,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 4.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30918,12 +30386,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30936,13 +30404,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 6.0 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30950,12 +30418,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 10 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 300 text_color: 11711154 } @@ -30968,13 +30436,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1437 + priority: 1451 cap: BUTTCAP } lines { width: 7.5 color: 4794651 - priority: 1438 + priority: 1452 } path_text { primary { @@ -30982,12 +30450,12 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16438 + priority: 16452 } shield { height: 11 stroke_color: 11711154 - priority: 16438 + priority: 16452 min_distance: 350 text_color: 11711154 } @@ -31000,7 +30468,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31010,7 +30478,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31020,7 +30488,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31029,7 +30497,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16361 + priority: 16377 } } element { @@ -31037,7 +30505,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31046,7 +30514,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31054,7 +30522,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31063,7 +30531,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31071,7 +30539,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31079,7 +30547,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31087,7 +30555,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31095,7 +30563,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31103,7 +30571,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31111,7 +30579,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -31119,7 +30587,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31127,7 +30595,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -31138,7 +30606,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31148,7 +30616,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31158,7 +30626,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31167,7 +30635,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16361 + priority: 16377 } } element { @@ -31175,7 +30643,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31184,7 +30652,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31192,7 +30660,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31201,7 +30669,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31209,7 +30677,7 @@ cont { lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31217,7 +30685,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31225,7 +30693,7 @@ cont { lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31233,7 +30701,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31241,7 +30709,7 @@ cont { lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31249,7 +30717,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -31257,7 +30725,7 @@ cont { lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31265,7 +30733,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -31276,7 +30744,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31286,7 +30754,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31296,7 +30764,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31305,7 +30773,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16361 + priority: 16377 } } element { @@ -31315,7 +30783,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31323,13 +30791,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31338,7 +30806,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31348,7 +30816,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31356,13 +30824,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31371,7 +30839,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31381,7 +30849,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31389,13 +30857,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 4.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31403,7 +30871,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31413,7 +30881,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31421,13 +30889,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 6.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31435,7 +30903,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31445,7 +30913,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31453,13 +30921,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 9.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31467,7 +30935,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -31477,7 +30945,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -31485,13 +30953,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 12.0 color: 4933187 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31499,7 +30967,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -31510,7 +30978,7 @@ cont { lines { width: 0.8 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31520,7 +30988,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 join: BEVELJOIN cap: BUTTCAP } @@ -31530,7 +30998,7 @@ cont { lines { width: 1.2 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31539,7 +31007,7 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16361 + priority: 16377 } } element { @@ -31547,7 +31015,7 @@ cont { lines { width: 1.8 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31556,7 +31024,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31564,7 +31032,7 @@ cont { lines { width: 3.0 color: 4933187 - priority: 1361 + priority: 1377 cap: BUTTCAP } path_text { @@ -31573,7 +31041,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31584,13 +31052,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 4.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31598,7 +31066,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31609,13 +31077,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31623,7 +31091,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16361 + priority: 16377 } } element { @@ -31634,13 +31102,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31648,7 +31116,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } element { @@ -31659,13 +31127,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1360 + priority: 1376 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1361 + priority: 1377 } path_text { primary { @@ -31673,7 +31141,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16361 + priority: 16377 } } } @@ -31684,7 +31152,7 @@ cont { lines { width: 0.5 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31694,7 +31162,7 @@ cont { lines { width: 0.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31704,7 +31172,7 @@ cont { lines { width: 0.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31714,7 +31182,7 @@ cont { lines { width: 0.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31724,7 +31192,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31734,7 +31202,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31747,7 +31215,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31757,7 +31225,7 @@ cont { lines { width: 0.7 color: 4794651 - priority: 1447 + priority: 1462 join: BEVELJOIN cap: BUTTCAP } @@ -31767,7 +31235,7 @@ cont { lines { width: 0.9 color: 4794651 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31777,7 +31245,7 @@ cont { lines { width: 0.8 color: 4794651 - priority: 1428 + priority: 1443 join: BEVELJOIN cap: BUTTCAP } @@ -31789,7 +31257,7 @@ cont { scale: 17 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -31798,14 +31266,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -31814,14 +31282,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "archaeological-site-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -31830,7 +31298,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -31840,7 +31308,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -31850,14 +31318,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31867,14 +31335,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31884,14 +31352,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31901,14 +31369,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -31918,7 +31386,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -31928,7 +31396,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31938,14 +31406,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31955,14 +31423,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31972,14 +31440,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -31989,7 +31457,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -31999,7 +31467,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32009,14 +31477,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32026,14 +31494,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32043,14 +31511,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32060,14 +31528,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32076,14 +31544,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32092,14 +31560,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32108,14 +31576,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32124,7 +31592,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32134,7 +31602,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32144,14 +31612,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32161,14 +31629,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32178,14 +31646,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32195,14 +31663,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32211,14 +31679,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32227,14 +31695,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32243,14 +31711,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32259,7 +31727,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32269,7 +31737,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32279,14 +31747,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32296,14 +31764,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32313,14 +31781,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32330,14 +31798,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32346,14 +31814,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32362,14 +31830,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32378,14 +31846,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32394,7 +31862,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32404,7 +31872,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32414,14 +31882,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32431,14 +31899,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32448,14 +31916,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32465,14 +31933,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32481,14 +31949,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32497,14 +31965,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32513,14 +31981,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32529,7 +31997,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32539,7 +32007,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32549,14 +32017,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32566,14 +32034,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32583,14 +32051,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32600,14 +32068,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32616,14 +32084,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32632,14 +32100,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32648,14 +32116,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32664,7 +32132,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32674,7 +32142,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32684,14 +32152,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32701,14 +32169,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32718,14 +32186,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32735,14 +32203,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32751,14 +32219,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32767,14 +32235,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32783,14 +32251,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32799,7 +32267,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32809,7 +32277,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32819,14 +32287,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32836,14 +32304,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32853,14 +32321,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -32870,14 +32338,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32886,14 +32354,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32902,14 +32370,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32918,14 +32386,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -32934,7 +32402,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -32944,7 +32412,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32954,14 +32422,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32971,14 +32439,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -32988,14 +32456,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33005,14 +32473,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33021,14 +32489,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33037,14 +32505,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33053,14 +32521,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33069,7 +32537,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33079,7 +32547,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33089,14 +32557,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33106,14 +32574,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33123,14 +32591,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33140,14 +32608,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33156,14 +32624,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33172,14 +32640,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33188,14 +32656,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33204,7 +32672,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33214,7 +32682,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33224,14 +32692,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33241,14 +32709,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33258,14 +32726,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33275,14 +32743,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33291,14 +32759,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33307,14 +32775,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33323,14 +32791,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33339,7 +32807,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33349,7 +32817,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33359,14 +32827,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33376,14 +32844,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33393,14 +32861,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33410,14 +32878,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33426,14 +32894,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33442,14 +32910,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33458,14 +32926,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33474,7 +32942,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33484,7 +32952,7 @@ cont { scale: 13 symbol { name: "remains-s" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33494,14 +32962,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "remains-s" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33511,14 +32979,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 24 } caption { @@ -33528,14 +32996,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33545,14 +33013,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33562,14 +33030,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33579,14 +33047,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "remains-m" - priority: 16590 + priority: 16603 min_distance: 12 } caption { @@ -33596,7 +33064,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -33607,7 +33075,7 @@ cont { lines { width: 2.0 color: 3881787 - priority: 1590 + priority: 1603 cap: BUTTCAP } } @@ -33616,7 +33084,7 @@ cont { lines { width: 2.8 color: 3881787 - priority: 1590 + priority: 1603 cap: BUTTCAP } } @@ -33631,7 +33099,7 @@ cont { dd: 1.5 dd: 3.0 } - priority: 1590 + priority: 1603 } } element { @@ -33645,7 +33113,7 @@ cont { dd: 1.9 dd: 4.0 } - priority: 1590 + priority: 1603 } } element { @@ -33659,7 +33127,7 @@ cont { dd: 2.5 dd: 6.0 } - priority: 1590 + priority: 1603 } } element { @@ -33673,7 +33141,7 @@ cont { dd: 3.0 dd: 8.0 } - priority: 1590 + priority: 1603 } } } @@ -33683,7 +33151,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33693,14 +33161,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 13 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33710,14 +33178,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 14 symbol { name: "remains-s" - priority: 16876 + priority: 16877 min_distance: 12 } caption { @@ -33727,14 +33195,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 15 symbol { name: "remains-m" - priority: 16876 + priority: 16877 min_distance: 5 } caption { @@ -33744,14 +33212,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 16 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33760,14 +33228,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 17 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33776,14 +33244,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 18 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33792,14 +33260,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } element { scale: 19 symbol { name: "remains-m" - priority: 16876 + priority: 16877 } caption { primary { @@ -33808,7 +33276,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15876 + priority: 15877 } } } @@ -33818,7 +33286,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -33826,7 +33294,7 @@ cont { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -33836,14 +33304,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -33853,14 +33321,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -33870,7 +33338,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -33880,7 +33348,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -33890,14 +33358,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33907,14 +33375,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33924,14 +33392,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33941,14 +33409,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33958,7 +33426,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -33968,7 +33436,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16733 + priority: 16745 min_distance: 24 } } @@ -33976,7 +33444,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16733 + priority: 16745 min_distance: 12 } } @@ -33984,7 +33452,7 @@ cont { scale: 17 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -33994,14 +33462,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34011,14 +33479,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "cross-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34028,7 +33496,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34038,7 +33506,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 24 } } @@ -34046,7 +33514,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34054,7 +33522,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34062,7 +33530,7 @@ cont { scale: 18 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34072,14 +33540,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34089,7 +33557,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -34099,7 +33567,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34109,14 +33577,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34126,14 +33594,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34143,14 +33611,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34160,14 +33628,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34177,7 +33645,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34187,7 +33655,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34197,14 +33665,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34214,14 +33682,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34231,14 +33699,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34248,14 +33716,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34265,7 +33733,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34275,7 +33743,7 @@ cont { scale: 15 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 24 } } @@ -34283,7 +33751,7 @@ cont { scale: 16 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34291,7 +33759,7 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34299,7 +33767,7 @@ cont { scale: 18 symbol { name: "zero-icon" - priority: 16676 + priority: 16688 min_distance: 12 } } @@ -34307,7 +33775,7 @@ cont { scale: 19 symbol { name: "plaque" - priority: 16857 + priority: 16858 min_distance: 12 } caption { @@ -34317,7 +33785,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -34327,7 +33795,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34337,14 +33805,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34354,14 +33822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34371,14 +33839,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34388,14 +33856,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34405,7 +33873,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34415,7 +33883,7 @@ cont { scale: 13 symbol { name: "monument-s" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34425,14 +33893,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 14 symbol { name: "monument-s" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34442,14 +33910,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 15 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -34459,14 +33927,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 16 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34476,14 +33944,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 17 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34493,14 +33961,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34510,14 +33978,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "monument-m" - priority: 16733 + priority: 16745 min_distance: 12 } caption { @@ -34527,7 +33995,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -34537,7 +34005,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -34545,7 +34013,7 @@ cont { scale: 17 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34555,14 +34023,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34572,14 +34040,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "monument-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34589,7 +34057,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34599,7 +34067,7 @@ cont { scale: 17 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34608,7 +34076,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34616,7 +34084,7 @@ cont { scale: 18 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34625,7 +34093,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34633,7 +34101,7 @@ cont { scale: 19 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34642,7 +34110,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "name" } @@ -34650,7 +34118,7 @@ cont { scale: 19 symbol { name: "remains-m" - priority: 16600 + priority: 16613 } caption { primary { @@ -34659,7 +34127,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } apply_if: "!name" } @@ -34670,7 +34138,7 @@ cont { scale: 16 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34680,14 +34148,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 17 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34697,14 +34165,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 18 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34714,14 +34182,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } element { scale: 19 symbol { name: "historic-ship-m" - priority: 16819 + priority: 16613 min_distance: 8 } caption { @@ -34731,7 +34199,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15819 + priority: 15613 } } } @@ -34741,7 +34209,7 @@ cont { scale: 16 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34751,14 +34219,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34768,14 +34236,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34785,14 +34253,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "tomb-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34802,7 +34270,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34812,7 +34280,7 @@ cont { scale: 16 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34822,14 +34290,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34839,14 +34307,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34856,14 +34324,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "cross-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34873,7 +34341,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34883,7 +34351,7 @@ cont { scale: 16 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } } @@ -34891,7 +34359,7 @@ cont { scale: 17 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34901,14 +34369,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34918,14 +34386,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "wayside_shrine-m" - priority: 16590 + priority: 16603 min_distance: 8 } caption { @@ -34935,7 +34403,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -34944,7 +34412,7 @@ cont { element { scale: 15 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-xs" step: 44.0 @@ -34955,7 +34423,7 @@ cont { element { scale: 16 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-s" step: 54.0 @@ -34966,7 +34434,7 @@ cont { element { scale: 17 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-s" step: 64.0 @@ -34977,7 +34445,7 @@ cont { element { scale: 18 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-m" step: 74.0 @@ -34988,7 +34456,7 @@ cont { element { scale: 19 lines { - priority: 1476 + priority: 1490 pathsym { name: "arrow-m" step: 74.0 @@ -35004,7 +34472,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35013,7 +34481,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35021,14 +34489,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35036,14 +34504,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35051,14 +34519,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35069,7 +34537,7 @@ cont { lines { width: 1.0 color: 2152292681 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35078,7 +34546,7 @@ cont { lines { width: 1.3 color: 1716085065 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35087,7 +34555,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35095,7 +34563,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35103,14 +34571,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35118,14 +34586,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35133,14 +34601,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35148,14 +34616,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35166,7 +34634,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35175,7 +34643,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35183,7 +34651,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35192,7 +34660,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35200,7 +34668,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35208,7 +34676,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35216,7 +34684,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35224,7 +34692,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35232,7 +34700,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35240,7 +34708,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35248,14 +34716,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35263,14 +34731,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35278,14 +34746,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35293,14 +34761,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35311,7 +34779,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35320,7 +34788,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35328,14 +34796,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35343,14 +34811,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35358,14 +34826,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35376,7 +34844,7 @@ cont { lines { width: 1.0 color: 2152292681 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35386,7 +34854,7 @@ cont { lines { width: 1.3 color: 1716085065 - priority: 1409 + priority: 1424 join: BEVELJOIN cap: BUTTCAP } @@ -35395,7 +34863,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35403,7 +34871,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35411,7 +34879,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35419,7 +34887,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35427,7 +34895,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35435,7 +34903,7 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 cap: BUTTCAP } path_text { @@ -35443,7 +34911,7 @@ cont { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35451,14 +34919,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35466,14 +34934,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35481,14 +34949,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } element { @@ -35496,14 +34964,14 @@ cont { lines { width: 1.3 color: 860447049 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 4809033 } - priority: 16409 + priority: 16424 } } } @@ -35514,7 +34982,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 cap: BUTTCAP } } @@ -35523,7 +34991,7 @@ cont { lines { width: 1.0 color: 2153149782 - priority: 1409 + priority: 1424 } } element { @@ -35531,14 +34999,14 @@ cont { lines { width: 1.0 color: 1716942166 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35546,14 +35014,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } element { @@ -35561,14 +35029,14 @@ cont { lines { width: 1.3 color: 861304150 - priority: 1409 + priority: 1424 } path_text { primary { height: 9 color: 5666134 } - priority: 16409 + priority: 16424 } } } @@ -35581,7 +35049,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -35591,7 +35059,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -35601,7 +35069,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } } @@ -35614,7 +35082,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -35624,7 +35092,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { @@ -35634,7 +35102,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } } @@ -35644,91 +35112,91 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } } @@ -35738,56 +35206,56 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } } } @@ -35797,18 +35265,18 @@ cont { scale: 14 area { color: 655629312 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35816,18 +35284,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 16 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35835,18 +35303,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 17 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35854,18 +35322,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35873,18 +35341,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35892,7 +35360,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -35902,18 +35370,18 @@ cont { scale: 14 area { color: 655629312 - priority: -15600 + priority: -15585 } } element { scale: 15 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35921,18 +35389,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 16 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35940,18 +35408,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 17 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35959,18 +35427,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 18 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35978,18 +35446,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } element { scale: 19 area { color: 1317888 - priority: -15600 + priority: -15585 } symbol { name: "cemetery-m" - priority: 16400 + priority: 16415 } caption { primary { @@ -35997,7 +35465,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15400 + priority: 15415 } } } @@ -36184,105 +35652,105 @@ cont { scale: 10 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 11 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 12 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } } @@ -36292,105 +35760,105 @@ cont { scale: 10 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 11 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 12 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1381632 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 1381632 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } } @@ -36400,56 +35868,56 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } } } @@ -36459,21 +35927,21 @@ cont { scale: 10 area { color: 1251584 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 1317888 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } caption { primary { @@ -36481,7 +35949,7 @@ cont { color: 2836760 stroke_color: 856756480 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36489,7 +35957,7 @@ cont { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36497,11 +35965,11 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -36511,7 +35979,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36519,7 +35987,7 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36527,11 +35995,11 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36541,7 +36009,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36549,7 +36017,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36557,11 +36025,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36571,7 +36039,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36579,7 +36047,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36587,11 +36055,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36608,7 +36076,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36616,7 +36084,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36624,11 +36092,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36645,7 +36113,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36653,7 +36121,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36661,11 +36129,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36682,7 +36150,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36690,11 +36158,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36702,11 +36170,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36723,7 +36191,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36731,11 +36199,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36746,21 +36214,21 @@ cont { scale: 10 area { color: 1251584 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 1317888 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } caption { primary { @@ -36768,7 +36236,7 @@ cont { color: 2836760 stroke_color: 856756480 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36776,7 +36244,7 @@ cont { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36784,11 +36252,11 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -36798,7 +36266,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36806,7 +36274,7 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36814,11 +36282,11 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36828,7 +36296,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36836,7 +36304,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36844,11 +36312,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36858,7 +36326,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36866,7 +36334,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36874,11 +36342,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36895,7 +36363,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36903,7 +36371,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36911,11 +36379,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36932,7 +36400,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36940,7 +36408,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -36948,11 +36416,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -36969,7 +36437,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -36977,11 +36445,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -36989,11 +36457,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37010,7 +36478,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37018,11 +36486,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37033,21 +36501,21 @@ cont { scale: 10 area { color: 1251584 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 1317888 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } caption { primary { @@ -37055,7 +36523,7 @@ cont { color: 2836760 stroke_color: 856756480 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37063,7 +36531,7 @@ cont { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37071,11 +36539,11 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -37085,7 +36553,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37093,7 +36561,7 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37101,11 +36569,11 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37115,7 +36583,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37123,7 +36591,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37131,11 +36599,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37145,7 +36613,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37153,7 +36621,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37161,11 +36629,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37182,7 +36650,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37190,7 +36658,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37198,11 +36666,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37219,7 +36687,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37227,7 +36695,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37235,11 +36703,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37256,7 +36724,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37264,11 +36732,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37276,11 +36744,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37297,7 +36765,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37305,11 +36773,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37320,21 +36788,21 @@ cont { scale: 10 area { color: 1251584 - priority: -15943 + priority: -15925 } } element { scale: 11 area { color: 1317888 - priority: -15943 + priority: -15925 } } element { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } caption { primary { @@ -37342,7 +36810,7 @@ cont { color: 2836760 stroke_color: 856756480 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37350,7 +36818,7 @@ cont { scale: 12 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37358,11 +36826,11 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 12 } caption { @@ -37372,7 +36840,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37380,7 +36848,7 @@ cont { scale: 13 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37388,11 +36856,11 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-s" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37402,7 +36870,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37410,7 +36878,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37418,11 +36886,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37432,7 +36900,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37440,7 +36908,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37448,11 +36916,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37469,7 +36937,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37477,7 +36945,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37485,11 +36953,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37506,7 +36974,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37514,7 +36982,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15943 + priority: -15925 } apply_if: "!name" } @@ -37522,11 +36990,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37543,7 +37011,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37551,11 +37019,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37563,11 +37031,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-outline-m" - priority: 16057 + priority: 16075 min_distance: 8 } caption { @@ -37584,7 +37052,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15057 + priority: 15075 } apply_if: "name" } @@ -37592,11 +37060,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15943 + priority: -15925 } symbol { name: "nparkf-m" - priority: 16057 + priority: 16075 } apply_if: "!name" } @@ -37607,14 +37075,14 @@ cont { scale: 14 area { color: 2150246954 - priority: 1229 + priority: 1246 } } element { scale: 15 area { color: 1714039338 - priority: 1229 + priority: 1246 } } element { @@ -37625,7 +37093,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1229 + priority: 1246 } } element { @@ -37636,7 +37104,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1229 + priority: 1246 } } element { @@ -37647,7 +37115,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1229 + priority: 1246 } } element { @@ -37658,7 +37126,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1229 + priority: 1246 } } } @@ -37668,56 +37136,56 @@ cont { scale: 12 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 1251584 - priority: -15877 + priority: -15859 } } } @@ -37800,11 +37268,11 @@ cont { scale: 15 area { color: 1643545 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37812,18 +37280,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 16 area { color: 1643545 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37831,18 +37299,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 area { color: 1643545 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37850,18 +37318,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 area { color: 1643545 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37869,18 +37337,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 area { color: 1643545 - priority: -15362 + priority: -15350 } symbol { name: "waste-basket-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -37888,7 +37356,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -37898,56 +37366,56 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } } } @@ -37957,39 +37425,39 @@ cont { scale: 12 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 14 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 15 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 16 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 min_distance: 10 } } @@ -37997,11 +37465,11 @@ cont { scale: 17 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38009,18 +37477,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 18 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38028,18 +37496,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 19 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38047,7 +37515,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15476 + priority: 15490 } } } @@ -38057,53 +37525,53 @@ cont { scale: 10 area { color: 12000284 - priority: -15524 + priority: -15510 } } element { scale: 11 area { color: 12000284 - priority: -15524 + priority: -15510 } } element { scale: 12 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 13 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 14 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 15 area { color: 2159483932 - priority: -15524 + priority: -15510 } } element { scale: 16 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 min_distance: 10 } } @@ -38111,11 +37579,11 @@ cont { scale: 17 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38123,18 +37591,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 18 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38142,18 +37610,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15476 + priority: 15490 } } element { scale: 19 area { color: 2159483932 - priority: -15524 + priority: -15510 } symbol { name: "military-m" - priority: 16476 + priority: 16490 } caption { primary { @@ -38161,7 +37629,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15476 + priority: 15490 } } } @@ -38171,91 +37639,91 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } } @@ -38411,91 +37879,91 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } } @@ -38508,7 +37976,7 @@ cont { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38519,7 +37987,7 @@ cont { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38527,14 +37995,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38542,7 +38010,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38550,14 +38018,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38565,7 +38033,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38573,14 +38041,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38588,7 +38056,7 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38596,14 +38064,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38611,7 +38079,7 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38619,14 +38087,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38634,7 +38102,7 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38642,14 +38110,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38657,7 +38125,7 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38665,14 +38133,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38680,7 +38148,7 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38688,14 +38156,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -38703,7 +38171,7 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -38764,140 +38232,140 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } } } @@ -38907,56 +38375,56 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } } } @@ -38966,91 +38434,91 @@ cont { scale: 12 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 988160 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 1251584 - priority: -15924 + priority: -15906 } } element { scale: 15 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 1251584 - priority: -15924 + priority: -15906 } caption { primary { height: 10 color: 5592405 } - priority: 15076 + priority: 15094 } } } @@ -39127,11 +38595,11 @@ cont { scale: 17 area { color: 2631706 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39140,18 +38608,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 + priority: 15047 } } element { scale: 18 area { color: 2631706 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39160,18 +38628,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 + priority: 15047 } } element { scale: 19 area { color: 2631706 - priority: -15991 + priority: -15953 } symbol { name: "beach-m" - priority: 16009 + priority: 16047 } caption { primary { @@ -39180,58 +38648,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15009 - } - } -} -cont { - name: "leisure-bowling_alley" - element { - scale: 17 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 18 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 - } - } - element { - scale: 19 - symbol { - name: "bowling_alley-m" - priority: 16657 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15657 + priority: 15047 } } } @@ -39313,7 +38730,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -39322,14 +38739,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39339,14 +38756,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39356,14 +38773,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "dog_park-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -39373,7 +38790,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -39383,7 +38800,8 @@ cont { scale: 17 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39399,7 +38817,8 @@ cont { scale: 18 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39415,7 +38834,8 @@ cont { scale: 19 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39434,7 +38854,8 @@ cont { scale: 17 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39450,7 +38871,8 @@ cont { scale: 18 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39466,7 +38888,8 @@ cont { scale: 19 symbol { name: "gym-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39485,39 +38908,39 @@ cont { scale: 12 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39534,7 +38957,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39542,7 +38965,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -39550,11 +38973,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39571,7 +38994,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39579,7 +39002,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -39587,7 +39010,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39595,11 +39018,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39616,7 +39039,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39624,11 +39047,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "garden-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -39636,11 +39059,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "garden-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -39657,7 +39080,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39665,11 +39088,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "garden-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -39680,35 +39103,35 @@ cont { scale: 12 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -39716,7 +39139,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -39724,7 +39147,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39732,7 +39155,7 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -39740,7 +39163,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39748,7 +39171,7 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -39756,7 +39179,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39764,7 +39187,7 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -39772,7 +39195,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -39780,7 +39203,7 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -39788,7 +39211,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -39799,46 +39222,46 @@ cont { scale: 12 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 1251584 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -39847,18 +39270,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15142 + priority: 15160 } } element { scale: 18 area { color: 1251584 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -39867,18 +39290,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15142 + priority: 15160 } } element { scale: 19 area { color: 1251584 - priority: -15858 + priority: -15840 } symbol { name: "golf-m" - priority: 16142 + priority: 16160 min_distance: 10 } caption { @@ -39887,7 +39310,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15142 + priority: 15160 } } } @@ -39897,7 +39320,8 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39913,7 +39337,8 @@ cont { scale: 18 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39929,7 +39354,8 @@ cont { scale: 19 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -39984,7 +39410,7 @@ cont { scale: 16 symbol { name: "marina-m" - priority: 16095 + priority: 16113 min_distance: 30 } caption { @@ -39993,14 +39419,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15095 + priority: 15113 } } element { scale: 17 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -40010,14 +39436,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } element { scale: 18 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -40027,14 +39453,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } element { scale: 19 symbol { name: "marina-m" - priority: 16095 + priority: 16047 min_distance: 20 } caption { @@ -40044,7 +39470,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15095 + priority: 15047 } } } @@ -40054,18 +39480,18 @@ cont { scale: 10 area { color: 3425648640 - priority: -15334 + priority: -15321 } } element { scale: 11 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 20 } } @@ -40073,11 +39499,11 @@ cont { scale: 12 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -40087,18 +39513,18 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 13 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 min_distance: 12 } caption { @@ -40108,18 +39534,18 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 14 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-s" - priority: 16666 + priority: 16679 } caption { primary { @@ -40128,18 +39554,18 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40148,18 +39574,18 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40168,18 +39594,18 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40188,18 +39614,18 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40209,18 +39635,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } element { scale: 19 area { color: 3425648640 - priority: -15334 + priority: -15321 } symbol { name: "nparkf-outline-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -40230,7 +39656,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15666 + priority: 15679 } } } @@ -40240,39 +39666,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40282,7 +39708,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40290,7 +39716,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40298,11 +39724,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40312,7 +39738,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40320,7 +39746,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40328,11 +39754,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40349,7 +39775,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40357,7 +39783,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40365,11 +39791,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40386,7 +39812,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40394,7 +39820,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -40402,7 +39828,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40410,11 +39836,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40431,7 +39857,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40439,11 +39865,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40451,11 +39877,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40472,7 +39898,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40480,11 +39906,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40495,39 +39921,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40537,7 +39963,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40545,7 +39971,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40553,11 +39979,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40567,7 +39993,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40575,7 +40001,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40583,11 +40009,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40604,7 +40030,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40612,7 +40038,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40620,11 +40046,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40641,7 +40067,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40649,7 +40075,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -40657,7 +40083,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40665,11 +40091,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40686,7 +40112,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40694,11 +40120,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40706,11 +40132,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40727,7 +40153,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40735,11 +40161,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40750,39 +40176,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40792,7 +40218,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40800,7 +40226,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40808,11 +40234,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40822,7 +40248,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40830,7 +40256,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40838,11 +40264,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40859,7 +40285,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40867,7 +40293,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -40875,11 +40301,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40896,7 +40322,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40904,7 +40330,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -40912,7 +40338,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -40920,11 +40346,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40941,7 +40367,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40949,11 +40375,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -40961,11 +40387,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -40982,7 +40408,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -40990,11 +40416,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41005,39 +40431,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 11 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 12 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 13 area { color: 1317888 - priority: -15934 + priority: -15916 } } element { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-s" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41047,7 +40473,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41055,7 +40481,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41063,11 +40489,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41077,7 +40503,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41085,7 +40511,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41093,11 +40519,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41114,7 +40540,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41122,7 +40548,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15934 + priority: -15916 } apply_if: "!name" } @@ -41130,11 +40556,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41151,7 +40577,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41159,7 +40585,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15934 + priority: -15916 } caption { primary { @@ -41167,7 +40593,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15066 + priority: 15084 } apply_if: "!name" } @@ -41175,11 +40601,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41196,7 +40622,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41204,11 +40630,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41216,11 +40642,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-outline-m" - priority: 16066 + priority: 16084 min_distance: 8 } caption { @@ -41237,7 +40663,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15066 + priority: 15084 } apply_if: "name" } @@ -41245,11 +40671,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15934 + priority: -15916 } symbol { name: "park-m" - priority: 16066 + priority: 16084 } apply_if: "!name" } @@ -41260,7 +40686,7 @@ cont { scale: 16 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41269,14 +40695,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41285,14 +40711,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41301,14 +40727,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "picnic_table-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -41317,7 +40743,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } } @@ -41327,25 +40753,26 @@ cont { scale: 15 area { color: 2171163 - priority: -15924 + priority: -15963 } } element { scale: 16 area { color: 2171163 - priority: -15924 + priority: -15963 } } element { scale: 17 area { color: 2171163 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41361,11 +40788,12 @@ cont { scale: 18 area { color: 2171163 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41381,11 +40809,12 @@ cont { scale: 19 area { color: 2171163 - priority: -15924 + priority: -15953 } symbol { name: "pitch-m" - priority: 16076 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41404,18 +40833,19 @@ cont { scale: 16 area { color: 2171163 - priority: -15924 + priority: -15963 } } element { scale: 17 area { color: 2171163 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41424,18 +40854,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 area { color: 2171163 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41444,18 +40875,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 area { color: 2171163 - priority: -15400 + priority: -15387 } symbol { name: "playground-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -41464,7 +40896,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -41510,7 +40942,8 @@ cont { scale: 17 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41526,7 +40959,8 @@ cont { scale: 18 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41542,7 +40976,8 @@ cont { scale: 19 symbol { name: "sauna-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41597,7 +41032,8 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41613,7 +41049,8 @@ cont { scale: 18 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41629,7 +41066,8 @@ cont { scale: 19 symbol { name: "pitch-m" - priority: 16000 + apply_for_type: 1 + priority: 16047 min_distance: 10 } caption { @@ -41648,7 +41086,8 @@ cont { scale: 13 symbol { name: "stadium-s" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 16 } caption { @@ -41657,14 +41096,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 14 symbol { name: "stadium-s" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 16 } caption { @@ -41673,18 +41113,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 15 area { color: 2171163 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41693,18 +41134,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 16 area { color: 2171163 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41713,18 +41155,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 17 area { color: 2171163 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41733,18 +41176,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 18 area { color: 2171163 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41753,18 +41197,19 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } element { scale: 19 area { color: 2171163 - priority: -15153 + priority: -15151 } symbol { name: "stadium-m" - priority: 16847 + apply_for_type: 1 + priority: 16849 min_distance: 8 } caption { @@ -41773,7 +41218,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15847 + priority: 15849 } } } @@ -41783,39 +41228,39 @@ cont { scale: 13 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 14 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 8738 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41824,18 +41269,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 8738 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41844,18 +41289,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 8738 - priority: -15343 + priority: -15331 } symbol { name: "swimming-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41864,7 +41309,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -41874,39 +41319,39 @@ cont { scale: 13 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 14 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 15 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 16 area { color: 8738 - priority: -15343 + priority: -15331 } } element { scale: 17 area { color: 8738 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41915,18 +41360,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 area { color: 8738 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41935,18 +41380,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 area { color: 8738 - priority: -15343 + priority: -15331 } symbol { name: "zero-icon" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -41955,7 +41400,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -41966,7 +41411,7 @@ cont { lines { width: 1.5 color: 2171163 - priority: 1314 + priority: 1330 cap: BUTTCAP } } @@ -41975,7 +41420,7 @@ cont { lines { width: 1.8 color: 2171163 - priority: 1314 + priority: 1330 } caption { primary { @@ -41983,7 +41428,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 15314 + priority: 15330 } } element { @@ -41991,7 +41436,7 @@ cont { lines { width: 3.0 color: 2171163 - priority: 1314 + priority: 1330 } caption { primary { @@ -42000,7 +41445,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { @@ -42008,7 +41453,7 @@ cont { lines { width: 3.0 color: 2171163 - priority: 1314 + priority: 1330 } caption { primary { @@ -42017,7 +41462,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { @@ -42025,7 +41470,7 @@ cont { lines { width: 4.0 color: 2171163 - priority: 1314 + priority: 1330 } caption { primary { @@ -42034,7 +41479,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15314 + priority: 15330 } } } @@ -42044,14 +41489,14 @@ cont { scale: 15 area { color: 2171163 - priority: -15686 + priority: -15670 } } element { scale: 16 area { color: 2171163 - priority: -15686 + priority: -15670 } caption { primary { @@ -42059,14 +41504,14 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 15314 + priority: 15330 } } element { scale: 17 area { color: 2171163 - priority: -15686 + priority: -15670 } caption { primary { @@ -42075,14 +41520,14 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { scale: 18 area { color: 2171163 - priority: -15686 + priority: -15670 } caption { primary { @@ -42091,14 +41536,14 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15314 + priority: 15330 } } element { scale: 19 area { color: 2171163 - priority: -15686 + priority: -15670 } caption { primary { @@ -42107,7 +41552,7 @@ cont { stroke_color: 856756480 offset_y: 1 } - priority: 15314 + priority: 15330 } } } @@ -42117,7 +41562,7 @@ cont { scale: 16 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -42126,14 +41571,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42143,14 +41588,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42160,14 +41605,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "swimming-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42177,7 +41622,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -42186,52 +41631,52 @@ cont { element { scale: 12 area { - priority: -15524 + priority: -15510 } } element { scale: 13 area { - priority: -15524 + priority: -15510 } } element { scale: 14 lines { width: 1.5 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { - priority: -15524 + priority: -15510 } } element { scale: 15 lines { width: 2.0 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { - priority: -15524 + priority: -15510 } } element { scale: 16 lines { width: 3.0 - priority: 1476 + priority: 1490 } area { - priority: -15524 + priority: -15510 } } element { scale: 17 lines { width: 4.5 - priority: 1476 + priority: 1490 } area { priority: 16000 @@ -42241,14 +41686,14 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { scale: 18 lines { width: 6.0 - priority: 1476 + priority: 1490 } area { priority: 16000 @@ -42258,14 +41703,14 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { scale: 19 lines { width: 8.0 - priority: 1476 + priority: 1490 } area { priority: 16000 @@ -42275,7 +41720,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } } @@ -42285,21 +41730,21 @@ cont { scale: 16 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } } element { scale: 17 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } } element { scale: 18 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -42307,14 +41752,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "chimney-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -42322,7 +41767,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15590 + priority: 15603 } } } @@ -42333,7 +41778,7 @@ cont { lines { width: 1.0 color: 1712264192 - priority: 1180 + priority: 1198 cap: BUTTCAP } } @@ -42342,7 +41787,7 @@ cont { lines { width: 1.5 color: 1712264192 - priority: 1180 + priority: 1198 cap: BUTTCAP } } @@ -42351,7 +41796,7 @@ cont { lines { width: 2.0 color: 1712264192 - priority: 1180 + priority: 1198 } } element { @@ -42359,7 +41804,7 @@ cont { lines { width: 3.0 color: 1712264192 - priority: 1180 + priority: 1198 } } element { @@ -42367,7 +41812,7 @@ cont { lines { width: 4.5 color: 1712264192 - priority: 1180 + priority: 1198 } } element { @@ -42375,7 +41820,7 @@ cont { lines { width: 6.0 color: 1712264192 - priority: 1180 + priority: 1198 } } } @@ -42392,7 +41837,7 @@ cont { dd: 2.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -42406,7 +41851,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1219 + priority: 1235 } } element { @@ -42420,7 +41865,7 @@ cont { dd: 4.0 dd: 3.0 } - priority: 1219 + priority: 1235 } } element { @@ -42434,7 +41879,7 @@ cont { dd: 5.0 dd: 4.0 } - priority: 1219 + priority: 1235 } } } @@ -42444,6 +41889,7 @@ cont { scale: 15 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42451,6 +41897,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42458,6 +41905,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42465,6 +41913,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42472,6 +41921,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42482,7 +41932,7 @@ cont { scale: 14 symbol { name: "lighthouse-s" - priority: 16666 + priority: 16679 min_distance: 5 } caption { @@ -42491,14 +41941,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 15 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42506,14 +41956,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42521,14 +41971,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 17 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42536,14 +41986,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 18 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42551,14 +42001,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } element { scale: 19 symbol { name: "lighthouse-m" - priority: 16666 + priority: 16679 } caption { primary { @@ -42566,7 +42016,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15666 + priority: 15679 } } } @@ -42576,6 +42026,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42583,6 +42034,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42590,6 +42042,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42597,6 +42050,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -42606,52 +42060,52 @@ cont { element { scale: 12 area { - priority: -15524 + priority: -15510 } } element { scale: 13 area { - priority: -15524 + priority: -15510 } } element { scale: 14 lines { width: 1.5 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { - priority: -15524 + priority: -15510 } } element { scale: 15 lines { width: 2.0 - priority: 1476 + priority: 1490 cap: BUTTCAP } area { - priority: -15524 + priority: -15510 } } element { scale: 16 lines { width: 3.0 - priority: 1476 + priority: 1490 } area { - priority: -15524 + priority: -15510 } } element { scale: 17 lines { width: 4.5 - priority: 1476 + priority: 1490 } area { priority: 16000 @@ -42661,14 +42115,14 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { scale: 18 lines { width: 6.0 - priority: 1476 + priority: 1490 } area { priority: 16000 @@ -42678,14 +42132,14 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } element { scale: 19 lines { width: 8.0 - priority: 1476 + priority: 1490 } area { priority: 16000 @@ -42695,7 +42149,7 @@ cont { height: 10 color: 5592405 } - priority: 15476 + priority: 15490 } } } @@ -42799,7 +42253,8 @@ cont { scale: 16 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42808,14 +42263,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42824,14 +42280,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42840,14 +42297,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "survey_point-m" - priority: 16580 + apply_for_type: 1 + priority: 16594 } caption { primary { @@ -42856,7 +42314,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -42866,7 +42324,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42874,7 +42332,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42882,7 +42340,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42890,7 +42348,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42898,7 +42356,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42909,7 +42367,7 @@ cont { scale: 15 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42917,7 +42375,7 @@ cont { scale: 16 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42925,7 +42383,7 @@ cont { scale: 17 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42933,7 +42391,7 @@ cont { scale: 18 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42941,7 +42399,7 @@ cont { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 36 } } @@ -42952,7 +42410,7 @@ cont { scale: 16 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -42961,14 +42419,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42978,14 +42436,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -42995,14 +42453,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "windmill-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -43012,7 +42470,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -43069,7 +42527,7 @@ cont { scale: 14 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43078,14 +42536,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43094,14 +42552,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43110,14 +42568,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43126,14 +42584,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43142,14 +42600,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -43158,7 +42616,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -43168,21 +42626,21 @@ cont { scale: 12 area { color: 3156522 - priority: -15924 + priority: -15906 } } element { scale: 13 area { color: 3156522 - priority: -15924 + priority: -15906 } } element { scale: 14 area { color: 3156522 - priority: -15924 + priority: -15906 } caption { primary { @@ -43191,14 +42649,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 15 area { color: 3156522 - priority: -15924 + priority: -15906 } caption { primary { @@ -43207,14 +42665,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 16 area { color: 3156522 - priority: -15924 + priority: -15906 } caption { primary { @@ -43223,14 +42681,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 17 area { color: 3156522 - priority: -15924 + priority: -15906 } caption { primary { @@ -43239,14 +42697,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 18 area { color: 3156522 - priority: -15924 + priority: -15906 } caption { primary { @@ -43255,14 +42713,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } element { scale: 19 area { color: 3156522 - priority: -15924 + priority: -15906 } caption { primary { @@ -43271,7 +42729,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15076 + priority: 15094 } } } @@ -43755,7 +43213,7 @@ cont { scale: 11 symbol { name: "cave-s" - priority: 16590 + priority: 16603 min_distance: 20 } caption { @@ -43765,14 +43223,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -43781,14 +43239,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -43797,14 +43255,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "cave-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -43813,14 +43271,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43829,14 +43287,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43845,14 +43303,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43861,14 +43319,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43877,14 +43335,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "cave-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -43893,7 +43351,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -43908,7 +43366,7 @@ cont { dd: 1.4 dd: 1.4 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -43921,7 +43379,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -43936,7 +43394,7 @@ cont { dd: 4.5 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -43950,7 +43408,7 @@ cont { dd: 6.0 dd: 1.4 } - priority: 1219 + priority: 1235 } } element { @@ -43964,7 +43422,7 @@ cont { dd: 8.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -43978,7 +43436,7 @@ cont { dd: 10.0 dd: 1.9 } - priority: 1219 + priority: 1235 } } } @@ -44319,7 +43777,7 @@ cont { dd: 1.4 dd: 1.4 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44332,7 +43790,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1219 + priority: 1235 cap: BUTTCAP } } @@ -44347,7 +43805,7 @@ cont { dd: 4.5 dd: 1.2 } - priority: 1219 + priority: 1235 } } element { @@ -44361,7 +43819,7 @@ cont { dd: 6.0 dd: 1.4 } - priority: 1219 + priority: 1235 } } element { @@ -44375,7 +43833,7 @@ cont { dd: 8.0 dd: 1.5 } - priority: 1219 + priority: 1235 } } element { @@ -44389,7 +43847,7 @@ cont { dd: 10.0 dd: 1.9 } - priority: 1219 + priority: 1235 } } } @@ -44399,7 +43857,7 @@ cont { scale: 14 symbol { name: "geyser-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44409,14 +43867,14 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44426,14 +43884,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44443,14 +43901,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44460,14 +43918,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44477,14 +43935,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "geyser-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44494,7 +43952,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -44646,56 +44104,56 @@ cont { scale: 12 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 1251584 - priority: -15877 + priority: -15859 } } } @@ -44705,56 +44163,56 @@ cont { scale: 12 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 13 area { color: 988160 - priority: -15877 + priority: -15859 } } element { scale: 14 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 15 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 16 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 17 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 18 area { color: 1251584 - priority: -15877 + priority: -15859 } } element { scale: 19 area { color: 1251584 - priority: -15877 + priority: -15859 } } } @@ -44764,7 +44222,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44774,65 +44232,65 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 5592405 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 5592405 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 5592405 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44842,14 +44300,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -44859,7 +44317,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -44991,7 +44449,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 min_distance: 10 } caption { @@ -45001,7 +44459,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -45013,7 +44471,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "!name" } @@ -45021,7 +44479,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45030,7 +44488,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -45042,7 +44500,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "!name" } @@ -45050,7 +44508,7 @@ cont { scale: 14 symbol { name: "peakt-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45059,7 +44517,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } apply_if: "name" } @@ -45067,7 +44525,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45076,14 +44534,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45092,14 +44550,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45108,14 +44566,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45124,14 +44582,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "peakt-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45140,7 +44598,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45188,7 +44646,7 @@ cont { scale: 14 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45197,14 +44655,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45213,14 +44671,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45229,14 +44687,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45245,14 +44703,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45261,14 +44719,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "mountain-pass" - priority: 16590 + priority: 16603 } caption { primary { @@ -45277,7 +44735,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45287,42 +44745,42 @@ cont { scale: 14 area { color: 1317888 - priority: -15867 + priority: -15850 } } element { scale: 15 area { color: 1317888 - priority: -15867 + priority: -15850 } } element { scale: 16 area { color: 1317888 - priority: -15867 + priority: -15850 } } element { scale: 17 area { color: 1317888 - priority: -15867 + priority: -15850 } } element { scale: 18 area { color: 1317888 - priority: -15867 + priority: -15850 } } element { scale: 19 area { color: 1317888 - priority: -15867 + priority: -15850 } } } @@ -45332,7 +44790,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45342,65 +44800,65 @@ cont { offset_y: 6 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 15 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 5592405 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 16 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 5592405 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 17 symbol { - name: "drinking-water-s" - priority: 16580 + name: "drinking-water-m" + priority: 16594 min_distance: 24 } caption { primary { height: 10 color: 5592405 - offset_y: 6 + offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 18 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45410,14 +44868,14 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } element { scale: 19 symbol { name: "drinking-water-m" - priority: 16580 + priority: 16594 min_distance: 24 } caption { @@ -45427,7 +44885,7 @@ cont { offset_y: 8 is_optional: true } - priority: 15580 + priority: 15594 } } } @@ -45548,7 +45006,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45557,14 +45015,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45573,14 +45031,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45589,14 +45047,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45605,14 +45063,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -45621,14 +45079,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45637,14 +45095,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45653,14 +45111,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45669,14 +45127,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45685,14 +45143,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "volcano-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -45701,7 +45159,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -45710,84 +45168,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45795,7 +45253,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45803,14 +45261,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45818,7 +45276,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45826,14 +45284,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45841,7 +45299,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45849,14 +45307,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45864,7 +45322,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -45872,14 +45330,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45887,14 +45345,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45902,14 +45360,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45917,14 +45375,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45932,14 +45390,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45947,14 +45405,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45962,14 +45420,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -45977,14 +45435,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -45992,14 +45450,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46007,14 +45465,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46022,14 +45480,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46037,14 +45495,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46054,84 +45512,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46139,7 +45597,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46147,14 +45605,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46162,7 +45620,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46170,14 +45628,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46185,7 +45643,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46193,14 +45651,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46208,7 +45666,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46216,14 +45674,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46231,14 +45689,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46246,14 +45704,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46261,14 +45719,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46276,14 +45734,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46291,14 +45749,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46306,14 +45764,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46321,14 +45779,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46336,14 +45794,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46351,14 +45809,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46366,14 +45824,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46381,14 +45839,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46398,84 +45856,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46483,7 +45941,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46491,14 +45949,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46506,7 +45964,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46514,14 +45972,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46529,7 +45987,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46537,14 +45995,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46552,7 +46010,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46560,14 +46018,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46575,14 +46033,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46590,14 +46048,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46605,14 +46063,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46620,14 +46078,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46635,14 +46093,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46650,14 +46108,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46665,14 +46123,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46680,14 +46138,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46695,14 +46153,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46710,14 +46168,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46725,14 +46183,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46742,84 +46200,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46827,7 +46285,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46835,14 +46293,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46850,7 +46308,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46858,14 +46316,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46873,7 +46331,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46881,14 +46339,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46896,7 +46354,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -46904,14 +46362,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46919,14 +46377,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46934,14 +46392,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46949,14 +46407,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46964,14 +46422,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -46979,14 +46437,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -46994,14 +46452,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47009,14 +46467,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47024,14 +46482,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47039,14 +46497,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47054,14 +46512,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47069,14 +46527,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47086,84 +46544,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47171,7 +46629,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47179,14 +46637,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47194,7 +46652,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47202,14 +46660,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47217,7 +46675,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47225,14 +46683,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47240,7 +46698,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47248,14 +46706,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47263,14 +46721,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47278,14 +46736,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47293,14 +46751,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47308,14 +46766,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47323,14 +46781,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47338,14 +46796,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47353,14 +46811,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47368,14 +46826,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47383,14 +46841,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47398,14 +46856,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47413,14 +46871,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47430,84 +46888,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47515,7 +46973,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47523,14 +46981,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47538,7 +46996,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47546,14 +47004,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47561,7 +47019,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47569,14 +47027,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47584,7 +47042,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47592,14 +47050,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47607,14 +47065,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47622,14 +47080,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47637,14 +47095,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47652,14 +47110,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47667,14 +47125,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47682,14 +47140,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47697,14 +47155,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47712,14 +47170,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47727,14 +47185,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47742,14 +47200,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47757,14 +47215,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47774,84 +47232,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47859,7 +47317,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47867,14 +47325,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47882,7 +47340,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47890,14 +47348,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47905,7 +47363,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47913,14 +47371,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47928,7 +47386,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -47936,14 +47394,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47951,14 +47409,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47966,14 +47424,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -47981,14 +47439,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -47996,14 +47454,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48011,14 +47469,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48026,14 +47484,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48041,14 +47499,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48056,14 +47514,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48071,14 +47529,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48086,14 +47544,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48101,14 +47559,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48118,84 +47576,84 @@ cont { element { area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 1 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 2 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 3 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 4 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 5 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 6 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 7 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 8 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 9 area { color: 8738 - priority: -15848 + priority: -15831 } } element { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48203,7 +47661,7 @@ cont { scale: 10 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48211,14 +47669,14 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48226,7 +47684,7 @@ cont { scale: 11 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48234,14 +47692,14 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48249,7 +47707,7 @@ cont { scale: 12 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48257,14 +47715,14 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 9 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48272,7 +47730,7 @@ cont { scale: 13 area { color: 8738 - priority: -15848 + priority: -15831 } apply_if: "bbox_area<4000000" } @@ -48280,14 +47738,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48295,14 +47753,14 @@ cont { scale: 14 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48310,14 +47768,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48325,14 +47783,14 @@ cont { scale: 15 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 10 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48340,14 +47798,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48355,14 +47813,14 @@ cont { scale: 16 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48370,14 +47828,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48385,14 +47843,14 @@ cont { scale: 17 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48400,14 +47858,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48415,14 +47873,14 @@ cont { scale: 18 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48430,14 +47888,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area>=4000000" } @@ -48445,14 +47903,14 @@ cont { scale: 19 area { color: 8738 - priority: -15848 + priority: -15831 } caption { primary { height: 11 color: 19033 } - priority: 15152 + priority: 15169 } apply_if: "bbox_area<4000000" } @@ -48463,91 +47921,91 @@ cont { scale: 11 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } } @@ -48557,91 +48015,91 @@ cont { scale: 11 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } } @@ -48651,91 +48109,91 @@ cont { scale: 11 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 12 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 13 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 14 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 15 area { color: 6425 - priority: -15905 + priority: -15887 } } element { scale: 16 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 17 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 18 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } element { scale: 19 area { color: 6425 - priority: -15905 + priority: -15887 } caption { primary { height: 11 color: 19033 } - priority: 15095 + priority: 15113 } } } @@ -48745,7 +48203,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48754,14 +48212,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48770,7 +48228,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48780,7 +48238,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48789,14 +48247,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48805,7 +48263,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48815,7 +48273,7 @@ cont { scale: 17 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -48824,14 +48282,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -48840,14 +48298,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "embassy-m" - priority: 16657 + priority: 16669 } caption { primary { @@ -48856,7 +48314,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -48866,7 +48324,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48875,14 +48333,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48891,7 +48349,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48901,7 +48359,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48910,14 +48368,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48926,7 +48384,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48936,7 +48394,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48945,14 +48403,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -48961,7 +48419,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -48971,7 +48429,7 @@ cont { scale: 17 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -48981,14 +48439,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -48998,14 +48456,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "lawyer-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -49015,7 +48473,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -49025,7 +48483,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49034,14 +48492,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49050,7 +48508,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49060,7 +48518,7 @@ cont { scale: 18 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49069,14 +48527,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "office-m" - priority: 16638 + priority: 16650 } caption { primary { @@ -49085,7 +48543,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -49096,7 +48554,7 @@ cont { lines { width: 0.8 color: 6438271 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49105,7 +48563,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49114,7 +48572,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49122,7 +48580,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49130,7 +48588,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49138,7 +48596,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } } @@ -49149,7 +48607,7 @@ cont { lines { width: 1.0 color: 2236962 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49158,7 +48616,7 @@ cont { lines { width: 1.1 color: 2236962 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49167,7 +48625,7 @@ cont { lines { width: 1.1 color: 2236962 - priority: 1247 + priority: 1264 } } element { @@ -49175,7 +48633,7 @@ cont { lines { width: 1.5 color: 2236962 - priority: 1247 + priority: 1264 } } element { @@ -49183,7 +48641,7 @@ cont { lines { width: 1.5 color: 2236962 - priority: 1247 + priority: 1264 } } element { @@ -49191,7 +48649,7 @@ cont { lines { width: 1.5 color: 2236962 - priority: 1247 + priority: 1264 } } } @@ -49202,7 +48660,7 @@ cont { lines { width: 1.0 color: 731131 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49211,7 +48669,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49220,7 +48678,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49228,7 +48686,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49236,7 +48694,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } element { @@ -49244,7 +48702,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1247 + priority: 1264 } } } @@ -49255,7 +48713,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49264,7 +48722,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49273,7 +48731,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1247 + priority: 1264 } } element { @@ -49281,7 +48739,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1247 + priority: 1264 } } element { @@ -49289,7 +48747,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1247 + priority: 1264 } } element { @@ -49297,7 +48755,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1247 + priority: 1264 } } } @@ -49308,7 +48766,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49317,7 +48775,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49326,7 +48784,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1247 + priority: 1264 } } element { @@ -49334,7 +48792,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1247 + priority: 1264 } } element { @@ -49342,7 +48800,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1247 + priority: 1264 } } element { @@ -49350,7 +48808,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1247 + priority: 1264 } } } @@ -49361,7 +48819,7 @@ cont { lines { width: 1.0 color: 16518683 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49370,7 +48828,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49379,7 +48837,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49387,7 +48845,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49395,7 +48853,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } element { @@ -49403,7 +48861,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1247 + priority: 1264 } } } @@ -49414,7 +48872,7 @@ cont { lines { width: 1.0 color: 6286126 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49423,7 +48881,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49432,7 +48890,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49440,7 +48898,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49448,7 +48906,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } element { @@ -49456,7 +48914,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1247 + priority: 1264 } } } @@ -49467,7 +48925,7 @@ cont { lines { width: 0.8 color: 6438271 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49476,7 +48934,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49485,7 +48943,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49493,7 +48951,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49501,7 +48959,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49509,7 +48967,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } } @@ -49520,7 +48978,7 @@ cont { lines { width: 0.8 color: 6438271 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49529,7 +48987,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1247 + priority: 1264 cap: BUTTCAP } } @@ -49538,7 +48996,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49546,7 +49004,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49554,7 +49012,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } element { @@ -49562,7 +49020,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1247 + priority: 1264 } } } @@ -49640,7 +49098,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49659,7 +49117,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49678,7 +49136,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49697,7 +49155,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49735,7 +49193,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49754,7 +49212,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49792,7 +49250,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49811,7 +49269,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -49849,7 +49307,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49868,7 +49326,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49887,7 +49345,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49906,7 +49364,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49925,7 +49383,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49944,7 +49402,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49963,7 +49421,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -49982,7 +49440,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50061,7 +49519,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50080,7 +49538,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50099,7 +49557,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50118,7 +49576,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50156,7 +49614,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50175,7 +49633,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50213,7 +49671,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50232,7 +49690,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50270,7 +49728,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50289,7 +49747,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50308,7 +49766,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50327,7 +49785,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50346,7 +49804,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50365,7 +49823,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50384,7 +49842,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50403,7 +49861,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50482,7 +49940,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50501,7 +49959,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50520,7 +49978,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50539,7 +49997,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50577,7 +50035,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50596,7 +50054,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50634,7 +50092,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50653,7 +50111,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50691,7 +50149,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50710,7 +50168,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50729,7 +50187,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50748,7 +50206,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50767,7 +50225,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50786,7 +50244,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50805,7 +50263,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50824,7 +50282,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50903,7 +50361,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50922,7 +50380,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50941,7 +50399,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -50960,7 +50418,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -50998,7 +50456,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51017,7 +50475,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51055,7 +50513,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51074,7 +50532,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51112,7 +50570,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51131,7 +50589,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51150,7 +50608,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51169,7 +50627,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51188,7 +50646,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51207,7 +50665,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51226,7 +50684,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51245,7 +50703,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -51256,7 +50714,8 @@ cont { scale: 4 symbol { name: "star-s" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51265,7 +50724,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51287,7 +50746,8 @@ cont { scale: 5 symbol { name: "star-m" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51296,7 +50756,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51318,7 +50778,8 @@ cont { scale: 6 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51327,7 +50788,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51349,7 +50810,8 @@ cont { scale: 7 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51358,7 +50820,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51380,7 +50842,8 @@ cont { scale: 8 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51389,7 +50852,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51411,7 +50874,8 @@ cont { scale: 9 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51420,7 +50884,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51442,7 +50906,8 @@ cont { scale: 10 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51451,7 +50916,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51473,7 +50938,8 @@ cont { scale: 11 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51482,7 +50948,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51504,7 +50970,8 @@ cont { scale: 12 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51513,7 +50980,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51535,7 +51002,8 @@ cont { scale: 13 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51544,7 +51012,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51566,7 +51034,8 @@ cont { scale: 14 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51575,7 +51044,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51597,7 +51066,8 @@ cont { scale: 15 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51606,7 +51076,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51628,7 +51098,8 @@ cont { scale: 16 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51637,7 +51108,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51659,7 +51130,8 @@ cont { scale: 17 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51668,7 +51140,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51690,7 +51162,8 @@ cont { scale: 18 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51699,7 +51172,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51721,7 +51194,8 @@ cont { scale: 19 symbol { name: "star-l" - priority: 16561 + apply_for_type: 1 + priority: 16575 } caption { primary { @@ -51730,7 +51204,7 @@ cont { stroke_color: 1118464 offset_y: 1 } - priority: 15561 + priority: 15575 } apply_if: "population>=0" } @@ -51823,7 +51297,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51842,7 +51316,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51861,7 +51335,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51880,7 +51354,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51918,7 +51392,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51937,7 +51411,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -51975,7 +51449,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -51994,7 +51468,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52032,7 +51506,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52051,7 +51525,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52070,7 +51544,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52089,7 +51563,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52108,7 +51582,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52127,7 +51601,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52146,7 +51620,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52165,7 +51639,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52244,7 +51718,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52263,7 +51737,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52282,7 +51756,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52301,7 +51775,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52339,7 +51813,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52358,7 +51832,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52396,7 +51870,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52415,7 +51889,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52453,7 +51927,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52472,7 +51946,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52491,7 +51965,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52510,7 +51984,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52529,7 +52003,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52548,7 +52022,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52567,7 +52041,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52586,7 +52060,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15542 + priority: 15556 } apply_if: "population<40000" } @@ -52665,7 +52139,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52684,7 +52158,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52703,7 +52177,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52722,7 +52196,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52760,7 +52234,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52779,7 +52253,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52817,7 +52291,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52836,7 +52310,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -52874,7 +52348,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52893,7 +52367,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52912,7 +52386,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52931,7 +52405,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52950,7 +52424,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52969,7 +52443,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -52988,7 +52462,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53007,7 +52481,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53086,7 +52560,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53105,7 +52579,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53124,7 +52598,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53143,7 +52617,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53181,7 +52655,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53200,7 +52674,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53238,7 +52712,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53257,7 +52731,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53295,7 +52769,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53314,7 +52788,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53333,7 +52807,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53352,7 +52826,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53371,7 +52845,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53390,7 +52864,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53409,7 +52883,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53428,7 +52902,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53507,7 +52981,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53526,7 +53000,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53545,7 +53019,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53564,7 +53038,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53602,7 +53076,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53621,7 +53095,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53659,7 +53133,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53678,7 +53152,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53716,7 +53190,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53735,7 +53209,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53754,7 +53228,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53773,7 +53247,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53792,7 +53266,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53811,7 +53285,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53830,7 +53304,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53849,7 +53323,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53928,7 +53402,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53947,7 +53421,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -53966,7 +53440,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -53985,7 +53459,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54023,7 +53497,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54042,7 +53516,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54080,7 +53554,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54099,7 +53573,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54137,7 +53611,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54156,7 +53630,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54175,7 +53649,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54194,7 +53668,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54213,7 +53687,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54232,7 +53706,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54251,7 +53725,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54270,7 +53744,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54349,7 +53823,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54368,7 +53842,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54387,7 +53861,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54406,7 +53880,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54444,7 +53918,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54463,7 +53937,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54501,7 +53975,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54520,7 +53994,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15552 + priority: 15566 } apply_if: "population>=40000" } @@ -54558,7 +54032,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54577,7 +54051,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54596,7 +54070,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54615,7 +54089,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54634,7 +54108,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54653,7 +54127,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54672,7 +54146,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -54691,7 +54165,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15533 + priority: 15547 } apply_if: "population<40000" } @@ -55103,7 +54577,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } element { @@ -55114,7 +54588,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } element { @@ -55125,7 +54599,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } element { @@ -55136,7 +54610,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } element { @@ -55147,7 +54621,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } element { @@ -55158,7 +54632,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } element { @@ -55169,22 +54643,12 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15495 + priority: 15509 } } } cont { name: "place-island" - element { - scale: 9 - caption { - primary { - height: 8 - color: 5592405 - } - priority: 15000 - } - } element { scale: 10 caption { @@ -55729,7 +55193,7 @@ cont { height: 14 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55739,7 +55203,7 @@ cont { height: 14 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55749,7 +55213,7 @@ cont { height: 15 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55759,7 +55223,7 @@ cont { height: 16 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55769,7 +55233,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55779,7 +55243,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55789,7 +55253,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55799,7 +55263,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55809,7 +55273,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55819,7 +55283,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55829,7 +55293,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55839,7 +55303,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55849,7 +55313,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55859,7 +55323,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55869,7 +55333,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55879,7 +55343,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55889,7 +55353,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55899,7 +55363,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55909,7 +55373,7 @@ cont { height: 18 color: 19033 } - priority: 15961 + priority: 15962 } } } @@ -55922,7 +55386,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55932,7 +55396,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55942,7 +55406,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55952,7 +55416,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55962,7 +55426,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55972,7 +55436,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55982,7 +55446,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -55992,7 +55456,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56002,7 +55466,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56012,7 +55476,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56022,7 +55486,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56032,7 +55496,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56042,7 +55506,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56052,7 +55516,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56062,7 +55526,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } element { @@ -56072,7 +55536,7 @@ cont { height: 12 color: 19033 } - priority: 15961 + priority: 15962 } } } @@ -56082,7 +55546,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -56092,14 +55556,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -56109,14 +55573,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56126,14 +55590,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56143,14 +55607,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56160,14 +55624,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -56177,7 +55641,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -56190,7 +55654,7 @@ cont { height: 11 color: 4473924 } - priority: 15485 + priority: 15500 } } element { @@ -56206,7 +55670,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56222,7 +55686,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56238,7 +55702,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56254,7 +55718,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } } @@ -56267,7 +55731,7 @@ cont { height: 11 color: 4473924 } - priority: 15485 + priority: 15500 } } element { @@ -56277,7 +55741,7 @@ cont { height: 11 color: 4473924 } - priority: 15485 + priority: 15500 } } element { @@ -56293,7 +55757,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56309,7 +55773,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56325,7 +55789,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } element { @@ -56341,7 +55805,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15485 + priority: 15500 } } } @@ -56425,7 +55889,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=40000" } @@ -56442,7 +55906,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=20000" } @@ -56461,7 +55925,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=0" } @@ -56480,7 +55944,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population>=0" } @@ -56499,7 +55963,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56518,7 +55982,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56537,7 +56001,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56556,7 +56020,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56575,7 +56039,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56594,7 +56058,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56613,7 +56077,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56632,7 +56096,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15523 + priority: 15537 } apply_if: "population<20000" } @@ -56654,7 +56118,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56672,7 +56136,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56690,7 +56154,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56708,7 +56172,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56726,7 +56190,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56744,7 +56208,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56762,7 +56226,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56780,7 +56244,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } element { @@ -56798,7 +56262,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15514 + priority: 15528 } } } @@ -56809,7 +56273,7 @@ cont { lines { width: 1.0 color: 1714631475 - priority: 1571 + priority: 1584 } } } @@ -56819,7 +56283,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56828,14 +56292,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56844,14 +56308,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56860,7 +56324,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -56870,7 +56334,7 @@ cont { scale: 19 symbol { name: "power-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -56879,7 +56343,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -56889,6 +56353,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56896,6 +56361,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56903,6 +56369,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56910,6 +56377,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 } } @@ -56920,49 +56388,49 @@ cont { scale: 16 area { color: 2499106 - priority: -15886 + priority: -15868 } } element { scale: 17 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } } @@ -56977,7 +56445,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -56989,7 +56457,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57001,7 +56469,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57013,7 +56481,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57035,7 +56503,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57054,7 +56522,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57073,7 +56541,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57092,7 +56560,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57107,7 +56575,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57119,7 +56587,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57131,7 +56599,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -57143,7 +56611,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -57158,7 +56626,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57170,7 +56638,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57182,7 +56650,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57194,7 +56662,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } } @@ -57209,7 +56677,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57221,7 +56689,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57233,7 +56701,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } element { @@ -57245,7 +56713,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1295 + priority: 1311 } } } @@ -57471,7 +56939,8 @@ cont { scale: 13 symbol { name: "train-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57489,14 +56958,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 14 symbol { name: "train-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57514,14 +56984,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 15 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57539,14 +57010,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 16 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57564,14 +57036,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 17 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57589,14 +57062,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 18 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57614,14 +57088,15 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 19 symbol { name: "train-m" - priority: 16923 + apply_for_type: 1 + priority: 16924 } caption { primary { @@ -57639,7 +57114,7 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } } @@ -57649,21 +57124,24 @@ cont { scale: 17 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 18 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } element { scale: 19 symbol { name: "railway-crossing-m" - priority: 16657 + apply_for_type: 1 + priority: 16669 } } } @@ -57674,7 +57152,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57683,7 +57161,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57692,7 +57170,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57701,7 +57179,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -57710,7 +57188,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -57718,7 +57196,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57727,7 +57205,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -57735,7 +57213,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57744,7 +57222,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -57752,7 +57230,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57761,7 +57239,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -57772,7 +57250,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57783,13 +57261,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57800,13 +57278,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -57817,7 +57295,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57825,13 +57303,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -57840,7 +57318,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -57850,7 +57328,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57858,13 +57336,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57873,7 +57351,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -57883,7 +57361,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57891,13 +57369,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57906,7 +57384,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -57916,7 +57394,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -57924,13 +57402,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -57939,7 +57417,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -57950,7 +57428,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57959,7 +57437,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -57968,7 +57446,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -57976,7 +57454,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -57984,7 +57462,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -57992,7 +57470,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } } @@ -58003,7 +57481,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58012,7 +57490,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58021,7 +57499,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58029,7 +57507,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58037,7 +57515,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58045,7 +57523,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } } @@ -58056,7 +57534,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58065,7 +57543,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58074,7 +57552,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58082,7 +57560,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58090,7 +57568,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58098,7 +57576,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } } @@ -58109,7 +57587,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58118,7 +57596,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58126,7 +57604,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58134,7 +57612,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58142,7 +57620,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } } @@ -58153,7 +57631,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58162,7 +57640,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58170,7 +57648,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58178,7 +57656,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58186,7 +57664,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } } @@ -58197,7 +57675,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -58206,7 +57684,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58214,7 +57692,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58222,7 +57700,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } element { @@ -58230,7 +57708,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1457 + priority: 1471 } } } @@ -58240,56 +57718,56 @@ cont { scale: 16 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } element { scale: 17 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } element { scale: 18 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } element { scale: 19 area { color: 2499106 - priority: -15886 + priority: -15868 } caption { primary { height: 9 color: 5592405 } - priority: 15114 + priority: 15132 } } } @@ -58304,7 +57782,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58316,7 +57794,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58328,7 +57806,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58340,7 +57818,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58362,7 +57840,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58381,7 +57859,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58400,7 +57878,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58419,7 +57897,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58434,7 +57912,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58446,7 +57924,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58458,7 +57936,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } element { @@ -58470,7 +57948,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1295 + priority: 1311 } } } @@ -58481,7 +57959,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58491,7 +57969,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58501,7 +57979,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58510,7 +57988,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58519,7 +57997,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58528,7 +58006,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58537,7 +58015,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58545,7 +58023,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58554,7 +58032,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58562,7 +58040,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58571,7 +58049,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58579,7 +58057,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58588,7 +58066,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58599,7 +58077,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58609,7 +58087,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58619,7 +58097,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58630,13 +58108,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58647,13 +58125,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58664,7 +58142,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58672,13 +58150,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58687,7 +58165,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58697,7 +58175,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58705,13 +58183,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58720,7 +58198,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58730,7 +58208,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58738,13 +58216,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58753,7 +58231,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58763,7 +58241,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -58771,13 +58249,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58786,7 +58264,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58797,7 +58275,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58807,7 +58285,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58817,7 +58295,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58826,7 +58304,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58835,7 +58313,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58844,7 +58322,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -58853,7 +58331,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -58861,7 +58339,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58870,7 +58348,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -58878,7 +58356,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58887,7 +58365,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -58895,7 +58373,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -58904,7 +58382,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -58915,7 +58393,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58925,7 +58403,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -58935,7 +58413,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58948,13 +58426,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58967,13 +58445,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -58986,13 +58464,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -59001,7 +58479,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -59013,13 +58491,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59028,7 +58506,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -59040,13 +58518,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59055,7 +58533,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -59067,13 +58545,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -59082,7 +58560,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -59092,6 +58570,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59117,6 +58596,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59142,6 +58622,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59167,6 +58648,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59192,6 +58674,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59217,6 +58700,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59242,6 +58726,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59267,6 +58752,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59295,6 +58781,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59320,6 +58807,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59345,6 +58833,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59370,6 +58859,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59395,6 +58885,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59420,6 +58911,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59445,6 +58937,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59470,6 +58963,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59498,6 +58992,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59523,6 +59018,7 @@ cont { scale: 13 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59548,6 +59044,7 @@ cont { scale: 14 symbol { name: "train-s" + apply_for_type: 1 priority: 16952 } caption { @@ -59573,6 +59070,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59598,6 +59096,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59623,6 +59122,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59648,6 +59148,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59673,6 +59174,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59701,6 +59203,7 @@ cont { scale: 13 symbol { name: "subway-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59709,6 +59212,7 @@ cont { scale: 14 symbol { name: "subway-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59735,6 +59239,7 @@ cont { scale: 15 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59760,6 +59265,7 @@ cont { scale: 16 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59785,6 +59291,7 @@ cont { scale: 17 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59810,6 +59317,7 @@ cont { scale: 18 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59835,6 +59343,7 @@ cont { scale: 19 symbol { name: "subway-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59863,6 +59372,7 @@ cont { scale: 12 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59871,6 +59381,7 @@ cont { scale: 13 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59879,6 +59390,7 @@ cont { scale: 14 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -59905,6 +59417,7 @@ cont { scale: 15 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59930,6 +59443,7 @@ cont { scale: 16 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59955,6 +59469,7 @@ cont { scale: 17 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -59980,6 +59495,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60005,6 +59521,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60033,6 +59550,7 @@ cont { scale: 12 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60041,6 +59559,7 @@ cont { scale: 13 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60049,6 +59568,7 @@ cont { scale: 14 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60075,6 +59595,7 @@ cont { scale: 15 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60100,6 +59621,7 @@ cont { scale: 16 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60125,6 +59647,7 @@ cont { scale: 17 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60150,6 +59673,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60175,6 +59699,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60203,6 +59728,7 @@ cont { scale: 12 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60211,6 +59737,7 @@ cont { scale: 13 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60219,6 +59746,7 @@ cont { scale: 14 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60245,6 +59773,7 @@ cont { scale: 15 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60270,6 +59799,7 @@ cont { scale: 16 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60295,6 +59825,7 @@ cont { scale: 17 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60320,6 +59851,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60345,6 +59877,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60373,6 +59906,7 @@ cont { scale: 12 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60381,6 +59915,7 @@ cont { scale: 13 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60389,6 +59924,7 @@ cont { scale: 14 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60415,6 +59951,7 @@ cont { scale: 15 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60440,6 +59977,7 @@ cont { scale: 16 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60465,6 +60003,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60490,6 +60029,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60515,6 +60055,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60543,6 +60084,7 @@ cont { scale: 13 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60551,6 +60093,7 @@ cont { scale: 14 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60577,6 +60120,7 @@ cont { scale: 15 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60602,6 +60146,7 @@ cont { scale: 16 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60627,6 +60172,7 @@ cont { scale: 17 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60652,6 +60198,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60677,6 +60224,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60705,6 +60253,7 @@ cont { scale: 13 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60713,6 +60262,7 @@ cont { scale: 14 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60739,6 +60289,7 @@ cont { scale: 15 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60764,6 +60315,7 @@ cont { scale: 16 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60789,6 +60341,7 @@ cont { scale: 17 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60814,6 +60367,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60839,6 +60393,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60867,6 +60422,7 @@ cont { scale: 13 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60875,6 +60431,7 @@ cont { scale: 14 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -60901,6 +60458,7 @@ cont { scale: 15 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60926,6 +60484,7 @@ cont { scale: 16 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60951,6 +60510,7 @@ cont { scale: 17 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -60976,6 +60536,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61001,6 +60562,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61029,6 +60591,7 @@ cont { scale: 13 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61037,6 +60600,7 @@ cont { scale: 14 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61063,6 +60627,7 @@ cont { scale: 15 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61088,6 +60653,7 @@ cont { scale: 16 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61113,6 +60679,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61138,6 +60705,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61163,6 +60731,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61191,6 +60760,7 @@ cont { scale: 12 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61199,6 +60769,7 @@ cont { scale: 13 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61207,6 +60778,7 @@ cont { scale: 14 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61233,6 +60805,7 @@ cont { scale: 15 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61258,6 +60831,7 @@ cont { scale: 16 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61283,6 +60857,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61308,6 +60883,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61333,6 +60909,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61361,6 +60938,7 @@ cont { scale: 12 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61369,6 +60947,7 @@ cont { scale: 13 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61377,6 +60956,7 @@ cont { scale: 14 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61403,6 +60983,7 @@ cont { scale: 15 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61428,6 +61009,7 @@ cont { scale: 16 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61453,6 +61035,7 @@ cont { scale: 17 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61478,6 +61061,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61503,6 +61087,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61531,6 +61116,7 @@ cont { scale: 13 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61539,6 +61125,7 @@ cont { scale: 14 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61565,6 +61152,7 @@ cont { scale: 15 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61590,6 +61178,7 @@ cont { scale: 16 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61615,6 +61204,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61640,6 +61230,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61665,6 +61256,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61693,6 +61285,7 @@ cont { scale: 12 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61701,6 +61294,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61709,6 +61303,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -61735,6 +61330,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61760,6 +61356,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61785,6 +61382,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61810,6 +61408,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -61835,168 +61434,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } -} -cont { - name: "railway-station-subway-bilbao" - element { - scale: 13 - symbol { - name: "subway-bilbao-s" - priority: 16952 - min_distance: 1 - } - } - element { - scale: 14 - symbol { - name: "subway-bilbao-s" - priority: 16952 - min_distance: 1 - } - caption { - primary { - height: 11 - color: 8947848 - stroke_color: 1292964096 - offset_y: 1 - is_optional: true - } - secondary { - height: 9 - color: 8947848 - stroke_color: 1292964096 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 15 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 12 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - is_optional: true - } - secondary { - height: 10 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 16 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 17 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 18 - symbol { - name: "subway-bilbao-m" - priority: 16952 - } - caption { - primary { - height: 13 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - is_optional: true - } - secondary { - height: 11 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - text: "int_name" - is_optional: true - } - priority: 15952 - } - } - element { - scale: 19 - symbol { - name: "subway-bilbao-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62025,6 +61463,7 @@ cont { scale: 13 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62033,6 +61472,7 @@ cont { scale: 14 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62059,6 +61499,7 @@ cont { scale: 15 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62084,6 +61525,7 @@ cont { scale: 16 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62109,6 +61551,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62134,6 +61577,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62159,6 +61603,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62187,6 +61632,7 @@ cont { scale: 13 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62195,6 +61641,7 @@ cont { scale: 14 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62221,6 +61668,7 @@ cont { scale: 15 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62246,6 +61694,7 @@ cont { scale: 16 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62271,6 +61720,7 @@ cont { scale: 17 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62296,6 +61746,7 @@ cont { scale: 18 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62321,6 +61772,7 @@ cont { scale: 19 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62349,6 +61801,7 @@ cont { scale: 13 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62357,6 +61810,7 @@ cont { scale: 14 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62383,6 +61837,7 @@ cont { scale: 15 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62408,6 +61863,7 @@ cont { scale: 16 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62433,6 +61889,7 @@ cont { scale: 17 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62458,6 +61915,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62483,6 +61941,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62511,6 +61970,7 @@ cont { scale: 13 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62519,6 +61979,7 @@ cont { scale: 14 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62545,6 +62006,7 @@ cont { scale: 15 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62570,6 +62032,7 @@ cont { scale: 16 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62595,6 +62058,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62620,6 +62084,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62645,6 +62110,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62673,6 +62139,7 @@ cont { scale: 13 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62681,6 +62148,7 @@ cont { scale: 14 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62707,6 +62175,7 @@ cont { scale: 15 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62732,6 +62201,7 @@ cont { scale: 16 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62757,6 +62227,7 @@ cont { scale: 17 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62782,6 +62253,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62807,6 +62279,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62835,6 +62308,7 @@ cont { scale: 12 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62843,6 +62317,7 @@ cont { scale: 13 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62851,6 +62326,7 @@ cont { scale: 14 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -62877,6 +62353,7 @@ cont { scale: 15 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62902,6 +62379,7 @@ cont { scale: 16 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62927,6 +62405,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62952,6 +62431,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -62977,6 +62457,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63005,6 +62486,7 @@ cont { scale: 13 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63013,6 +62495,7 @@ cont { scale: 14 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63039,6 +62522,7 @@ cont { scale: 15 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63064,6 +62548,7 @@ cont { scale: 16 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63089,6 +62574,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63114,6 +62600,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63139,6 +62626,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63167,6 +62655,7 @@ cont { scale: 13 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63175,6 +62664,7 @@ cont { scale: 14 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63201,6 +62691,7 @@ cont { scale: 15 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63226,6 +62717,7 @@ cont { scale: 16 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63251,6 +62743,7 @@ cont { scale: 17 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63276,6 +62769,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63301,6 +62795,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63329,6 +62824,7 @@ cont { scale: 13 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63337,6 +62833,7 @@ cont { scale: 14 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63363,6 +62860,7 @@ cont { scale: 15 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63388,6 +62886,7 @@ cont { scale: 16 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63413,6 +62912,7 @@ cont { scale: 17 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63438,6 +62938,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63463,6 +62964,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63491,6 +62993,7 @@ cont { scale: 13 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63499,6 +63002,7 @@ cont { scale: 14 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63525,6 +63029,7 @@ cont { scale: 15 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63550,6 +63055,7 @@ cont { scale: 16 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63575,6 +63081,7 @@ cont { scale: 17 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63600,6 +63107,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63625,6 +63133,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63653,6 +63162,7 @@ cont { scale: 13 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63661,6 +63171,7 @@ cont { scale: 14 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63687,6 +63198,7 @@ cont { scale: 15 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63712,6 +63224,7 @@ cont { scale: 16 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63737,6 +63250,7 @@ cont { scale: 17 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63762,6 +63276,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63787,6 +63302,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63815,6 +63331,7 @@ cont { scale: 13 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63823,6 +63340,7 @@ cont { scale: 14 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63849,6 +63367,7 @@ cont { scale: 15 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63874,6 +63393,7 @@ cont { scale: 16 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63899,6 +63419,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63924,6 +63445,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63949,6 +63471,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16952 } caption { @@ -63977,6 +63500,7 @@ cont { scale: 13 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -63985,6 +63509,7 @@ cont { scale: 14 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64011,6 +63536,7 @@ cont { scale: 15 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64036,6 +63562,7 @@ cont { scale: 16 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64061,6 +63588,7 @@ cont { scale: 17 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64086,6 +63614,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64111,6 +63640,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64139,6 +63669,7 @@ cont { scale: 13 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64147,6 +63678,7 @@ cont { scale: 14 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64173,6 +63705,7 @@ cont { scale: 15 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64198,6 +63731,7 @@ cont { scale: 16 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64223,6 +63757,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64248,6 +63783,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64273,6 +63809,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64301,6 +63838,7 @@ cont { scale: 13 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64309,6 +63847,7 @@ cont { scale: 14 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64335,6 +63874,7 @@ cont { scale: 15 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64360,6 +63900,7 @@ cont { scale: 16 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64385,6 +63926,7 @@ cont { scale: 17 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64410,6 +63952,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64435,6 +63978,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64463,6 +64007,7 @@ cont { scale: 13 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64471,6 +64016,7 @@ cont { scale: 14 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64497,6 +64043,7 @@ cont { scale: 15 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64522,6 +64069,7 @@ cont { scale: 16 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64547,6 +64095,7 @@ cont { scale: 17 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64572,6 +64121,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64597,6 +64147,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64625,6 +64176,7 @@ cont { scale: 13 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64633,6 +64185,7 @@ cont { scale: 14 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64659,6 +64212,7 @@ cont { scale: 15 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64684,6 +64238,7 @@ cont { scale: 16 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64709,6 +64264,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64734,6 +64290,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64759,6 +64316,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64787,6 +64345,7 @@ cont { scale: 13 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64795,6 +64354,7 @@ cont { scale: 14 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64821,6 +64381,7 @@ cont { scale: 15 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64846,6 +64407,7 @@ cont { scale: 16 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64871,6 +64433,7 @@ cont { scale: 17 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64896,6 +64459,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64921,6 +64485,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -64949,6 +64514,7 @@ cont { scale: 13 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64957,6 +64523,7 @@ cont { scale: 14 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -64983,6 +64550,7 @@ cont { scale: 15 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65008,6 +64576,7 @@ cont { scale: 16 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65033,6 +64602,7 @@ cont { scale: 17 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65058,6 +64628,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65083,6 +64654,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65111,6 +64683,7 @@ cont { scale: 13 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65119,6 +64692,7 @@ cont { scale: 14 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65145,6 +64719,7 @@ cont { scale: 15 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65170,6 +64745,7 @@ cont { scale: 16 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65195,6 +64771,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65220,6 +64797,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65245,6 +64823,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65273,6 +64852,7 @@ cont { scale: 13 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65281,6 +64861,7 @@ cont { scale: 14 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65307,6 +64888,7 @@ cont { scale: 15 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65332,6 +64914,7 @@ cont { scale: 16 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65357,6 +64940,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65382,6 +64966,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65407,6 +64992,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65435,6 +65021,7 @@ cont { scale: 13 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65443,6 +65030,7 @@ cont { scale: 14 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65469,6 +65057,7 @@ cont { scale: 15 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65494,6 +65083,7 @@ cont { scale: 16 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65519,6 +65109,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65544,6 +65135,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65569,6 +65161,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65597,6 +65190,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65605,6 +65199,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65631,6 +65226,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65656,6 +65252,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65681,6 +65278,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65706,6 +65304,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65731,6 +65330,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65759,6 +65359,7 @@ cont { scale: 13 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65767,6 +65368,7 @@ cont { scale: 14 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65793,6 +65395,7 @@ cont { scale: 15 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65818,6 +65421,7 @@ cont { scale: 16 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65843,6 +65447,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65868,6 +65473,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65893,6 +65499,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65921,6 +65528,7 @@ cont { scale: 13 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65929,6 +65537,7 @@ cont { scale: 14 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -65955,6 +65564,7 @@ cont { scale: 15 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -65980,6 +65590,7 @@ cont { scale: 16 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66005,6 +65616,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66030,6 +65642,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66055,6 +65668,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66083,6 +65697,7 @@ cont { scale: 13 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66091,6 +65706,7 @@ cont { scale: 14 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66117,6 +65733,7 @@ cont { scale: 15 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66142,6 +65759,7 @@ cont { scale: 16 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66167,6 +65785,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66192,6 +65811,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66217,6 +65837,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66245,6 +65866,7 @@ cont { scale: 12 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66253,6 +65875,7 @@ cont { scale: 13 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66261,6 +65884,7 @@ cont { scale: 14 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66287,6 +65911,7 @@ cont { scale: 15 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66312,6 +65937,7 @@ cont { scale: 16 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66337,6 +65963,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66362,6 +65989,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66387,6 +66015,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66415,6 +66044,7 @@ cont { scale: 13 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66423,6 +66053,7 @@ cont { scale: 14 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66449,6 +66080,7 @@ cont { scale: 15 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66474,6 +66106,7 @@ cont { scale: 16 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66499,6 +66132,7 @@ cont { scale: 17 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66524,6 +66158,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66549,6 +66184,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66577,6 +66213,7 @@ cont { scale: 13 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66585,6 +66222,7 @@ cont { scale: 14 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66611,6 +66249,7 @@ cont { scale: 15 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66636,6 +66275,7 @@ cont { scale: 16 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66661,6 +66301,7 @@ cont { scale: 17 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66686,6 +66327,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66711,6 +66353,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66739,6 +66382,7 @@ cont { scale: 13 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66747,6 +66391,7 @@ cont { scale: 14 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66773,6 +66418,7 @@ cont { scale: 15 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66798,6 +66444,7 @@ cont { scale: 16 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66823,6 +66470,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66848,6 +66496,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66873,6 +66522,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66901,6 +66551,7 @@ cont { scale: 12 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66918,6 +66569,7 @@ cont { scale: 13 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66936,6 +66588,7 @@ cont { scale: 14 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -66962,6 +66615,7 @@ cont { scale: 15 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16952 } caption { @@ -66987,6 +66641,7 @@ cont { scale: 16 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67012,6 +66667,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -67035,6 +66691,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -67058,6 +66715,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -67084,6 +66742,7 @@ cont { scale: 13 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67092,6 +66751,7 @@ cont { scale: 14 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67118,6 +66778,7 @@ cont { scale: 15 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67143,6 +66804,7 @@ cont { scale: 16 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67168,6 +66830,7 @@ cont { scale: 17 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67193,6 +66856,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67218,6 +66882,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67246,6 +66911,7 @@ cont { scale: 13 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67254,6 +66920,7 @@ cont { scale: 14 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67280,6 +66947,7 @@ cont { scale: 15 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67305,6 +66973,7 @@ cont { scale: 16 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67330,6 +66999,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67355,6 +67025,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67380,6 +67051,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67408,6 +67080,7 @@ cont { scale: 13 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67416,6 +67089,7 @@ cont { scale: 14 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67442,6 +67116,7 @@ cont { scale: 15 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67467,6 +67142,7 @@ cont { scale: 16 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67492,6 +67168,7 @@ cont { scale: 17 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67517,6 +67194,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67542,6 +67220,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67570,6 +67249,7 @@ cont { scale: 13 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67578,6 +67258,7 @@ cont { scale: 14 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67604,6 +67285,7 @@ cont { scale: 15 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67629,6 +67311,7 @@ cont { scale: 16 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67654,6 +67337,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67679,6 +67363,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67704,6 +67389,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67732,6 +67418,7 @@ cont { scale: 12 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67740,6 +67427,7 @@ cont { scale: 13 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67748,6 +67436,7 @@ cont { scale: 14 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67774,6 +67463,7 @@ cont { scale: 15 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67799,6 +67489,7 @@ cont { scale: 16 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67824,6 +67515,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67849,6 +67541,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67874,6 +67567,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67902,6 +67596,7 @@ cont { scale: 13 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67910,6 +67605,7 @@ cont { scale: 14 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -67936,6 +67632,7 @@ cont { scale: 15 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67961,6 +67658,7 @@ cont { scale: 16 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -67986,6 +67684,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68011,6 +67710,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68036,6 +67736,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68064,6 +67765,7 @@ cont { scale: 13 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68072,6 +67774,7 @@ cont { scale: 14 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68098,6 +67801,7 @@ cont { scale: 15 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68123,6 +67827,7 @@ cont { scale: 16 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68148,6 +67853,7 @@ cont { scale: 17 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68173,6 +67879,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68198,6 +67905,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68226,6 +67934,7 @@ cont { scale: 13 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68234,6 +67943,7 @@ cont { scale: 14 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68260,6 +67970,7 @@ cont { scale: 15 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68285,6 +67996,7 @@ cont { scale: 16 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68310,6 +68022,7 @@ cont { scale: 17 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68335,6 +68048,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68360,6 +68074,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68388,6 +68103,7 @@ cont { scale: 12 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68396,6 +68112,7 @@ cont { scale: 13 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68404,6 +68121,7 @@ cont { scale: 14 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68430,6 +68148,7 @@ cont { scale: 15 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68455,6 +68174,7 @@ cont { scale: 16 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68480,6 +68200,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68505,6 +68226,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68530,6 +68252,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68558,6 +68281,7 @@ cont { scale: 12 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68566,6 +68290,7 @@ cont { scale: 13 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68574,6 +68299,7 @@ cont { scale: 14 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68600,6 +68326,7 @@ cont { scale: 15 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68625,6 +68352,7 @@ cont { scale: 16 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68650,6 +68378,7 @@ cont { scale: 17 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68675,6 +68404,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68700,6 +68430,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68728,6 +68459,7 @@ cont { scale: 13 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68736,6 +68468,7 @@ cont { scale: 14 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68762,6 +68495,7 @@ cont { scale: 15 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68787,6 +68521,7 @@ cont { scale: 16 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68812,6 +68547,7 @@ cont { scale: 17 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68837,6 +68573,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68862,6 +68599,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68890,6 +68628,7 @@ cont { scale: 12 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68898,6 +68637,7 @@ cont { scale: 13 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68906,6 +68646,7 @@ cont { scale: 14 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -68932,6 +68673,7 @@ cont { scale: 15 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68957,6 +68699,7 @@ cont { scale: 16 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -68982,6 +68725,7 @@ cont { scale: 17 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69007,6 +68751,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69032,6 +68777,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69060,6 +68806,7 @@ cont { scale: 13 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69068,6 +68815,7 @@ cont { scale: 14 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69094,6 +68842,7 @@ cont { scale: 15 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69119,6 +68868,7 @@ cont { scale: 16 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69144,6 +68894,7 @@ cont { scale: 17 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69169,6 +68920,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69194,6 +68946,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69222,6 +68975,7 @@ cont { scale: 13 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69230,6 +68984,7 @@ cont { scale: 14 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69256,6 +69011,7 @@ cont { scale: 15 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69281,6 +69037,7 @@ cont { scale: 16 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69306,6 +69063,7 @@ cont { scale: 17 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69331,6 +69089,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69356,6 +69115,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69384,6 +69144,7 @@ cont { scale: 13 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69392,6 +69153,7 @@ cont { scale: 14 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69418,6 +69180,7 @@ cont { scale: 15 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69443,6 +69206,7 @@ cont { scale: 16 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69468,6 +69232,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69493,6 +69258,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69518,6 +69284,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69546,6 +69313,7 @@ cont { scale: 13 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69554,6 +69322,7 @@ cont { scale: 14 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69580,6 +69349,7 @@ cont { scale: 15 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69605,6 +69375,7 @@ cont { scale: 16 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69630,6 +69401,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69655,6 +69427,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69680,6 +69453,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69708,6 +69482,7 @@ cont { scale: 13 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69716,6 +69491,7 @@ cont { scale: 14 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69742,6 +69518,7 @@ cont { scale: 15 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69767,6 +69544,7 @@ cont { scale: 16 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69792,6 +69570,7 @@ cont { scale: 17 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69817,6 +69596,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69842,6 +69622,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69870,6 +69651,7 @@ cont { scale: 13 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69878,6 +69660,7 @@ cont { scale: 14 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -69904,6 +69687,7 @@ cont { scale: 15 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69929,6 +69713,7 @@ cont { scale: 16 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69954,6 +69739,7 @@ cont { scale: 17 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -69979,6 +69765,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70004,6 +69791,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70032,6 +69820,7 @@ cont { scale: 12 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70040,6 +69829,7 @@ cont { scale: 13 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70048,6 +69838,7 @@ cont { scale: 14 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70074,6 +69865,7 @@ cont { scale: 15 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70099,6 +69891,7 @@ cont { scale: 16 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70124,6 +69917,7 @@ cont { scale: 17 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70149,6 +69943,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70174,6 +69969,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70202,6 +69998,7 @@ cont { scale: 13 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70210,6 +70007,7 @@ cont { scale: 14 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70236,6 +70034,7 @@ cont { scale: 15 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70261,6 +70060,7 @@ cont { scale: 16 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70286,6 +70086,7 @@ cont { scale: 17 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70311,6 +70112,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70336,6 +70138,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70364,6 +70167,7 @@ cont { scale: 12 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70381,6 +70185,7 @@ cont { scale: 13 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70399,6 +70204,7 @@ cont { scale: 14 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70425,6 +70231,7 @@ cont { scale: 15 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70450,6 +70257,7 @@ cont { scale: 16 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70473,6 +70281,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70496,6 +70305,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70519,6 +70329,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -70545,6 +70356,7 @@ cont { scale: 13 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70553,6 +70365,7 @@ cont { scale: 14 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70579,6 +70392,7 @@ cont { scale: 15 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70604,6 +70418,7 @@ cont { scale: 16 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70629,6 +70444,7 @@ cont { scale: 17 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70654,6 +70470,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70679,6 +70496,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70707,6 +70525,7 @@ cont { scale: 11 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70715,6 +70534,7 @@ cont { scale: 12 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70741,6 +70561,7 @@ cont { scale: 13 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70767,6 +70588,7 @@ cont { scale: 14 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70793,6 +70615,7 @@ cont { scale: 15 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70818,6 +70641,7 @@ cont { scale: 16 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70825,6 +70649,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70832,6 +70657,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70839,6 +70665,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -70849,6 +70676,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70857,6 +70685,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -70883,6 +70712,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70908,6 +70738,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70933,6 +70764,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70958,6 +70790,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -70983,6 +70816,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71011,6 +70845,7 @@ cont { scale: 13 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71019,6 +70854,7 @@ cont { scale: 14 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71045,6 +70881,7 @@ cont { scale: 15 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71070,6 +70907,7 @@ cont { scale: 16 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71095,6 +70933,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71120,6 +70959,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71145,6 +70985,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71173,6 +71014,7 @@ cont { scale: 12 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71181,6 +71023,7 @@ cont { scale: 13 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71189,6 +71032,7 @@ cont { scale: 14 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71215,6 +71059,7 @@ cont { scale: 15 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71240,6 +71085,7 @@ cont { scale: 16 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71265,6 +71111,7 @@ cont { scale: 17 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71290,6 +71137,7 @@ cont { scale: 18 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71315,6 +71163,7 @@ cont { scale: 19 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71343,6 +71192,7 @@ cont { scale: 13 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71351,6 +71201,7 @@ cont { scale: 14 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71377,6 +71228,7 @@ cont { scale: 15 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71402,6 +71254,7 @@ cont { scale: 16 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71427,6 +71280,7 @@ cont { scale: 17 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71452,6 +71306,7 @@ cont { scale: 18 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71477,6 +71332,7 @@ cont { scale: 19 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71505,6 +71361,7 @@ cont { scale: 13 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71513,6 +71370,7 @@ cont { scale: 14 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71539,6 +71397,7 @@ cont { scale: 15 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71564,6 +71423,7 @@ cont { scale: 16 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71589,6 +71449,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71614,6 +71475,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71639,6 +71501,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71667,6 +71530,7 @@ cont { scale: 13 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71675,6 +71539,7 @@ cont { scale: 14 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71701,6 +71566,7 @@ cont { scale: 15 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71726,6 +71592,7 @@ cont { scale: 16 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71751,6 +71618,7 @@ cont { scale: 17 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71776,6 +71644,7 @@ cont { scale: 18 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71801,6 +71670,7 @@ cont { scale: 19 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71829,6 +71699,7 @@ cont { scale: 13 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71837,6 +71708,7 @@ cont { scale: 14 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71863,6 +71735,7 @@ cont { scale: 15 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71888,6 +71761,7 @@ cont { scale: 16 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71913,6 +71787,7 @@ cont { scale: 17 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71938,6 +71813,7 @@ cont { scale: 18 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71963,6 +71839,7 @@ cont { scale: 19 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -71991,6 +71868,7 @@ cont { scale: 13 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -71999,6 +71877,7 @@ cont { scale: 14 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72025,6 +71904,7 @@ cont { scale: 15 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72050,6 +71930,7 @@ cont { scale: 16 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72075,6 +71956,7 @@ cont { scale: 17 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72100,6 +71982,7 @@ cont { scale: 18 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72125,6 +72008,7 @@ cont { scale: 19 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72153,6 +72037,7 @@ cont { scale: 13 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72161,6 +72046,7 @@ cont { scale: 14 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72187,6 +72073,7 @@ cont { scale: 15 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72212,6 +72099,7 @@ cont { scale: 16 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72237,6 +72125,7 @@ cont { scale: 17 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72262,6 +72151,7 @@ cont { scale: 18 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72287,6 +72177,7 @@ cont { scale: 19 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72315,6 +72206,7 @@ cont { scale: 12 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72323,6 +72215,7 @@ cont { scale: 13 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72331,6 +72224,7 @@ cont { scale: 14 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72357,6 +72251,7 @@ cont { scale: 15 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72382,6 +72277,7 @@ cont { scale: 16 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72407,6 +72303,7 @@ cont { scale: 17 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72432,6 +72329,7 @@ cont { scale: 18 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72457,6 +72355,7 @@ cont { scale: 19 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72485,6 +72384,7 @@ cont { scale: 13 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72493,6 +72393,7 @@ cont { scale: 14 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72519,6 +72420,7 @@ cont { scale: 15 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72544,6 +72446,7 @@ cont { scale: 16 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72569,6 +72472,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72594,6 +72498,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72619,6 +72524,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72647,6 +72553,7 @@ cont { scale: 13 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72655,6 +72562,7 @@ cont { scale: 14 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72681,6 +72589,7 @@ cont { scale: 15 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72706,6 +72615,7 @@ cont { scale: 16 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72731,6 +72641,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72756,6 +72667,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72781,6 +72693,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72809,6 +72722,7 @@ cont { scale: 13 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72817,6 +72731,7 @@ cont { scale: 14 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72843,6 +72758,7 @@ cont { scale: 15 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72868,6 +72784,7 @@ cont { scale: 16 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72893,6 +72810,7 @@ cont { scale: 17 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72918,6 +72836,7 @@ cont { scale: 18 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72943,6 +72862,7 @@ cont { scale: 19 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16952 } caption { @@ -72971,6 +72891,7 @@ cont { scale: 13 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -72979,6 +72900,7 @@ cont { scale: 14 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73005,6 +72927,7 @@ cont { scale: 15 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73030,6 +72953,7 @@ cont { scale: 16 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73055,6 +72979,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73080,6 +73005,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73105,6 +73031,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73133,6 +73060,7 @@ cont { scale: 12 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73141,6 +73069,7 @@ cont { scale: 13 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73149,6 +73078,7 @@ cont { scale: 14 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73175,6 +73105,7 @@ cont { scale: 15 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73200,6 +73131,7 @@ cont { scale: 16 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73225,6 +73157,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73248,6 +73181,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73271,6 +73205,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } caption { @@ -73297,6 +73232,7 @@ cont { scale: 13 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73305,6 +73241,7 @@ cont { scale: 14 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73331,6 +73268,7 @@ cont { scale: 15 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73356,6 +73294,7 @@ cont { scale: 16 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73381,6 +73320,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73406,6 +73346,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73431,6 +73372,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73459,6 +73401,7 @@ cont { scale: 13 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73467,6 +73410,7 @@ cont { scale: 14 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73493,6 +73437,7 @@ cont { scale: 15 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73518,6 +73463,7 @@ cont { scale: 16 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73543,6 +73489,7 @@ cont { scale: 17 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73568,6 +73515,7 @@ cont { scale: 18 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73593,6 +73541,7 @@ cont { scale: 19 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73621,6 +73570,7 @@ cont { scale: 13 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73629,6 +73579,7 @@ cont { scale: 14 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73655,6 +73606,7 @@ cont { scale: 15 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73680,6 +73632,7 @@ cont { scale: 16 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73705,6 +73658,7 @@ cont { scale: 17 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73730,6 +73684,7 @@ cont { scale: 18 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73755,6 +73710,7 @@ cont { scale: 19 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73783,6 +73739,7 @@ cont { scale: 13 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73791,6 +73748,7 @@ cont { scale: 14 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73817,6 +73775,7 @@ cont { scale: 15 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73842,6 +73801,7 @@ cont { scale: 16 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73867,6 +73827,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73892,6 +73853,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73917,6 +73879,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -73945,6 +73908,7 @@ cont { scale: 13 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73953,6 +73917,7 @@ cont { scale: 14 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -73979,6 +73944,7 @@ cont { scale: 15 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74004,6 +73970,7 @@ cont { scale: 16 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74029,6 +73996,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74054,6 +74022,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74079,6 +74048,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74107,6 +74077,7 @@ cont { scale: 13 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74115,6 +74086,7 @@ cont { scale: 14 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74141,6 +74113,7 @@ cont { scale: 15 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74166,6 +74139,7 @@ cont { scale: 16 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74191,6 +74165,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74216,6 +74191,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74241,6 +74217,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74269,6 +74246,7 @@ cont { scale: 13 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74277,6 +74255,7 @@ cont { scale: 14 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74303,6 +74282,7 @@ cont { scale: 15 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74328,6 +74308,7 @@ cont { scale: 16 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74353,6 +74334,7 @@ cont { scale: 17 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74378,6 +74360,7 @@ cont { scale: 18 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74403,6 +74386,7 @@ cont { scale: 19 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74431,6 +74415,7 @@ cont { scale: 12 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74439,6 +74424,7 @@ cont { scale: 13 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74447,6 +74433,7 @@ cont { scale: 14 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74473,6 +74460,7 @@ cont { scale: 15 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74498,6 +74486,7 @@ cont { scale: 16 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74523,6 +74512,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74548,6 +74538,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74573,6 +74564,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74601,6 +74593,7 @@ cont { scale: 12 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74609,6 +74602,7 @@ cont { scale: 13 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74617,6 +74611,7 @@ cont { scale: 14 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74643,6 +74638,7 @@ cont { scale: 15 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74668,6 +74664,7 @@ cont { scale: 16 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74693,6 +74690,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74718,6 +74716,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74743,6 +74742,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74771,6 +74771,7 @@ cont { scale: 13 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74779,6 +74780,7 @@ cont { scale: 14 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74805,6 +74807,7 @@ cont { scale: 15 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74830,6 +74833,7 @@ cont { scale: 16 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74855,6 +74859,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74880,6 +74885,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74905,6 +74911,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74933,6 +74940,7 @@ cont { scale: 13 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74941,6 +74949,7 @@ cont { scale: 14 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -74967,6 +74976,7 @@ cont { scale: 15 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -74992,6 +75002,7 @@ cont { scale: 16 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75017,6 +75028,7 @@ cont { scale: 17 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75042,6 +75054,7 @@ cont { scale: 18 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75067,6 +75080,7 @@ cont { scale: 19 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75095,6 +75109,7 @@ cont { scale: 11 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75103,6 +75118,7 @@ cont { scale: 12 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 } caption { @@ -75128,6 +75144,7 @@ cont { scale: 13 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75154,6 +75171,7 @@ cont { scale: 14 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75180,6 +75198,7 @@ cont { scale: 15 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75205,6 +75224,7 @@ cont { scale: 16 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75228,6 +75248,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75235,6 +75256,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75242,6 +75264,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16952 } } @@ -75252,6 +75275,7 @@ cont { scale: 12 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75260,6 +75284,7 @@ cont { scale: 13 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75268,6 +75293,7 @@ cont { scale: 14 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75294,6 +75320,7 @@ cont { scale: 15 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75319,6 +75346,7 @@ cont { scale: 16 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75344,6 +75372,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75369,6 +75398,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75394,6 +75424,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75422,6 +75453,7 @@ cont { scale: 13 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75430,6 +75462,7 @@ cont { scale: 14 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75456,6 +75489,7 @@ cont { scale: 15 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75481,6 +75515,7 @@ cont { scale: 16 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75506,6 +75541,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75531,6 +75567,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75556,6 +75593,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75584,6 +75622,7 @@ cont { scale: 13 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75592,6 +75631,7 @@ cont { scale: 14 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75618,6 +75658,7 @@ cont { scale: 15 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75643,6 +75684,7 @@ cont { scale: 16 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75668,6 +75710,7 @@ cont { scale: 17 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75693,6 +75736,7 @@ cont { scale: 18 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75718,6 +75762,7 @@ cont { scale: 19 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75746,6 +75791,7 @@ cont { scale: 13 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75754,6 +75800,7 @@ cont { scale: 14 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75780,6 +75827,7 @@ cont { scale: 15 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75805,6 +75853,7 @@ cont { scale: 16 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75830,6 +75879,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75855,6 +75905,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75880,6 +75931,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75908,6 +75960,7 @@ cont { scale: 13 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75916,6 +75969,7 @@ cont { scale: 14 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -75942,6 +75996,7 @@ cont { scale: 15 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75967,6 +76022,7 @@ cont { scale: 16 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -75992,6 +76048,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76017,6 +76074,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76042,6 +76100,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76070,6 +76129,7 @@ cont { scale: 13 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76078,6 +76138,7 @@ cont { scale: 14 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76104,6 +76165,7 @@ cont { scale: 15 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76129,6 +76191,7 @@ cont { scale: 16 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76154,6 +76217,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76179,6 +76243,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76204,6 +76269,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76232,6 +76298,7 @@ cont { scale: 13 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76240,6 +76307,7 @@ cont { scale: 14 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76266,6 +76334,7 @@ cont { scale: 15 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76291,6 +76360,7 @@ cont { scale: 16 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76316,6 +76386,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76341,6 +76412,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76366,6 +76438,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76394,6 +76467,7 @@ cont { scale: 12 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76402,6 +76476,7 @@ cont { scale: 13 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76410,6 +76485,7 @@ cont { scale: 14 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76436,6 +76512,7 @@ cont { scale: 15 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76461,6 +76538,7 @@ cont { scale: 16 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76486,6 +76564,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76511,6 +76590,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76536,6 +76616,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76564,6 +76645,7 @@ cont { scale: 13 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76572,6 +76654,7 @@ cont { scale: 14 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76598,6 +76681,7 @@ cont { scale: 15 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76623,6 +76707,7 @@ cont { scale: 16 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76648,6 +76733,7 @@ cont { scale: 17 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76673,6 +76759,7 @@ cont { scale: 18 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76698,6 +76785,7 @@ cont { scale: 19 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76726,6 +76814,7 @@ cont { scale: 12 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76734,6 +76823,7 @@ cont { scale: 13 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76742,6 +76832,7 @@ cont { scale: 14 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76768,6 +76859,7 @@ cont { scale: 15 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76793,6 +76885,7 @@ cont { scale: 16 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76818,6 +76911,7 @@ cont { scale: 17 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76843,6 +76937,7 @@ cont { scale: 18 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76868,6 +76963,7 @@ cont { scale: 19 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76896,6 +76992,7 @@ cont { scale: 13 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76904,6 +77001,7 @@ cont { scale: 14 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -76930,6 +77028,7 @@ cont { scale: 15 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76955,6 +77054,7 @@ cont { scale: 16 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -76980,6 +77080,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77005,6 +77106,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77030,6 +77132,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77058,6 +77161,7 @@ cont { scale: 13 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77066,6 +77170,7 @@ cont { scale: 14 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77092,6 +77197,7 @@ cont { scale: 15 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77117,6 +77223,7 @@ cont { scale: 16 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77142,6 +77249,7 @@ cont { scale: 17 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77167,6 +77275,7 @@ cont { scale: 18 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77192,6 +77301,7 @@ cont { scale: 19 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77220,6 +77330,7 @@ cont { scale: 13 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77228,6 +77339,7 @@ cont { scale: 14 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77254,6 +77366,7 @@ cont { scale: 15 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77279,6 +77392,7 @@ cont { scale: 16 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77304,6 +77418,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77329,6 +77444,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77354,6 +77470,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77382,6 +77499,7 @@ cont { scale: 13 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77390,6 +77508,7 @@ cont { scale: 14 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77416,6 +77535,7 @@ cont { scale: 15 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77441,6 +77561,7 @@ cont { scale: 16 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77466,6 +77587,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77491,6 +77613,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77516,6 +77639,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77544,6 +77668,7 @@ cont { scale: 13 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77552,6 +77677,7 @@ cont { scale: 14 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16952 min_distance: 1 } @@ -77578,6 +77704,7 @@ cont { scale: 15 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77603,6 +77730,7 @@ cont { scale: 16 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77628,6 +77756,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77653,6 +77782,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77678,6 +77808,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16952 } caption { @@ -77707,7 +77838,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77716,7 +77847,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77725,7 +77856,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77734,7 +77865,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -77743,7 +77874,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -77751,7 +77882,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77760,7 +77891,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -77768,7 +77899,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77777,7 +77908,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -77785,7 +77916,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77794,7 +77925,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -77805,7 +77936,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77816,13 +77947,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77833,13 +77964,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -77850,7 +77981,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77858,13 +77989,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -77873,7 +78004,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -77883,7 +78014,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77891,13 +78022,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77906,7 +78037,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -77916,7 +78047,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77924,13 +78055,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77939,7 +78070,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -77949,7 +78080,7 @@ cont { color: 5263440 dashdot { } - priority: 1275 + priority: 1291 cap: BUTTCAP } lines { @@ -77957,13 +78088,13 @@ cont { color: 2894874 dashdot { } - priority: 1284 + priority: 1300 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -77972,7 +78103,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -77995,14 +78126,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78020,14 +78152,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78045,14 +78178,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78070,7 +78204,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78093,14 +78227,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-adana-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78118,14 +78253,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-adana-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78143,14 +78279,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-adana-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78168,7 +78305,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78191,14 +78328,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-algeria-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78216,14 +78354,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-algeria-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78241,14 +78380,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-algeria-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78266,7 +78406,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78289,14 +78429,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-almaty-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78314,14 +78455,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-almaty-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78339,14 +78481,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-almaty-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78364,7 +78507,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78387,14 +78530,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-amsterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78412,14 +78556,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-amsterdam-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78437,14 +78582,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-amsterdam-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78462,7 +78608,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78485,14 +78631,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ankara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78510,14 +78657,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ankara-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78535,14 +78683,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ankara-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78560,7 +78709,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78583,14 +78732,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-athens-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78608,14 +78758,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-athens-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78633,14 +78784,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-athens-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78658,7 +78810,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78681,14 +78833,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-baku-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78706,14 +78859,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-baku-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78731,14 +78885,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-baku-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78756,7 +78911,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78779,14 +78934,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bangkok-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78804,14 +78960,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bangkok-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78829,14 +78986,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bangkok-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78854,7 +79012,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78877,14 +79035,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-barcelona-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78902,14 +79061,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-barcelona-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78927,14 +79087,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-barcelona-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -78952,7 +79113,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -78975,14 +79136,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-beijing-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79000,14 +79162,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-beijing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79025,14 +79188,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-beijing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79050,7 +79214,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79073,14 +79237,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79098,14 +79263,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79123,14 +79289,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bengaluru-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79148,7 +79315,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79171,14 +79338,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79196,14 +79364,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79221,14 +79390,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79246,7 +79416,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79269,14 +79439,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79294,14 +79465,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79319,14 +79491,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brasilia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79344,7 +79517,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79367,14 +79540,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79392,14 +79566,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79417,14 +79592,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brescia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79442,7 +79618,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79465,14 +79641,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-brussel-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79490,14 +79667,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-brussel-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79515,14 +79693,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-brussel-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79540,7 +79719,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79563,14 +79742,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bucharest-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79588,14 +79768,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bucharest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79613,14 +79794,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bucharest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79638,7 +79820,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79661,14 +79843,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-budapest-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79686,14 +79869,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-budapest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79711,14 +79895,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-budapest-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79736,7 +79921,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79759,14 +79944,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-buenosaires-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79784,14 +79970,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-buenosaires-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79809,14 +79996,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-buenosaires-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79834,7 +80022,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79857,14 +80045,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-bursaray-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79882,14 +80071,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-bursaray-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79907,14 +80097,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-bursaray-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79932,7 +80123,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -79955,14 +80146,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-cairo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -79980,14 +80172,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-cairo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80005,14 +80198,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-cairo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80030,7 +80224,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80053,14 +80247,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-caracas-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80078,14 +80273,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-caracas-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80103,14 +80299,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-caracas-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80128,7 +80325,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80151,14 +80348,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-catania-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80176,14 +80374,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-catania-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80201,14 +80400,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-catania-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80226,7 +80426,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80249,14 +80449,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-changchun-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80274,14 +80475,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-changchun-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80299,14 +80501,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-changchun-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80324,7 +80527,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80347,14 +80550,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chengdu-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80372,14 +80576,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chengdu-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80397,14 +80602,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chengdu-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80422,7 +80628,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80445,14 +80651,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chicago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80470,14 +80677,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chicago-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80495,14 +80703,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chicago-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80520,7 +80729,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80543,14 +80752,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-chongqing-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80568,14 +80778,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-chongqing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80593,14 +80804,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-chongqing-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80618,7 +80830,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80641,14 +80853,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dalian-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80666,14 +80879,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dalian-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80691,14 +80905,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dalian-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80716,7 +80931,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80739,14 +80954,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-delhi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80764,14 +80980,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80789,14 +81006,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-entrance-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80814,7 +81032,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80837,14 +81055,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dnepro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80862,14 +81081,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dnepro-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80887,14 +81107,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dnepro-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80912,7 +81133,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -80935,14 +81156,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-dubai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80960,14 +81182,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-dubai-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -80985,14 +81208,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-dubai-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81010,7 +81234,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81033,14 +81257,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ekb-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81058,14 +81283,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ekb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81083,14 +81309,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ekb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81108,7 +81335,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81131,14 +81358,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-fukuoka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81156,14 +81384,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-fukuoka-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81181,14 +81410,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-fukuoka-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81206,7 +81436,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81229,14 +81459,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-glasgow-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81254,14 +81485,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-glasgow-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81279,14 +81511,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-glasgow-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81304,7 +81537,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81327,14 +81560,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-guangzhou-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81352,14 +81586,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-guangzhou-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81377,14 +81612,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-guangzhou-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81402,7 +81638,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81425,14 +81661,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81450,14 +81687,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81475,14 +81713,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81500,7 +81739,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81523,14 +81762,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-helsinki-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81548,14 +81788,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-helsinki-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81573,14 +81814,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-helsinki-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81598,7 +81840,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81621,14 +81863,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-hirosima-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81646,14 +81889,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-hirosima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81671,14 +81915,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-hirosima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81696,7 +81941,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81719,14 +81964,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-isfahan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81744,14 +81990,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-isfahan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81769,14 +82016,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-isfahan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81794,7 +82042,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81817,14 +82065,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-istanbul-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81842,14 +82091,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-istanbul-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81867,14 +82117,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-istanbul-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81892,7 +82143,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -81915,14 +82166,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-izmir-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81940,14 +82192,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-izmir-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81965,14 +82218,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-izmir-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -81990,7 +82244,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82013,14 +82267,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kazan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82038,14 +82293,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kazan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82063,14 +82319,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kazan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82088,7 +82345,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82111,14 +82368,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kharkiv-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82136,14 +82394,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kharkiv-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82161,14 +82420,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kharkiv-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82186,7 +82446,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82209,14 +82469,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82234,14 +82495,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82259,14 +82521,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kiev-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82284,7 +82547,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82307,14 +82570,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kobe-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82332,14 +82596,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kobe-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82357,14 +82622,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kobe-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82382,7 +82648,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82405,14 +82671,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kolkata-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82430,14 +82697,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kolkata-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82455,14 +82723,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kolkata-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82480,7 +82749,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82503,14 +82772,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kunming-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82528,14 +82798,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kunming-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82553,14 +82824,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kunming-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82578,7 +82850,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82601,14 +82873,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-kyoto-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82626,14 +82899,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-kyoto-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82651,14 +82925,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-kyoto-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82676,7 +82951,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82699,14 +82974,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-losangeles-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82724,14 +83000,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-losangeles-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82749,14 +83026,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-losangeles-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82774,7 +83052,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82797,14 +83075,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lausanne-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82822,14 +83101,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lausanne-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82847,14 +83127,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lausanne-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82872,7 +83153,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82895,14 +83176,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lille-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82920,14 +83202,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lille-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82945,14 +83228,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lille-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -82970,7 +83254,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -82993,14 +83277,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lima-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83018,14 +83303,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83043,14 +83329,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lima-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83068,7 +83355,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83091,14 +83378,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lisboa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83116,14 +83404,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lisboa-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83141,14 +83430,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lisboa-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83166,7 +83456,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83189,14 +83479,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-london-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83214,14 +83505,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-london-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83239,14 +83531,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-london-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83264,7 +83557,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83287,14 +83580,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-lyon-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83312,14 +83606,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-lyon-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83337,14 +83632,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-lyon-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83362,7 +83658,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83385,14 +83681,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-madrid-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83410,14 +83707,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-madrid-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83435,14 +83733,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-madrid-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83460,7 +83759,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83483,14 +83782,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-malaga-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83508,14 +83808,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-malaga-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83533,14 +83834,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-malaga-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83558,7 +83860,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83581,14 +83883,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-manila-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83606,14 +83909,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-manila-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83631,14 +83935,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-manila-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83656,7 +83961,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83679,14 +83984,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-maracaibo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83704,14 +84010,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-maracaibo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83729,14 +84036,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-maracaibo-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83754,7 +84062,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83777,14 +84085,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mashhad-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83802,14 +84111,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mashhad-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83827,14 +84137,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mashhad-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83852,7 +84163,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83875,14 +84186,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mecca-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83900,14 +84212,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mecca-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83925,14 +84238,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mecca-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83950,7 +84264,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -83973,14 +84287,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-medellin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -83998,14 +84313,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-medellin-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84023,14 +84339,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-medellin-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84048,7 +84365,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84071,14 +84388,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-mexico-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84096,14 +84414,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-mexico-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84121,14 +84440,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-mexico-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84146,7 +84466,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84169,14 +84489,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-milan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84194,14 +84515,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-milan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84219,14 +84541,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-milan-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84244,7 +84567,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84267,14 +84590,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84292,14 +84616,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84317,14 +84642,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-minsk-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84342,7 +84668,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84365,14 +84691,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-montreal-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84390,14 +84717,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-montreal-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84415,14 +84743,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-montreal-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84440,7 +84769,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84450,6 +84779,7 @@ cont { scale: 15 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16952 } caption { @@ -84475,6 +84805,7 @@ cont { scale: 16 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84500,6 +84831,7 @@ cont { scale: 17 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84525,6 +84857,7 @@ cont { scale: 18 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84550,6 +84883,7 @@ cont { scale: 19 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16952 } caption { @@ -84591,14 +84925,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-ubahn-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84616,14 +84951,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84641,14 +84977,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84666,7 +85003,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84689,14 +85026,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-nagoya-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84714,14 +85052,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-nagoya-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84739,14 +85078,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-nagoya-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84764,7 +85104,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84787,14 +85127,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84812,14 +85153,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84837,14 +85179,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-newyork-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84862,7 +85205,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84885,14 +85228,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84910,14 +85254,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84935,14 +85280,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-nnov-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -84960,7 +85306,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -84983,14 +85329,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85008,14 +85355,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85033,14 +85381,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-novosibirsk-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85058,7 +85407,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85081,14 +85430,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85106,14 +85456,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85131,14 +85482,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-osaka-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85156,7 +85508,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85179,14 +85531,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85204,14 +85557,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85229,14 +85583,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-oslo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85254,7 +85609,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85277,14 +85632,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85302,14 +85658,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85327,14 +85684,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-palma-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85352,7 +85710,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85375,14 +85733,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85400,14 +85759,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85425,14 +85785,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-panama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85450,7 +85811,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85473,14 +85834,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85498,14 +85860,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85523,14 +85886,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-paris-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85548,7 +85912,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85571,14 +85935,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85596,14 +85961,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85621,14 +85987,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-philadelphia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85646,7 +86013,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85669,14 +86036,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85694,14 +86062,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85719,14 +86088,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-pyongyang-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85744,7 +86114,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85767,14 +86137,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85792,14 +86163,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85817,14 +86189,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rennes-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85842,7 +86215,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85865,14 +86238,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85890,14 +86264,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85915,14 +86290,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-riodejaneiro-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85940,7 +86316,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -85963,14 +86339,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -85988,14 +86365,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86013,14 +86391,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rome-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86038,7 +86417,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86061,14 +86440,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86086,14 +86466,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86111,14 +86492,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-rotterdam-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86136,7 +86518,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86159,14 +86541,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86184,14 +86567,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86209,14 +86593,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-samara-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86234,7 +86619,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86257,14 +86642,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86282,14 +86668,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86307,14 +86694,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-santiago-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86332,7 +86720,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86355,14 +86743,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86380,14 +86769,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86405,14 +86795,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-santodomingo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86430,7 +86821,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86453,14 +86844,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86478,14 +86870,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86503,14 +86896,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-saopaulo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86528,7 +86922,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86551,14 +86945,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86576,14 +86971,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86601,14 +86997,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sapporo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86626,7 +87023,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86649,14 +87046,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86674,14 +87072,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86699,14 +87098,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sendai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86724,7 +87124,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86747,14 +87147,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86772,14 +87173,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86797,14 +87199,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sanfrancisco-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86822,7 +87225,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86845,14 +87248,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86870,14 +87274,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86895,14 +87300,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-shanghai-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86920,7 +87326,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -86943,14 +87349,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86968,14 +87375,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -86993,14 +87401,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-shiraz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87018,7 +87427,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87041,14 +87450,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87066,14 +87476,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87091,14 +87502,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-sofia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87116,7 +87528,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87126,7 +87538,8 @@ cont { scale: 16 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87144,14 +87557,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87169,14 +87583,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87194,14 +87609,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-spb-m" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87219,7 +87635,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87242,14 +87658,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87267,14 +87684,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87292,14 +87710,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-stockholm-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87317,7 +87736,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87340,14 +87759,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87365,14 +87785,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87390,14 +87811,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tabriz-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87415,7 +87837,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87438,14 +87860,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87463,14 +87886,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87488,14 +87912,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-taipei-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87513,7 +87938,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87536,14 +87961,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87561,14 +87987,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87586,14 +88013,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-taoyuan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87611,7 +88039,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87634,14 +88062,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87659,14 +88088,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87684,14 +88114,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tashkent-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87709,7 +88140,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87732,14 +88163,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87757,14 +88189,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87782,14 +88215,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tbilisi-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87807,7 +88241,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87830,14 +88264,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87855,14 +88290,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87880,14 +88316,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tianjin-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87905,7 +88342,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -87928,14 +88365,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87953,14 +88391,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -87978,14 +88417,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-tokyo-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88003,7 +88443,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88026,14 +88466,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88051,14 +88492,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88076,14 +88518,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-valencia-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88101,7 +88544,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88124,14 +88567,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88149,14 +88593,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88174,14 +88619,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-vienna-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88199,7 +88645,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88222,14 +88668,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88247,14 +88694,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88272,14 +88720,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-warszawa-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88297,7 +88746,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88320,14 +88769,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88345,14 +88795,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88370,14 +88821,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-washington-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88395,7 +88847,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88418,14 +88870,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88443,14 +88896,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88468,14 +88922,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-wuhan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88493,7 +88948,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88516,14 +88971,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88541,14 +88997,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88566,14 +89023,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-yerevan-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88591,7 +89049,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88614,14 +89072,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 17 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88639,14 +89098,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 18 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88664,14 +89124,15 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } element { scale: 19 symbol { name: "subway-yokohama-s" - priority: 16914 + apply_for_type: 1 + priority: 16915 } caption { primary { @@ -88689,7 +89150,7 @@ cont { text: "int_name" is_optional: true } - priority: 15914 + priority: 15915 } } } @@ -88700,7 +89161,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88709,7 +89170,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88718,7 +89179,7 @@ cont { lines { width: 0.7 color: 861690961 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88727,7 +89188,7 @@ cont { lines { width: 0.8 color: 442260561 - priority: 1457 + priority: 1471 } } element { @@ -88735,7 +89196,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } element { @@ -88743,7 +89204,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } element { @@ -88751,7 +89212,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } } @@ -88762,7 +89223,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88771,7 +89232,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88780,7 +89241,7 @@ cont { lines { width: 0.7 color: 861690961 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88789,7 +89250,7 @@ cont { lines { width: 0.8 color: 442260561 - priority: 1457 + priority: 1471 } } element { @@ -88797,7 +89258,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } element { @@ -88805,7 +89266,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } element { @@ -88813,7 +89274,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } } @@ -88824,7 +89285,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88833,7 +89294,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88842,7 +89303,7 @@ cont { lines { width: 0.7 color: 861690961 - priority: 1457 + priority: 1471 cap: BUTTCAP } } @@ -88851,7 +89312,7 @@ cont { lines { width: 0.8 color: 442260561 - priority: 1457 + priority: 1471 } } element { @@ -88859,7 +89320,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } element { @@ -88867,7 +89328,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } element { @@ -88875,7 +89336,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1457 + priority: 1471 } } } @@ -88885,28 +89346,29 @@ cont { scale: 14 symbol { name: "tram-s" - priority: 16923 + apply_for_type: 1 + priority: 16924 } } element { scale: 15 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } } element { scale: 16 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } } element { scale: 17 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -88924,14 +89386,14 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 18 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -88949,14 +89411,14 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } element { scale: 19 symbol { name: "tram-m" - priority: 16923 + priority: 16924 } caption { primary { @@ -88974,7 +89436,7 @@ cont { text: "int_name" is_optional: true } - priority: 15923 + priority: 15924 } } } @@ -88985,7 +89447,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -88995,7 +89457,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89005,7 +89467,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89014,7 +89476,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89023,7 +89485,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89032,7 +89494,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89041,7 +89503,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89049,7 +89511,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89058,7 +89520,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89066,7 +89528,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89075,7 +89537,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89083,7 +89545,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89092,7 +89554,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89103,7 +89565,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89113,7 +89575,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89123,7 +89585,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89134,13 +89596,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89151,13 +89613,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89168,7 +89630,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89176,13 +89638,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89191,7 +89653,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89201,7 +89663,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89209,13 +89671,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89224,7 +89686,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89234,7 +89696,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89242,13 +89704,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89257,7 +89719,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89267,7 +89729,7 @@ cont { color: 5263440 dashdot { } - priority: 1046 + priority: 1065 cap: BUTTCAP } lines { @@ -89275,13 +89737,13 @@ cont { color: 2894874 dashdot { } - priority: 1056 + priority: 1074 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89290,7 +89752,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89301,7 +89763,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89311,7 +89773,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1342 + priority: 1358 join: BEVELJOIN cap: BUTTCAP } @@ -89321,7 +89783,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89334,13 +89796,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89353,13 +89815,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1342 + priority: 1358 cap: BUTTCAP } } @@ -89372,13 +89834,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 1.3 @@ -89387,7 +89849,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1352 + priority: 1367 } } element { @@ -89399,13 +89861,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89414,7 +89876,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1352 + priority: 1367 } } element { @@ -89426,13 +89888,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89441,7 +89903,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } element { @@ -89453,13 +89915,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1357 cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1342 + priority: 1358 } lines { width: 2.0 @@ -89468,7 +89930,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1352 + priority: 1367 } } } @@ -89483,7 +89945,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89492,7 +89954,7 @@ cont { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89504,7 +89966,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89513,7 +89975,7 @@ cont { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89525,7 +89987,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -89534,7 +89996,7 @@ cont { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89546,7 +90008,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89554,7 +90016,7 @@ cont { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89566,7 +90028,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89574,7 +90036,7 @@ cont { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89586,7 +90048,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 cap: BUTTCAP } path_text { @@ -89594,7 +90056,7 @@ cont { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89606,14 +90068,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 9 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89625,14 +90087,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89644,14 +90106,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 19033 } - priority: 16180 + priority: 16198 } } element { @@ -89663,14 +90125,14 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1180 + priority: 1198 } path_text { primary { height: 10 color: 19033 } - priority: 16180 + priority: 16198 } } } @@ -89678,31 +90140,41 @@ cont { name: "shop" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89711,14 +90183,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89727,7 +90199,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89737,7 +90209,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89746,14 +90218,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89763,14 +90235,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89780,14 +90252,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -89797,7 +90269,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -89805,31 +90277,41 @@ cont { name: "shop-antiques" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89838,14 +90320,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89854,7 +90336,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89862,31 +90344,41 @@ cont { name: "shop-art" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89895,14 +90387,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89911,7 +90403,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89919,31 +90411,41 @@ cont { name: "shop-baby_goods" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89952,14 +90454,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -89968,7 +90470,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -89976,31 +90478,41 @@ cont { name: "shop-bag" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90009,14 +90521,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90025,7 +90537,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90035,7 +90547,7 @@ cont { scale: 16 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90044,14 +90556,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90061,14 +90573,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90078,14 +90590,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90095,7 +90607,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90105,7 +90617,7 @@ cont { scale: 16 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90114,14 +90626,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90131,14 +90643,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90148,14 +90660,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90165,7 +90677,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90175,7 +90687,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90184,14 +90696,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90201,14 +90713,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90218,14 +90730,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90235,7 +90747,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90245,7 +90757,7 @@ cont { scale: 16 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90254,14 +90766,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90271,14 +90783,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90288,14 +90800,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-bicycle-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90305,7 +90817,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90315,7 +90827,7 @@ cont { scale: 16 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90324,14 +90836,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90341,14 +90853,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90358,14 +90870,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bookmaker-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90375,7 +90887,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90385,7 +90897,7 @@ cont { scale: 16 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90394,14 +90906,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90411,14 +90923,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90428,14 +90940,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "book-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90445,7 +90957,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90453,31 +90965,41 @@ cont { name: "shop-boutique" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90486,14 +91008,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90502,7 +91024,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -90512,7 +91034,7 @@ cont { scale: 16 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90521,14 +91043,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90538,14 +91060,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90555,14 +91077,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "butcher-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90572,7 +91094,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90582,7 +91104,7 @@ cont { scale: 16 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90591,14 +91113,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90608,14 +91130,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90625,14 +91147,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90642,7 +91164,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90652,7 +91174,7 @@ cont { scale: 16 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90661,14 +91183,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90678,14 +91200,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90695,14 +91217,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-part-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90712,7 +91234,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90722,7 +91244,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -90731,14 +91253,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90748,14 +91270,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90765,14 +91287,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -90782,7 +91304,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -90792,7 +91314,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16657 + priority: 16669 min_distance: 20 } caption { @@ -90808,7 +91330,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -90824,7 +91346,7 @@ cont { scale: 17 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90841,7 +91363,7 @@ cont { scale: 18 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90858,7 +91380,7 @@ cont { scale: 19 symbol { name: "car-repair-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90878,7 +91400,7 @@ cont { scale: 16 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 10 } caption { @@ -90887,14 +91409,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90904,14 +91426,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90921,14 +91443,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "caravan-shop-m" - priority: 16657 + priority: 16669 min_distance: 24 } caption { @@ -90938,7 +91460,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15657 + priority: 15669 } } } @@ -90948,7 +91470,7 @@ cont { scale: 16 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 10 } caption { @@ -90957,14 +91479,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15735 } } element { scale: 17 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -90974,14 +91496,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 18 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -90991,14 +91513,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 19 symbol { name: "charity_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -91008,7 +91530,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } } @@ -91016,31 +91538,41 @@ cont { name: "shop-cheese" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91049,14 +91581,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91065,7 +91597,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91075,7 +91607,7 @@ cont { scale: 16 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91084,14 +91616,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91101,14 +91633,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91118,14 +91650,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "chemist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91135,7 +91667,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91145,7 +91677,7 @@ cont { scale: 16 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91154,14 +91686,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91171,14 +91703,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91188,14 +91720,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91205,7 +91737,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91215,7 +91747,7 @@ cont { scale: 16 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91224,14 +91756,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91241,14 +91773,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91258,14 +91790,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "clothes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91275,7 +91807,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91283,31 +91815,41 @@ cont { name: "shop-coffee" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91316,14 +91858,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91332,7 +91874,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91342,7 +91884,7 @@ cont { scale: 16 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91351,14 +91893,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91368,14 +91910,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91385,14 +91927,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "computer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91402,7 +91944,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91412,7 +91954,7 @@ cont { scale: 16 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91421,14 +91963,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91438,14 +91980,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91455,14 +91997,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sweets-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91472,7 +92014,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91482,7 +92024,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91491,14 +92033,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91508,14 +92050,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91525,14 +92067,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91542,7 +92084,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91552,7 +92094,7 @@ cont { scale: 16 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91561,14 +92103,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91578,14 +92120,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91595,14 +92137,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "copyshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91612,7 +92154,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91622,7 +92164,7 @@ cont { scale: 16 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91631,14 +92173,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91648,14 +92190,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91665,14 +92207,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "beauty-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91682,7 +92224,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91690,31 +92232,41 @@ cont { name: "shop-craft" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91723,14 +92275,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91739,7 +92291,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91747,31 +92299,41 @@ cont { name: "shop-dairy" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91780,14 +92342,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91796,7 +92358,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -91806,7 +92368,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91815,14 +92377,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91832,14 +92394,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91849,14 +92411,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91866,7 +92428,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91876,7 +92438,7 @@ cont { scale: 16 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91885,14 +92447,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91902,14 +92464,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91919,14 +92481,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "department_store-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91936,7 +92498,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -91946,7 +92508,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -91955,14 +92517,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91972,14 +92534,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -91989,14 +92551,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92006,7 +92568,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92016,7 +92578,7 @@ cont { scale: 16 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92025,14 +92587,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92042,14 +92604,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92059,14 +92621,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92076,7 +92638,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92084,31 +92646,41 @@ cont { name: "shop-electrical" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92117,14 +92689,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92133,7 +92705,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92143,7 +92715,7 @@ cont { scale: 16 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92152,14 +92724,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92169,14 +92741,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92186,14 +92758,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "electronics-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92203,7 +92775,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92213,7 +92785,7 @@ cont { scale: 16 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92222,14 +92794,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92239,14 +92811,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92256,14 +92828,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "erotic-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92273,7 +92845,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92283,7 +92855,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92292,14 +92864,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92308,14 +92880,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92324,14 +92896,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92340,7 +92912,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92350,7 +92922,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92359,14 +92931,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92376,14 +92948,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92393,14 +92965,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92410,7 +92982,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92418,31 +92990,41 @@ cont { name: "shop-fishing" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92451,14 +93033,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92467,7 +93049,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -92477,7 +93059,7 @@ cont { scale: 16 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92486,14 +93068,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92503,14 +93085,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92520,14 +93102,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "florist-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92537,7 +93119,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92547,7 +93129,7 @@ cont { scale: 16 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92556,14 +93138,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92573,14 +93155,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92590,14 +93172,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "funeral_directors-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92607,7 +93189,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92617,7 +93199,7 @@ cont { scale: 16 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92626,14 +93208,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92643,14 +93225,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92660,14 +93242,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92677,7 +93259,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92687,7 +93269,7 @@ cont { scale: 16 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92696,14 +93278,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92713,14 +93295,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92730,14 +93312,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "garden_center-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92747,7 +93329,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92757,7 +93339,7 @@ cont { scale: 16 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92766,14 +93348,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92783,14 +93365,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92800,14 +93382,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "gift-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92817,7 +93399,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92827,7 +93409,7 @@ cont { scale: 16 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92836,14 +93418,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92853,14 +93435,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92870,14 +93452,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "greengrocer-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92887,7 +93469,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92897,7 +93479,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92906,14 +93488,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92923,14 +93505,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92940,14 +93522,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92957,7 +93539,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -92967,7 +93549,7 @@ cont { scale: 16 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -92976,14 +93558,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -92993,14 +93575,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93010,14 +93592,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hairdresser-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93027,7 +93609,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93037,7 +93619,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93046,14 +93628,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93063,14 +93645,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93080,14 +93662,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93097,7 +93679,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93107,7 +93689,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93116,14 +93698,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93133,14 +93715,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93150,14 +93732,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93167,7 +93749,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93177,7 +93759,7 @@ cont { scale: 16 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93186,14 +93768,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93203,14 +93785,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93220,14 +93802,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "doityourself-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93237,7 +93819,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93245,31 +93827,41 @@ cont { name: "shop-interior_decoration" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93278,14 +93870,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93294,7 +93886,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93304,7 +93896,7 @@ cont { scale: 16 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93313,14 +93905,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93330,14 +93922,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93347,14 +93939,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "jewelry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93364,7 +93956,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93374,7 +93966,7 @@ cont { scale: 16 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93383,14 +93975,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93400,14 +93992,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93417,14 +94009,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "kiosk-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93434,7 +94026,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93444,7 +94036,7 @@ cont { scale: 16 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93453,14 +94045,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93470,14 +94062,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93487,14 +94079,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "furniture-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93504,7 +94096,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93514,7 +94106,7 @@ cont { scale: 16 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93523,14 +94115,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93540,14 +94132,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93557,14 +94149,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "laundry-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93574,7 +94166,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93582,31 +94174,41 @@ cont { name: "shop-lottery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93615,14 +94217,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93631,7 +94233,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93641,7 +94243,7 @@ cont { scale: 14 symbol { name: "shop-s" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -93650,14 +94252,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 15 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -93666,14 +94268,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 16 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 16 } caption { @@ -93682,14 +94284,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 17 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -93698,14 +94300,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 18 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -93714,14 +94316,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15904 + priority: 15905 } } element { scale: 19 symbol { name: "shop-m" - priority: 16904 + priority: 16905 min_distance: 8 } caption { @@ -93730,7 +94332,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15904 + priority: 15905 } } } @@ -93738,20 +94340,9 @@ cont { name: "shop-massage" element { scale: 16 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15600 - } - } - element { - scale: 17 symbol { - name: "sauna-m" - priority: 16600 + name: "shop-m" + priority: 16613 min_distance: 10 } caption { @@ -93759,16 +94350,31 @@ cont { height: 10 color: 5592405 offset_y: 1 - is_optional: true } - priority: 15600 + priority: 15613 + } + } + element { + scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15613 } } element { scale: 18 symbol { name: "sauna-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93778,14 +94384,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sauna-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93795,7 +94401,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93803,31 +94409,41 @@ cont { name: "shop-medical_supply" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93836,14 +94452,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93852,7 +94468,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -93862,7 +94478,7 @@ cont { scale: 16 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -93871,14 +94487,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93888,14 +94504,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93905,14 +94521,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "mobile_phone-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -93922,7 +94538,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93930,20 +94546,25 @@ cont { name: "shop-money_lender" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -93953,14 +94574,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -93970,14 +94591,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bank-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -93987,7 +94608,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -93997,7 +94618,7 @@ cont { scale: 16 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94006,14 +94627,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94023,14 +94644,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94040,14 +94661,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "motorcycle_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94057,7 +94678,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94066,8 +94687,8 @@ cont { element { scale: 16 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 10 } caption { @@ -94076,14 +94697,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94093,14 +94714,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94110,14 +94731,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "music-m" - priority: 16600 + name: "media-m" + priority: 16613 min_distance: 24 } caption { @@ -94127,7 +94748,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94136,8 +94757,8 @@ cont { element { scale: 16 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 10 } caption { @@ -94146,14 +94767,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94163,14 +94784,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94180,14 +94801,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "musical-instrument-m" - priority: 16600 + name: "music-m" + priority: 16613 min_distance: 24 } caption { @@ -94197,7 +94818,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94205,20 +94826,25 @@ cont { name: "shop-newsagent" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94228,14 +94854,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94245,14 +94871,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "newsagent_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94262,7 +94888,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94270,31 +94896,41 @@ cont { name: "shop-nutrition_supplements" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94303,14 +94939,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94319,7 +94955,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94329,7 +94965,7 @@ cont { scale: 16 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94338,14 +94974,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94355,14 +94991,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94372,14 +95008,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "optician-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94389,7 +95025,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94399,7 +95035,7 @@ cont { scale: 16 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94408,14 +95044,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94425,14 +95061,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94442,14 +95078,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "outdoor-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94459,7 +95095,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94467,31 +95103,41 @@ cont { name: "shop-paint" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94500,14 +95146,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94516,7 +95162,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94526,7 +95172,7 @@ cont { scale: 16 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94535,14 +95181,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94552,14 +95198,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94569,14 +95215,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "bakery-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94586,7 +95232,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94594,20 +95240,25 @@ cont { name: "shop-pawnbroker" element { scale: 16 + symbol { + name: "shop-m" + priority: 16650 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -94617,14 +95268,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -94634,14 +95285,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "bookmaker-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -94651,7 +95302,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -94659,31 +95310,41 @@ cont { name: "shop-perfumery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94692,14 +95353,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94708,7 +95369,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -94718,7 +95379,7 @@ cont { scale: 16 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94727,14 +95388,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94744,14 +95405,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94761,14 +95422,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "petshop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94778,7 +95439,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94788,7 +95449,7 @@ cont { scale: 16 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94797,14 +95458,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94814,14 +95475,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94831,14 +95492,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "photo-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94848,7 +95509,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94858,7 +95519,7 @@ cont { scale: 16 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -94867,14 +95528,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94884,14 +95545,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94901,14 +95562,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "seafood-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -94918,7 +95579,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -94928,7 +95589,7 @@ cont { scale: 16 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 10 } caption { @@ -94937,14 +95598,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15735 } } element { scale: 17 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -94954,14 +95615,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 18 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -94971,14 +95632,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } element { scale: 19 symbol { name: "second_hand_shop-m" - priority: 16638 + priority: 16735 min_distance: 24 } caption { @@ -94988,7 +95649,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15735 } } } @@ -94996,31 +95657,41 @@ cont { name: "shop-sewing" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95029,14 +95700,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95045,7 +95716,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95055,7 +95726,7 @@ cont { scale: 16 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95064,14 +95735,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95081,14 +95752,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95098,14 +95769,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shoes-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95115,7 +95786,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95125,7 +95796,7 @@ cont { scale: 16 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95134,14 +95805,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95151,14 +95822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95168,14 +95839,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "sports-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95185,7 +95856,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95193,20 +95864,25 @@ cont { name: "shop-stationery" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95216,14 +95892,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95233,14 +95909,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "stationery_shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95250,7 +95926,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95258,31 +95934,41 @@ cont { name: "shop-storage_rental" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95291,14 +95977,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95307,7 +95993,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95317,7 +96003,7 @@ cont { scale: 16 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 16 } caption { @@ -95326,14 +96012,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 17 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95342,14 +96028,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 18 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95358,14 +96044,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } element { scale: 19 symbol { name: "grocery-m" - priority: 16657 + priority: 16669 min_distance: 8 } caption { @@ -95374,7 +96060,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15657 + priority: 15669 } } } @@ -95384,7 +96070,7 @@ cont { scale: 16 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95393,14 +96079,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95410,14 +96096,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95427,14 +96113,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "hand-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95444,7 +96130,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95452,31 +96138,41 @@ cont { name: "shop-tea" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95485,14 +96181,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95501,7 +96197,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95511,7 +96207,7 @@ cont { scale: 16 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95520,14 +96216,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95537,14 +96233,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95554,14 +96250,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "ticket-shop-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95571,7 +96267,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95579,31 +96275,41 @@ cont { name: "shop-tobacco" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95612,14 +96318,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95628,7 +96334,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95638,7 +96344,7 @@ cont { scale: 16 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95647,14 +96353,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95664,14 +96370,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95681,14 +96387,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "toys-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95698,7 +96404,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95706,31 +96412,41 @@ cont { name: "shop-trade" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95739,14 +96455,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95755,7 +96471,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95763,31 +96479,41 @@ cont { name: "shop-travel_agency" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95796,14 +96522,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95812,7 +96538,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95822,7 +96548,7 @@ cont { scale: 16 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95831,14 +96557,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95848,14 +96574,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95865,14 +96591,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95882,7 +96608,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -95890,31 +96616,41 @@ cont { name: "shop-variety_store" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 8 + } caption { primary { height: 11 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 8 } caption { @@ -95923,14 +96659,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 8 } caption { @@ -95939,7 +96675,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -95949,7 +96685,7 @@ cont { scale: 16 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -95958,14 +96694,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95975,14 +96711,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -95992,14 +96728,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "media-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96009,7 +96745,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96018,8 +96754,8 @@ cont { element { scale: 16 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 10 } caption { @@ -96028,14 +96764,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -96045,14 +96781,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -96062,14 +96798,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { - name: "video-games-m" - priority: 16600 + name: "computer-m" + priority: 16613 min_distance: 24 } caption { @@ -96079,7 +96815,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96087,31 +96823,41 @@ cont { name: "shop-watches" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96120,14 +96866,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96136,7 +96882,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96144,31 +96890,41 @@ cont { name: "shop-wholesale" element { scale: 16 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 16613 + min_distance: 10 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96177,14 +96933,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "shop-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96193,7 +96949,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } } @@ -96203,7 +96959,7 @@ cont { scale: 16 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 10 } caption { @@ -96212,14 +96968,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96229,14 +96985,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96246,14 +97002,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "alcohol-m" - priority: 16600 + priority: 16613 min_distance: 24 } caption { @@ -96263,7 +97019,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -96273,7 +97029,7 @@ cont { scale: 17 symbol { name: "bowling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96282,14 +97038,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96299,14 +97055,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } element { scale: 19 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96316,7 +97072,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } } @@ -96326,7 +97082,7 @@ cont { scale: 17 symbol { name: "bowling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96335,14 +97091,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96352,14 +97108,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } element { scale: 19 symbol { name: "bowling-m" - priority: 16619 + priority: 16622 min_distance: 10 } caption { @@ -96369,7 +97125,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15622 } } } @@ -96379,7 +97135,7 @@ cont { scale: 17 symbol { name: "america-football-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96388,14 +97144,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "america-football-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96405,14 +97161,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "america-football-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96422,7 +97178,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96432,7 +97188,7 @@ cont { scale: 17 symbol { name: "archery-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96441,14 +97197,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96458,14 +97214,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96475,7 +97231,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96485,7 +97241,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96494,14 +97250,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96511,14 +97267,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96528,7 +97284,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96538,7 +97294,7 @@ cont { scale: 17 symbol { name: "australian-football-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96547,14 +97303,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "australian-football-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96564,14 +97320,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "australian-football-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96581,7 +97337,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96591,7 +97347,7 @@ cont { scale: 17 symbol { name: "badminton-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96600,14 +97356,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "badminton-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96617,14 +97373,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "badminton-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96634,7 +97390,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96644,7 +97400,7 @@ cont { scale: 17 symbol { name: "baseball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96653,14 +97409,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "baseball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96670,14 +97426,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "baseball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96687,7 +97443,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96697,7 +97453,7 @@ cont { scale: 17 symbol { name: "basketball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96706,14 +97462,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "basketball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96723,14 +97479,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "basketball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96740,7 +97496,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96750,7 +97506,7 @@ cont { scale: 17 symbol { name: "volleyball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96759,14 +97515,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96776,14 +97532,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -96793,7 +97549,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -96803,7 +97559,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96812,14 +97568,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96829,14 +97585,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96846,7 +97602,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96856,7 +97612,7 @@ cont { scale: 17 symbol { name: "chess-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96865,14 +97621,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "chess-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96882,14 +97638,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "chess-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96899,7 +97655,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96909,7 +97665,7 @@ cont { scale: 17 symbol { name: "climbing-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96918,14 +97674,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "climbing-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96935,14 +97691,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "climbing-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96952,7 +97708,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -96962,7 +97718,7 @@ cont { scale: 17 symbol { name: "cricket-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -96971,14 +97727,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "cricket-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -96988,14 +97744,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "cricket-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97005,7 +97761,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97015,7 +97771,7 @@ cont { scale: 17 symbol { name: "curling-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97024,14 +97780,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "curling-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97041,14 +97797,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "curling-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97058,7 +97814,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97068,7 +97824,7 @@ cont { scale: 17 symbol { name: "diving-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97077,14 +97833,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97094,14 +97850,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97111,7 +97867,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97121,7 +97877,7 @@ cont { scale: 17 symbol { name: "equestrian-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97130,14 +97886,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "equestrian-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97147,14 +97903,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "equestrian-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97164,7 +97920,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97174,7 +97930,7 @@ cont { scale: 17 symbol { name: "hockey-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97183,14 +97939,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97200,14 +97956,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97217,7 +97973,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97227,7 +97983,7 @@ cont { scale: 17 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97236,14 +97992,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97253,14 +98009,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97270,7 +98026,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97280,7 +98036,7 @@ cont { scale: 17 symbol { name: "golf-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97289,14 +98045,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "golf-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97306,14 +98062,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "golf-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97323,7 +98079,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97333,7 +98089,7 @@ cont { scale: 17 symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97342,14 +98098,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97359,14 +98115,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pitch-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97376,7 +98132,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97386,7 +98142,7 @@ cont { scale: 17 symbol { name: "handball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97395,14 +98151,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "handball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97412,14 +98168,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "handball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97429,7 +98185,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97439,7 +98195,7 @@ cont { scale: 17 symbol { name: "hockey-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97448,14 +98204,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97465,14 +98221,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "hockey-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97482,7 +98238,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97492,25 +98248,25 @@ cont { scale: 15 area { color: 2171163 - priority: -15391 + priority: -15378 } } element { scale: 16 area { color: 2171163 - priority: -15391 + priority: -15378 } } element { scale: 17 area { color: 2171163 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97519,18 +98275,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 area { color: 2171163 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97540,18 +98296,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 area { color: 2171163 - priority: -15391 + priority: -15378 } symbol { name: "pitch-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97561,7 +98317,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97571,7 +98327,7 @@ cont { scale: 17 symbol { name: "padel-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97580,14 +98336,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "padel-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97597,14 +98353,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "padel-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97614,7 +98370,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97624,7 +98380,7 @@ cont { scale: 17 symbol { name: "pelota-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97633,14 +98389,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "pelota-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97650,14 +98406,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "pelota-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97667,7 +98423,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97677,7 +98433,7 @@ cont { scale: 17 symbol { name: "diving-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97686,14 +98442,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97703,14 +98459,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "diving-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97720,7 +98476,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97730,7 +98486,7 @@ cont { scale: 17 symbol { name: "archery-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97739,14 +98495,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97756,14 +98512,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } element { scale: 19 symbol { name: "archery-m" - priority: 16619 + priority: 16632 min_distance: 10 } caption { @@ -97773,7 +98529,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15619 + priority: 15632 } } } @@ -97783,7 +98539,7 @@ cont { scale: 17 symbol { name: "skateboard-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97792,14 +98548,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "skateboard-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97809,14 +98565,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "skateboard-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97826,7 +98582,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -97836,7 +98592,7 @@ cont { scale: 17 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97845,14 +98601,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97862,14 +98618,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "skiing-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -97879,7 +98635,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -97889,25 +98645,25 @@ cont { scale: 15 area { color: 2171163 - priority: -15391 + priority: -15378 } } element { scale: 16 area { color: 2171163 - priority: -15391 + priority: -15378 } } element { scale: 17 area { color: 2171163 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97916,18 +98672,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 area { color: 2171163 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97937,18 +98693,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } element { scale: 19 area { color: 2171163 - priority: -15391 + priority: -15378 } symbol { name: "soccer-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97958,7 +98714,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15609 + priority: 15622 } } } @@ -97968,7 +98724,7 @@ cont { scale: 17 symbol { name: "swimming-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -97977,14 +98733,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "swimming-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -97994,14 +98750,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "swimming-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98011,7 +98767,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98021,7 +98777,7 @@ cont { scale: 17 symbol { name: "table-tennis-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98030,14 +98786,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "table-tennis-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98047,14 +98803,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "table-tennis-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98064,7 +98820,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98074,7 +98830,7 @@ cont { scale: 17 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98083,14 +98839,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98100,14 +98856,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "tennis-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -98117,7 +98873,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -98127,7 +98883,7 @@ cont { scale: 17 symbol { name: "volleyball-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98136,14 +98892,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98153,14 +98909,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "volleyball-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98170,7 +98926,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98180,7 +98936,7 @@ cont { scale: 17 symbol { name: "yoga-m" - priority: 16609 + priority: 16622 min_distance: 10 } caption { @@ -98189,14 +98945,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15609 + priority: 15622 } } element { scale: 18 symbol { name: "yoga-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98206,14 +98962,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } element { scale: 19 symbol { name: "yoga-m" - priority: 16628 + priority: 16641 min_distance: 10 } caption { @@ -98223,7 +98979,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15628 + priority: 15641 } } } @@ -98233,7 +98989,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 24 } caption { @@ -98242,14 +98998,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98258,14 +99014,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98275,14 +99031,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -98292,7 +99048,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } } @@ -98302,7 +99058,7 @@ cont { scale: 16 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -98311,14 +99067,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 } caption { primary { @@ -98326,14 +99082,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -98343,14 +99099,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -98360,7 +99116,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -98370,7 +99126,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98380,14 +99136,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98397,14 +99153,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98414,14 +99170,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98431,14 +99187,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98448,7 +99204,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } } @@ -98458,7 +99214,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98468,14 +99224,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98485,14 +99241,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98502,14 +99258,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98519,14 +99275,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98536,7 +99292,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98546,7 +99302,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98556,14 +99312,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98573,14 +99329,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98590,14 +99346,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98607,14 +99363,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98624,7 +99380,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98634,7 +99390,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98644,14 +99400,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98661,14 +99417,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -98678,14 +99434,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -98695,14 +99451,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16733 + priority: 16745 min_distance: 24 } caption { @@ -98712,7 +99468,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15733 + priority: 15745 } } } @@ -98722,7 +99478,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 8 } caption { @@ -98732,14 +99488,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16676 + priority: 16688 min_distance: 24 } caption { @@ -98749,14 +99505,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15676 + priority: 15688 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98766,14 +99522,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98783,14 +99539,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16857 + priority: 16858 min_distance: 24 } caption { @@ -98800,7 +99556,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -98810,7 +99566,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -98820,14 +99576,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -98837,14 +99593,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98854,14 +99610,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98871,14 +99627,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98888,14 +99644,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98905,7 +99661,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -98915,7 +99671,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -98925,14 +99681,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -98942,14 +99698,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98959,14 +99715,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98976,14 +99732,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -98993,14 +99749,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "zoo-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99010,7 +99766,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -99020,7 +99776,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -99030,14 +99786,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -99047,14 +99803,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99064,14 +99820,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99081,14 +99837,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99098,14 +99854,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "tourism-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -99115,7 +99871,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -99125,7 +99881,7 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99134,14 +99890,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99150,14 +99906,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99166,14 +99922,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99183,14 +99939,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "campsite-m" - priority: 16638 + priority: 16650 min_distance: 12 } caption { @@ -99200,7 +99956,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -99210,7 +99966,7 @@ cont { scale: 16 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 30 } caption { @@ -99219,14 +99975,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 17 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99235,14 +99991,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15600 + priority: 15613 } } element { scale: 18 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99252,14 +100008,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "caravan_site-m" - priority: 16600 + priority: 16613 min_distance: 20 } caption { @@ -99269,7 +100025,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99279,7 +100035,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -99288,14 +100044,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99304,14 +100060,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99321,14 +100077,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99338,7 +100094,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -99348,7 +100104,8 @@ cont { scale: 15 symbol { name: "gallery-m" - priority: 16828 + apply_for_type: 1 + priority: 16830 min_distance: 8 } caption { @@ -99358,14 +100115,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 16 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99375,14 +100132,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 17 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99392,14 +100149,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 18 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99409,14 +100166,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } element { scale: 19 symbol { name: "gallery-m" - priority: 16828 + priority: 16830 min_distance: 12 } caption { @@ -99426,7 +100183,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15828 + priority: 15830 } } } @@ -99436,7 +100193,7 @@ cont { scale: 16 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 24 } caption { @@ -99445,14 +100202,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 17 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 } caption { primary { @@ -99460,14 +100217,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15742 + priority: 15754 } } element { scale: 18 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99477,14 +100234,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } element { scale: 19 symbol { name: "apartment-m" - priority: 16742 + priority: 16754 min_distance: 16 } caption { @@ -99494,7 +100251,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15742 + priority: 15754 } } } @@ -99504,7 +100261,8 @@ cont { scale: 16 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 24 } caption { @@ -99513,14 +100271,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15761 + priority: 15773 } } element { scale: 17 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99529,14 +100288,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15761 + priority: 15773 } } element { scale: 18 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99546,14 +100306,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15761 + priority: 15773 } } element { scale: 19 symbol { name: "hostel-m" - priority: 16761 + apply_for_type: 1 + priority: 16773 min_distance: 16 } caption { @@ -99563,7 +100324,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15761 + priority: 15773 } } } @@ -99573,7 +100334,8 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 24 } caption { @@ -99582,14 +100344,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15790 + priority: 15801 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -99598,14 +100361,15 @@ cont { color: 5592405 offset_y: 1 } - priority: 15790 + priority: 15801 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -99615,14 +100379,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15790 + priority: 15801 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16790 + apply_for_type: 1 + priority: 16801 min_distance: 16 } caption { @@ -99632,7 +100397,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15790 + priority: 15801 } } } @@ -99642,7 +100407,8 @@ cont { scale: 16 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99652,14 +100418,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99669,14 +100436,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "information-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99686,14 +100454,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "information-m" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99703,7 +100472,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99713,7 +100482,8 @@ cont { scale: 16 symbol { name: "board" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99723,14 +100493,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "board" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99740,14 +100511,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "board" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99757,14 +100529,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "board" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99774,7 +100547,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99784,7 +100557,8 @@ cont { scale: 16 symbol { name: "guidepost" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99794,14 +100568,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "guidepost" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99811,14 +100586,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "guidepost" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99828,14 +100604,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "guidepost" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99845,7 +100622,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99855,7 +100632,8 @@ cont { scale: 16 symbol { name: "map" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99865,14 +100643,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "map" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99882,14 +100661,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "map" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99899,14 +100679,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } element { scale: 19 symbol { name: "map" - priority: 16600 + apply_for_type: 1 + priority: 16613 min_distance: 10 } caption { @@ -99916,7 +100697,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15613 } } } @@ -99926,7 +100707,8 @@ cont { scale: 16 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99936,14 +100718,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "information-m" - priority: 16590 + apply_for_type: 1 + priority: 16603 min_distance: 10 } caption { @@ -99953,14 +100736,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { - name: "information-m" - priority: 16600 + name: "office-m" + priority: 16650 min_distance: 10 } caption { @@ -99970,14 +100753,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15650 } } element { scale: 19 symbol { - name: "information-m" - priority: 16600 + name: "office-m" + priority: 16650 min_distance: 10 } caption { @@ -99987,7 +100770,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15600 + priority: 15650 } } } @@ -99997,7 +100780,7 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 24 } caption { @@ -100006,14 +100789,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15771 + priority: 15783 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -100022,14 +100805,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15771 + priority: 15783 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -100039,14 +100822,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15771 + priority: 15783 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16771 + priority: 16783 min_distance: 16 } caption { @@ -100056,7 +100839,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15771 + priority: 15783 } } } @@ -100066,7 +100849,7 @@ cont { scale: 13 symbol { name: "museum-s" - priority: 16838 + priority: 16839 min_distance: 16 } caption { @@ -100076,14 +100859,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 14 symbol { name: "museum-s" - priority: 16838 + priority: 16839 min_distance: 16 } caption { @@ -100093,14 +100876,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 15 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 24 } caption { @@ -100110,14 +100893,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 16 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100127,14 +100910,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 17 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100144,14 +100927,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 18 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100161,14 +100944,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } element { scale: 19 symbol { name: "museum-m" - priority: 16838 + priority: 16839 min_distance: 12 } caption { @@ -100178,7 +100961,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15838 + priority: 15839 } } } @@ -100188,7 +100971,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100197,14 +100980,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 17 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100213,14 +100996,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15638 + priority: 15650 } } element { scale: 18 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100230,14 +101013,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } element { scale: 19 symbol { name: "picnic-m" - priority: 16638 + priority: 16650 min_distance: 10 } caption { @@ -100247,7 +101030,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15638 + priority: 15650 } } } @@ -100257,7 +101040,7 @@ cont { scale: 16 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 24 } caption { @@ -100266,14 +101049,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15780 + priority: 15792 } } element { scale: 17 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100282,14 +101065,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15780 + priority: 15792 } } element { scale: 18 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100299,14 +101082,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15780 + priority: 15792 } } element { scale: 19 symbol { name: "hotel-m" - priority: 16780 + priority: 16792 min_distance: 16 } caption { @@ -100316,7 +101099,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15780 + priority: 15792 } } } @@ -100326,7 +101109,7 @@ cont { scale: 14 symbol { name: "theme_park-s" - priority: 16809 + priority: 16820 min_distance: 12 } caption { @@ -100336,14 +101119,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 15 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 36 } caption { @@ -100353,14 +101136,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 16 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100370,14 +101153,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 17 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100387,14 +101170,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 18 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100404,14 +101187,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } element { scale: 19 symbol { name: "theme_park-m" - priority: 16809 + priority: 16820 min_distance: 24 } caption { @@ -100421,7 +101204,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15809 + priority: 15820 } } } @@ -100431,7 +101214,8 @@ cont { scale: 14 symbol { name: "viewpoint-s" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100441,14 +101225,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 15 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100458,14 +101243,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 16 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100475,14 +101261,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 17 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100492,14 +101279,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 18 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100509,14 +101297,15 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } element { scale: 19 symbol { name: "viewpoint-m" - priority: 16857 + apply_for_type: 1 + priority: 16858 min_distance: 8 } caption { @@ -100526,7 +101315,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15857 + priority: 15858 } } } @@ -100536,7 +101325,7 @@ cont { scale: 16 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 24 } caption { @@ -100545,14 +101334,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 17 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -100561,14 +101350,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15752 + priority: 15764 } } element { scale: 18 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -100578,14 +101367,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } element { scale: 19 symbol { name: "alpine_hut-m" - priority: 16752 + priority: 16764 min_distance: 16 } caption { @@ -100595,7 +101384,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15752 + priority: 15764 } } } @@ -100605,7 +101394,7 @@ cont { scale: 13 symbol { name: "zoo-s" - priority: 16866 + priority: 16867 min_distance: 12 } caption { @@ -100615,14 +101404,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 14 symbol { name: "zoo-s" - priority: 16866 + priority: 16867 min_distance: 12 } caption { @@ -100632,14 +101421,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 15 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100649,14 +101438,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100666,14 +101455,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 17 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100683,14 +101472,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 18 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100700,14 +101489,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } element { scale: 19 symbol { name: "zoo-m" - priority: 16866 + priority: 16867 min_distance: 8 } caption { @@ -100717,7 +101506,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15866 + priority: 15867 } } } @@ -101186,28 +101975,32 @@ cont { scale: 16 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 17 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 18 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } element { scale: 19 symbol { name: "dot-m" - priority: 16161 + apply_for_type: 1 + priority: 16179 } } } @@ -101997,7 +102790,7 @@ cont { scale: 11 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 min_distance: 15 } caption { @@ -102007,14 +102800,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 12 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102023,14 +102816,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102039,14 +102832,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102055,14 +102848,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 15 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102071,14 +102864,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 16 symbol { name: "waterfall-s" - priority: 16590 + priority: 16603 } caption { primary { @@ -102087,14 +102880,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 17 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102103,14 +102896,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 18 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102119,14 +102912,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } element { scale: 19 symbol { name: "waterfall-m" - priority: 16590 + priority: 16603 } caption { primary { @@ -102135,7 +102928,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15590 + priority: 15603 } } } @@ -102155,7 +102948,7 @@ cont { lines { width: 2.0 color: 1295727419 - priority: 1476 + priority: 1490 cap: BUTTCAP } path_text { @@ -102163,7 +102956,7 @@ cont { height: 10 color: 5592405 } - priority: 16476 + priority: 16490 } } element { @@ -102171,14 +102964,14 @@ cont { lines { width: 3.0 color: 1295727419 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 5592405 } - priority: 16476 + priority: 16490 } } element { @@ -102186,14 +102979,14 @@ cont { lines { width: 4.5 color: 1295727419 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 5592405 } - priority: 16476 + priority: 16490 } } element { @@ -102201,14 +102994,14 @@ cont { lines { width: 6.0 color: 1295727419 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 5592405 } - priority: 16476 + priority: 16490 } } element { @@ -102216,14 +103009,14 @@ cont { lines { width: 8.0 color: 1295727419 - priority: 1476 + priority: 1490 } path_text { primary { height: 10 color: 5592405 } - priority: 16476 + priority: 16490 } } } @@ -102497,7 +103290,7 @@ colors { } value { name: "Selection" - color: 1560281087 + color: 1548466662 } value { name: "SpeedCameraMarkBg" diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 3d9e774dd0..6b19341a20 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index bfd1417bd6..92f90c55b4 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -4,66 +4,122 @@ cont { scale: 10 area { color: 14209512 - priority: -15989 + priority: -15083 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + } + priority: 15917 } } element { scale: 11 area { color: 14209512 - priority: -15989 + priority: -15083 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + } + priority: 15917 } } element { scale: 12 area { color: 14209512 - priority: -15989 + priority: -15083 + } + symbol { + name: "airport-m" + priority: 3100 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + text: "int_name" + } + priority: 15917 } } element { scale: 13 area { color: 14209512 - priority: -15989 + priority: -15083 + } + symbol { + name: "airport-m" + priority: 3100 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + text: "int_name" + } + priority: 15917 } } element { scale: 14 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { - height: 12 + height: 11 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 10 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 15 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -79,18 +135,18 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 16 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -106,88 +162,88 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 17 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 18 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 19 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } } @@ -197,32 +253,32 @@ cont { scale: 7 symbol { name: "airport-s" - priority: 16011 + priority: 10000 } } element { scale: 8 symbol { name: "airport-s" - priority: 16011 + priority: 10000 } } element { scale: 9 symbol { name: "airport-s" - priority: 16011 + priority: 10000 } } element { scale: 10 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-s" - priority: 16011 + priority: 16917 } caption { primary { @@ -231,18 +287,18 @@ cont { stroke_color: 1308622847 offset_y: 1 } - priority: 15011 + priority: 15917 } } element { scale: 11 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { @@ -251,18 +307,18 @@ cont { stroke_color: 1308622847 offset_y: 1 } - priority: 15011 + priority: 15917 } } element { scale: 12 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { @@ -278,18 +334,18 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 13 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { @@ -305,45 +361,45 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 14 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { - height: 12 + height: 11 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 10 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 15 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -359,18 +415,18 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 16 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -386,88 +442,88 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 17 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 18 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 19 area { color: 14209512 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 1 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } } @@ -848,6 +904,7 @@ cont { scale: 18 symbol { name: "car-wash-m" + apply_for_type: 1 priority: 16752 } caption { @@ -863,6 +920,7 @@ cont { scale: 19 symbol { name: "car-wash-m" + apply_for_type: 1 priority: 16752 } caption { @@ -1401,6 +1459,7 @@ cont { scale: 15 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 min_distance: 10 } @@ -1417,6 +1476,7 @@ cont { scale: 16 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 min_distance: 8 } @@ -1433,6 +1493,7 @@ cont { scale: 17 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 min_distance: 14 } @@ -1449,6 +1510,7 @@ cont { scale: 18 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 } caption { @@ -1464,6 +1526,7 @@ cont { scale: 19 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 } caption { @@ -2040,11 +2103,11 @@ cont { scale: 17 area { color: 16579778 - priority: -15953 + priority: -15942 } symbol { name: "zero-icon" - priority: 16047 + priority: 16058 min_distance: 7 } caption { @@ -2135,11 +2198,11 @@ cont { scale: 17 area { color: 16579778 - priority: -15953 + priority: -15942 } symbol { name: "zero-icon" - priority: 16047 + priority: 16058 min_distance: 7 } caption { @@ -4047,6 +4110,7 @@ cont { scale: 15 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4062,6 +4126,7 @@ cont { scale: 16 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4077,6 +4142,7 @@ cont { scale: 17 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4092,6 +4158,7 @@ cont { scale: 18 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4107,6 +4174,7 @@ cont { scale: 19 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -5887,6 +5955,7 @@ cont { scale: 14 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5895,6 +5964,7 @@ cont { scale: 15 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5903,6 +5973,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5911,6 +5982,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5919,6 +5991,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5927,6 +6000,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -7520,7 +7594,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 color: 16118756 dashdot { } @@ -7777,7 +7851,7 @@ cont { cap: BUTTCAP } lines { - width: 4.27 + width: 4.2700000000000005 color: 16118756 dashdot { } @@ -8108,7 +8182,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 color: 8421504 dashdot { dd: 5.0 @@ -8318,7 +8392,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8330,7 +8403,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8357,7 +8429,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8369,7 +8440,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8396,7 +8466,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8408,7 +8477,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8435,7 +8503,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8447,7 +8514,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8474,7 +8540,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8486,7 +8551,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8513,7 +8577,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8525,7 +8588,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8552,7 +8614,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8564,7 +8625,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8591,7 +8651,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8603,7 +8662,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8630,7 +8688,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8642,7 +8699,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8669,7 +8725,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8681,7 +8736,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8708,7 +8762,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8720,7 +8773,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -8747,7 +8799,6 @@ cont { scale: 18 lines { width: 1.1 - color: 10506258 dashdot { dd: 3.5 dd: 2.0 @@ -8759,7 +8810,6 @@ cont { scale: 19 lines { width: 1.5 - color: 10506258 dashdot { dd: 4.0 dd: 2.5 @@ -9195,7 +9245,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 color: 16118756 dashdot { } @@ -9527,7 +9577,7 @@ cont { cap: BUTTCAP } lines { - width: 5.8 + width: 5.800000000000001 color: 16118756 dashdot { } @@ -9893,7 +9943,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 color: 8421504 dashdot { dd: 5.0 @@ -10132,7 +10182,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 color: 16118756 dashdot { } @@ -10393,7 +10443,7 @@ cont { cap: BUTTCAP } lines { - width: 5.8 + width: 5.800000000000001 color: 16118756 dashdot { } @@ -10688,7 +10738,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 color: 8421504 dashdot { dd: 5.0 @@ -12151,7 +12201,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 16118756 dashdot { } @@ -12435,7 +12485,7 @@ cont { cap: BUTTCAP } lines { - width: 3.9 + width: 3.9000000000000004 color: 16118756 dashdot { } @@ -12783,7 +12833,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 16118756 dashdot { } @@ -12976,7 +13026,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 16118756 dashdot { } @@ -13125,7 +13175,7 @@ cont { cap: BUTTCAP } lines { - width: 3.9 + width: 3.9000000000000004 color: 16118756 dashdot { } @@ -13338,7 +13388,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 16118756 dashdot { } @@ -13729,91 +13779,6 @@ cont { } } } -cont { - name: "highway-service-busway" - element { - scale: 14 - lines { - width: 1.0 - color: 16579836 - priority: 1364 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 16579836 - priority: 1364 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 16579836 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16364 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 16579836 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16364 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 16579836 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16364 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 16579836 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16364 - } - } -} cont { name: "highway-service-driveway" element { @@ -14066,6 +14031,7 @@ cont { scale: 13 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -14073,6 +14039,7 @@ cont { scale: 14 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14080,6 +14047,7 @@ cont { scale: 15 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14087,6 +14055,7 @@ cont { scale: 16 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14094,6 +14063,7 @@ cont { scale: 17 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14101,6 +14071,7 @@ cont { scale: 18 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14108,6 +14079,7 @@ cont { scale: 19 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -15351,7 +15323,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15363,7 +15334,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15375,7 +15345,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15402,7 +15371,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15414,7 +15382,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15426,7 +15393,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15453,7 +15419,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15465,7 +15430,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15477,7 +15441,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15530,7 +15493,7 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 + color: 16579836 dashdot { dd: 6.0 dd: 2.5 @@ -15542,7 +15505,7 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 + color: 16579836 dashdot { dd: 7.0 dd: 3.0 @@ -15554,7 +15517,7 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 + color: 16579836 dashdot { dd: 7.0 dd: 3.0 @@ -15581,7 +15544,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15593,7 +15555,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15605,7 +15566,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15632,7 +15592,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15644,7 +15603,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15656,7 +15614,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15683,7 +15640,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15695,7 +15651,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15707,7 +15662,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15734,7 +15688,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15746,7 +15699,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15758,7 +15710,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15785,7 +15736,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15797,7 +15747,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15809,7 +15758,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15836,7 +15784,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15848,7 +15795,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15860,7 +15806,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15887,7 +15832,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6510384 dashdot { dd: 6.0 dd: 2.5 @@ -15899,7 +15843,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -15911,7 +15854,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6510384 dashdot { dd: 7.0 dd: 3.0 @@ -17055,7 +16997,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 color: 16118756 dashdot { } @@ -17312,7 +17254,7 @@ cont { cap: BUTTCAP } lines { - width: 4.27 + width: 4.2700000000000005 color: 16118756 dashdot { } @@ -17643,7 +17585,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 color: 8421504 dashdot { dd: 5.0 @@ -21687,25 +21629,25 @@ cont { scale: 10 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -21715,7 +21657,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21723,7 +21665,7 @@ cont { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -21731,11 +21673,11 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -21745,7 +21687,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21753,7 +21695,7 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -21761,11 +21703,11 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -21775,7 +21717,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21783,7 +21725,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -21791,11 +21733,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -21805,7 +21747,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21813,7 +21755,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -21821,11 +21763,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -21835,7 +21777,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21843,7 +21785,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -21851,11 +21793,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -21865,7 +21807,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21873,7 +21815,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -21881,11 +21823,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -21901,7 +21843,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21909,11 +21851,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -21921,11 +21863,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -21941,7 +21883,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -21949,11 +21891,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -21964,25 +21906,25 @@ cont { scale: 10 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -21992,7 +21934,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22000,7 +21942,7 @@ cont { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22008,11 +21950,11 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22022,7 +21964,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22030,7 +21972,7 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22038,11 +21980,11 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22052,7 +21994,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22060,7 +22002,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22068,11 +22010,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22082,7 +22024,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22090,7 +22032,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22098,11 +22040,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22112,7 +22054,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22120,7 +22062,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22128,11 +22070,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22142,7 +22084,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22150,7 +22092,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22158,11 +22100,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22178,7 +22120,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22186,11 +22128,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22198,11 +22140,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22218,7 +22160,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22226,11 +22168,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22241,25 +22183,25 @@ cont { scale: 10 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22269,7 +22211,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22277,7 +22219,7 @@ cont { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22285,11 +22227,11 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22299,7 +22241,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22307,7 +22249,7 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22315,11 +22257,11 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22329,7 +22271,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22337,7 +22279,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22345,11 +22287,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22359,7 +22301,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22367,7 +22309,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22375,11 +22317,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22389,7 +22331,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22397,7 +22339,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22405,11 +22347,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22419,7 +22361,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22427,7 +22369,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22435,11 +22377,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22455,7 +22397,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22463,11 +22405,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22475,11 +22417,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22495,7 +22437,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22503,11 +22445,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22518,25 +22460,25 @@ cont { scale: 10 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 13031851 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22546,7 +22488,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22554,7 +22496,7 @@ cont { scale: 12 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22562,11 +22504,11 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22576,7 +22518,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22584,7 +22526,7 @@ cont { scale: 13 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22592,11 +22534,11 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22606,7 +22548,7 @@ cont { stroke_color: 1090519039 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22614,7 +22556,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22622,11 +22564,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22636,7 +22578,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22644,7 +22586,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22652,11 +22594,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22666,7 +22608,7 @@ cont { stroke_color: 671088639 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22674,7 +22616,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22682,11 +22624,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22696,7 +22638,7 @@ cont { stroke_color: 452984831 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22704,7 +22646,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22712,11 +22654,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22732,7 +22674,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22740,11 +22682,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22752,11 +22694,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22772,7 +22714,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22780,11 +22722,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -23794,42 +23736,42 @@ cont { scale: 17 area { color: 2801593470 - priority: -15989 + priority: -15942 } caption { primary { height: 10 color: 4473924 } - priority: 15011 + priority: 15058 } } element { scale: 18 area { color: 2801593470 - priority: -15989 + priority: -15942 } caption { primary { height: 10 color: 4473924 } - priority: 15011 + priority: 15058 } } element { scale: 19 area { color: 2801593470 - priority: -15989 + priority: -15942 } caption { primary { height: 10 color: 4473924 } - priority: 15011 + priority: 15058 } } } @@ -23839,56 +23781,56 @@ cont { scale: 12 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } } element { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } } element { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } } element { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } } } @@ -23898,56 +23840,56 @@ cont { scale: 12 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } } element { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } } element { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } } element { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } } } @@ -24181,39 +24123,39 @@ cont { scale: 10 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24223,7 +24165,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24231,7 +24173,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24239,11 +24181,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24253,7 +24195,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24261,7 +24203,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24269,11 +24211,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24283,7 +24225,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24291,7 +24233,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24299,11 +24241,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24313,7 +24255,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24321,7 +24263,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24329,11 +24271,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24349,7 +24291,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24357,11 +24299,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24369,11 +24311,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24389,7 +24331,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24397,11 +24339,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24412,39 +24354,39 @@ cont { scale: 10 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24454,7 +24396,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24462,7 +24404,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24470,11 +24412,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24484,7 +24426,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24492,7 +24434,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24500,11 +24442,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24514,7 +24456,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24522,7 +24464,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24530,11 +24472,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24544,7 +24486,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24552,7 +24494,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24560,11 +24502,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24580,7 +24522,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24588,11 +24530,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24600,11 +24542,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24620,7 +24562,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24628,11 +24570,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24643,39 +24585,39 @@ cont { scale: 10 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24685,7 +24627,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24693,7 +24635,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24701,11 +24643,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24715,7 +24657,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24723,7 +24665,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24731,11 +24673,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24745,7 +24687,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24753,7 +24695,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24761,11 +24703,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24775,7 +24717,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24783,7 +24725,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24791,11 +24733,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24811,7 +24753,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24819,11 +24761,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24831,11 +24773,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24851,7 +24793,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24859,11 +24801,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24874,39 +24816,39 @@ cont { scale: 10 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 13031851 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24916,7 +24858,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24924,7 +24866,7 @@ cont { scale: 14 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24932,11 +24874,11 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24946,7 +24888,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24954,7 +24896,7 @@ cont { scale: 15 area { color: 13031851 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24962,11 +24904,11 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24976,7 +24918,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24984,7 +24926,7 @@ cont { scale: 16 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24992,11 +24934,11 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25006,7 +24948,7 @@ cont { stroke_color: 872415231 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25014,7 +24956,7 @@ cont { scale: 17 area { color: 13163437 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25022,11 +24964,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25042,7 +24984,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25050,11 +24992,11 @@ cont { scale: 18 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -25062,11 +25004,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25082,7 +25024,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25090,11 +25032,11 @@ cont { scale: 19 area { color: 13163437 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -32671,6 +32613,7 @@ cont { scale: 4 symbol { name: "star-s" + apply_for_type: 1 priority: 16647 } caption { @@ -32702,6 +32645,7 @@ cont { scale: 5 symbol { name: "star-m" + apply_for_type: 1 priority: 16647 } caption { @@ -32733,6 +32677,7 @@ cont { scale: 6 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32764,6 +32709,7 @@ cont { scale: 7 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32795,6 +32741,7 @@ cont { scale: 8 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32826,6 +32773,7 @@ cont { scale: 9 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32857,6 +32805,7 @@ cont { scale: 10 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32888,6 +32837,7 @@ cont { scale: 11 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32919,6 +32869,7 @@ cont { scale: 12 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32950,6 +32901,7 @@ cont { scale: 13 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -32981,6 +32933,7 @@ cont { scale: 14 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33012,6 +32965,7 @@ cont { scale: 15 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33043,6 +32997,7 @@ cont { scale: 16 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33074,6 +33029,7 @@ cont { scale: 17 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33105,6 +33061,7 @@ cont { scale: 18 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33136,6 +33093,7 @@ cont { scale: 19 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -38263,6 +38221,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38286,6 +38245,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38309,6 +38269,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38332,6 +38293,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38355,6 +38317,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38378,6 +38341,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38404,6 +38368,7 @@ cont { scale: 17 symbol { name: "railway-crossing-m" + apply_for_type: 1 priority: 16870 } } @@ -38411,6 +38376,7 @@ cont { scale: 18 symbol { name: "railway-crossing-m" + apply_for_type: 1 priority: 16870 } } @@ -38418,6 +38384,7 @@ cont { scale: 19 symbol { name: "railway-crossing-m" + apply_for_type: 1 priority: 16870 } } @@ -38538,7 +38505,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38555,7 +38522,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38572,7 +38539,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38580,7 +38547,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38605,7 +38572,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38613,7 +38580,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38638,7 +38605,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38646,7 +38613,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38671,7 +38638,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38679,7 +38646,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -39788,6 +39755,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16917 } } @@ -39795,6 +39763,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39818,6 +39787,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39841,6 +39811,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39864,6 +39835,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39887,6 +39859,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39910,6 +39883,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39933,6 +39907,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39959,6 +39934,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16917 } } @@ -39966,6 +39942,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -39989,6 +39966,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40012,6 +39990,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40035,6 +40014,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40058,6 +40038,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40081,6 +40062,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40104,6 +40086,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40130,6 +40113,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16917 } } @@ -40137,6 +40121,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40160,6 +40145,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40183,6 +40169,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40206,6 +40193,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40229,6 +40217,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40252,6 +40241,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40275,6 +40265,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40301,6 +40292,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40324,6 +40316,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40347,6 +40340,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40370,6 +40364,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40393,6 +40388,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40416,6 +40412,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40439,6 +40436,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40465,6 +40463,7 @@ cont { scale: 12 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40473,6 +40472,7 @@ cont { scale: 13 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40497,6 +40497,7 @@ cont { scale: 14 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16917 } caption { @@ -40520,6 +40521,7 @@ cont { scale: 15 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40543,6 +40545,7 @@ cont { scale: 16 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40566,6 +40569,7 @@ cont { scale: 17 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40589,6 +40593,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40612,6 +40617,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40638,6 +40644,7 @@ cont { scale: 12 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40646,6 +40653,7 @@ cont { scale: 13 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40670,6 +40678,7 @@ cont { scale: 14 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16917 } caption { @@ -40693,6 +40702,7 @@ cont { scale: 15 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40716,6 +40726,7 @@ cont { scale: 16 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40739,6 +40750,7 @@ cont { scale: 17 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40762,6 +40774,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40785,6 +40798,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40811,6 +40825,7 @@ cont { scale: 12 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40819,6 +40834,7 @@ cont { scale: 13 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40843,6 +40859,7 @@ cont { scale: 14 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16917 } caption { @@ -40866,6 +40883,7 @@ cont { scale: 15 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40889,6 +40907,7 @@ cont { scale: 16 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40912,6 +40931,7 @@ cont { scale: 17 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40935,6 +40955,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40958,6 +40979,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40984,6 +41006,7 @@ cont { scale: 13 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41008,6 +41031,7 @@ cont { scale: 14 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41031,6 +41055,7 @@ cont { scale: 15 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41054,6 +41079,7 @@ cont { scale: 16 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41077,6 +41103,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41100,6 +41127,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41123,6 +41151,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41149,6 +41178,7 @@ cont { scale: 13 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41173,6 +41203,7 @@ cont { scale: 14 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41196,6 +41227,7 @@ cont { scale: 15 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41219,6 +41251,7 @@ cont { scale: 16 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41242,6 +41275,7 @@ cont { scale: 17 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41265,6 +41299,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41288,6 +41323,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41314,6 +41350,7 @@ cont { scale: 13 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41338,6 +41375,7 @@ cont { scale: 14 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41361,6 +41399,7 @@ cont { scale: 15 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41384,6 +41423,7 @@ cont { scale: 16 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41407,6 +41447,7 @@ cont { scale: 17 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41430,6 +41471,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41453,6 +41495,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41479,6 +41522,7 @@ cont { scale: 13 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41503,6 +41547,7 @@ cont { scale: 14 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41526,6 +41571,7 @@ cont { scale: 15 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41549,6 +41595,7 @@ cont { scale: 16 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41572,6 +41619,7 @@ cont { scale: 17 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41595,6 +41643,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41618,6 +41667,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41644,6 +41694,7 @@ cont { scale: 13 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41668,6 +41719,7 @@ cont { scale: 14 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41691,6 +41743,7 @@ cont { scale: 15 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41714,6 +41767,7 @@ cont { scale: 16 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41737,6 +41791,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41760,6 +41815,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41783,6 +41839,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41809,6 +41866,7 @@ cont { scale: 13 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41833,6 +41891,7 @@ cont { scale: 14 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41856,6 +41915,7 @@ cont { scale: 15 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41879,6 +41939,7 @@ cont { scale: 16 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41902,6 +41963,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41925,6 +41987,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41948,6 +42011,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41974,6 +42038,7 @@ cont { scale: 13 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41998,6 +42063,7 @@ cont { scale: 14 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42021,6 +42087,7 @@ cont { scale: 15 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42044,6 +42111,7 @@ cont { scale: 16 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42067,6 +42135,7 @@ cont { scale: 17 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42090,6 +42159,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42113,6 +42183,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42139,6 +42210,7 @@ cont { scale: 13 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42163,6 +42235,7 @@ cont { scale: 14 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42186,6 +42259,7 @@ cont { scale: 15 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42209,6 +42283,7 @@ cont { scale: 16 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42232,6 +42307,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42255,6 +42331,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42278,6 +42355,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42304,6 +42382,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42328,6 +42407,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42351,6 +42431,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42374,6 +42455,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42397,6 +42479,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42420,6 +42503,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42443,171 +42527,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16917 - } - caption { - primary { - height: 14 - color: 3355443 - stroke_color: 452984831 - offset_y: 1 - } - secondary { - height: 12 - color: 3355443 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } -} -cont { - name: "railway-station-subway-bilbao" - element { - scale: 13 - symbol { - name: "subway-bilbao-s" - priority: 16917 - min_distance: 1 - } - caption { - primary { - height: 11 - color: 3355443 - stroke_color: 1728053247 - offset_y: 1 - } - secondary { - height: 9 - color: 3355443 - stroke_color: 1728053247 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 14 - symbol { - name: "subway-bilbao-s" - priority: 16917 - } - caption { - primary { - height: 12 - color: 3355443 - stroke_color: 1308622847 - offset_y: 1 - } - secondary { - height: 10 - color: 3355443 - stroke_color: 1308622847 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 15 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - offset_y: 1 - } - secondary { - height: 10 - color: 3355443 - stroke_color: 872415231 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 16 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 13 - color: 3355443 - stroke_color: 872415231 - offset_y: 1 - } - secondary { - height: 11 - color: 3355443 - stroke_color: 872415231 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 17 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 14 - color: 3355443 - stroke_color: 452984831 - offset_y: 1 - } - secondary { - height: 12 - color: 3355443 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 18 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 14 - color: 3355443 - stroke_color: 452984831 - offset_y: 1 - } - secondary { - height: 12 - color: 3355443 - stroke_color: 452984831 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 19 - symbol { - name: "subway-bilbao-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42634,6 +42554,7 @@ cont { scale: 13 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42658,6 +42579,7 @@ cont { scale: 14 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42681,6 +42603,7 @@ cont { scale: 15 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42704,6 +42627,7 @@ cont { scale: 16 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42727,6 +42651,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42750,6 +42675,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42773,6 +42699,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42799,6 +42726,7 @@ cont { scale: 13 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42823,6 +42751,7 @@ cont { scale: 14 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42846,6 +42775,7 @@ cont { scale: 15 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42869,6 +42799,7 @@ cont { scale: 16 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42892,6 +42823,7 @@ cont { scale: 17 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42915,6 +42847,7 @@ cont { scale: 18 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42938,6 +42871,7 @@ cont { scale: 19 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42964,6 +42898,7 @@ cont { scale: 13 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42988,6 +42923,7 @@ cont { scale: 14 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43011,6 +42947,7 @@ cont { scale: 15 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43034,6 +42971,7 @@ cont { scale: 16 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43057,6 +42995,7 @@ cont { scale: 17 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43080,6 +43019,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43103,6 +43043,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43129,6 +43070,7 @@ cont { scale: 13 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43153,6 +43095,7 @@ cont { scale: 14 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43176,6 +43119,7 @@ cont { scale: 15 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43199,6 +43143,7 @@ cont { scale: 16 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43222,6 +43167,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43245,6 +43191,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43268,6 +43215,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43294,6 +43242,7 @@ cont { scale: 13 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43318,6 +43267,7 @@ cont { scale: 14 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43341,6 +43291,7 @@ cont { scale: 15 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43364,6 +43315,7 @@ cont { scale: 16 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43387,6 +43339,7 @@ cont { scale: 17 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43410,6 +43363,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43433,6 +43387,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43459,6 +43414,7 @@ cont { scale: 13 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43483,6 +43439,7 @@ cont { scale: 14 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43506,6 +43463,7 @@ cont { scale: 15 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43529,6 +43487,7 @@ cont { scale: 16 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43552,6 +43511,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43575,6 +43535,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43598,6 +43559,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43624,6 +43586,7 @@ cont { scale: 13 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43648,6 +43611,7 @@ cont { scale: 14 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43671,6 +43635,7 @@ cont { scale: 15 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43694,6 +43659,7 @@ cont { scale: 16 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43717,6 +43683,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43740,6 +43707,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43763,6 +43731,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43789,6 +43758,7 @@ cont { scale: 13 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43813,6 +43783,7 @@ cont { scale: 14 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43836,6 +43807,7 @@ cont { scale: 15 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43859,6 +43831,7 @@ cont { scale: 16 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43882,6 +43855,7 @@ cont { scale: 17 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43905,6 +43879,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43928,6 +43903,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43954,6 +43930,7 @@ cont { scale: 13 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43978,6 +43955,7 @@ cont { scale: 14 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44001,6 +43979,7 @@ cont { scale: 15 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44024,6 +44003,7 @@ cont { scale: 16 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44047,6 +44027,7 @@ cont { scale: 17 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44070,6 +44051,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44093,6 +44075,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44119,6 +44102,7 @@ cont { scale: 13 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44143,6 +44127,7 @@ cont { scale: 14 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44166,6 +44151,7 @@ cont { scale: 15 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44189,6 +44175,7 @@ cont { scale: 16 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44212,6 +44199,7 @@ cont { scale: 17 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44235,6 +44223,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44258,6 +44247,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44284,6 +44274,7 @@ cont { scale: 13 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44308,6 +44299,7 @@ cont { scale: 14 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44331,6 +44323,7 @@ cont { scale: 15 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44354,6 +44347,7 @@ cont { scale: 16 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44377,6 +44371,7 @@ cont { scale: 17 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44400,6 +44395,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44423,6 +44419,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44449,6 +44446,7 @@ cont { scale: 13 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44473,6 +44471,7 @@ cont { scale: 14 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44496,6 +44495,7 @@ cont { scale: 15 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44519,6 +44519,7 @@ cont { scale: 16 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44542,6 +44543,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44565,6 +44567,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44588,6 +44591,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44614,6 +44618,7 @@ cont { scale: 13 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44638,6 +44643,7 @@ cont { scale: 14 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44661,6 +44667,7 @@ cont { scale: 15 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44684,6 +44691,7 @@ cont { scale: 16 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44707,6 +44715,7 @@ cont { scale: 17 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44730,6 +44739,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44753,6 +44763,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44779,6 +44790,7 @@ cont { scale: 13 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44803,6 +44815,7 @@ cont { scale: 14 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44826,6 +44839,7 @@ cont { scale: 15 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44849,6 +44863,7 @@ cont { scale: 16 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44872,6 +44887,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44895,6 +44911,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44918,6 +44935,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44944,6 +44962,7 @@ cont { scale: 13 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44968,6 +44987,7 @@ cont { scale: 14 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44991,6 +45011,7 @@ cont { scale: 15 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45014,6 +45035,7 @@ cont { scale: 16 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45037,6 +45059,7 @@ cont { scale: 17 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45060,6 +45083,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45083,6 +45107,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45109,6 +45134,7 @@ cont { scale: 13 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45133,6 +45159,7 @@ cont { scale: 14 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45156,6 +45183,7 @@ cont { scale: 15 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45179,6 +45207,7 @@ cont { scale: 16 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45202,6 +45231,7 @@ cont { scale: 17 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45225,6 +45255,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45248,6 +45279,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45274,6 +45306,7 @@ cont { scale: 13 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45298,6 +45331,7 @@ cont { scale: 14 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45321,6 +45355,7 @@ cont { scale: 15 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45344,6 +45379,7 @@ cont { scale: 16 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45367,6 +45403,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45390,6 +45427,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45413,6 +45451,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45439,6 +45478,7 @@ cont { scale: 13 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45463,6 +45503,7 @@ cont { scale: 14 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45486,6 +45527,7 @@ cont { scale: 15 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45509,6 +45551,7 @@ cont { scale: 16 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45532,6 +45575,7 @@ cont { scale: 17 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45555,6 +45599,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45578,6 +45623,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45604,6 +45650,7 @@ cont { scale: 13 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45628,6 +45675,7 @@ cont { scale: 14 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45651,6 +45699,7 @@ cont { scale: 15 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45674,6 +45723,7 @@ cont { scale: 16 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45697,6 +45747,7 @@ cont { scale: 17 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45720,6 +45771,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45743,6 +45795,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45769,6 +45822,7 @@ cont { scale: 13 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45793,6 +45847,7 @@ cont { scale: 14 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45816,6 +45871,7 @@ cont { scale: 15 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45839,6 +45895,7 @@ cont { scale: 16 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45862,6 +45919,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45885,6 +45943,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45908,6 +45967,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45934,6 +45994,7 @@ cont { scale: 13 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45958,6 +46019,7 @@ cont { scale: 14 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45981,6 +46043,7 @@ cont { scale: 15 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46004,6 +46067,7 @@ cont { scale: 16 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46027,6 +46091,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46050,6 +46115,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46073,6 +46139,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46099,6 +46166,7 @@ cont { scale: 13 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46123,6 +46191,7 @@ cont { scale: 14 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46146,6 +46215,7 @@ cont { scale: 15 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46169,6 +46239,7 @@ cont { scale: 16 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46192,6 +46263,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46215,6 +46287,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46238,6 +46311,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46264,6 +46338,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46288,6 +46363,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46311,6 +46387,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46334,6 +46411,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46357,6 +46435,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46380,6 +46459,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46403,6 +46483,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46429,6 +46510,7 @@ cont { scale: 13 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46453,6 +46535,7 @@ cont { scale: 14 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46476,6 +46559,7 @@ cont { scale: 15 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46499,6 +46583,7 @@ cont { scale: 16 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46522,6 +46607,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46545,6 +46631,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46568,6 +46655,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46594,6 +46682,7 @@ cont { scale: 13 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46618,6 +46707,7 @@ cont { scale: 14 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46641,6 +46731,7 @@ cont { scale: 15 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46664,6 +46755,7 @@ cont { scale: 16 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46687,6 +46779,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46710,6 +46803,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46733,6 +46827,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46759,6 +46854,7 @@ cont { scale: 13 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46783,6 +46879,7 @@ cont { scale: 14 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46806,6 +46903,7 @@ cont { scale: 15 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46829,6 +46927,7 @@ cont { scale: 16 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46852,6 +46951,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46875,6 +46975,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46898,6 +46999,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46924,6 +47026,7 @@ cont { scale: 13 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46948,6 +47051,7 @@ cont { scale: 14 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46971,6 +47075,7 @@ cont { scale: 15 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46994,6 +47099,7 @@ cont { scale: 16 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47017,6 +47123,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47040,6 +47147,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47063,6 +47171,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47089,6 +47198,7 @@ cont { scale: 13 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47113,6 +47223,7 @@ cont { scale: 14 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47136,6 +47247,7 @@ cont { scale: 15 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47159,6 +47271,7 @@ cont { scale: 16 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47182,6 +47295,7 @@ cont { scale: 17 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47205,6 +47319,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47228,6 +47343,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47254,6 +47370,7 @@ cont { scale: 13 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47278,6 +47395,7 @@ cont { scale: 14 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47301,6 +47419,7 @@ cont { scale: 15 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47324,6 +47443,7 @@ cont { scale: 16 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47347,6 +47467,7 @@ cont { scale: 17 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47370,6 +47491,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47393,6 +47515,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47419,6 +47542,7 @@ cont { scale: 13 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47443,6 +47567,7 @@ cont { scale: 14 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47466,6 +47591,7 @@ cont { scale: 15 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47489,6 +47615,7 @@ cont { scale: 16 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47512,6 +47639,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47535,6 +47663,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47558,6 +47687,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47584,6 +47714,7 @@ cont { scale: 13 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47608,6 +47739,7 @@ cont { scale: 14 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47631,6 +47763,7 @@ cont { scale: 15 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47654,6 +47787,7 @@ cont { scale: 16 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47677,6 +47811,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -47698,6 +47833,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -47719,6 +47855,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -47743,6 +47880,7 @@ cont { scale: 13 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47767,6 +47905,7 @@ cont { scale: 14 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47790,6 +47929,7 @@ cont { scale: 15 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47813,6 +47953,7 @@ cont { scale: 16 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47836,6 +47977,7 @@ cont { scale: 17 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47859,6 +48001,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47882,6 +48025,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47908,6 +48052,7 @@ cont { scale: 13 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47932,6 +48077,7 @@ cont { scale: 14 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47955,6 +48101,7 @@ cont { scale: 15 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47978,6 +48125,7 @@ cont { scale: 16 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48001,6 +48149,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48024,6 +48173,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48047,6 +48197,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48073,6 +48224,7 @@ cont { scale: 13 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48097,6 +48249,7 @@ cont { scale: 14 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48120,6 +48273,7 @@ cont { scale: 15 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48143,6 +48297,7 @@ cont { scale: 16 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48166,6 +48321,7 @@ cont { scale: 17 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48189,6 +48345,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48212,6 +48369,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48238,6 +48396,7 @@ cont { scale: 13 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48262,6 +48421,7 @@ cont { scale: 14 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48285,6 +48445,7 @@ cont { scale: 15 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48308,6 +48469,7 @@ cont { scale: 16 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48331,6 +48493,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48354,6 +48517,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48377,6 +48541,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48403,6 +48568,7 @@ cont { scale: 13 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48427,6 +48593,7 @@ cont { scale: 14 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48450,6 +48617,7 @@ cont { scale: 15 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48473,6 +48641,7 @@ cont { scale: 16 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48496,6 +48665,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48519,6 +48689,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48542,6 +48713,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48568,6 +48740,7 @@ cont { scale: 13 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48592,6 +48765,7 @@ cont { scale: 14 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48615,6 +48789,7 @@ cont { scale: 15 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48638,6 +48813,7 @@ cont { scale: 16 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48661,6 +48837,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48684,6 +48861,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48707,6 +48885,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48733,6 +48912,7 @@ cont { scale: 13 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48757,6 +48937,7 @@ cont { scale: 14 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48780,6 +48961,7 @@ cont { scale: 15 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48803,6 +48985,7 @@ cont { scale: 16 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48826,6 +49009,7 @@ cont { scale: 17 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48849,6 +49033,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48872,6 +49057,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48898,6 +49084,7 @@ cont { scale: 13 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48922,6 +49109,7 @@ cont { scale: 14 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48945,6 +49133,7 @@ cont { scale: 15 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48968,6 +49157,7 @@ cont { scale: 16 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48991,6 +49181,7 @@ cont { scale: 17 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49014,6 +49205,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49037,6 +49229,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49063,6 +49256,7 @@ cont { scale: 13 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49087,6 +49281,7 @@ cont { scale: 14 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49110,6 +49305,7 @@ cont { scale: 15 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49133,6 +49329,7 @@ cont { scale: 16 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49156,6 +49353,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49179,6 +49377,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49202,6 +49401,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49228,6 +49428,7 @@ cont { scale: 13 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49252,6 +49453,7 @@ cont { scale: 14 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49275,6 +49477,7 @@ cont { scale: 15 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49298,6 +49501,7 @@ cont { scale: 16 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49321,6 +49525,7 @@ cont { scale: 17 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49344,6 +49549,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49367,6 +49573,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49393,6 +49600,7 @@ cont { scale: 13 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49417,6 +49625,7 @@ cont { scale: 14 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49440,6 +49649,7 @@ cont { scale: 15 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49463,6 +49673,7 @@ cont { scale: 16 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49486,6 +49697,7 @@ cont { scale: 17 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49509,6 +49721,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49532,6 +49745,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49558,6 +49772,7 @@ cont { scale: 13 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49582,6 +49797,7 @@ cont { scale: 14 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49605,6 +49821,7 @@ cont { scale: 15 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49628,6 +49845,7 @@ cont { scale: 16 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49651,6 +49869,7 @@ cont { scale: 17 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49674,6 +49893,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49697,6 +49917,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49723,6 +49944,7 @@ cont { scale: 13 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49747,6 +49969,7 @@ cont { scale: 14 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49770,6 +49993,7 @@ cont { scale: 15 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49793,6 +50017,7 @@ cont { scale: 16 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49816,6 +50041,7 @@ cont { scale: 17 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49839,6 +50065,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49862,6 +50089,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49888,6 +50116,7 @@ cont { scale: 13 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49912,6 +50141,7 @@ cont { scale: 14 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49935,6 +50165,7 @@ cont { scale: 15 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49958,6 +50189,7 @@ cont { scale: 16 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49981,6 +50213,7 @@ cont { scale: 17 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50004,6 +50237,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50027,6 +50261,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50053,6 +50288,7 @@ cont { scale: 13 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50077,6 +50313,7 @@ cont { scale: 14 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50100,6 +50337,7 @@ cont { scale: 15 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50123,6 +50361,7 @@ cont { scale: 16 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50146,6 +50385,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50169,6 +50409,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50192,6 +50433,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50218,6 +50460,7 @@ cont { scale: 13 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50242,6 +50485,7 @@ cont { scale: 14 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50265,6 +50509,7 @@ cont { scale: 15 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50288,6 +50533,7 @@ cont { scale: 16 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50311,6 +50557,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50334,6 +50581,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50357,6 +50605,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50383,6 +50632,7 @@ cont { scale: 13 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50407,6 +50657,7 @@ cont { scale: 14 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50430,6 +50681,7 @@ cont { scale: 15 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50453,6 +50705,7 @@ cont { scale: 16 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50476,6 +50729,7 @@ cont { scale: 17 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50499,6 +50753,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50522,6 +50777,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50548,6 +50804,7 @@ cont { scale: 13 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50572,6 +50829,7 @@ cont { scale: 14 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50595,6 +50853,7 @@ cont { scale: 15 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50618,6 +50877,7 @@ cont { scale: 16 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50641,6 +50901,7 @@ cont { scale: 17 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50664,6 +50925,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50687,6 +50949,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50713,6 +50976,7 @@ cont { scale: 13 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50737,6 +51001,7 @@ cont { scale: 14 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50760,6 +51025,7 @@ cont { scale: 15 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50783,6 +51049,7 @@ cont { scale: 16 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50806,6 +51073,7 @@ cont { scale: 17 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50829,6 +51097,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50852,6 +51121,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50878,6 +51148,7 @@ cont { scale: 13 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50902,6 +51173,7 @@ cont { scale: 14 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50925,6 +51197,7 @@ cont { scale: 15 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50948,6 +51221,7 @@ cont { scale: 16 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50971,6 +51245,7 @@ cont { scale: 17 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50994,6 +51269,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51017,6 +51293,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51043,6 +51320,7 @@ cont { scale: 13 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51067,6 +51345,7 @@ cont { scale: 14 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51090,6 +51369,7 @@ cont { scale: 15 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51113,6 +51393,7 @@ cont { scale: 16 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51134,6 +51415,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51155,6 +51437,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51176,6 +51459,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51200,6 +51484,7 @@ cont { scale: 13 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51224,6 +51509,7 @@ cont { scale: 14 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51247,6 +51533,7 @@ cont { scale: 15 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51270,6 +51557,7 @@ cont { scale: 16 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51293,6 +51581,7 @@ cont { scale: 17 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51316,6 +51605,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51339,6 +51629,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51365,6 +51656,7 @@ cont { scale: 11 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51373,6 +51665,7 @@ cont { scale: 12 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51397,6 +51690,7 @@ cont { scale: 13 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51421,6 +51715,7 @@ cont { scale: 14 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51444,6 +51739,7 @@ cont { scale: 15 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51467,6 +51763,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51490,6 +51787,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51513,6 +51811,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51536,6 +51835,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51562,6 +51862,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51586,6 +51887,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51609,6 +51911,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51632,6 +51935,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51655,6 +51959,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51678,6 +51983,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51701,6 +52007,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51727,6 +52034,7 @@ cont { scale: 13 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51751,6 +52059,7 @@ cont { scale: 14 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51774,6 +52083,7 @@ cont { scale: 15 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51797,6 +52107,7 @@ cont { scale: 16 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51820,6 +52131,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51843,6 +52155,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51866,6 +52179,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51892,6 +52206,7 @@ cont { scale: 13 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51916,6 +52231,7 @@ cont { scale: 14 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51939,6 +52255,7 @@ cont { scale: 15 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51962,6 +52279,7 @@ cont { scale: 16 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51985,6 +52303,7 @@ cont { scale: 17 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52008,6 +52327,7 @@ cont { scale: 18 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52031,6 +52351,7 @@ cont { scale: 19 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52057,6 +52378,7 @@ cont { scale: 13 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52081,6 +52403,7 @@ cont { scale: 14 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52104,6 +52427,7 @@ cont { scale: 15 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52127,6 +52451,7 @@ cont { scale: 16 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52150,6 +52475,7 @@ cont { scale: 17 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52173,6 +52499,7 @@ cont { scale: 18 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52196,6 +52523,7 @@ cont { scale: 19 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52222,6 +52550,7 @@ cont { scale: 13 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52246,6 +52575,7 @@ cont { scale: 14 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52269,6 +52599,7 @@ cont { scale: 15 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52292,6 +52623,7 @@ cont { scale: 16 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52315,6 +52647,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52338,6 +52671,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52361,6 +52695,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52387,6 +52722,7 @@ cont { scale: 13 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52411,6 +52747,7 @@ cont { scale: 14 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52434,6 +52771,7 @@ cont { scale: 15 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52457,6 +52795,7 @@ cont { scale: 16 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52480,6 +52819,7 @@ cont { scale: 17 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52503,6 +52843,7 @@ cont { scale: 18 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52526,6 +52867,7 @@ cont { scale: 19 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52552,6 +52894,7 @@ cont { scale: 13 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52576,6 +52919,7 @@ cont { scale: 14 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52599,6 +52943,7 @@ cont { scale: 15 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52622,6 +52967,7 @@ cont { scale: 16 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52645,6 +52991,7 @@ cont { scale: 17 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52668,6 +53015,7 @@ cont { scale: 18 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52691,6 +53039,7 @@ cont { scale: 19 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52717,6 +53066,7 @@ cont { scale: 13 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52741,6 +53091,7 @@ cont { scale: 14 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52764,6 +53115,7 @@ cont { scale: 15 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52787,6 +53139,7 @@ cont { scale: 16 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52810,6 +53163,7 @@ cont { scale: 17 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52833,6 +53187,7 @@ cont { scale: 18 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52856,6 +53211,7 @@ cont { scale: 19 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52882,6 +53238,7 @@ cont { scale: 13 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52906,6 +53263,7 @@ cont { scale: 14 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52929,6 +53287,7 @@ cont { scale: 15 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52952,6 +53311,7 @@ cont { scale: 16 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52975,6 +53335,7 @@ cont { scale: 17 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52998,6 +53359,7 @@ cont { scale: 18 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53021,6 +53383,7 @@ cont { scale: 19 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53047,6 +53410,7 @@ cont { scale: 13 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53071,6 +53435,7 @@ cont { scale: 14 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53094,6 +53459,7 @@ cont { scale: 15 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53117,6 +53483,7 @@ cont { scale: 16 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53140,6 +53507,7 @@ cont { scale: 17 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53163,6 +53531,7 @@ cont { scale: 18 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53186,6 +53555,7 @@ cont { scale: 19 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53212,6 +53582,7 @@ cont { scale: 13 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53236,6 +53607,7 @@ cont { scale: 14 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53259,6 +53631,7 @@ cont { scale: 15 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53282,6 +53655,7 @@ cont { scale: 16 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53305,6 +53679,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53328,6 +53703,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53351,6 +53727,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53377,6 +53754,7 @@ cont { scale: 13 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53401,6 +53779,7 @@ cont { scale: 14 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53424,6 +53803,7 @@ cont { scale: 15 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53447,6 +53827,7 @@ cont { scale: 16 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53470,6 +53851,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53493,6 +53875,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53516,6 +53899,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53542,6 +53926,7 @@ cont { scale: 13 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53566,6 +53951,7 @@ cont { scale: 14 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53589,6 +53975,7 @@ cont { scale: 15 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53612,6 +53999,7 @@ cont { scale: 16 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53635,6 +54023,7 @@ cont { scale: 17 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53658,6 +54047,7 @@ cont { scale: 18 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53681,6 +54071,7 @@ cont { scale: 19 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53707,6 +54098,7 @@ cont { scale: 13 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53731,6 +54123,7 @@ cont { scale: 14 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53754,6 +54147,7 @@ cont { scale: 15 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53777,6 +54171,7 @@ cont { scale: 16 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53800,6 +54195,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53823,6 +54219,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53846,6 +54243,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53872,6 +54270,7 @@ cont { scale: 13 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53896,6 +54295,7 @@ cont { scale: 14 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53919,6 +54319,7 @@ cont { scale: 15 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53942,6 +54343,7 @@ cont { scale: 16 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53965,6 +54367,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -53986,6 +54389,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -54007,6 +54411,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -54031,6 +54436,7 @@ cont { scale: 13 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54055,6 +54461,7 @@ cont { scale: 14 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54078,6 +54485,7 @@ cont { scale: 15 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54101,6 +54509,7 @@ cont { scale: 16 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54124,6 +54533,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54147,6 +54557,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54170,6 +54581,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54196,6 +54608,7 @@ cont { scale: 13 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54220,6 +54633,7 @@ cont { scale: 14 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54243,6 +54657,7 @@ cont { scale: 15 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54266,6 +54681,7 @@ cont { scale: 16 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54289,6 +54705,7 @@ cont { scale: 17 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54312,6 +54729,7 @@ cont { scale: 18 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54335,6 +54753,7 @@ cont { scale: 19 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54361,6 +54780,7 @@ cont { scale: 13 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54385,6 +54805,7 @@ cont { scale: 14 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54408,6 +54829,7 @@ cont { scale: 15 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54431,6 +54853,7 @@ cont { scale: 16 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54454,6 +54877,7 @@ cont { scale: 17 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54477,6 +54901,7 @@ cont { scale: 18 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54500,6 +54925,7 @@ cont { scale: 19 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54526,6 +54952,7 @@ cont { scale: 13 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54550,6 +54977,7 @@ cont { scale: 14 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54573,6 +55001,7 @@ cont { scale: 15 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54596,6 +55025,7 @@ cont { scale: 16 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54619,6 +55049,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54642,6 +55073,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54665,6 +55097,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54691,6 +55124,7 @@ cont { scale: 13 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54715,6 +55149,7 @@ cont { scale: 14 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54738,6 +55173,7 @@ cont { scale: 15 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54761,6 +55197,7 @@ cont { scale: 16 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54784,6 +55221,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54807,6 +55245,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54830,6 +55269,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54856,6 +55296,7 @@ cont { scale: 13 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54880,6 +55321,7 @@ cont { scale: 14 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54903,6 +55345,7 @@ cont { scale: 15 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54926,6 +55369,7 @@ cont { scale: 16 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54949,6 +55393,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54972,6 +55417,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54995,6 +55441,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55021,6 +55468,7 @@ cont { scale: 13 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55045,6 +55493,7 @@ cont { scale: 14 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55068,6 +55517,7 @@ cont { scale: 15 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55091,6 +55541,7 @@ cont { scale: 16 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55114,6 +55565,7 @@ cont { scale: 17 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55137,6 +55589,7 @@ cont { scale: 18 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55160,6 +55613,7 @@ cont { scale: 19 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55186,6 +55640,7 @@ cont { scale: 13 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55210,6 +55665,7 @@ cont { scale: 14 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55233,6 +55689,7 @@ cont { scale: 15 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55256,6 +55713,7 @@ cont { scale: 16 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55279,6 +55737,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55302,6 +55761,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55325,6 +55785,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55351,6 +55812,7 @@ cont { scale: 13 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55375,6 +55837,7 @@ cont { scale: 14 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55398,6 +55861,7 @@ cont { scale: 15 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55421,6 +55885,7 @@ cont { scale: 16 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55444,6 +55909,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55467,6 +55933,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55490,6 +55957,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55516,6 +55984,7 @@ cont { scale: 13 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55540,6 +56009,7 @@ cont { scale: 14 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55563,6 +56033,7 @@ cont { scale: 15 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55586,6 +56057,7 @@ cont { scale: 16 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55609,6 +56081,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55632,6 +56105,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55655,6 +56129,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55681,6 +56156,7 @@ cont { scale: 13 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55705,6 +56181,7 @@ cont { scale: 14 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55728,6 +56205,7 @@ cont { scale: 15 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55751,6 +56229,7 @@ cont { scale: 16 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55774,6 +56253,7 @@ cont { scale: 17 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55797,6 +56277,7 @@ cont { scale: 18 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55820,6 +56301,7 @@ cont { scale: 19 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55846,6 +56328,7 @@ cont { scale: 11 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55854,6 +56337,7 @@ cont { scale: 12 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55877,6 +56361,7 @@ cont { scale: 13 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55900,6 +56385,7 @@ cont { scale: 14 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55923,6 +56409,7 @@ cont { scale: 15 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55946,6 +56433,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55969,6 +56457,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55992,6 +56481,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56015,6 +56505,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56041,6 +56532,7 @@ cont { scale: 13 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56065,6 +56557,7 @@ cont { scale: 14 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56088,6 +56581,7 @@ cont { scale: 15 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56111,6 +56605,7 @@ cont { scale: 16 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56134,6 +56629,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56157,6 +56653,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56180,6 +56677,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56206,6 +56704,7 @@ cont { scale: 13 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56230,6 +56729,7 @@ cont { scale: 14 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56253,6 +56753,7 @@ cont { scale: 15 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56276,6 +56777,7 @@ cont { scale: 16 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56299,6 +56801,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56322,6 +56825,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56345,6 +56849,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56371,6 +56876,7 @@ cont { scale: 13 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56395,6 +56901,7 @@ cont { scale: 14 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56418,6 +56925,7 @@ cont { scale: 15 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56441,6 +56949,7 @@ cont { scale: 16 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56464,6 +56973,7 @@ cont { scale: 17 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56487,6 +56997,7 @@ cont { scale: 18 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56510,6 +57021,7 @@ cont { scale: 19 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56536,6 +57048,7 @@ cont { scale: 13 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56560,6 +57073,7 @@ cont { scale: 14 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56583,6 +57097,7 @@ cont { scale: 15 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56606,6 +57121,7 @@ cont { scale: 16 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56629,6 +57145,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56652,6 +57169,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56675,6 +57193,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56701,6 +57220,7 @@ cont { scale: 13 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56725,6 +57245,7 @@ cont { scale: 14 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56748,6 +57269,7 @@ cont { scale: 15 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56771,6 +57293,7 @@ cont { scale: 16 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56794,6 +57317,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56817,6 +57341,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56840,6 +57365,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56866,6 +57392,7 @@ cont { scale: 13 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56890,6 +57417,7 @@ cont { scale: 14 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56913,6 +57441,7 @@ cont { scale: 15 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56936,6 +57465,7 @@ cont { scale: 16 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56959,6 +57489,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56982,6 +57513,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57005,6 +57537,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57031,6 +57564,7 @@ cont { scale: 13 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57055,6 +57589,7 @@ cont { scale: 14 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57078,6 +57613,7 @@ cont { scale: 15 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57101,6 +57637,7 @@ cont { scale: 16 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57124,6 +57661,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57147,6 +57685,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57170,6 +57709,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57196,6 +57736,7 @@ cont { scale: 13 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57220,6 +57761,7 @@ cont { scale: 14 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57243,6 +57785,7 @@ cont { scale: 15 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57266,6 +57809,7 @@ cont { scale: 16 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57289,6 +57833,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57312,6 +57857,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57335,6 +57881,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57361,6 +57908,7 @@ cont { scale: 13 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57385,6 +57933,7 @@ cont { scale: 14 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57408,6 +57957,7 @@ cont { scale: 15 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57431,6 +57981,7 @@ cont { scale: 16 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57454,6 +58005,7 @@ cont { scale: 17 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57477,6 +58029,7 @@ cont { scale: 18 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57500,6 +58053,7 @@ cont { scale: 19 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57526,6 +58080,7 @@ cont { scale: 13 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57550,6 +58105,7 @@ cont { scale: 14 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57573,6 +58129,7 @@ cont { scale: 15 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57596,6 +58153,7 @@ cont { scale: 16 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57619,6 +58177,7 @@ cont { scale: 17 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57642,6 +58201,7 @@ cont { scale: 18 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57665,6 +58225,7 @@ cont { scale: 19 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57691,6 +58252,7 @@ cont { scale: 13 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57715,6 +58277,7 @@ cont { scale: 14 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57738,6 +58301,7 @@ cont { scale: 15 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57761,6 +58325,7 @@ cont { scale: 16 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57784,6 +58349,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57807,6 +58373,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57830,6 +58397,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57856,6 +58424,7 @@ cont { scale: 13 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57880,6 +58449,7 @@ cont { scale: 14 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57903,6 +58473,7 @@ cont { scale: 15 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57926,6 +58497,7 @@ cont { scale: 16 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57949,6 +58521,7 @@ cont { scale: 17 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57972,6 +58545,7 @@ cont { scale: 18 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57995,6 +58569,7 @@ cont { scale: 19 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58021,6 +58596,7 @@ cont { scale: 13 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58045,6 +58621,7 @@ cont { scale: 14 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58068,6 +58645,7 @@ cont { scale: 15 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58091,6 +58669,7 @@ cont { scale: 16 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58114,6 +58693,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58137,6 +58717,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58160,6 +58741,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58186,6 +58768,7 @@ cont { scale: 13 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58210,6 +58793,7 @@ cont { scale: 14 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58233,6 +58817,7 @@ cont { scale: 15 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58256,6 +58841,7 @@ cont { scale: 16 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58279,6 +58865,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58302,6 +58889,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58325,6 +58913,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58351,6 +58940,7 @@ cont { scale: 13 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58375,6 +58965,7 @@ cont { scale: 14 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58398,6 +58989,7 @@ cont { scale: 15 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58421,6 +59013,7 @@ cont { scale: 16 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58444,6 +59037,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58467,6 +59061,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58490,6 +59085,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58885,6 +59481,7 @@ cont { scale: 17 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16000 } caption { @@ -58907,6 +59504,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16000 } caption { @@ -58929,6 +59527,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16000 } caption { @@ -58972,6 +59571,7 @@ cont { scale: 17 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16000 } caption { @@ -58994,6 +59594,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59016,6 +59617,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59059,6 +59661,7 @@ cont { scale: 17 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59081,6 +59684,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59103,6 +59707,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59146,6 +59751,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59168,6 +59774,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59190,6 +59797,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59233,6 +59841,7 @@ cont { scale: 17 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59255,6 +59864,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59277,6 +59887,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59320,6 +59931,7 @@ cont { scale: 17 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59342,6 +59954,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59364,6 +59977,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59407,6 +60021,7 @@ cont { scale: 17 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59429,6 +60044,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59451,6 +60067,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59494,6 +60111,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59516,6 +60134,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59538,6 +60157,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59581,6 +60201,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59603,6 +60224,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59625,6 +60247,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59668,6 +60291,7 @@ cont { scale: 17 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59690,6 +60314,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59712,6 +60337,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59755,6 +60381,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59777,6 +60404,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59799,6 +60427,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59842,6 +60471,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59864,6 +60494,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59886,6 +60517,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59929,6 +60561,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59951,6 +60584,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59973,6 +60607,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60016,6 +60651,7 @@ cont { scale: 17 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60038,6 +60674,7 @@ cont { scale: 18 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60060,6 +60697,7 @@ cont { scale: 19 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60103,6 +60741,7 @@ cont { scale: 17 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60125,6 +60764,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60147,6 +60787,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60190,6 +60831,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60212,6 +60854,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60234,6 +60877,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60277,6 +60921,7 @@ cont { scale: 17 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60299,6 +60944,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60321,6 +60967,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60364,6 +61011,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60386,6 +61034,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60408,6 +61057,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60451,6 +61101,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60473,6 +61124,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60495,6 +61147,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60538,6 +61191,7 @@ cont { scale: 17 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60560,6 +61214,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60582,6 +61237,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60625,6 +61281,7 @@ cont { scale: 17 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60647,6 +61304,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60669,6 +61327,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60712,6 +61371,7 @@ cont { scale: 17 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60734,6 +61394,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60756,6 +61417,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60799,6 +61461,7 @@ cont { scale: 17 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60821,6 +61484,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60843,6 +61507,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60886,6 +61551,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60908,6 +61574,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60930,6 +61597,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60973,6 +61641,7 @@ cont { scale: 17 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60995,6 +61664,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61017,6 +61687,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61060,6 +61731,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61082,6 +61754,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61104,6 +61777,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61147,6 +61821,7 @@ cont { scale: 17 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61169,6 +61844,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61191,6 +61867,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61234,6 +61911,7 @@ cont { scale: 17 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61256,6 +61934,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61278,6 +61957,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61321,6 +62001,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61343,6 +62024,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61365,6 +62047,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61408,6 +62091,7 @@ cont { scale: 17 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61430,6 +62114,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61452,6 +62137,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61495,6 +62181,7 @@ cont { scale: 17 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61517,6 +62204,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61539,6 +62227,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61582,6 +62271,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61604,6 +62294,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61626,6 +62317,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61669,6 +62361,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61691,6 +62384,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61713,6 +62407,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61756,6 +62451,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61778,6 +62474,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61800,6 +62497,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61843,6 +62541,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61865,6 +62564,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61887,6 +62587,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61930,6 +62631,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61952,6 +62654,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61974,6 +62677,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62017,6 +62721,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62039,6 +62744,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62061,6 +62767,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62104,6 +62811,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62126,6 +62834,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62148,6 +62857,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62191,6 +62901,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62213,6 +62924,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62235,6 +62947,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62278,6 +62991,7 @@ cont { scale: 17 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62300,6 +63014,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62322,6 +63037,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62365,6 +63081,7 @@ cont { scale: 17 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62387,6 +63104,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62409,6 +63127,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62452,6 +63171,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62474,6 +63194,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62496,6 +63217,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62539,6 +63261,7 @@ cont { scale: 17 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62561,6 +63284,7 @@ cont { scale: 18 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62583,6 +63307,7 @@ cont { scale: 19 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62626,6 +63351,7 @@ cont { scale: 17 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62648,6 +63374,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62670,6 +63397,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62713,6 +63441,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62735,6 +63464,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62757,6 +63487,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62800,6 +63531,7 @@ cont { scale: 17 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62822,6 +63554,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62844,6 +63577,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62887,6 +63621,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62909,6 +63644,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62931,6 +63667,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62974,6 +63711,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62996,6 +63734,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63018,6 +63757,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63061,6 +63801,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63083,6 +63824,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63105,6 +63847,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63148,6 +63891,7 @@ cont { scale: 17 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63170,6 +63914,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63192,6 +63937,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63235,6 +63981,7 @@ cont { scale: 17 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63257,6 +64004,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63279,6 +64027,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63322,6 +64071,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63344,6 +64094,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63366,6 +64117,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63409,6 +64161,7 @@ cont { scale: 17 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63431,6 +64184,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63453,6 +64207,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63496,6 +64251,7 @@ cont { scale: 17 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63518,6 +64274,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63540,6 +64297,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63583,6 +64341,7 @@ cont { scale: 17 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63605,6 +64364,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63627,6 +64387,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63670,6 +64431,7 @@ cont { scale: 17 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63692,6 +64454,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63714,6 +64477,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63757,6 +64521,7 @@ cont { scale: 17 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63779,6 +64544,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63801,6 +64567,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63844,6 +64611,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63866,6 +64634,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63888,6 +64657,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63931,6 +64701,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63953,6 +64724,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63975,6 +64747,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64018,6 +64791,7 @@ cont { scale: 17 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64040,6 +64814,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64062,6 +64837,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64105,6 +64881,7 @@ cont { scale: 17 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64127,6 +64904,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64149,6 +64927,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64192,6 +64971,7 @@ cont { scale: 17 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64214,6 +64994,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64236,6 +65017,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64279,6 +65061,7 @@ cont { scale: 17 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64301,6 +65084,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64323,6 +65107,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64366,6 +65151,7 @@ cont { scale: 17 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64389,6 +65175,7 @@ cont { scale: 18 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64412,6 +65199,7 @@ cont { scale: 19 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64456,6 +65244,7 @@ cont { scale: 17 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64478,6 +65267,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64500,6 +65290,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64525,6 +65316,7 @@ cont { scale: 16 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64548,6 +65340,7 @@ cont { scale: 17 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64571,6 +65364,7 @@ cont { scale: 18 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64594,6 +65388,7 @@ cont { scale: 19 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64638,6 +65433,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64660,6 +65456,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64682,6 +65479,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64725,6 +65523,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64747,6 +65546,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64769,6 +65569,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64812,6 +65613,7 @@ cont { scale: 17 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64834,6 +65636,7 @@ cont { scale: 18 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64856,6 +65659,7 @@ cont { scale: 19 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64899,6 +65703,7 @@ cont { scale: 17 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64921,6 +65726,7 @@ cont { scale: 18 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64943,6 +65749,7 @@ cont { scale: 19 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64986,6 +65793,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65008,6 +65816,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65030,6 +65839,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65073,6 +65883,7 @@ cont { scale: 17 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65095,6 +65906,7 @@ cont { scale: 18 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65117,6 +65929,7 @@ cont { scale: 19 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65160,6 +65973,7 @@ cont { scale: 17 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65182,6 +65996,7 @@ cont { scale: 18 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65204,6 +66019,7 @@ cont { scale: 19 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65247,6 +66063,7 @@ cont { scale: 17 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65269,6 +66086,7 @@ cont { scale: 18 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65291,6 +66109,7 @@ cont { scale: 19 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65334,6 +66153,7 @@ cont { scale: 17 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65356,6 +66176,7 @@ cont { scale: 18 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65378,6 +66199,7 @@ cont { scale: 19 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65421,6 +66243,7 @@ cont { scale: 17 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65443,6 +66266,7 @@ cont { scale: 18 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65465,6 +66289,7 @@ cont { scale: 19 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65508,6 +66333,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65530,6 +66356,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65552,6 +66379,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65595,6 +66423,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65617,6 +66446,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65639,6 +66469,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65682,6 +66513,7 @@ cont { scale: 17 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65704,6 +66536,7 @@ cont { scale: 18 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65726,6 +66559,7 @@ cont { scale: 19 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65769,6 +66603,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65791,6 +66626,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65813,6 +66649,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65856,6 +66693,7 @@ cont { scale: 17 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65878,6 +66716,7 @@ cont { scale: 18 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65900,6 +66739,7 @@ cont { scale: 19 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65943,6 +66783,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65965,6 +66806,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65987,6 +66829,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66030,6 +66873,7 @@ cont { scale: 17 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66052,6 +66896,7 @@ cont { scale: 18 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66074,6 +66919,7 @@ cont { scale: 19 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66117,6 +66963,7 @@ cont { scale: 17 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66139,6 +66986,7 @@ cont { scale: 18 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66161,6 +67009,7 @@ cont { scale: 19 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66204,6 +67053,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66226,6 +67076,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66248,6 +67099,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66291,6 +67143,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66313,6 +67166,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66335,6 +67189,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66378,6 +67233,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66400,6 +67256,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66422,6 +67279,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66465,6 +67323,7 @@ cont { scale: 17 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66487,6 +67346,7 @@ cont { scale: 18 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66509,6 +67369,7 @@ cont { scale: 19 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66552,6 +67413,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66574,6 +67436,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66596,6 +67459,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66639,6 +67503,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66661,6 +67526,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66683,6 +67549,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66726,6 +67593,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66748,6 +67616,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66770,6 +67639,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66813,6 +67683,7 @@ cont { scale: 17 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66835,6 +67706,7 @@ cont { scale: 18 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66857,6 +67729,7 @@ cont { scale: 19 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66882,6 +67755,7 @@ cont { scale: 16 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66905,6 +67779,7 @@ cont { scale: 17 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66928,6 +67803,7 @@ cont { scale: 18 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66951,6 +67827,7 @@ cont { scale: 19 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66995,6 +67872,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67017,6 +67895,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67039,6 +67918,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67082,6 +67962,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67104,6 +67985,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67126,6 +68008,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67169,6 +68052,7 @@ cont { scale: 17 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67191,6 +68075,7 @@ cont { scale: 18 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67213,6 +68098,7 @@ cont { scale: 19 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67256,6 +68142,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67278,6 +68165,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67300,6 +68188,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67343,6 +68232,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67365,6 +68255,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67387,6 +68278,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67430,6 +68322,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67452,6 +68345,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67474,6 +68368,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67517,6 +68412,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67539,6 +68435,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67561,6 +68458,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67604,6 +68502,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67626,6 +68525,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67648,6 +68548,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67691,6 +68592,7 @@ cont { scale: 17 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67713,6 +68615,7 @@ cont { scale: 18 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67735,6 +68638,7 @@ cont { scale: 19 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67778,6 +68682,7 @@ cont { scale: 17 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67800,6 +68705,7 @@ cont { scale: 18 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67822,6 +68728,7 @@ cont { scale: 19 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67865,6 +68772,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67887,6 +68795,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67909,6 +68818,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67952,6 +68862,7 @@ cont { scale: 17 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67974,6 +68885,7 @@ cont { scale: 18 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67996,6 +68908,7 @@ cont { scale: 19 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68039,6 +68952,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68061,6 +68975,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68083,6 +68998,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68126,6 +69042,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68148,6 +69065,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68170,6 +69088,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68213,6 +69132,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68235,6 +69155,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68257,6 +69178,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68729,7 +69651,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -68746,7 +69668,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -68763,7 +69685,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -68771,7 +69693,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -68796,7 +69718,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -68804,7 +69726,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -68829,7 +69751,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -68837,7 +69759,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -68862,7 +69784,7 @@ cont { color: 8421504 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -68870,7 +69792,7 @@ cont { color: 15066325 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69476,6 +70398,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69492,6 +70415,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69508,6 +70432,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69524,6 +70449,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69540,6 +70466,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69559,6 +70486,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69575,6 +70503,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69591,6 +70520,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69607,6 +70537,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69623,6 +70554,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69642,6 +70574,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69658,6 +70591,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69674,6 +70608,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69690,6 +70625,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69706,6 +70642,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69725,6 +70662,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69741,6 +70679,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69757,6 +70696,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69773,6 +70713,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69789,6 +70730,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69808,6 +70750,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69824,6 +70767,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69840,6 +70784,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69856,6 +70801,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69872,6 +70818,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70140,6 +71087,7 @@ cont { scale: 15 symbol { name: "gallery-m" + apply_for_type: 1 priority: 16800 min_distance: 8 } @@ -70397,6 +71345,7 @@ cont { scale: 14 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70405,6 +71354,7 @@ cont { scale: 15 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70421,6 +71371,7 @@ cont { scale: 16 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70437,6 +71388,7 @@ cont { scale: 17 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70453,6 +71405,7 @@ cont { scale: 18 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70469,6 +71422,7 @@ cont { scale: 19 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -71021,6 +71975,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -71028,6 +71983,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -71035,6 +71991,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -71042,6 +71999,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index c7bca4f49e..bd8a523848 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 308a6d4067..6dfd2b15b6 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -4,66 +4,122 @@ cont { scale: 10 area { color: 1775649 - priority: -15989 + priority: -15083 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 15917 } } element { scale: 11 area { color: 1775649 - priority: -15989 + priority: -15083 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 15917 } } element { scale: 12 area { color: 1775649 - priority: -15989 + priority: -15083 + } + symbol { + name: "airport-m" + priority: 3100 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + text: "int_name" + } + priority: 15917 } } element { scale: 13 area { color: 1775649 - priority: -15989 + priority: -15083 + } + symbol { + name: "airport-m" + priority: 3100 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + text: "int_name" + } + priority: 15917 } } element { scale: 14 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { - height: 12 + height: 11 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 10 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 15 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -79,18 +135,18 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 16 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -106,88 +162,88 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 17 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 18 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 19 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } } @@ -197,32 +253,32 @@ cont { scale: 7 symbol { name: "airport-s" - priority: 16011 + priority: 10000 } } element { scale: 8 symbol { name: "airport-s" - priority: 16011 + priority: 10000 } } element { scale: 9 symbol { name: "airport-s" - priority: 16011 + priority: 10000 } } element { scale: 10 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-s" - priority: 16011 + priority: 16917 } caption { primary { @@ -231,18 +287,18 @@ cont { stroke_color: 1292964096 offset_y: 1 } - priority: 15011 + priority: 15917 } } element { scale: 11 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { @@ -251,18 +307,18 @@ cont { stroke_color: 1292964096 offset_y: 1 } - priority: 15011 + priority: 15917 } } element { scale: 12 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { @@ -278,18 +334,18 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 13 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { @@ -305,45 +361,45 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 14 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 3100 } caption { primary { - height: 12 + height: 11 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 10 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 15 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -359,18 +415,18 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 16 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { @@ -386,88 +442,88 @@ cont { offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 17 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 18 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } element { scale: 19 area { color: 1775649 - priority: -15989 + priority: -15083 } symbol { name: "airport-m" - priority: 16011 + priority: 16917 } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 1 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 1 text: "int_name" } - priority: 15011 + priority: 15917 } } } @@ -848,6 +904,7 @@ cont { scale: 18 symbol { name: "car-wash-m" + apply_for_type: 1 priority: 16752 } caption { @@ -863,6 +920,7 @@ cont { scale: 19 symbol { name: "car-wash-m" + apply_for_type: 1 priority: 16752 } caption { @@ -1401,6 +1459,7 @@ cont { scale: 15 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 min_distance: 10 } @@ -1417,6 +1476,7 @@ cont { scale: 16 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 min_distance: 8 } @@ -1433,6 +1493,7 @@ cont { scale: 17 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 min_distance: 14 } @@ -1449,6 +1510,7 @@ cont { scale: 18 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 } caption { @@ -1464,6 +1526,7 @@ cont { scale: 19 symbol { name: "hospital-m" + apply_for_type: 1 priority: 16000 } caption { @@ -2040,11 +2103,11 @@ cont { scale: 17 area { color: 2038026 - priority: -15953 + priority: -15942 } symbol { name: "zero-icon" - priority: 16047 + priority: 16058 min_distance: 7 } caption { @@ -2135,11 +2198,11 @@ cont { scale: 17 area { color: 2038026 - priority: -15953 + priority: -15942 } symbol { name: "zero-icon" - priority: 16047 + priority: 16058 min_distance: 7 } caption { @@ -4047,6 +4110,7 @@ cont { scale: 15 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4062,6 +4126,7 @@ cont { scale: 16 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4077,6 +4142,7 @@ cont { scale: 17 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4092,6 +4158,7 @@ cont { scale: 18 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -4107,6 +4174,7 @@ cont { scale: 19 symbol { name: "bcontrol-m" + apply_for_type: 1 priority: 16870 } caption { @@ -5887,6 +5955,7 @@ cont { scale: 14 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5895,6 +5964,7 @@ cont { scale: 15 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5903,6 +5973,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5911,6 +5982,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5919,6 +5991,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -5927,6 +6000,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16000 min_distance: 20 } @@ -7570,7 +7644,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 color: 855309 dashdot { } @@ -7841,7 +7915,7 @@ cont { cap: BUTTCAP } lines { - width: 4.27 + width: 4.2700000000000005 color: 855309 dashdot { } @@ -8185,7 +8259,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 dashdot { dd: 5.0 dd: 5.0 @@ -8401,7 +8475,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8413,7 +8486,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8440,7 +8512,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8452,7 +8523,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8479,7 +8549,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8491,7 +8560,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8518,7 +8586,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8530,7 +8597,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8557,7 +8623,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8569,7 +8634,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8596,7 +8660,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8608,7 +8671,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8635,7 +8697,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8647,7 +8708,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8674,7 +8734,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8686,7 +8745,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8713,7 +8771,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8725,7 +8782,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8752,7 +8808,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8764,7 +8819,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8791,7 +8845,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8803,7 +8856,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -8830,7 +8882,6 @@ cont { scale: 18 lines { width: 1.1 - color: 9718290 dashdot { dd: 3.5 dd: 2.0 @@ -8842,7 +8893,6 @@ cont { scale: 19 lines { width: 1.5 - color: 9718290 dashdot { dd: 4.0 dd: 2.5 @@ -9288,7 +9338,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 color: 855309 dashdot { } @@ -9640,7 +9690,7 @@ cont { cap: BUTTCAP } lines { - width: 5.8 + width: 5.800000000000001 color: 855309 dashdot { } @@ -10025,7 +10075,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 dashdot { dd: 5.0 dd: 5.0 @@ -10271,7 +10321,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 color: 855309 dashdot { } @@ -10544,7 +10594,7 @@ cont { cap: BUTTCAP } lines { - width: 5.8 + width: 5.800000000000001 color: 855309 dashdot { } @@ -10850,7 +10900,7 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 5.800000000000001 dashdot { dd: 5.0 dd: 5.0 @@ -12334,7 +12384,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 855309 dashdot { } @@ -12634,7 +12684,7 @@ cont { cap: BUTTCAP } lines { - width: 3.9 + width: 3.9000000000000004 color: 855309 dashdot { } @@ -12998,7 +13048,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 855309 dashdot { } @@ -13199,7 +13249,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 855309 dashdot { } @@ -13348,7 +13398,7 @@ cont { cap: BUTTCAP } lines { - width: 3.9 + width: 3.9000000000000004 color: 855309 dashdot { } @@ -13561,7 +13611,7 @@ cont { element { scale: 14 lines { - width: 3.9 + width: 3.9000000000000004 color: 855309 dashdot { } @@ -13948,91 +13998,6 @@ cont { } } } -cont { - name: "highway-service-busway" - element { - scale: 14 - lines { - width: 1.0 - color: 3354929 - priority: 1364 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 3354929 - priority: 1364 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 3354929 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16364 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 3354929 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16364 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 3354929 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16364 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 3354929 - priority: 1364 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16364 - } - } -} cont { name: "highway-service-driveway" element { @@ -14285,6 +14250,7 @@ cont { scale: 13 symbol { name: "speedcam-s" + apply_for_type: 1 priority: 16976 } } @@ -14292,6 +14258,7 @@ cont { scale: 14 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14299,6 +14266,7 @@ cont { scale: 15 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14306,6 +14274,7 @@ cont { scale: 16 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14313,6 +14282,7 @@ cont { scale: 17 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14320,6 +14290,7 @@ cont { scale: 18 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -14327,6 +14298,7 @@ cont { scale: 19 symbol { name: "speedcam-m" + apply_for_type: 1 priority: 16976 } } @@ -15592,7 +15564,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15604,7 +15575,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15616,7 +15586,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15643,7 +15612,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15655,7 +15623,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15667,7 +15634,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15694,7 +15660,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15706,7 +15671,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15718,7 +15682,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15771,7 +15734,7 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 + color: 5064516 dashdot { dd: 6.0 dd: 2.5 @@ -15783,7 +15746,7 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 + color: 5064516 dashdot { dd: 7.0 dd: 3.0 @@ -15795,7 +15758,7 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 + color: 5064516 dashdot { dd: 7.0 dd: 3.0 @@ -15822,7 +15785,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15834,7 +15796,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15846,7 +15807,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15873,7 +15833,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15885,7 +15844,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15897,7 +15855,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15924,7 +15881,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15936,7 +15892,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15948,7 +15903,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15975,7 +15929,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -15987,7 +15940,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -15999,7 +15951,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -16026,7 +15977,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -16038,7 +15988,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -16050,7 +15999,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -16077,7 +16025,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -16089,7 +16036,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -16101,7 +16047,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -16128,7 +16073,6 @@ cont { scale: 17 lines { width: 1.4 - color: 6247213 dashdot { dd: 6.0 dd: 2.5 @@ -16140,7 +16084,6 @@ cont { scale: 18 lines { width: 1.9 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -16152,7 +16095,6 @@ cont { scale: 19 lines { width: 2.5 - color: 6247213 dashdot { dd: 7.0 dd: 3.0 @@ -17350,7 +17292,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 color: 855309 dashdot { } @@ -17621,7 +17563,7 @@ cont { cap: BUTTCAP } lines { - width: 4.27 + width: 4.2700000000000005 color: 855309 dashdot { } @@ -17965,7 +17907,7 @@ cont { element { scale: 14 lines { - width: 4.27 + width: 4.2700000000000005 dashdot { dd: 5.0 dd: 5.0 @@ -22011,25 +21953,25 @@ cont { scale: 10 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22039,7 +21981,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22047,7 +21989,7 @@ cont { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22055,11 +21997,11 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22069,7 +22011,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22077,7 +22019,7 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22085,11 +22027,11 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22099,7 +22041,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22107,7 +22049,7 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22115,11 +22057,11 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22129,7 +22071,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22137,7 +22079,7 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22145,11 +22087,11 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22159,7 +22101,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22167,7 +22109,7 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22175,11 +22117,11 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22189,7 +22131,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22197,7 +22139,7 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22205,11 +22147,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22225,7 +22167,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22233,11 +22175,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22245,11 +22187,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22265,7 +22207,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22273,11 +22215,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22288,25 +22230,25 @@ cont { scale: 10 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22316,7 +22258,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22324,7 +22266,7 @@ cont { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22332,11 +22274,11 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22346,7 +22288,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22354,7 +22296,7 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22362,11 +22304,11 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22376,7 +22318,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22384,7 +22326,7 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22392,11 +22334,11 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22406,7 +22348,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22414,7 +22356,7 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22422,11 +22364,11 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22436,7 +22378,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22444,7 +22386,7 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22452,11 +22394,11 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22466,7 +22408,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22474,7 +22416,7 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22482,11 +22424,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22502,7 +22444,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22510,11 +22452,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22522,11 +22464,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22542,7 +22484,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22550,11 +22492,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22565,25 +22507,25 @@ cont { scale: 10 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22593,7 +22535,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22601,7 +22543,7 @@ cont { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22609,11 +22551,11 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22623,7 +22565,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22631,7 +22573,7 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22639,11 +22581,11 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22653,7 +22595,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22661,7 +22603,7 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22669,11 +22611,11 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22683,7 +22625,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22691,7 +22633,7 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22699,11 +22641,11 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22713,7 +22655,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22721,7 +22663,7 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22729,11 +22671,11 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22743,7 +22685,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22751,7 +22693,7 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22759,11 +22701,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22779,7 +22721,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22787,11 +22729,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22799,11 +22741,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22819,7 +22761,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22827,11 +22769,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -22842,25 +22784,25 @@ cont { scale: 10 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 11 area { color: 593674 - priority: -15918 + priority: -15906 } } element { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22870,7 +22812,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22878,7 +22820,7 @@ cont { scale: 12 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22886,11 +22828,11 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-s" - priority: 16082 + priority: 16094 min_distance: 12 } caption { @@ -22900,7 +22842,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22908,7 +22850,7 @@ cont { scale: 13 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22916,11 +22858,11 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22930,7 +22872,7 @@ cont { stroke_color: 1074860288 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22938,7 +22880,7 @@ cont { scale: 14 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22946,11 +22888,11 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22960,7 +22902,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22968,7 +22910,7 @@ cont { scale: 15 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -22976,11 +22918,11 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -22990,7 +22932,7 @@ cont { stroke_color: 655429888 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -22998,7 +22940,7 @@ cont { scale: 16 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -23006,11 +22948,11 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -23020,7 +22962,7 @@ cont { stroke_color: 437326080 offset_y: 1 } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -23028,7 +22970,7 @@ cont { scale: 17 area { color: 593674 - priority: -15918 + priority: -15906 } apply_if: "!name" } @@ -23036,11 +22978,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -23056,7 +22998,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -23064,11 +23006,11 @@ cont { scale: 18 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -23076,11 +23018,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-outline-m" - priority: 16082 + priority: 16094 min_distance: 8 } caption { @@ -23096,7 +23038,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15082 + priority: 15094 } apply_if: "name" } @@ -23104,11 +23046,11 @@ cont { scale: 19 area { color: 593674 - priority: -15918 + priority: -15906 } symbol { name: "nparkf-m" - priority: 16082 + priority: 16094 } apply_if: "!name" } @@ -24118,42 +24060,42 @@ cont { scale: 17 area { color: 2787649562 - priority: -15989 + priority: -15942 } caption { primary { height: 10 color: 6710886 } - priority: 15011 + priority: 15058 } } element { scale: 18 area { color: 2787649562 - priority: -15989 + priority: -15942 } caption { primary { height: 10 color: 6710886 } - priority: 15011 + priority: 15058 } } element { scale: 19 area { color: 2787649562 - priority: -15989 + priority: -15942 } caption { primary { height: 10 color: 6710886 } - priority: 15011 + priority: 15058 } } } @@ -24163,56 +24105,56 @@ cont { scale: 12 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } } } @@ -24222,56 +24164,56 @@ cont { scale: 12 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } } } @@ -24505,39 +24447,39 @@ cont { scale: 10 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24547,7 +24489,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24555,7 +24497,7 @@ cont { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24563,11 +24505,11 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24577,7 +24519,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24585,7 +24527,7 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24593,11 +24535,11 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24607,7 +24549,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24615,7 +24557,7 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24623,11 +24565,11 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24637,7 +24579,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24645,7 +24587,7 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24653,11 +24595,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24673,7 +24615,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24681,11 +24623,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24693,11 +24635,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24713,7 +24655,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24721,11 +24663,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24736,39 +24678,39 @@ cont { scale: 10 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24778,7 +24720,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24786,7 +24728,7 @@ cont { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24794,11 +24736,11 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24808,7 +24750,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24816,7 +24758,7 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24824,11 +24766,11 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24838,7 +24780,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24846,7 +24788,7 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24854,11 +24796,11 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24868,7 +24810,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24876,7 +24818,7 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -24884,11 +24826,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24904,7 +24846,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24912,11 +24854,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24924,11 +24866,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -24944,7 +24886,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -24952,11 +24894,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -24967,39 +24909,39 @@ cont { scale: 10 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25009,7 +24951,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25017,7 +24959,7 @@ cont { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25025,11 +24967,11 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25039,7 +24981,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25047,7 +24989,7 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25055,11 +24997,11 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25069,7 +25011,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25077,7 +25019,7 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25085,11 +25027,11 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25099,7 +25041,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25107,7 +25049,7 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25115,11 +25057,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25135,7 +25077,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25143,11 +25085,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -25155,11 +25097,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25175,7 +25117,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25183,11 +25125,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -25198,39 +25140,39 @@ cont { scale: 10 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 11 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 12 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 13 area { color: 593674 - priority: -15906 + priority: -15895 } } element { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25240,7 +25182,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25248,7 +25190,7 @@ cont { scale: 14 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25256,11 +25198,11 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25270,7 +25212,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25278,7 +25220,7 @@ cont { scale: 15 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25286,11 +25228,11 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25300,7 +25242,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25308,7 +25250,7 @@ cont { scale: 16 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25316,11 +25258,11 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25330,7 +25272,7 @@ cont { stroke_color: 856756497 offset_y: 1 } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25338,7 +25280,7 @@ cont { scale: 17 area { color: 593674 - priority: -15906 + priority: -15895 } apply_if: "!name" } @@ -25346,11 +25288,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25366,7 +25308,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25374,11 +25316,11 @@ cont { scale: 18 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -25386,11 +25328,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-outline-m" - priority: 16094 + priority: 16105 min_distance: 8 } caption { @@ -25406,7 +25348,7 @@ cont { offset_y: 1 text: "int_name" } - priority: 15094 + priority: 15105 } apply_if: "name" } @@ -25414,11 +25356,11 @@ cont { scale: 19 area { color: 593674 - priority: -15906 + priority: -15895 } symbol { name: "park-m" - priority: 16094 + priority: 16105 } apply_if: "!name" } @@ -32995,6 +32937,7 @@ cont { scale: 4 symbol { name: "star-s" + apply_for_type: 1 priority: 16647 } caption { @@ -33026,6 +32969,7 @@ cont { scale: 5 symbol { name: "star-m" + apply_for_type: 1 priority: 16647 } caption { @@ -33057,6 +33001,7 @@ cont { scale: 6 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33088,6 +33033,7 @@ cont { scale: 7 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33119,6 +33065,7 @@ cont { scale: 8 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33150,6 +33097,7 @@ cont { scale: 9 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33181,6 +33129,7 @@ cont { scale: 10 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33212,6 +33161,7 @@ cont { scale: 11 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33243,6 +33193,7 @@ cont { scale: 12 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33274,6 +33225,7 @@ cont { scale: 13 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33305,6 +33257,7 @@ cont { scale: 14 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33336,6 +33289,7 @@ cont { scale: 15 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33367,6 +33321,7 @@ cont { scale: 16 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33398,6 +33353,7 @@ cont { scale: 17 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33429,6 +33385,7 @@ cont { scale: 18 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -33460,6 +33417,7 @@ cont { scale: 19 symbol { name: "star-l" + apply_for_type: 1 priority: 16647 } caption { @@ -38587,6 +38545,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38610,6 +38569,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38633,6 +38593,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38656,6 +38617,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38679,6 +38641,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38702,6 +38665,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16894 } caption { @@ -38728,6 +38692,7 @@ cont { scale: 17 symbol { name: "railway-crossing-m" + apply_for_type: 1 priority: 16870 } } @@ -38735,6 +38700,7 @@ cont { scale: 18 symbol { name: "railway-crossing-m" + apply_for_type: 1 priority: 16870 } } @@ -38742,6 +38708,7 @@ cont { scale: 19 symbol { name: "railway-crossing-m" + apply_for_type: 1 priority: 16870 } } @@ -38862,7 +38829,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38879,7 +38846,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38896,7 +38863,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38904,7 +38871,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38929,7 +38896,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38937,7 +38904,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38962,7 +38929,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -38970,7 +38937,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -38995,7 +38962,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -39003,7 +38970,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -40112,6 +40079,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16917 } } @@ -40119,6 +40087,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40142,6 +40111,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40165,6 +40135,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40188,6 +40159,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40211,6 +40183,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40234,6 +40207,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40257,6 +40231,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40283,6 +40258,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16917 } } @@ -40290,6 +40266,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40313,6 +40290,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40336,6 +40314,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40359,6 +40338,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40382,6 +40362,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40405,6 +40386,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40428,6 +40410,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40454,6 +40437,7 @@ cont { scale: 12 symbol { name: "train-s" + apply_for_type: 1 priority: 16917 } } @@ -40461,6 +40445,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40484,6 +40469,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40507,6 +40493,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40530,6 +40517,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40553,6 +40541,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40576,6 +40565,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40599,6 +40589,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40625,6 +40616,7 @@ cont { scale: 13 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40648,6 +40640,7 @@ cont { scale: 14 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40671,6 +40664,7 @@ cont { scale: 15 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40694,6 +40688,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40717,6 +40712,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40740,6 +40736,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40763,6 +40760,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40789,6 +40787,7 @@ cont { scale: 12 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40797,6 +40796,7 @@ cont { scale: 13 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40821,6 +40821,7 @@ cont { scale: 14 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16917 } caption { @@ -40844,6 +40845,7 @@ cont { scale: 15 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40867,6 +40869,7 @@ cont { scale: 16 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40890,6 +40893,7 @@ cont { scale: 17 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40913,6 +40917,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40936,6 +40941,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16917 } caption { @@ -40962,6 +40968,7 @@ cont { scale: 12 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40970,6 +40977,7 @@ cont { scale: 13 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -40994,6 +41002,7 @@ cont { scale: 14 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41017,6 +41026,7 @@ cont { scale: 15 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41040,6 +41050,7 @@ cont { scale: 16 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41063,6 +41074,7 @@ cont { scale: 17 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41086,6 +41098,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41109,6 +41122,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41135,6 +41149,7 @@ cont { scale: 12 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41143,6 +41158,7 @@ cont { scale: 13 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41167,6 +41183,7 @@ cont { scale: 14 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41190,6 +41207,7 @@ cont { scale: 15 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41213,6 +41231,7 @@ cont { scale: 16 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41236,6 +41255,7 @@ cont { scale: 17 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41259,6 +41279,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41282,6 +41303,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41308,6 +41330,7 @@ cont { scale: 13 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41332,6 +41355,7 @@ cont { scale: 14 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41355,6 +41379,7 @@ cont { scale: 15 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41378,6 +41403,7 @@ cont { scale: 16 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41401,6 +41427,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41424,6 +41451,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41447,6 +41475,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41473,6 +41502,7 @@ cont { scale: 13 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41497,6 +41527,7 @@ cont { scale: 14 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41520,6 +41551,7 @@ cont { scale: 15 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41543,6 +41575,7 @@ cont { scale: 16 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41566,6 +41599,7 @@ cont { scale: 17 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41589,6 +41623,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41612,6 +41647,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41638,6 +41674,7 @@ cont { scale: 13 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41662,6 +41699,7 @@ cont { scale: 14 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41685,6 +41723,7 @@ cont { scale: 15 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41708,6 +41747,7 @@ cont { scale: 16 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41731,6 +41771,7 @@ cont { scale: 17 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41754,6 +41795,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41777,6 +41819,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41803,6 +41846,7 @@ cont { scale: 13 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41827,6 +41871,7 @@ cont { scale: 14 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16917 } caption { @@ -41850,6 +41895,7 @@ cont { scale: 15 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41873,6 +41919,7 @@ cont { scale: 16 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41896,6 +41943,7 @@ cont { scale: 17 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41919,6 +41967,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41942,6 +41991,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16917 } caption { @@ -41968,6 +42018,7 @@ cont { scale: 13 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -41992,6 +42043,7 @@ cont { scale: 14 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42015,6 +42067,7 @@ cont { scale: 15 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42038,6 +42091,7 @@ cont { scale: 16 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42061,6 +42115,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42084,6 +42139,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42107,6 +42163,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42133,6 +42190,7 @@ cont { scale: 13 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42157,6 +42215,7 @@ cont { scale: 14 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42180,6 +42239,7 @@ cont { scale: 15 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42203,6 +42263,7 @@ cont { scale: 16 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42226,6 +42287,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42249,6 +42311,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42272,6 +42335,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42298,6 +42362,7 @@ cont { scale: 13 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42322,6 +42387,7 @@ cont { scale: 14 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42345,6 +42411,7 @@ cont { scale: 15 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42368,6 +42435,7 @@ cont { scale: 16 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42391,6 +42459,7 @@ cont { scale: 17 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42414,6 +42483,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42437,6 +42507,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42463,6 +42534,7 @@ cont { scale: 13 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42487,6 +42559,7 @@ cont { scale: 14 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42510,6 +42583,7 @@ cont { scale: 15 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42533,6 +42607,7 @@ cont { scale: 16 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42556,6 +42631,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42579,6 +42655,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42602,6 +42679,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42628,6 +42706,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42652,6 +42731,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 } caption { @@ -42675,6 +42755,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42698,6 +42779,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42721,6 +42803,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42744,6 +42827,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42767,171 +42851,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" - priority: 16917 - } - caption { - primary { - height: 14 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - } - secondary { - height: 12 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } -} -cont { - name: "railway-station-subway-bilbao" - element { - scale: 13 - symbol { - name: "subway-bilbao-s" - priority: 16917 - min_distance: 1 - } - caption { - primary { - height: 11 - color: 8947848 - stroke_color: 1712394496 - offset_y: 1 - } - secondary { - height: 9 - color: 8947848 - stroke_color: 1712394496 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 14 - symbol { - name: "subway-bilbao-s" - priority: 16917 - } - caption { - primary { - height: 12 - color: 8947848 - stroke_color: 1292964096 - offset_y: 1 - } - secondary { - height: 10 - color: 8947848 - stroke_color: 1292964096 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 15 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 12 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - } - secondary { - height: 10 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 16 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 13 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - } - secondary { - height: 11 - color: 8947848 - stroke_color: 856756480 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 17 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 14 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - } - secondary { - height: 12 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 18 - symbol { - name: "subway-bilbao-m" - priority: 16917 - } - caption { - primary { - height: 14 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - } - secondary { - height: 12 - color: 8947848 - stroke_color: 437326080 - offset_y: 1 - text: "int_name" - } - priority: 15917 - } - } - element { - scale: 19 - symbol { - name: "subway-bilbao-m" + apply_for_type: 1 priority: 16917 } caption { @@ -42958,6 +42878,7 @@ cont { scale: 13 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -42982,6 +42903,7 @@ cont { scale: 14 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43005,6 +42927,7 @@ cont { scale: 15 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43028,6 +42951,7 @@ cont { scale: 16 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43051,6 +42975,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43074,6 +42999,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43097,6 +43023,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43123,6 +43050,7 @@ cont { scale: 13 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43147,6 +43075,7 @@ cont { scale: 14 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43170,6 +43099,7 @@ cont { scale: 15 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43193,6 +43123,7 @@ cont { scale: 16 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43216,6 +43147,7 @@ cont { scale: 17 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43239,6 +43171,7 @@ cont { scale: 18 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43262,6 +43195,7 @@ cont { scale: 19 symbol { name: "subway-brescia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43288,6 +43222,7 @@ cont { scale: 13 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43312,6 +43247,7 @@ cont { scale: 14 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43335,6 +43271,7 @@ cont { scale: 15 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43358,6 +43295,7 @@ cont { scale: 16 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43381,6 +43319,7 @@ cont { scale: 17 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43404,6 +43343,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43427,6 +43367,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43453,6 +43394,7 @@ cont { scale: 13 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43477,6 +43419,7 @@ cont { scale: 14 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43500,6 +43443,7 @@ cont { scale: 15 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43523,6 +43467,7 @@ cont { scale: 16 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43546,6 +43491,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43569,6 +43515,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43592,6 +43539,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43618,6 +43566,7 @@ cont { scale: 13 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43642,6 +43591,7 @@ cont { scale: 14 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43665,6 +43615,7 @@ cont { scale: 15 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43688,6 +43639,7 @@ cont { scale: 16 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43711,6 +43663,7 @@ cont { scale: 17 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43734,6 +43687,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43757,6 +43711,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43783,6 +43738,7 @@ cont { scale: 13 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43807,6 +43763,7 @@ cont { scale: 14 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43830,6 +43787,7 @@ cont { scale: 15 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43853,6 +43811,7 @@ cont { scale: 16 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43876,6 +43835,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43899,6 +43859,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43922,6 +43883,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16917 } caption { @@ -43948,6 +43910,7 @@ cont { scale: 13 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -43972,6 +43935,7 @@ cont { scale: 14 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16917 } caption { @@ -43995,6 +43959,7 @@ cont { scale: 15 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44018,6 +43983,7 @@ cont { scale: 16 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44041,6 +44007,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44064,6 +44031,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44087,6 +44055,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44113,6 +44082,7 @@ cont { scale: 13 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44137,6 +44107,7 @@ cont { scale: 14 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44160,6 +44131,7 @@ cont { scale: 15 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44183,6 +44155,7 @@ cont { scale: 16 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44206,6 +44179,7 @@ cont { scale: 17 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44229,6 +44203,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44252,6 +44227,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44278,6 +44254,7 @@ cont { scale: 13 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44302,6 +44279,7 @@ cont { scale: 14 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44325,6 +44303,7 @@ cont { scale: 15 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44348,6 +44327,7 @@ cont { scale: 16 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44371,6 +44351,7 @@ cont { scale: 17 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44394,6 +44375,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44417,6 +44399,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44443,6 +44426,7 @@ cont { scale: 13 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44467,6 +44451,7 @@ cont { scale: 14 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44490,6 +44475,7 @@ cont { scale: 15 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44513,6 +44499,7 @@ cont { scale: 16 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44536,6 +44523,7 @@ cont { scale: 17 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44559,6 +44547,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44582,6 +44571,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44608,6 +44598,7 @@ cont { scale: 13 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44632,6 +44623,7 @@ cont { scale: 14 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44655,6 +44647,7 @@ cont { scale: 15 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44678,6 +44671,7 @@ cont { scale: 16 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44701,6 +44695,7 @@ cont { scale: 17 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44724,6 +44719,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44747,6 +44743,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44773,6 +44770,7 @@ cont { scale: 13 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44797,6 +44795,7 @@ cont { scale: 14 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44820,6 +44819,7 @@ cont { scale: 15 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44843,6 +44843,7 @@ cont { scale: 16 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44866,6 +44867,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44889,6 +44891,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44912,6 +44915,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16917 } caption { @@ -44938,6 +44942,7 @@ cont { scale: 13 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -44962,6 +44967,7 @@ cont { scale: 14 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16917 } caption { @@ -44985,6 +44991,7 @@ cont { scale: 15 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45008,6 +45015,7 @@ cont { scale: 16 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45031,6 +45039,7 @@ cont { scale: 17 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45054,6 +45063,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45077,6 +45087,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45103,6 +45114,7 @@ cont { scale: 13 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45127,6 +45139,7 @@ cont { scale: 14 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45150,6 +45163,7 @@ cont { scale: 15 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45173,6 +45187,7 @@ cont { scale: 16 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45196,6 +45211,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45219,6 +45235,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45242,6 +45259,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45268,6 +45286,7 @@ cont { scale: 13 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45292,6 +45311,7 @@ cont { scale: 14 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45315,6 +45335,7 @@ cont { scale: 15 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45338,6 +45359,7 @@ cont { scale: 16 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45361,6 +45383,7 @@ cont { scale: 17 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45384,6 +45407,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45407,6 +45431,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45433,6 +45458,7 @@ cont { scale: 13 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45457,6 +45483,7 @@ cont { scale: 14 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45480,6 +45507,7 @@ cont { scale: 15 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45503,6 +45531,7 @@ cont { scale: 16 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45526,6 +45555,7 @@ cont { scale: 17 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45549,6 +45579,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45572,6 +45603,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45598,6 +45630,7 @@ cont { scale: 13 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45622,6 +45655,7 @@ cont { scale: 14 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45645,6 +45679,7 @@ cont { scale: 15 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45668,6 +45703,7 @@ cont { scale: 16 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45691,6 +45727,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45714,6 +45751,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45737,6 +45775,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45763,6 +45802,7 @@ cont { scale: 13 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45787,6 +45827,7 @@ cont { scale: 14 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45810,6 +45851,7 @@ cont { scale: 15 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45833,6 +45875,7 @@ cont { scale: 16 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45856,6 +45899,7 @@ cont { scale: 17 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45879,6 +45923,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45902,6 +45947,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45928,6 +45974,7 @@ cont { scale: 13 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -45952,6 +45999,7 @@ cont { scale: 14 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -45975,6 +46023,7 @@ cont { scale: 15 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -45998,6 +46047,7 @@ cont { scale: 16 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46021,6 +46071,7 @@ cont { scale: 17 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46044,6 +46095,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46067,6 +46119,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46093,6 +46146,7 @@ cont { scale: 13 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46117,6 +46171,7 @@ cont { scale: 14 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46140,6 +46195,7 @@ cont { scale: 15 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46163,6 +46219,7 @@ cont { scale: 16 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46186,6 +46243,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46209,6 +46267,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46232,6 +46291,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46258,6 +46318,7 @@ cont { scale: 13 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46282,6 +46343,7 @@ cont { scale: 14 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46305,6 +46367,7 @@ cont { scale: 15 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46328,6 +46391,7 @@ cont { scale: 16 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46351,6 +46415,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46374,6 +46439,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46397,6 +46463,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46423,6 +46490,7 @@ cont { scale: 13 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46447,6 +46515,7 @@ cont { scale: 14 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46470,6 +46539,7 @@ cont { scale: 15 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46493,6 +46563,7 @@ cont { scale: 16 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46516,6 +46587,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46539,6 +46611,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46562,6 +46635,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46588,6 +46662,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46612,6 +46687,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46635,6 +46711,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46658,6 +46735,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46681,6 +46759,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46704,6 +46783,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46727,6 +46807,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46753,6 +46834,7 @@ cont { scale: 13 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46777,6 +46859,7 @@ cont { scale: 14 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46800,6 +46883,7 @@ cont { scale: 15 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46823,6 +46907,7 @@ cont { scale: 16 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46846,6 +46931,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46869,6 +46955,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46892,6 +46979,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46918,6 +47006,7 @@ cont { scale: 13 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -46942,6 +47031,7 @@ cont { scale: 14 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16917 } caption { @@ -46965,6 +47055,7 @@ cont { scale: 15 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -46988,6 +47079,7 @@ cont { scale: 16 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47011,6 +47103,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47034,6 +47127,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47057,6 +47151,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47083,6 +47178,7 @@ cont { scale: 13 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47107,6 +47203,7 @@ cont { scale: 14 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47130,6 +47227,7 @@ cont { scale: 15 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47153,6 +47251,7 @@ cont { scale: 16 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47176,6 +47275,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47199,6 +47299,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47222,6 +47323,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47248,6 +47350,7 @@ cont { scale: 13 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47272,6 +47375,7 @@ cont { scale: 14 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47295,6 +47399,7 @@ cont { scale: 15 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47318,6 +47423,7 @@ cont { scale: 16 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47341,6 +47447,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47364,6 +47471,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47387,6 +47495,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47413,6 +47522,7 @@ cont { scale: 13 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47437,6 +47547,7 @@ cont { scale: 14 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47460,6 +47571,7 @@ cont { scale: 15 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47483,6 +47595,7 @@ cont { scale: 16 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47506,6 +47619,7 @@ cont { scale: 17 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47529,6 +47643,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47552,6 +47667,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47578,6 +47694,7 @@ cont { scale: 13 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47602,6 +47719,7 @@ cont { scale: 14 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47625,6 +47743,7 @@ cont { scale: 15 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47648,6 +47767,7 @@ cont { scale: 16 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47671,6 +47791,7 @@ cont { scale: 17 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47694,6 +47815,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47717,6 +47839,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47743,6 +47866,7 @@ cont { scale: 13 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47767,6 +47891,7 @@ cont { scale: 14 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47790,6 +47915,7 @@ cont { scale: 15 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47813,6 +47939,7 @@ cont { scale: 16 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47836,6 +47963,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47859,6 +47987,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47882,6 +48011,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47908,6 +48038,7 @@ cont { scale: 13 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -47932,6 +48063,7 @@ cont { scale: 14 symbol { name: "subway-kiev-s" + apply_for_type: 1 priority: 16917 } caption { @@ -47955,6 +48087,7 @@ cont { scale: 15 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16917 } caption { @@ -47978,6 +48111,7 @@ cont { scale: 16 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48001,6 +48135,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -48022,6 +48157,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -48043,6 +48179,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -48067,6 +48204,7 @@ cont { scale: 13 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48091,6 +48229,7 @@ cont { scale: 14 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48114,6 +48253,7 @@ cont { scale: 15 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48137,6 +48277,7 @@ cont { scale: 16 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48160,6 +48301,7 @@ cont { scale: 17 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48183,6 +48325,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48206,6 +48349,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48232,6 +48376,7 @@ cont { scale: 13 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48256,6 +48401,7 @@ cont { scale: 14 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48279,6 +48425,7 @@ cont { scale: 15 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48302,6 +48449,7 @@ cont { scale: 16 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48325,6 +48473,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48348,6 +48497,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48371,6 +48521,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48397,6 +48548,7 @@ cont { scale: 13 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48421,6 +48573,7 @@ cont { scale: 14 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48444,6 +48597,7 @@ cont { scale: 15 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48467,6 +48621,7 @@ cont { scale: 16 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48490,6 +48645,7 @@ cont { scale: 17 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48513,6 +48669,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48536,6 +48693,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48562,6 +48720,7 @@ cont { scale: 13 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48586,6 +48745,7 @@ cont { scale: 14 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48609,6 +48769,7 @@ cont { scale: 15 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48632,6 +48793,7 @@ cont { scale: 16 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48655,6 +48817,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48678,6 +48841,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48701,6 +48865,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48727,6 +48892,7 @@ cont { scale: 13 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48751,6 +48917,7 @@ cont { scale: 14 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48774,6 +48941,7 @@ cont { scale: 15 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48797,6 +48965,7 @@ cont { scale: 16 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48820,6 +48989,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48843,6 +49013,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48866,6 +49037,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48892,6 +49064,7 @@ cont { scale: 13 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -48916,6 +49089,7 @@ cont { scale: 14 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16917 } caption { @@ -48939,6 +49113,7 @@ cont { scale: 15 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48962,6 +49137,7 @@ cont { scale: 16 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -48985,6 +49161,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49008,6 +49185,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49031,6 +49209,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49057,6 +49236,7 @@ cont { scale: 13 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49081,6 +49261,7 @@ cont { scale: 14 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49104,6 +49285,7 @@ cont { scale: 15 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49127,6 +49309,7 @@ cont { scale: 16 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49150,6 +49333,7 @@ cont { scale: 17 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49173,6 +49357,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49196,6 +49381,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49222,6 +49408,7 @@ cont { scale: 13 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49246,6 +49433,7 @@ cont { scale: 14 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49269,6 +49457,7 @@ cont { scale: 15 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49292,6 +49481,7 @@ cont { scale: 16 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49315,6 +49505,7 @@ cont { scale: 17 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49338,6 +49529,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49361,6 +49553,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49387,6 +49580,7 @@ cont { scale: 13 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49411,6 +49605,7 @@ cont { scale: 14 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49434,6 +49629,7 @@ cont { scale: 15 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49457,6 +49653,7 @@ cont { scale: 16 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49480,6 +49677,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49503,6 +49701,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49526,6 +49725,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49552,6 +49752,7 @@ cont { scale: 13 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49576,6 +49777,7 @@ cont { scale: 14 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49599,6 +49801,7 @@ cont { scale: 15 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49622,6 +49825,7 @@ cont { scale: 16 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49645,6 +49849,7 @@ cont { scale: 17 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49668,6 +49873,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49691,6 +49897,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49717,6 +49924,7 @@ cont { scale: 13 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49741,6 +49949,7 @@ cont { scale: 14 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49764,6 +49973,7 @@ cont { scale: 15 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49787,6 +49997,7 @@ cont { scale: 16 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49810,6 +50021,7 @@ cont { scale: 17 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49833,6 +50045,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49856,6 +50069,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49882,6 +50096,7 @@ cont { scale: 13 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -49906,6 +50121,7 @@ cont { scale: 14 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16917 } caption { @@ -49929,6 +50145,7 @@ cont { scale: 15 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49952,6 +50169,7 @@ cont { scale: 16 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49975,6 +50193,7 @@ cont { scale: 17 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -49998,6 +50217,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50021,6 +50241,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50047,6 +50268,7 @@ cont { scale: 13 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50071,6 +50293,7 @@ cont { scale: 14 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50094,6 +50317,7 @@ cont { scale: 15 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50117,6 +50341,7 @@ cont { scale: 16 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50140,6 +50365,7 @@ cont { scale: 17 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50163,6 +50389,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50186,6 +50413,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50212,6 +50440,7 @@ cont { scale: 13 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50236,6 +50465,7 @@ cont { scale: 14 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50259,6 +50489,7 @@ cont { scale: 15 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50282,6 +50513,7 @@ cont { scale: 16 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50305,6 +50537,7 @@ cont { scale: 17 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50328,6 +50561,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50351,6 +50585,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50377,6 +50612,7 @@ cont { scale: 13 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50401,6 +50637,7 @@ cont { scale: 14 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50424,6 +50661,7 @@ cont { scale: 15 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50447,6 +50685,7 @@ cont { scale: 16 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50470,6 +50709,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50493,6 +50733,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50516,6 +50757,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50542,6 +50784,7 @@ cont { scale: 13 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50566,6 +50809,7 @@ cont { scale: 14 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50589,6 +50833,7 @@ cont { scale: 15 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50612,6 +50857,7 @@ cont { scale: 16 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50635,6 +50881,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50658,6 +50905,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50681,6 +50929,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50707,6 +50956,7 @@ cont { scale: 13 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50731,6 +50981,7 @@ cont { scale: 14 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50754,6 +51005,7 @@ cont { scale: 15 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50777,6 +51029,7 @@ cont { scale: 16 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50800,6 +51053,7 @@ cont { scale: 17 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50823,6 +51077,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50846,6 +51101,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50872,6 +51128,7 @@ cont { scale: 13 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -50896,6 +51153,7 @@ cont { scale: 14 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16917 } caption { @@ -50919,6 +51177,7 @@ cont { scale: 15 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50942,6 +51201,7 @@ cont { scale: 16 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50965,6 +51225,7 @@ cont { scale: 17 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -50988,6 +51249,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51011,6 +51273,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51037,6 +51300,7 @@ cont { scale: 13 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51061,6 +51325,7 @@ cont { scale: 14 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51084,6 +51349,7 @@ cont { scale: 15 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51107,6 +51373,7 @@ cont { scale: 16 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51130,6 +51397,7 @@ cont { scale: 17 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51153,6 +51421,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51176,6 +51445,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51202,6 +51472,7 @@ cont { scale: 13 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51226,6 +51497,7 @@ cont { scale: 14 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51249,6 +51521,7 @@ cont { scale: 15 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51272,6 +51545,7 @@ cont { scale: 16 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51295,6 +51569,7 @@ cont { scale: 17 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51318,6 +51593,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51341,6 +51617,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51367,6 +51644,7 @@ cont { scale: 13 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51391,6 +51669,7 @@ cont { scale: 14 symbol { name: "subway-minsk-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51414,6 +51693,7 @@ cont { scale: 15 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51437,6 +51717,7 @@ cont { scale: 16 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51458,6 +51739,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51479,6 +51761,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51500,6 +51783,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -51524,6 +51808,7 @@ cont { scale: 13 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51548,6 +51833,7 @@ cont { scale: 14 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51571,6 +51857,7 @@ cont { scale: 15 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51594,6 +51881,7 @@ cont { scale: 16 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51617,6 +51905,7 @@ cont { scale: 17 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51640,6 +51929,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51663,6 +51953,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51689,6 +51980,7 @@ cont { scale: 11 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51697,6 +51989,7 @@ cont { scale: 12 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51721,6 +52014,7 @@ cont { scale: 13 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51745,6 +52039,7 @@ cont { scale: 14 symbol { name: "subway-moscow-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51768,6 +52063,7 @@ cont { scale: 15 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51791,6 +52087,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51814,6 +52111,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51837,6 +52135,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51860,6 +52159,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51886,6 +52186,7 @@ cont { scale: 13 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -51910,6 +52211,7 @@ cont { scale: 14 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16917 } caption { @@ -51933,6 +52235,7 @@ cont { scale: 15 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51956,6 +52259,7 @@ cont { scale: 16 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -51979,6 +52283,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52002,6 +52307,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52025,6 +52331,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52051,6 +52358,7 @@ cont { scale: 13 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52075,6 +52383,7 @@ cont { scale: 14 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52098,6 +52407,7 @@ cont { scale: 15 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52121,6 +52431,7 @@ cont { scale: 16 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52144,6 +52455,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52167,6 +52479,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52190,6 +52503,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52216,6 +52530,7 @@ cont { scale: 13 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52240,6 +52555,7 @@ cont { scale: 14 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52263,6 +52579,7 @@ cont { scale: 15 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52286,6 +52603,7 @@ cont { scale: 16 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52309,6 +52627,7 @@ cont { scale: 17 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52332,6 +52651,7 @@ cont { scale: 18 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52355,6 +52675,7 @@ cont { scale: 19 symbol { name: "subway-newyork-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52381,6 +52702,7 @@ cont { scale: 13 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52405,6 +52727,7 @@ cont { scale: 14 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52428,6 +52751,7 @@ cont { scale: 15 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52451,6 +52775,7 @@ cont { scale: 16 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52474,6 +52799,7 @@ cont { scale: 17 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52497,6 +52823,7 @@ cont { scale: 18 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52520,6 +52847,7 @@ cont { scale: 19 symbol { name: "subway-nnov-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52546,6 +52874,7 @@ cont { scale: 13 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52570,6 +52899,7 @@ cont { scale: 14 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52593,6 +52923,7 @@ cont { scale: 15 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52616,6 +52947,7 @@ cont { scale: 16 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52639,6 +52971,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52662,6 +52995,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52685,6 +53019,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52711,6 +53046,7 @@ cont { scale: 13 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52735,6 +53071,7 @@ cont { scale: 14 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52758,6 +53095,7 @@ cont { scale: 15 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52781,6 +53119,7 @@ cont { scale: 16 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52804,6 +53143,7 @@ cont { scale: 17 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52827,6 +53167,7 @@ cont { scale: 18 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52850,6 +53191,7 @@ cont { scale: 19 symbol { name: "subway-osaka-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52876,6 +53218,7 @@ cont { scale: 13 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -52900,6 +53243,7 @@ cont { scale: 14 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -52923,6 +53267,7 @@ cont { scale: 15 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52946,6 +53291,7 @@ cont { scale: 16 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52969,6 +53315,7 @@ cont { scale: 17 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -52992,6 +53339,7 @@ cont { scale: 18 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53015,6 +53363,7 @@ cont { scale: 19 symbol { name: "subway-oslo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53041,6 +53390,7 @@ cont { scale: 13 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53065,6 +53415,7 @@ cont { scale: 14 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53088,6 +53439,7 @@ cont { scale: 15 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53111,6 +53463,7 @@ cont { scale: 16 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53134,6 +53487,7 @@ cont { scale: 17 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53157,6 +53511,7 @@ cont { scale: 18 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53180,6 +53535,7 @@ cont { scale: 19 symbol { name: "subway-palma-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53206,6 +53562,7 @@ cont { scale: 13 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53230,6 +53587,7 @@ cont { scale: 14 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53253,6 +53611,7 @@ cont { scale: 15 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53276,6 +53635,7 @@ cont { scale: 16 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53299,6 +53659,7 @@ cont { scale: 17 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53322,6 +53683,7 @@ cont { scale: 18 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53345,6 +53707,7 @@ cont { scale: 19 symbol { name: "subway-panama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53371,6 +53734,7 @@ cont { scale: 13 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53395,6 +53759,7 @@ cont { scale: 14 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53418,6 +53783,7 @@ cont { scale: 15 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53441,6 +53807,7 @@ cont { scale: 16 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53464,6 +53831,7 @@ cont { scale: 17 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53487,6 +53855,7 @@ cont { scale: 18 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53510,6 +53879,7 @@ cont { scale: 19 symbol { name: "subway-paris-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53536,6 +53906,7 @@ cont { scale: 13 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53560,6 +53931,7 @@ cont { scale: 14 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53583,6 +53955,7 @@ cont { scale: 15 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53606,6 +53979,7 @@ cont { scale: 16 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53629,6 +54003,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53652,6 +54027,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53675,6 +54051,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53701,6 +54078,7 @@ cont { scale: 13 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53725,6 +54103,7 @@ cont { scale: 14 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53748,6 +54127,7 @@ cont { scale: 15 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53771,6 +54151,7 @@ cont { scale: 16 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53794,6 +54175,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53817,6 +54199,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53840,6 +54223,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53866,6 +54250,7 @@ cont { scale: 13 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -53890,6 +54275,7 @@ cont { scale: 14 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16917 } caption { @@ -53913,6 +54299,7 @@ cont { scale: 15 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53936,6 +54323,7 @@ cont { scale: 16 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53959,6 +54347,7 @@ cont { scale: 17 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -53982,6 +54371,7 @@ cont { scale: 18 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54005,6 +54395,7 @@ cont { scale: 19 symbol { name: "subway-rennes-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54031,6 +54422,7 @@ cont { scale: 13 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54055,6 +54447,7 @@ cont { scale: 14 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54078,6 +54471,7 @@ cont { scale: 15 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54101,6 +54495,7 @@ cont { scale: 16 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54124,6 +54519,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54147,6 +54543,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54170,6 +54567,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54196,6 +54594,7 @@ cont { scale: 13 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54220,6 +54619,7 @@ cont { scale: 14 symbol { name: "subway-rome-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54243,6 +54643,7 @@ cont { scale: 15 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54266,6 +54667,7 @@ cont { scale: 16 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54289,6 +54691,7 @@ cont { scale: 17 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -54310,6 +54713,7 @@ cont { scale: 18 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -54331,6 +54735,7 @@ cont { scale: 19 symbol { name: "zero-icon" + apply_for_type: 1 priority: 16917 } caption { @@ -54355,6 +54760,7 @@ cont { scale: 13 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54379,6 +54785,7 @@ cont { scale: 14 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54402,6 +54809,7 @@ cont { scale: 15 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54425,6 +54833,7 @@ cont { scale: 16 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54448,6 +54857,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54471,6 +54881,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54494,6 +54905,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54520,6 +54932,7 @@ cont { scale: 13 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54544,6 +54957,7 @@ cont { scale: 14 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54567,6 +54981,7 @@ cont { scale: 15 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54590,6 +55005,7 @@ cont { scale: 16 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54613,6 +55029,7 @@ cont { scale: 17 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54636,6 +55053,7 @@ cont { scale: 18 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54659,6 +55077,7 @@ cont { scale: 19 symbol { name: "subway-samara-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54685,6 +55104,7 @@ cont { scale: 13 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54709,6 +55129,7 @@ cont { scale: 14 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54732,6 +55153,7 @@ cont { scale: 15 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54755,6 +55177,7 @@ cont { scale: 16 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54778,6 +55201,7 @@ cont { scale: 17 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54801,6 +55225,7 @@ cont { scale: 18 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54824,6 +55249,7 @@ cont { scale: 19 symbol { name: "subway-santiago-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54850,6 +55276,7 @@ cont { scale: 13 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -54874,6 +55301,7 @@ cont { scale: 14 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -54897,6 +55325,7 @@ cont { scale: 15 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54920,6 +55349,7 @@ cont { scale: 16 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54943,6 +55373,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54966,6 +55397,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -54989,6 +55421,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55015,6 +55448,7 @@ cont { scale: 13 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55039,6 +55473,7 @@ cont { scale: 14 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55062,6 +55497,7 @@ cont { scale: 15 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55085,6 +55521,7 @@ cont { scale: 16 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55108,6 +55545,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55131,6 +55569,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55154,6 +55593,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55180,6 +55620,7 @@ cont { scale: 13 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55204,6 +55645,7 @@ cont { scale: 14 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55227,6 +55669,7 @@ cont { scale: 15 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55250,6 +55693,7 @@ cont { scale: 16 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55273,6 +55717,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55296,6 +55741,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55319,6 +55765,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55345,6 +55792,7 @@ cont { scale: 13 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55369,6 +55817,7 @@ cont { scale: 14 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55392,6 +55841,7 @@ cont { scale: 15 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55415,6 +55865,7 @@ cont { scale: 16 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55438,6 +55889,7 @@ cont { scale: 17 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55461,6 +55913,7 @@ cont { scale: 18 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55484,6 +55937,7 @@ cont { scale: 19 symbol { name: "subway-sendai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55510,6 +55964,7 @@ cont { scale: 13 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55534,6 +55989,7 @@ cont { scale: 14 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55557,6 +56013,7 @@ cont { scale: 15 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55580,6 +56037,7 @@ cont { scale: 16 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55603,6 +56061,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55626,6 +56085,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55649,6 +56109,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55675,6 +56136,7 @@ cont { scale: 13 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55699,6 +56161,7 @@ cont { scale: 14 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55722,6 +56185,7 @@ cont { scale: 15 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55745,6 +56209,7 @@ cont { scale: 16 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55768,6 +56233,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55791,6 +56257,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55814,6 +56281,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55840,6 +56308,7 @@ cont { scale: 13 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -55864,6 +56333,7 @@ cont { scale: 14 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16917 } caption { @@ -55887,6 +56357,7 @@ cont { scale: 15 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55910,6 +56381,7 @@ cont { scale: 16 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55933,6 +56405,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55956,6 +56429,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -55979,6 +56453,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56005,6 +56480,7 @@ cont { scale: 13 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56029,6 +56505,7 @@ cont { scale: 14 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56052,6 +56529,7 @@ cont { scale: 15 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56075,6 +56553,7 @@ cont { scale: 16 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56098,6 +56577,7 @@ cont { scale: 17 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56121,6 +56601,7 @@ cont { scale: 18 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56144,6 +56625,7 @@ cont { scale: 19 symbol { name: "subway-sofia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56170,6 +56652,7 @@ cont { scale: 11 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56178,6 +56661,7 @@ cont { scale: 12 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56201,6 +56685,7 @@ cont { scale: 13 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56224,6 +56709,7 @@ cont { scale: 14 symbol { name: "subway-spb-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56247,6 +56733,7 @@ cont { scale: 15 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56270,6 +56757,7 @@ cont { scale: 16 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56293,6 +56781,7 @@ cont { scale: 17 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56316,6 +56805,7 @@ cont { scale: 18 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56339,6 +56829,7 @@ cont { scale: 19 symbol { name: "train-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56365,6 +56856,7 @@ cont { scale: 13 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56389,6 +56881,7 @@ cont { scale: 14 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56412,6 +56905,7 @@ cont { scale: 15 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56435,6 +56929,7 @@ cont { scale: 16 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56458,6 +56953,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56481,6 +56977,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56504,6 +57001,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56530,6 +57028,7 @@ cont { scale: 13 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56554,6 +57053,7 @@ cont { scale: 14 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56577,6 +57077,7 @@ cont { scale: 15 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56600,6 +57101,7 @@ cont { scale: 16 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56623,6 +57125,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56646,6 +57149,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56669,6 +57173,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56695,6 +57200,7 @@ cont { scale: 13 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56719,6 +57225,7 @@ cont { scale: 14 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56742,6 +57249,7 @@ cont { scale: 15 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56765,6 +57273,7 @@ cont { scale: 16 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56788,6 +57297,7 @@ cont { scale: 17 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56811,6 +57321,7 @@ cont { scale: 18 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56834,6 +57345,7 @@ cont { scale: 19 symbol { name: "subway-taipei-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56860,6 +57372,7 @@ cont { scale: 13 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -56884,6 +57397,7 @@ cont { scale: 14 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -56907,6 +57421,7 @@ cont { scale: 15 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56930,6 +57445,7 @@ cont { scale: 16 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56953,6 +57469,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56976,6 +57493,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -56999,6 +57517,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57025,6 +57544,7 @@ cont { scale: 13 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57049,6 +57569,7 @@ cont { scale: 14 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57072,6 +57593,7 @@ cont { scale: 15 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57095,6 +57617,7 @@ cont { scale: 16 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57118,6 +57641,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57141,6 +57665,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57164,6 +57689,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57190,6 +57716,7 @@ cont { scale: 13 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57214,6 +57741,7 @@ cont { scale: 14 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57237,6 +57765,7 @@ cont { scale: 15 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57260,6 +57789,7 @@ cont { scale: 16 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57283,6 +57813,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57306,6 +57837,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57329,6 +57861,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57355,6 +57888,7 @@ cont { scale: 13 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57379,6 +57913,7 @@ cont { scale: 14 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57402,6 +57937,7 @@ cont { scale: 15 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57425,6 +57961,7 @@ cont { scale: 16 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57448,6 +57985,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57471,6 +58009,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57494,6 +58033,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57520,6 +58060,7 @@ cont { scale: 13 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57544,6 +58085,7 @@ cont { scale: 14 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57567,6 +58109,7 @@ cont { scale: 15 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57590,6 +58133,7 @@ cont { scale: 16 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57613,6 +58157,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57636,6 +58181,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57659,6 +58205,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57685,6 +58232,7 @@ cont { scale: 13 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57709,6 +58257,7 @@ cont { scale: 14 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57732,6 +58281,7 @@ cont { scale: 15 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57755,6 +58305,7 @@ cont { scale: 16 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57778,6 +58329,7 @@ cont { scale: 17 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57801,6 +58353,7 @@ cont { scale: 18 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57824,6 +58377,7 @@ cont { scale: 19 symbol { name: "subway-valencia-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57850,6 +58404,7 @@ cont { scale: 13 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -57874,6 +58429,7 @@ cont { scale: 14 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16917 } caption { @@ -57897,6 +58453,7 @@ cont { scale: 15 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57920,6 +58477,7 @@ cont { scale: 16 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57943,6 +58501,7 @@ cont { scale: 17 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57966,6 +58525,7 @@ cont { scale: 18 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -57989,6 +58549,7 @@ cont { scale: 19 symbol { name: "subway-vienna-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58015,6 +58576,7 @@ cont { scale: 13 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58039,6 +58601,7 @@ cont { scale: 14 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58062,6 +58625,7 @@ cont { scale: 15 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58085,6 +58649,7 @@ cont { scale: 16 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58108,6 +58673,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58131,6 +58697,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58154,6 +58721,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58180,6 +58748,7 @@ cont { scale: 13 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58204,6 +58773,7 @@ cont { scale: 14 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58227,6 +58797,7 @@ cont { scale: 15 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58250,6 +58821,7 @@ cont { scale: 16 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58273,6 +58845,7 @@ cont { scale: 17 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58296,6 +58869,7 @@ cont { scale: 18 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58319,6 +58893,7 @@ cont { scale: 19 symbol { name: "subway-washington-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58345,6 +58920,7 @@ cont { scale: 13 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58369,6 +58945,7 @@ cont { scale: 14 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58392,6 +58969,7 @@ cont { scale: 15 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58415,6 +58993,7 @@ cont { scale: 16 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58438,6 +59017,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58461,6 +59041,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58484,6 +59065,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58510,6 +59092,7 @@ cont { scale: 13 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58534,6 +59117,7 @@ cont { scale: 14 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58557,6 +59141,7 @@ cont { scale: 15 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58580,6 +59165,7 @@ cont { scale: 16 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58603,6 +59189,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58626,6 +59213,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58649,6 +59237,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58675,6 +59264,7 @@ cont { scale: 13 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16917 min_distance: 1 } @@ -58699,6 +59289,7 @@ cont { scale: 14 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16917 } caption { @@ -58722,6 +59313,7 @@ cont { scale: 15 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58745,6 +59337,7 @@ cont { scale: 16 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58768,6 +59361,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58791,6 +59385,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -58814,6 +59409,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-m" + apply_for_type: 1 priority: 16917 } caption { @@ -59209,6 +59805,7 @@ cont { scale: 17 symbol { name: "subway-adana-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59231,6 +59828,7 @@ cont { scale: 18 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59253,6 +59851,7 @@ cont { scale: 19 symbol { name: "subway-adana-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59296,6 +59895,7 @@ cont { scale: 17 symbol { name: "subway-algeria-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59318,6 +59918,7 @@ cont { scale: 18 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59340,6 +59941,7 @@ cont { scale: 19 symbol { name: "subway-algeria-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59383,6 +59985,7 @@ cont { scale: 17 symbol { name: "subway-almaty-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59405,6 +60008,7 @@ cont { scale: 18 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59427,6 +60031,7 @@ cont { scale: 19 symbol { name: "subway-almaty-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59470,6 +60075,7 @@ cont { scale: 17 symbol { name: "subway-amsterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59492,6 +60098,7 @@ cont { scale: 18 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59514,6 +60121,7 @@ cont { scale: 19 symbol { name: "subway-amsterdam-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59557,6 +60165,7 @@ cont { scale: 17 symbol { name: "subway-ankara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59579,6 +60188,7 @@ cont { scale: 18 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59601,6 +60211,7 @@ cont { scale: 19 symbol { name: "subway-ankara-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59644,6 +60255,7 @@ cont { scale: 17 symbol { name: "subway-athens-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59666,6 +60278,7 @@ cont { scale: 18 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59688,6 +60301,7 @@ cont { scale: 19 symbol { name: "subway-athens-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59731,6 +60345,7 @@ cont { scale: 17 symbol { name: "subway-baku-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59753,6 +60368,7 @@ cont { scale: 18 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59775,6 +60391,7 @@ cont { scale: 19 symbol { name: "subway-baku-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59818,6 +60435,7 @@ cont { scale: 17 symbol { name: "subway-bangkok-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59840,6 +60458,7 @@ cont { scale: 18 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59862,6 +60481,7 @@ cont { scale: 19 symbol { name: "subway-bangkok-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59905,6 +60525,7 @@ cont { scale: 17 symbol { name: "subway-barcelona-s" + apply_for_type: 1 priority: 16000 } caption { @@ -59927,6 +60548,7 @@ cont { scale: 18 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59949,6 +60571,7 @@ cont { scale: 19 symbol { name: "subway-barcelona-m" + apply_for_type: 1 priority: 16000 } caption { @@ -59992,6 +60615,7 @@ cont { scale: 17 symbol { name: "subway-beijing-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60014,6 +60638,7 @@ cont { scale: 18 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60036,6 +60661,7 @@ cont { scale: 19 symbol { name: "subway-beijing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60079,6 +60705,7 @@ cont { scale: 17 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60101,6 +60728,7 @@ cont { scale: 18 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60123,6 +60751,7 @@ cont { scale: 19 symbol { name: "subway-bengaluru-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60166,6 +60795,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60188,6 +60818,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60210,6 +60841,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60253,6 +60885,7 @@ cont { scale: 17 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60275,6 +60908,7 @@ cont { scale: 18 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60297,6 +60931,7 @@ cont { scale: 19 symbol { name: "subway-brasilia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60340,6 +60975,7 @@ cont { scale: 17 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60362,6 +60998,7 @@ cont { scale: 18 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60384,6 +61021,7 @@ cont { scale: 19 symbol { name: "subway-brescia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60427,6 +61065,7 @@ cont { scale: 17 symbol { name: "subway-brussel-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60449,6 +61088,7 @@ cont { scale: 18 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60471,6 +61111,7 @@ cont { scale: 19 symbol { name: "subway-brussel-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60514,6 +61155,7 @@ cont { scale: 17 symbol { name: "subway-bucharest-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60536,6 +61178,7 @@ cont { scale: 18 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60558,6 +61201,7 @@ cont { scale: 19 symbol { name: "subway-bucharest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60601,6 +61245,7 @@ cont { scale: 17 symbol { name: "subway-budapest-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60623,6 +61268,7 @@ cont { scale: 18 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60645,6 +61291,7 @@ cont { scale: 19 symbol { name: "subway-budapest-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60688,6 +61335,7 @@ cont { scale: 17 symbol { name: "subway-buenosaires-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60710,6 +61358,7 @@ cont { scale: 18 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60732,6 +61381,7 @@ cont { scale: 19 symbol { name: "subway-buenosaires-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60775,6 +61425,7 @@ cont { scale: 17 symbol { name: "subway-bursaray-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60797,6 +61448,7 @@ cont { scale: 18 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60819,6 +61471,7 @@ cont { scale: 19 symbol { name: "subway-bursaray-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60862,6 +61515,7 @@ cont { scale: 17 symbol { name: "subway-cairo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60884,6 +61538,7 @@ cont { scale: 18 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60906,6 +61561,7 @@ cont { scale: 19 symbol { name: "subway-cairo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60949,6 +61605,7 @@ cont { scale: 17 symbol { name: "subway-caracas-s" + apply_for_type: 1 priority: 16000 } caption { @@ -60971,6 +61628,7 @@ cont { scale: 18 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16000 } caption { @@ -60993,6 +61651,7 @@ cont { scale: 19 symbol { name: "subway-caracas-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61036,6 +61695,7 @@ cont { scale: 17 symbol { name: "subway-catania-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61058,6 +61718,7 @@ cont { scale: 18 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61080,6 +61741,7 @@ cont { scale: 19 symbol { name: "subway-catania-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61123,6 +61785,7 @@ cont { scale: 17 symbol { name: "subway-changchun-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61145,6 +61808,7 @@ cont { scale: 18 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61167,6 +61831,7 @@ cont { scale: 19 symbol { name: "subway-changchun-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61210,6 +61875,7 @@ cont { scale: 17 symbol { name: "subway-chengdu-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61232,6 +61898,7 @@ cont { scale: 18 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61254,6 +61921,7 @@ cont { scale: 19 symbol { name: "subway-chengdu-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61297,6 +61965,7 @@ cont { scale: 17 symbol { name: "subway-chicago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61319,6 +61988,7 @@ cont { scale: 18 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61341,6 +62011,7 @@ cont { scale: 19 symbol { name: "subway-chicago-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61384,6 +62055,7 @@ cont { scale: 17 symbol { name: "subway-chongqing-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61406,6 +62078,7 @@ cont { scale: 18 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61428,6 +62101,7 @@ cont { scale: 19 symbol { name: "subway-chongqing-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61471,6 +62145,7 @@ cont { scale: 17 symbol { name: "subway-dalian-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61493,6 +62168,7 @@ cont { scale: 18 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61515,6 +62191,7 @@ cont { scale: 19 symbol { name: "subway-dalian-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61558,6 +62235,7 @@ cont { scale: 17 symbol { name: "subway-delhi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61580,6 +62258,7 @@ cont { scale: 18 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61602,6 +62281,7 @@ cont { scale: 19 symbol { name: "subway-delhi-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61645,6 +62325,7 @@ cont { scale: 17 symbol { name: "subway-dnepro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61667,6 +62348,7 @@ cont { scale: 18 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61689,6 +62371,7 @@ cont { scale: 19 symbol { name: "subway-dnepro-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61732,6 +62415,7 @@ cont { scale: 17 symbol { name: "subway-dubai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61754,6 +62438,7 @@ cont { scale: 18 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61776,6 +62461,7 @@ cont { scale: 19 symbol { name: "subway-dubai-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61819,6 +62505,7 @@ cont { scale: 17 symbol { name: "subway-ekb-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61841,6 +62528,7 @@ cont { scale: 18 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61863,6 +62551,7 @@ cont { scale: 19 symbol { name: "subway-ekb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61906,6 +62595,7 @@ cont { scale: 17 symbol { name: "subway-fukuoka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -61928,6 +62618,7 @@ cont { scale: 18 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61950,6 +62641,7 @@ cont { scale: 19 symbol { name: "subway-fukuoka-m" + apply_for_type: 1 priority: 16000 } caption { @@ -61993,6 +62685,7 @@ cont { scale: 17 symbol { name: "subway-glasgow-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62015,6 +62708,7 @@ cont { scale: 18 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62037,6 +62731,7 @@ cont { scale: 19 symbol { name: "subway-glasgow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62080,6 +62775,7 @@ cont { scale: 17 symbol { name: "subway-guangzhou-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62102,6 +62798,7 @@ cont { scale: 18 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62124,6 +62821,7 @@ cont { scale: 19 symbol { name: "subway-guangzhou-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62167,6 +62865,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62189,6 +62888,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62211,6 +62911,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62254,6 +62955,7 @@ cont { scale: 17 symbol { name: "subway-helsinki-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62276,6 +62978,7 @@ cont { scale: 18 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62298,6 +63001,7 @@ cont { scale: 19 symbol { name: "subway-helsinki-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62341,6 +63045,7 @@ cont { scale: 17 symbol { name: "subway-hirosima-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62363,6 +63068,7 @@ cont { scale: 18 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62385,6 +63091,7 @@ cont { scale: 19 symbol { name: "subway-hirosima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62428,6 +63135,7 @@ cont { scale: 17 symbol { name: "subway-isfahan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62450,6 +63158,7 @@ cont { scale: 18 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62472,6 +63181,7 @@ cont { scale: 19 symbol { name: "subway-isfahan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62515,6 +63225,7 @@ cont { scale: 17 symbol { name: "subway-istanbul-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62537,6 +63248,7 @@ cont { scale: 18 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62559,6 +63271,7 @@ cont { scale: 19 symbol { name: "subway-istanbul-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62602,6 +63315,7 @@ cont { scale: 17 symbol { name: "subway-izmir-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62624,6 +63338,7 @@ cont { scale: 18 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62646,6 +63361,7 @@ cont { scale: 19 symbol { name: "subway-izmir-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62689,6 +63405,7 @@ cont { scale: 17 symbol { name: "subway-kazan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62711,6 +63428,7 @@ cont { scale: 18 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62733,6 +63451,7 @@ cont { scale: 19 symbol { name: "subway-kazan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62776,6 +63495,7 @@ cont { scale: 17 symbol { name: "subway-kharkiv-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62798,6 +63518,7 @@ cont { scale: 18 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62820,6 +63541,7 @@ cont { scale: 19 symbol { name: "subway-kharkiv-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62863,6 +63585,7 @@ cont { scale: 17 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62885,6 +63608,7 @@ cont { scale: 18 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62907,6 +63631,7 @@ cont { scale: 19 symbol { name: "subway-kiev-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62950,6 +63675,7 @@ cont { scale: 17 symbol { name: "subway-kobe-s" + apply_for_type: 1 priority: 16000 } caption { @@ -62972,6 +63698,7 @@ cont { scale: 18 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -62994,6 +63721,7 @@ cont { scale: 19 symbol { name: "subway-kobe-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63037,6 +63765,7 @@ cont { scale: 17 symbol { name: "subway-kolkata-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63059,6 +63788,7 @@ cont { scale: 18 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63081,6 +63811,7 @@ cont { scale: 19 symbol { name: "subway-kolkata-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63124,6 +63855,7 @@ cont { scale: 17 symbol { name: "subway-kunming-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63146,6 +63878,7 @@ cont { scale: 18 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63168,6 +63901,7 @@ cont { scale: 19 symbol { name: "subway-kunming-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63211,6 +63945,7 @@ cont { scale: 17 symbol { name: "subway-kyoto-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63233,6 +63968,7 @@ cont { scale: 18 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63255,6 +63991,7 @@ cont { scale: 19 symbol { name: "subway-kyoto-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63298,6 +64035,7 @@ cont { scale: 17 symbol { name: "subway-losangeles-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63320,6 +64058,7 @@ cont { scale: 18 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63342,6 +64081,7 @@ cont { scale: 19 symbol { name: "subway-losangeles-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63385,6 +64125,7 @@ cont { scale: 17 symbol { name: "subway-lausanne-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63407,6 +64148,7 @@ cont { scale: 18 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63429,6 +64171,7 @@ cont { scale: 19 symbol { name: "subway-lausanne-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63472,6 +64215,7 @@ cont { scale: 17 symbol { name: "subway-lille-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63494,6 +64238,7 @@ cont { scale: 18 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63516,6 +64261,7 @@ cont { scale: 19 symbol { name: "subway-lille-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63559,6 +64305,7 @@ cont { scale: 17 symbol { name: "subway-lima-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63581,6 +64328,7 @@ cont { scale: 18 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63603,6 +64351,7 @@ cont { scale: 19 symbol { name: "subway-lima-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63646,6 +64395,7 @@ cont { scale: 17 symbol { name: "subway-lisboa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63668,6 +64418,7 @@ cont { scale: 18 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63690,6 +64441,7 @@ cont { scale: 19 symbol { name: "subway-lisboa-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63733,6 +64485,7 @@ cont { scale: 17 symbol { name: "subway-london-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63755,6 +64508,7 @@ cont { scale: 18 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63777,6 +64531,7 @@ cont { scale: 19 symbol { name: "subway-london-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63820,6 +64575,7 @@ cont { scale: 17 symbol { name: "subway-lyon-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63842,6 +64598,7 @@ cont { scale: 18 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63864,6 +64621,7 @@ cont { scale: 19 symbol { name: "subway-lyon-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63907,6 +64665,7 @@ cont { scale: 17 symbol { name: "subway-madrid-s" + apply_for_type: 1 priority: 16000 } caption { @@ -63929,6 +64688,7 @@ cont { scale: 18 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63951,6 +64711,7 @@ cont { scale: 19 symbol { name: "subway-madrid-m" + apply_for_type: 1 priority: 16000 } caption { @@ -63994,6 +64755,7 @@ cont { scale: 17 symbol { name: "subway-malaga-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64016,6 +64778,7 @@ cont { scale: 18 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64038,6 +64801,7 @@ cont { scale: 19 symbol { name: "subway-malaga-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64081,6 +64845,7 @@ cont { scale: 17 symbol { name: "subway-manila-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64103,6 +64868,7 @@ cont { scale: 18 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64125,6 +64891,7 @@ cont { scale: 19 symbol { name: "subway-manila-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64168,6 +64935,7 @@ cont { scale: 17 symbol { name: "subway-maracaibo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64190,6 +64958,7 @@ cont { scale: 18 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64212,6 +64981,7 @@ cont { scale: 19 symbol { name: "subway-maracaibo-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64255,6 +65025,7 @@ cont { scale: 17 symbol { name: "subway-mashhad-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64277,6 +65048,7 @@ cont { scale: 18 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64299,6 +65071,7 @@ cont { scale: 19 symbol { name: "subway-mashhad-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64342,6 +65115,7 @@ cont { scale: 17 symbol { name: "subway-mecca-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64364,6 +65138,7 @@ cont { scale: 18 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64386,6 +65161,7 @@ cont { scale: 19 symbol { name: "subway-mecca-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64429,6 +65205,7 @@ cont { scale: 17 symbol { name: "subway-medellin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64451,6 +65228,7 @@ cont { scale: 18 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64473,6 +65251,7 @@ cont { scale: 19 symbol { name: "subway-medellin-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64516,6 +65295,7 @@ cont { scale: 17 symbol { name: "subway-mexico-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64538,6 +65318,7 @@ cont { scale: 18 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64560,6 +65341,7 @@ cont { scale: 19 symbol { name: "subway-mexico-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64603,6 +65385,7 @@ cont { scale: 17 symbol { name: "subway-milan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64625,6 +65408,7 @@ cont { scale: 18 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64647,6 +65431,7 @@ cont { scale: 19 symbol { name: "subway-milan-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64690,6 +65475,7 @@ cont { scale: 17 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64713,6 +65499,7 @@ cont { scale: 18 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64736,6 +65523,7 @@ cont { scale: 19 symbol { name: "subway-minsk-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64780,6 +65568,7 @@ cont { scale: 17 symbol { name: "subway-montreal-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64802,6 +65591,7 @@ cont { scale: 18 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64824,6 +65614,7 @@ cont { scale: 19 symbol { name: "subway-montreal-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64849,6 +65640,7 @@ cont { scale: 16 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64872,6 +65664,7 @@ cont { scale: 17 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64895,6 +65688,7 @@ cont { scale: 18 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64918,6 +65712,7 @@ cont { scale: 19 symbol { name: "subway-moscow-m" + apply_for_type: 1 priority: 16000 } caption { @@ -64962,6 +65757,7 @@ cont { scale: 17 symbol { name: "subway-ubahn-s" + apply_for_type: 1 priority: 16000 } caption { @@ -64984,6 +65780,7 @@ cont { scale: 18 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65006,6 +65803,7 @@ cont { scale: 19 symbol { name: "subway-ubahn-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65049,6 +65847,7 @@ cont { scale: 17 symbol { name: "subway-nagoya-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65071,6 +65870,7 @@ cont { scale: 18 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65093,6 +65893,7 @@ cont { scale: 19 symbol { name: "subway-nagoya-m" + apply_for_type: 1 priority: 16000 } caption { @@ -65136,6 +65937,7 @@ cont { scale: 17 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65158,6 +65960,7 @@ cont { scale: 18 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65180,6 +65983,7 @@ cont { scale: 19 symbol { name: "subway-newyork-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65223,6 +66027,7 @@ cont { scale: 17 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65245,6 +66050,7 @@ cont { scale: 18 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65267,6 +66073,7 @@ cont { scale: 19 symbol { name: "subway-nnov-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65310,6 +66117,7 @@ cont { scale: 17 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65332,6 +66140,7 @@ cont { scale: 18 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65354,6 +66163,7 @@ cont { scale: 19 symbol { name: "subway-novosibirsk-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65397,6 +66207,7 @@ cont { scale: 17 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65419,6 +66230,7 @@ cont { scale: 18 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65441,6 +66253,7 @@ cont { scale: 19 symbol { name: "subway-osaka-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65484,6 +66297,7 @@ cont { scale: 17 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65506,6 +66320,7 @@ cont { scale: 18 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65528,6 +66343,7 @@ cont { scale: 19 symbol { name: "subway-oslo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65571,6 +66387,7 @@ cont { scale: 17 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65593,6 +66410,7 @@ cont { scale: 18 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65615,6 +66433,7 @@ cont { scale: 19 symbol { name: "subway-palma-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65658,6 +66477,7 @@ cont { scale: 17 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65680,6 +66500,7 @@ cont { scale: 18 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65702,6 +66523,7 @@ cont { scale: 19 symbol { name: "subway-panama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65745,6 +66567,7 @@ cont { scale: 17 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65767,6 +66590,7 @@ cont { scale: 18 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65789,6 +66613,7 @@ cont { scale: 19 symbol { name: "subway-paris-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65832,6 +66657,7 @@ cont { scale: 17 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65854,6 +66680,7 @@ cont { scale: 18 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65876,6 +66703,7 @@ cont { scale: 19 symbol { name: "subway-philadelphia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65919,6 +66747,7 @@ cont { scale: 17 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65941,6 +66770,7 @@ cont { scale: 18 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16000 } caption { @@ -65963,6 +66793,7 @@ cont { scale: 19 symbol { name: "subway-pyongyang-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66006,6 +66837,7 @@ cont { scale: 17 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66028,6 +66860,7 @@ cont { scale: 18 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66050,6 +66883,7 @@ cont { scale: 19 symbol { name: "subway-rennes-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66093,6 +66927,7 @@ cont { scale: 17 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66115,6 +66950,7 @@ cont { scale: 18 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66137,6 +66973,7 @@ cont { scale: 19 symbol { name: "subway-riodejaneiro-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66180,6 +67017,7 @@ cont { scale: 17 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66202,6 +67040,7 @@ cont { scale: 18 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66224,6 +67063,7 @@ cont { scale: 19 symbol { name: "subway-rome-m" + apply_for_type: 1 priority: 16000 } caption { @@ -66267,6 +67107,7 @@ cont { scale: 17 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66289,6 +67130,7 @@ cont { scale: 18 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66311,6 +67153,7 @@ cont { scale: 19 symbol { name: "subway-rotterdam-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66354,6 +67197,7 @@ cont { scale: 17 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66376,6 +67220,7 @@ cont { scale: 18 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66398,6 +67243,7 @@ cont { scale: 19 symbol { name: "subway-samara-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66441,6 +67287,7 @@ cont { scale: 17 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66463,6 +67310,7 @@ cont { scale: 18 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66485,6 +67333,7 @@ cont { scale: 19 symbol { name: "subway-santiago-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66528,6 +67377,7 @@ cont { scale: 17 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66550,6 +67400,7 @@ cont { scale: 18 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66572,6 +67423,7 @@ cont { scale: 19 symbol { name: "subway-santodomingo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66615,6 +67467,7 @@ cont { scale: 17 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66637,6 +67490,7 @@ cont { scale: 18 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66659,6 +67513,7 @@ cont { scale: 19 symbol { name: "subway-saopaulo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66702,6 +67557,7 @@ cont { scale: 17 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66724,6 +67580,7 @@ cont { scale: 18 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66746,6 +67603,7 @@ cont { scale: 19 symbol { name: "subway-sapporo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66789,6 +67647,7 @@ cont { scale: 17 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66811,6 +67670,7 @@ cont { scale: 18 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66833,6 +67693,7 @@ cont { scale: 19 symbol { name: "subway-sendai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66876,6 +67737,7 @@ cont { scale: 17 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66898,6 +67760,7 @@ cont { scale: 18 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66920,6 +67783,7 @@ cont { scale: 19 symbol { name: "subway-sanfrancisco-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66963,6 +67827,7 @@ cont { scale: 17 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -66985,6 +67850,7 @@ cont { scale: 18 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67007,6 +67873,7 @@ cont { scale: 19 symbol { name: "subway-shanghai-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67050,6 +67917,7 @@ cont { scale: 17 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67072,6 +67940,7 @@ cont { scale: 18 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67094,6 +67963,7 @@ cont { scale: 19 symbol { name: "subway-shiraz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67137,6 +68007,7 @@ cont { scale: 17 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67159,6 +68030,7 @@ cont { scale: 18 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67181,6 +68053,7 @@ cont { scale: 19 symbol { name: "subway-sofia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67206,6 +68079,7 @@ cont { scale: 16 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -67229,6 +68103,7 @@ cont { scale: 17 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -67252,6 +68127,7 @@ cont { scale: 18 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -67275,6 +68151,7 @@ cont { scale: 19 symbol { name: "subway-spb-m" + apply_for_type: 1 priority: 16000 } caption { @@ -67319,6 +68196,7 @@ cont { scale: 17 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67341,6 +68219,7 @@ cont { scale: 18 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67363,6 +68242,7 @@ cont { scale: 19 symbol { name: "subway-stockholm-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67406,6 +68286,7 @@ cont { scale: 17 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67428,6 +68309,7 @@ cont { scale: 18 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67450,6 +68332,7 @@ cont { scale: 19 symbol { name: "subway-tabriz-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67493,6 +68376,7 @@ cont { scale: 17 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67515,6 +68399,7 @@ cont { scale: 18 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67537,6 +68422,7 @@ cont { scale: 19 symbol { name: "subway-taipei-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67580,6 +68466,7 @@ cont { scale: 17 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67602,6 +68489,7 @@ cont { scale: 18 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67624,6 +68512,7 @@ cont { scale: 19 symbol { name: "subway-taoyuan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67667,6 +68556,7 @@ cont { scale: 17 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67689,6 +68579,7 @@ cont { scale: 18 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67711,6 +68602,7 @@ cont { scale: 19 symbol { name: "subway-tashkent-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67754,6 +68646,7 @@ cont { scale: 17 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67776,6 +68669,7 @@ cont { scale: 18 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67798,6 +68692,7 @@ cont { scale: 19 symbol { name: "subway-tbilisi-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67841,6 +68736,7 @@ cont { scale: 17 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67863,6 +68759,7 @@ cont { scale: 18 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67885,6 +68782,7 @@ cont { scale: 19 symbol { name: "subway-tianjin-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67928,6 +68826,7 @@ cont { scale: 17 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67950,6 +68849,7 @@ cont { scale: 18 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -67972,6 +68872,7 @@ cont { scale: 19 symbol { name: "subway-tokyo-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68015,6 +68916,7 @@ cont { scale: 17 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68037,6 +68939,7 @@ cont { scale: 18 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68059,6 +68962,7 @@ cont { scale: 19 symbol { name: "subway-valencia-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68102,6 +69006,7 @@ cont { scale: 17 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68124,6 +69029,7 @@ cont { scale: 18 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68146,6 +69052,7 @@ cont { scale: 19 symbol { name: "subway-vienna-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68189,6 +69096,7 @@ cont { scale: 17 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68211,6 +69119,7 @@ cont { scale: 18 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68233,6 +69142,7 @@ cont { scale: 19 symbol { name: "subway-warszawa-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68276,6 +69186,7 @@ cont { scale: 17 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68298,6 +69209,7 @@ cont { scale: 18 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68320,6 +69232,7 @@ cont { scale: 19 symbol { name: "subway-washington-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68363,6 +69276,7 @@ cont { scale: 17 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68385,6 +69299,7 @@ cont { scale: 18 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68407,6 +69322,7 @@ cont { scale: 19 symbol { name: "subway-wuhan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68450,6 +69366,7 @@ cont { scale: 17 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68472,6 +69389,7 @@ cont { scale: 18 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68494,6 +69412,7 @@ cont { scale: 19 symbol { name: "subway-yerevan-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68537,6 +69456,7 @@ cont { scale: 17 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68559,6 +69479,7 @@ cont { scale: 18 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -68581,6 +69502,7 @@ cont { scale: 19 symbol { name: "subway-yokohama-s" + apply_for_type: 1 priority: 16000 } caption { @@ -69053,7 +69975,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69070,7 +69992,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69087,7 +70009,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -69095,7 +70017,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69120,7 +70042,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -69128,7 +70050,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69153,7 +70075,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -69161,7 +70083,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69186,7 +70108,7 @@ cont { color: 855309 dashdot { } - priority: 1069 + priority: 1081 cap: BUTTCAP } lines { @@ -69194,7 +70116,7 @@ cont { color: 1184274 dashdot { } - priority: 1081 + priority: 1093 cap: BUTTCAP } lines { @@ -69800,6 +70722,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69816,6 +70739,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69832,6 +70756,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69848,6 +70773,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69864,6 +70790,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69883,6 +70810,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69899,6 +70827,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69915,6 +70844,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69931,6 +70861,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69947,6 +70878,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -69966,6 +70898,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -69982,6 +70915,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -69998,6 +70932,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70014,6 +70949,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70030,6 +70966,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70049,6 +70986,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -70065,6 +71003,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -70081,6 +71020,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70097,6 +71037,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70113,6 +71054,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70132,6 +71074,7 @@ cont { scale: 15 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 8 } @@ -70148,6 +71091,7 @@ cont { scale: 16 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 28 } @@ -70164,6 +71108,7 @@ cont { scale: 17 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70180,6 +71125,7 @@ cont { scale: 18 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70196,6 +71142,7 @@ cont { scale: 19 symbol { name: "tourism-m" + apply_for_type: 1 priority: 16776 min_distance: 24 } @@ -70464,6 +71411,7 @@ cont { scale: 15 symbol { name: "gallery-m" + apply_for_type: 1 priority: 16800 min_distance: 8 } @@ -70721,6 +71669,7 @@ cont { scale: 14 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70729,6 +71678,7 @@ cont { scale: 15 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70745,6 +71695,7 @@ cont { scale: 16 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70761,6 +71712,7 @@ cont { scale: 17 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70777,6 +71729,7 @@ cont { scale: 18 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -70793,6 +71746,7 @@ cont { scale: 19 symbol { name: "viewpoint-m" + apply_for_type: 1 priority: 16905 min_distance: 8 } @@ -71345,6 +72299,7 @@ cont { scale: 16 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -71352,6 +72307,7 @@ cont { scale: 17 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -71359,6 +72315,7 @@ cont { scale: 18 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -71366,6 +72323,7 @@ cont { scale: 19 symbol { name: "dot-m" + apply_for_type: 1 priority: 16200 } } @@ -72196,7 +73154,7 @@ colors { } value { name: "Selection" - color: 1560281087 + color: 1548466662 } value { name: "SpeedCameraMarkBg" diff --git a/data/editor.config b/data/editor.config index a6e2d2d7c6..c2562d279b 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1,5 +1,5 @@ - + @@ -185,13 +170,15 @@ - + + - + + @@ -202,20 +189,23 @@ - + - + + - + + - + + @@ -223,73 +213,79 @@ - + + - + + - + + - + - + + - + + - + - + + - + + - + - + + - + + - + - - - - - - + + - + + @@ -301,26 +297,28 @@ - + - + - + - + + - + + @@ -330,11 +328,12 @@ - + + - + @@ -343,16 +342,17 @@ - + - + + - + @@ -363,105 +363,86 @@ - + + - + + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -491,18 +472,20 @@ - + + - + + - + @@ -524,31 +507,33 @@ - + + - + - + - + - + - + - + - + + - + @@ -563,7 +548,7 @@ - + @@ -573,251 +558,291 @@ - + + - + + - - - - + + - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - - - - + + - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - - - - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - - - - + + - + + - + + - + + - + + - + + - + + - + - + - + + - + + - + + - + - + + - + + - - - - + + - + + - + + - + + - + + - + + @@ -829,11 +854,8 @@ - - - - - + + @@ -845,33 +867,32 @@ - + + - + + - + - + - + - - - - + - + @@ -911,13 +932,14 @@ - + + - + @@ -936,67 +958,66 @@ - + - + - + - + - + - + - + + - + - + - + - + - + - + - + - + + - + - + - - - - + - + - + @@ -1084,10 +1110,12 @@ - + + - + + @@ -1102,4 +1130,4 @@ - + diff --git a/data/faq.html b/data/faq.html index 5ba8ea747b..643131ae02 100644 --- a/data/faq.html +++ b/data/faq.html @@ -338,7 +338,7 @@

Больше информации на нашем сайте - organicmaps.app + organicmaps.app

Für weitere Informationen besuchen Sie bitte unsere Website diff --git a/data/kml_test_data/track-from-google-earth.kml b/data/kml-with-track-from-google-earth.test similarity index 100% rename from data/kml_test_data/track-from-google-earth.kml rename to data/kml-with-track-from-google-earth.test diff --git a/data/kml_test_data/track.kml b/data/kml-with-track-kml.test similarity index 100% rename from data/kml_test_data/track.kml rename to data/kml-with-track-kml.test diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 1748254204..6dbbfacf74 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -310,7 +310,7 @@ highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309; highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310; deprecated|deprecated;311;x sport|equestrian;312; -tourism|information|office;[tourism=information][information=office];;name;int_name;313; +tourism|information|office;[tourism=information][office],[tourism=information][information=office];;name;int_name;313; highway|footway|hiking;[highway=footway][sac_scale=hiking];;name;int_name;314; aeroway|gate;315; railway|preserved;316; @@ -416,14 +416,14 @@ healthcare|laboratory;415; highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416; railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417; area:highway|service;418; -healthcare|alternative;419; -healthcare|audiologist;420; -healthcare|blood_donation;421; -healthcare|optometrist;422; +deprecated|deprecated;419;x +deprecated|deprecated;420;x +deprecated|deprecated;421;x +deprecated|deprecated;422;x highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423; sport|archery;424; -healthcare|podiatrist;425; -healthcare|psychotherapist;426; +deprecated|deprecated;425;x +deprecated|deprecated;426;x highway|ford;427; area:highway|path;428; railway|siding;429; @@ -432,10 +432,10 @@ amenity|sanitary_dump_station;431; railway|funicular;432; amenity|waste_transfer_station;433; historic|battlefield;434; -healthcare|sample_collection;435; +deprecated|deprecated;435;x sport|australian_football;436; -leisure|bowling_alley;437; -healthcare|speech_therapist;438; +deprecated|deprecated;437;x +deprecated|deprecated;438;x deprecated|deprecated;439;x deprecated|deprecated;440;x aerialway|t-bar;441; @@ -854,10 +854,10 @@ deprecated|deprecated;853;x deprecated|deprecated;854;x deprecated|deprecated;855;x mapswithme|grid;856; -highway|service|busway;[highway=service][service=busway];;name;int_name;857; -highway|busway;858; -highway|busway|bridge;[highway=busway][bridge?];;name;int_name;859; -highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860; +deprecated|deprecated;857;x +deprecated|deprecated;858;x +deprecated|deprecated;859;x +deprecated|deprecated;860;x natural|salt_pond;861;landuse|salt_pond deprecated|deprecated;862;x deprecated|deprecated;863;x @@ -880,7 +880,7 @@ area:highway|motorway;879; area:highway|trunk;880; deprecated|deprecated;881;x entrance;[entrance];;ref;addr:flats;882; -entrance|main;[entrance=main];;ref;addr:flats;883; +deprecated|deprecated;883;x tourism|artwork;885; railway|subway|red;[railway=subway][colour=red];x;name;int_name;886;railway|subway|tunnel railway|subway|blue;[railway=subway][colour=blue];x;name;int_name;887;railway|subway|tunnel @@ -1400,7 +1400,7 @@ railway|station|subway|lausanne;[railway=station][transport=subway][city=lausann railway|station|subway|lille;[railway=station][transport=subway][city=lille],[railway=station][station=subway][city=lille];;name;int_name;1402; railway|station|subway|lima;[railway=station][transport=subway][city=lima],[railway=station][station=subway][city=lima];;name;int_name;1403; railway|station|subway|lisboa;[railway=station][transport=subway][city=lisboa],[railway=station][station=subway][city=lisboa];;name;int_name;1404; -railway|station|subway|bilbao;[railway=station][transport=subway][city=bilbao],[railway=station][station=subway][city=bilbao];;name;int_name;1405; +deprecated|deprecated;1405;x railway|station|subway|lyon;[railway=station][transport=subway][city=lyon],[railway=station][station=subway][city=lyon];;name;int_name;1406; railway|station|subway|malaga;[railway=station][transport=subway][city=malaga],[railway=station][station=subway][city=malaga];;name;int_name;1407; railway|station|subway|manila;[railway=station][transport=subway][city=manila],[railway=station][station=subway][city=manila];;name;int_name;1408; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 4f00f903c8..4197a3d9bf 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -113,7 +113,6 @@ ruins=yes : historic=ruins historic=cannon : historic=memorial historic=technical_monument : historic=memorial historic=shield : historic=memorial -historic=fountain : amenity=fountain | u memorial=blue_plaque : memorial=plaque memorial=stele : memorial=sculpture diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index f41bef86b6..d0943660d6 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index 2269687812..2643721995 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -4,692 +4,678 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 2051ac02cf..6695e56bc4 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 38c1416209..3e7fa5342f 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -4,691 +4,675 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index d3bfac166e..9df4343a31 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 33f6a5b0c7..f6ca1073c4 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -5,691 +5,677 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 287716d0a5..78e330c6cb 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 6f410f90dd..b0f968003c 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -4,691 +4,675 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index c748ce8533..c964080b61 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index 7ff5bd566a..582d732d81 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -5,97 +5,97 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,593 +103,579 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 56402eb905..64bb9e5464 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 1c311b36ce..3c278d82b9 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -4,691 +4,675 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-svg/ic_follow.svg b/data/resources-svg/ic_follow.svg deleted file mode 100644 index 48a2ee9ffd..0000000000 --- a/data/resources-svg/ic_follow.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 84fda985dd..ed3efc3da5 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 55e905d0d2..2a8a818a0f 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -5,97 +5,97 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,593 +103,579 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 66df8cb15e..eb12769bba 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index dab93f4305..695f84fc5f 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -4,691 +4,675 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 24d442752e..c1e9f3b367 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 4a1d7951f5..1bf5682e7d 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -5,691 +5,677 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 9e3760f266..7421c0c279 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 3da75807a0..e8c826aa25 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -4,691 +4,675 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index 7337281e6f..21cb01a41d 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf index d84b862338..2b5ab64455 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -4,98 +4,98 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,593 +103,579 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index f06b0fc872..f73bcb9eb2 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf index 88021a6bb2..adfb5f7e4d 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -3,692 +3,676 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/sound-strings/es-MX.json/localize.json b/data/sound-strings/es-MX.json/localize.json deleted file mode 100644 index b906404558..0000000000 --- a/data/sound-strings/es-MX.json/localize.json +++ /dev/null @@ -1,67 +0,0 @@ -{ -"make_a_slight_right_turn":"Manténgase a la derecha.", -"make_a_right_turn":"Gire a la derecha.", -"make_a_sharp_right_turn":"Gire bruscamente a la derecha.", -"enter_the_roundabout":"Entre a la rotonda.", -"leave_the_roundabout":"Salga de la rotonda.", -"make_a_slight_left_turn":"Manténgase a la izquierda.", -"make_a_left_turn":"Gire a la izquierda.", -"make_a_sharp_left_turn":"Gire bruscamente a la izquierda.", -"make_a_u_turn":"Cambie de sentido.", -"go_straight":"Continúe recto.", -"exit":"Salida.", -"destination":"Llegará a su destino.", -"you_have_reached_the_destination":"Ha llegado a su destino.", -"in_50_meters":"En cincuenta metros", -"in_100_meters":"En cien metros", -"in_200_meters":"En doscientos metros", -"in_250_meters":"En doscientos cincuenta metros", -"in_300_meters":"En trescientos metros", -"in_400_meters":"En cuatrocientos metros", -"in_500_meters":"En quinientos metros", -"in_600_meters":"En seiscientos metros", -"in_700_meters":"En setecientos metros", -"in_750_meters":"En setecientos cincuenta metros", -"in_800_meters":"En ochocientos metros", -"in_900_meters":"En novecientos metros", -"in_1_kilometer":"En un kilómetro", -"in_1_5_kilometers":"En un kilómetro y medio", -"in_2_kilometers":"En dos kilómetros", -"in_2_5_kilometers":"En dos kilómetros y medio", -"in_3_kilometers":"En tres kilómetros", -"then":"Después", -"take_the_1_exit":"Tome la primera salida.", -"take_the_2_exit":"Tome la segunda salida.", -"take_the_3_exit":"Tome la tercera salida.", -"take_the_4_exit":"Tome la cuarta salida.", -"take_the_5_exit":"Tome la quinta salida.", -"take_the_6_exit":"Tome la sexta salida.", -"take_the_7_exit":"Tome la séptima salida.", -"take_the_8_exit":"Tome la octava salida.", -"take_the_9_exit":"Tome la novena salida.", -"take_the_10_exit":"Tome la décima salida.", -"take_the_11_exit":"Tome la undécima salida.", -"in_50_feet":"En cincuenta pies", -"in_100_feet":"En cien pies", -"in_200_feet":"En doscientos pies", -"in_300_feet":"En trescientos pies", -"in_400_feet":"En cuatrocientos pies", -"in_500_feet":"En quinientos pies", -"in_600_feet":"En seiscientos pies", -"in_700_feet":"En setecientos pies", -"in_800_feet":"En ochocientos pies", -"in_900_feet":"En novecientos pies", -"in_1000_feet":"En mil pies", -"in_1500_feet":"En mil quinientos pies", -"in_2000_feet":"En dos mil pies", -"in_2500_feet":"En dos mil quinientos pies", -"in_3000_feet":"En tres mil pies", -"in_3500_feet":"En tres mil quinientos pies", -"in_4000_feet":"En cuatro mil pies", -"in_4500_feet":"En cuatro mil quinientos pies", -"in_5000_feet":"En cinco mil pies", -"in_1_mile":"En una milla", -"in_1_5_miles":"En una milla y media", -"in_2_miles":"En dos millas", -"unknown_camera":"Cámara próxima" -} diff --git a/data/sound-strings/es.json/localize.json b/data/sound-strings/es.json/localize.json index f199fcb36f..2e58d50af2 100644 --- a/data/sound-strings/es.json/localize.json +++ b/data/sound-strings/es.json/localize.json @@ -1,10 +1,10 @@ { -"make_a_slight_right_turn":"Manténgase a la derecha.", +"make_a_slight_right_turn":"Mantente a la derecha.", "make_a_right_turn":"Gire a la derecha.", "make_a_sharp_right_turn":"Gire bruscamente a la derecha.", "enter_the_roundabout":"Entre a la rotonda.", "leave_the_roundabout":"Salga de la rotonda.", -"make_a_slight_left_turn":"Manténgase a la izquierda.", +"make_a_slight_left_turn":"Mantente a la izquierda.", "make_a_left_turn":"Gire a la izquierda.", "make_a_sharp_left_turn":"Gire bruscamente a la izquierda.", "make_a_u_turn":"Cambie de sentido.", diff --git a/data/sound-strings/fi.json/localize.json b/data/sound-strings/fi.json/localize.json index 0e5fb80c1d..3540c0e8bd 100644 --- a/data/sound-strings/fi.json/localize.json +++ b/data/sound-strings/fi.json/localize.json @@ -30,17 +30,17 @@ "in_2_5_kilometers":"Kahden ja puolen kilometrin päässä", "in_3_kilometers":"Kolmen kilometrin päässä", "then":"Sitten", -"take_the_1_exit":"Poistu ensimmäisestä liittymästä.", -"take_the_2_exit":"Poistu toisesta liittymästä.", -"take_the_3_exit":"Poistu kolmannesta liittymästä.", -"take_the_4_exit":"Poistu neljännestä liittymästä.", -"take_the_5_exit":"Poistu viidennestä liittymästä.", -"take_the_6_exit":"Poistu kuudennesta liittymästä.", -"take_the_7_exit":"Poistu seitsemännestä liittymästä.", -"take_the_8_exit":"Poistu kahdeksannesta liittymästä.", -"take_the_9_exit":"Poistu yhdeksännestä liittymästä.", -"take_the_10_exit":"Poistu kymmenennestä liittymästä.", -"take_the_11_exit":"Poistu yhdennestätoista liittymästä.", +"take_the_1_exit":"Poistu seuraavassa liittymässä.", +"take_the_2_exit":"Poistu toisessa liittymässä.", +"take_the_3_exit":"Poistu kolmannessa liittymässä.", +"take_the_4_exit":"Poistu neljännessä liittymässä.", +"take_the_5_exit":"Poistu viidennessä liittymässä.", +"take_the_6_exit":"Poistu kuudennessa liittymässä.", +"take_the_7_exit":"Poistu seitsemännessä liittymässä.", +"take_the_8_exit":"Poistu kahdeksannessa liittymässä.", +"take_the_9_exit":"Poistu yhdeksännessä liittymässä.", +"take_the_10_exit":"Poistu kymmenennessä liittymässä.", +"take_the_11_exit":"Poistu yhdennessätoista liittymässä.", "in_50_feet":"Viidenkymmenen jalan päässä", "in_100_feet":"Sadan jalan päässä", "in_200_feet":"Kahdensadan jalan päässä", diff --git a/data/sound-strings/hi.json/localize.json b/data/sound-strings/hi.json/localize.json index 14fec47a79..6ecfa37c78 100644 --- a/data/sound-strings/hi.json/localize.json +++ b/data/sound-strings/hi.json/localize.json @@ -1,12 +1,12 @@ { "make_a_slight_right_turn":"दायीं ओर रहें", "make_a_right_turn":"दायीं ओर मुड़ें।", -"make_a_sharp_right_turn":"तीव्रता से दाएं मुड़े।", +"make_a_sharp_right_turn":"तीव्रता से दाएं मुड़े।", "enter_the_roundabout":"गोल चक्‍कर में प्रवेश करें।", "leave_the_roundabout":"परिपथ से बाहर निकलें।", "make_a_slight_left_turn":"बायीं ओर रहें", "make_a_left_turn":"बायीं ओर मुड़ें।", -"make_a_sharp_left_turn":"तीव्रता से बाएं मुड़े।", +"make_a_sharp_left_turn":"तीव्रता से बाएं मुड़े।", "make_a_u_turn":"यू-टर्न लें।", "go_straight":"सीधे चलें।", "exit":"बाहर जाएं.", diff --git a/data/sound-strings/nb.json/localize.json b/data/sound-strings/nb.json/localize.json deleted file mode 100644 index 379d42e684..0000000000 --- a/data/sound-strings/nb.json/localize.json +++ /dev/null @@ -1,67 +0,0 @@ -{ -"make_a_slight_right_turn":"Hold til høyre.", -"make_a_right_turn":"Ta til høyre.", -"make_a_sharp_right_turn":"Ta skarpt til høyre.", -"enter_the_roundabout":"Kjør inn i rundkjøringen.", -"leave_the_roundabout":"Kjør ut av rundkjøringen.", -"make_a_slight_left_turn":"Hold til venstre.", -"make_a_left_turn":"Ta til venstre.", -"make_a_sharp_left_turn":"Ta skarpt til venstre.", -"make_a_u_turn":"Ta en U-sving.", -"go_straight":"Fortsett rett fram.", -"exit":"Ta avkjøringen.", -"destination":"Du ankommer.", -"you_have_reached_the_destination":"Du har ankommet.", -"in_50_meters":"Om femti meter", -"in_100_meters":"Om hundre meter", -"in_200_meters":"Om to hundre meter", -"in_250_meters":"Om to hundre og femti meter", -"in_300_meters":"Om tre hundre meter", -"in_400_meters":"Om fire hundre meter", -"in_500_meters":"Om fem hundre meter", -"in_600_meters":"Om seks hundre meter", -"in_700_meters":"Om sju hundre meter", -"in_750_meters":"Om sju hundre og femti meter", -"in_800_meters":"Om åtte hundre meter", -"in_900_meters":"Om ni hundre meter", -"in_1_kilometer":"Om en kilometer", -"in_1_5_kilometers":"Om halvannen kilometer", -"in_2_kilometers":"Om to kilometer", -"in_2_5_kilometers":"Om to og en halv kilometer", -"in_3_kilometers":"Om tre kilometer", -"then":"så", -"take_the_1_exit":"Ta første avkjøring.", -"take_the_2_exit":"Ta andre avkjøring.", -"take_the_3_exit":"Ta tredje avkjøring.", -"take_the_4_exit":"Ta fjerde avkjøring.", -"take_the_5_exit":"Ta femte avkjøring.", -"take_the_6_exit":"Ta sjette avkjøring.", -"take_the_7_exit":"Ta sjuende avkjøring.", -"take_the_8_exit":"Ta åttende avkjøring.", -"take_the_9_exit":"Ta niende avkjøring.", -"take_the_10_exit":"Ta tiende avkjøring.", -"take_the_11_exit":"Ta ellevte avkjøring.", -"in_50_feet":"Om femti fot", -"in_100_feet":"Om hundre fot", -"in_200_feet":"Om to hundre fot", -"in_300_feet":"Om tre hundre fot", -"in_400_feet":"Om fire hundre fot", -"in_500_feet":"Om fem hundre fot", -"in_600_feet":"Om seks hundre fot", -"in_700_feet":"Om sju hundre fot", -"in_800_feet":"Om åtte hundre fot", -"in_900_feet":"Om ni hundre fot", -"in_1000_feet":"Om tusen fot", -"in_1500_feet":"Om femten hundre fot", -"in_2000_feet":"Om to tusen fot", -"in_2500_feet":"Om to tusen fem hundre fot", -"in_3000_feet":"Om tre tusen fot", -"in_3500_feet":"Om tre tusen fem hundre fot", -"in_4000_feet":"Om fire tusen fot", -"in_4500_feet":"Om fire tusen fem hundre fot", -"in_5000_feet":"Om fem tusen fot", -"in_1_mile":"Om en mile", -"in_1_5_miles":"Om halvannen mile", -"in_2_miles":"Om to mile", -"unknown_camera":"Kamera foran" -} diff --git a/data/sound-strings/pt-BR.json/localize.json b/data/sound-strings/pt-BR.json/localize.json deleted file mode 100644 index 3e9dea000b..0000000000 --- a/data/sound-strings/pt-BR.json/localize.json +++ /dev/null @@ -1,67 +0,0 @@ -{ -"make_a_slight_right_turn":"Mantenha-se à direita.", -"make_a_right_turn":"Vire à direita.", -"make_a_sharp_right_turn":"Curva acentuada à direita.", -"enter_the_roundabout":"Entre na rotatória.", -"leave_the_roundabout":"Saia da rotatória.", -"make_a_slight_left_turn":"Mantenha-se à esquerda.", -"make_a_left_turn":"Vire à esquerda.", -"make_a_sharp_left_turn":"Curva acentuada à esquerda.", -"make_a_u_turn":"Faça o retorno.", -"go_straight":"Siga em frente.", -"exit":"Saia.", -"destination":"Você chegará ao seu destino.", -"you_have_reached_the_destination":"Você chegou ao seu destino.", -"in_50_meters":"Em cinquenta metros", -"in_100_meters":"Em cem metros", -"in_200_meters":"Em duzentos metros", -"in_250_meters":"Em duzentos e cinquenta metros", -"in_300_meters":"Em trezentos metros", -"in_400_meters":"Em quatrocentos metros", -"in_500_meters":"Em quinhentos metros", -"in_600_meters":"Em seiscentos metros", -"in_700_meters":"Em setecentos metros", -"in_750_meters":"Em setecentos e cinquenta metros", -"in_800_meters":"Em oitocentos metros", -"in_900_meters":"Em novecentos metros", -"in_1_kilometer":"Em um quilômetro", -"in_1_5_kilometers":"Em um quilômetro e meio", -"in_2_kilometers":"Em dois quilômetros", -"in_2_5_kilometers":"Em dois quilômetros e meio", -"in_3_kilometers":"Em três quilômetros", -"then":"Depois", -"take_the_1_exit":"Saia na primeira saída.", -"take_the_2_exit":"Saia na segunda saída.", -"take_the_3_exit":"Saia na terceira saída.", -"take_the_4_exit":"Saia na quarta saída.", -"take_the_5_exit":"Saia na quinta saída.", -"take_the_6_exit":"Saia na sexta saída.", -"take_the_7_exit":"Saia na sétima saída.", -"take_the_8_exit":"Saia na oitava saída.", -"take_the_9_exit":"Saia na nona saída.", -"take_the_10_exit":"Saia na décima saída.", -"take_the_11_exit":"Saia na décima primeira saída.", -"in_50_feet":"Em cinquenta pés", -"in_100_feet":"Em cem pés", -"in_200_feet":"Em duzentos pés", -"in_300_feet":"Em trezentos pés", -"in_400_feet":"Em quatrocentos pés", -"in_500_feet":"Em quinhentos pés", -"in_600_feet":"Em seiscentos pés", -"in_700_feet":"Em setecentos pés", -"in_800_feet":"Em oitocentos pés", -"in_900_feet":"Em novecentos pés", -"in_1000_feet":"Em mil pés", -"in_1500_feet":"Em mil e quinhentos pés", -"in_2000_feet":"Em dois mil pés", -"in_2500_feet":"Em dois mil e quinhentos pés", -"in_3000_feet":"Em três mil pés", -"in_3500_feet":"Em três mil e quinhentos pés", -"in_4000_feet":"Em quatro mil pés", -"in_4500_feet":"Em quatro mil e quinhentos pés", -"in_5000_feet":"Em cinco mil pés", -"in_1_mile":"Em uma milha", -"in_1_5_miles":"Em uma milha e meia", -"in_2_miles":"Em duas milhas", -"unknown_camera":"Radar à frente" -} diff --git a/data/sound-strings/pt.json/localize.json b/data/sound-strings/pt.json/localize.json index 4537dc9cc7..23a1b71f53 100644 --- a/data/sound-strings/pt.json/localize.json +++ b/data/sound-strings/pt.json/localize.json @@ -9,9 +9,9 @@ "make_a_sharp_left_turn":"Curva acentuada à esquerda.", "make_a_u_turn":"Faça inversão de marcha.", "go_straight":"Siga em frente.", -"exit":"Saia.", -"destination":"Chegará ao seu destino.", -"you_have_reached_the_destination":"Chegou ao seu destino.", +"exit":"Saída.", +"destination":"Você vai chegar.", +"you_have_reached_the_destination":"Chegou.", "in_50_meters":"A cinquenta metros", "in_100_meters":"A cem metros", "in_200_meters":"A duzentos metros", diff --git a/data/strings/sound.txt b/data/strings/sound.txt index 194723faf2..05854fcf75 100644 --- a/data/strings/sound.txt +++ b/data/strings/sound.txt @@ -9,7 +9,7 @@ da = Hold til højre. de = Halten Sie sich rechts. el = Μείνετε δεξιά. - es = Manténgase a la derecha. + es = Mantente a la derecha. eu = Mantendu eskuinera. fa = به راست برانید. fi = Pysy oikealla. @@ -22,7 +22,6 @@ ja = 右を維持してください。 ko = 오른쪽에 두기. mr = उजवीकडे ठेवा. - nb = Hold til høyre. nl = Rechts aanhouden. pl = Trzymaj się prawej strony. pt = Mantenha-se à direita. @@ -61,7 +60,6 @@ ja = 右に曲がります。 ko = 우회전하십시오. mr = उजवीकडे वळा. - nb = Ta til høyre. nl = Sla rechtsaf. pl = Skręć w prawo. pt = Vire à direita. @@ -92,7 +90,7 @@ fa = منتها الیه سمت راست. fi = Jyrkkä oikea. fr = À droite toute. - hi = तीव्रता से दाएं मुड़े। + hi = तीव्रता से दाएं मुड़े। hr = Oštro udesno. hu = Kanyarodjon élesen jobbra. id = Belok tajam ke kanan. @@ -100,7 +98,6 @@ ja = 急に右折。 ko = 급우회전. mr = तीव्र उजवे वळण - nb = Ta skarpt til høyre. nl = Scherp rechtsaf. pl = Ostro w prawo. pt = Curva acentuada à direita. @@ -139,7 +136,6 @@ ja = ロータリー入口です。 ko = 로터리 진입입니다. mr = चौकात प्रवेश करा. - nb = Kjør inn i rundkjøringen. nl = Rij de rotonde op. pl = Wjedź na rondo. pt = Entre na rotunda. @@ -178,7 +174,6 @@ ja = ロータリーから抜けてください。 ko = 원형 교차로에서 나갑니다. mr = चौकातून बाहेर पडा. - nb = Kjør ut av rundkjøringen. nl = Verlaat de rotonde. pl = Zjazd z ronda. pt = Saia da rotunda. @@ -204,7 +199,7 @@ da = Hold til venstre. de = Halten Sie sich links. el = Μείνετε αριστερά. - es = Manténgase a la izquierda. + es = Mantente a la izquierda. eu = Mantendu ezkerrean. fa = به چپ برانید. fi = Pysy vasemmalla. @@ -217,7 +212,6 @@ ja = 左を維持してください。 ko = 왼쪽에 두기. mr = डावीकडे ठेवा. - nb = Hold til venstre. nl = Links aanhouden. pl = Trzymaj się lewej strony. pt = Mantenha-se à esquerda. @@ -256,7 +250,6 @@ ja = 左に曲がります。 ko = 좌회전하십시오. mr = डावीकडे वळा. - nb = Ta til venstre. nl = Sla linksaf. pl = Skręć w lewo. pt = Vire à esquerda. @@ -287,7 +280,7 @@ fa = منتها الیه سمت چپ. fi = Jyrkkä vasen. fr = À gauche toute. - hi = तीव्रता से बाएं मुड़े। + hi = तीव्रता से बाएं मुड़े। hr = Oštro ulijevo. hu = Kanyarodjon élesen balra. id = Belok tajam ke kiri. @@ -295,7 +288,6 @@ ja = 急に左折。 ko = 급좌회전. mr = तीव्र डावे वळण - nb = Ta skarpt til venstre. nl = Scherp linksaf. pl = Ostro w lewo. pt = Curva acentuada à esquerda. @@ -334,7 +326,6 @@ ja = Uターンです。 ko = 유턴입니다. mr = यू-टर्न घ्या. - nb = Ta en U-sving. nl = Keer om. pl = Zawróć. pt = Faça inversão de marcha. @@ -373,7 +364,6 @@ ja = 直進です。 ko = 직진입니다. mr = सरळ जा. - nb = Fortsett rett fram. nl = Rij rechtdoor. pl = Jedź prosto. pt = Siga em frente. @@ -412,11 +402,10 @@ ja = 出口. ko = 출구. mr = बाहेर पडा. - nb = Ta avkjøringen. nl = Verlaat. pl = Zjazd. - pt = Saia. - pt-BR = Saia. + pt = Saída. + pt-BR = Saída. ro = Ieșire. ru = Съезд. sk = Výjazd. @@ -451,11 +440,10 @@ ja = 到着します。 ko = 도착할 예정입니다. mr = तुम्ही पोहोचाल. - nb = Du ankommer. nl = Arriveert u. pl = Dojedziesz. - pt = Chegará ao seu destino. - pt-BR = Você chegará ao seu destino. + pt = Você vai chegar. + pt-BR = Você vai chegar. ro = Veți sosi. ru = Вы прибудете в пункт назначения. sk = Dorazíte. @@ -490,11 +478,10 @@ ja = 到着。 ko = 도착했습니다. mr = तुम्ही पोहोचला आहात. - nb = Du har ankommet. nl = Bestemming bereikt. pl = Jesteś u celu. - pt = Chegou ao seu destino. - pt-BR = Você chegou ao seu destino. + pt = Chegou. + pt-BR = Chegou. ro = Ați ajuns. ru = Вы прибыли в пункт назначения. sk = Dorazili ste do cieľa. @@ -529,11 +516,10 @@ ja = 五十メートル先 ko = 오십 미터 앞 mr = पन्नास मीटर मध्ये - nb = Om femti meter nl = Over vijftig meter pl = Za pięćdziesiąt metrów pt = A cinquenta metros - pt-BR = Em cinquenta metros + pt-BR = A cinquenta metros ro = După cincizeci de metri ru = Через пятьдесят метров sk = Po päťdesiatich metroch @@ -568,11 +554,10 @@ ja = 百メートル先 ko = 백 미터 앞 mr = शंभर मीटर मध्ये - nb = Om hundre meter nl = Over honderd meter pl = Za sto metrów pt = A cem metros - pt-BR = Em cem metros + pt-BR = A cem metros ro = După o sută de metri ru = Через сто метров sk = Po sto metroch @@ -607,11 +592,10 @@ ja = 二百メートル先 ko = 이백 미터 앞 mr = दोनशे मीटर मध्ये - nb = Om to hundre meter nl = Over tweehonderd meter pl = Za dwieście metrów pt = A duzentos metros - pt-BR = Em duzentos metros + pt-BR = A duzentos metros ro = După două sute de metri ru = Через двести метров sk = Po dvesto metroch @@ -646,11 +630,10 @@ ja = 二百五十メートル先 ko = 이백오십 미터 앞 mr = अडीचशे मीटर मध्ये - nb = Om to hundre og femti meter nl = Over tweehonderdvijftig meter pl = Za dwieście pięćdziesiąt metrów pt = A duzentos e cinquenta metros - pt-BR = Em duzentos e cinquenta metros + pt-BR = A duzentos e cinquenta metros ro = După două sute cincizeci de metri ru = Через двести пятьдесят метров sk = Po dvestopäťdesiatich metroch @@ -685,11 +668,10 @@ ja = 三百メートル先 ko = 삼백 미터 앞 mr = तीनशे मीटर मध्ये - nb = Om tre hundre meter nl = Over driehonderd meter pl = Za trzysta metrów pt = A trezentos metros - pt-BR = Em trezentos metros + pt-BR = A trezentos metros ro = După trei sute de metri ru = Через триста метров sk = Po tristo metroch @@ -724,11 +706,10 @@ ja = 四百メートル先 ko = 사백 미터 앞 mr = चारशे मीटर मध्ये - nb = Om fire hundre meter nl = Over vierhonderd meter pl = Za czterysta metrów pt = A quatrocentos metros - pt-BR = Em quatrocentos metros + pt-BR = A quatrocentos metros ro = După patru sute de metri ru = Через четыреста метров sk = Po štyristo metroch @@ -763,11 +744,10 @@ ja = 五百メートル先 ko = 오백 미터 앞 mr = पाचशे मीटर मध्ये - nb = Om fem hundre meter nl = Over vijfhonderd meter pl = Za pięćset metrów pt = A quinhentos metros - pt-BR = Em quinhentos metros + pt-BR = A quinhentos metros ro = După cinci sute de metri ru = Через пятьсот метров sk = Po päťsto metroch @@ -802,11 +782,10 @@ ja = 六百メートル先 ko = 육백 미터 앞 mr = सहाशे मीटर मध्ये - nb = Om seks hundre meter nl = Over zeshonderd meter pl = Za sześćset metrów pt = A seiscentos metros - pt-BR = Em seiscentos metros + pt-BR = A seiscentos metros ro = După șase sute de metri ru = Через шестьсот метров sk = Po šesťsto metroch @@ -841,11 +820,10 @@ ja = 七百メートル先 ko = 칠백 미터 앞 mr = सातशे मीटर मध्ये - nb = Om sju hundre meter nl = Over zevenhonderd meter pl = Za siedemset metrów pt = A setecentos metros - pt-BR = Em setecentos metros + pt-BR = A setecentos metros ro = După șapte sute de metri ru = Через семьсот метров sk = Po sedemsto metroch @@ -880,11 +858,10 @@ ja = 七百五十メートル先 ko = 칠백오십 미터 앞 mr = साडेसातशे मीटर मध्ये - nb = Om sju hundre og femti meter nl = Over zevenhonderdvijftig meter pl = Za siedemset pięćdziesiąt metrów pt = A setecentos e cinquenta metros - pt-BR = Em setecentos e cinquenta metros + pt-BR = A setecentos e cinquenta metros ro = După șapte sute cincizeci de metri ru = Через семьсот пятьдесят метров sk = Po sedemstopäťdesiatich metroch @@ -919,11 +896,10 @@ ja = 八百メートル先 ko = 팔백 미터 앞 mr = आठशे मीटर मध्ये - nb = Om åtte hundre meter nl = Over achthonderd meter pl = Za osiemset metrów pt = A oitocentos metros - pt-BR = Em oitocentos metros + pt-BR = A oitocentos metros ro = După opt sute de metri ru = Через восемьсот метров sk = Po osemsto metroch @@ -958,11 +934,10 @@ ja = 九百メートル先 ko = 구백 미터 앞 mr = नऊशे मीटर मध्ये - nb = Om ni hundre meter nl = Over negenhonderd meter pl = Za dziewięćset metrów pt = A novecentos metros - pt-BR = Em novecentos metros + pt-BR = A novecentos metros ro = După nouă sute de metri ru = Через девятьсот метров sk = Po deväťsto metroch @@ -997,11 +972,10 @@ ja = 一キロ先 ko = 일 킬로미터 앞 mr = एक किलोमीटर मध्ये - nb = Om en kilometer nl = Over één kilometer pl = Za kilometr pt = A um quilómetro - pt-BR = Em um quilômetro + pt-BR = A um quilômetro ro = După un kilometru ru = Через километр sk = Po jednom kilometri @@ -1036,11 +1010,10 @@ ja = 一.五キロ先 ko = 일점오 킬로미터 앞 mr = दीड किलोमीटरमध्ये - nb = Om halvannen kilometer nl = Over anderhalve kilometer pl = Za półtora kilometra pt = A um quilómetro e meio - pt-BR = Em um quilômetro e meio + pt-BR = A um quilômetro e meio ro = După un kilometru și jumătate ru = Через полтора километра sk = Po jeden a pol kilometri @@ -1075,11 +1048,10 @@ ja = 二キロ先 ko = 이 킬로미터 앞 mr = दोन किलोमीटर मध्ये - nb = Om to kilometer nl = Over twee kilometer pl = Za dwa kilometry pt = A dois quilómetros - pt-BR = Em dois quilômetros + pt-BR = A dois quilômetros ro = După doi kilometri ru = Через два километра sk = Po dvoch kilometroch @@ -1114,11 +1086,10 @@ ja = 二.五キロ先 ko = 이점오 킬로미터 앞 mr = अडीच किलोमीटरमध्ये - nb = Om to og en halv kilometer nl = Over tweeëneenhalve kilometer pl = Za dwa i pół kilometra pt = A dois quilómetros e meio - pt-BR = Em dois quilômetros e meio + pt-BR = A dois quilômetros e meio ro = După doi kilometri și jumătate ru = Через два с половиной километра sk = Po dva a pol kilometri @@ -1153,11 +1124,10 @@ ja = 三キロ先 ko = 삼 킬로미터 앞 mr = तीन किलोमीटर मध्ये - nb = Om tre kilometer nl = Over drie kilometer pl = Za trzy kilometry pt = A três quilómetros - pt-BR = Em três quilômetros + pt-BR = A três quilômetros ro = După trei kilometri ru = Через три километра sk = Po troch kilometroch @@ -1192,7 +1162,6 @@ ja = その先 ko = 그 다음 mr = मग - nb = så nl = Daarna pl = Następnie pt = Depois @@ -1221,7 +1190,7 @@ es = Tome la primera salida. eu = Hartu lehen irteera. fa = اولین خروجی را داخل شوید - fi = Poistu ensimmäisestä liittymästä. + fi = Poistu seuraavassa liittymässä. fr = Prenez la première sortie. hi = पहला एग्जिट लें। hr = Izađite na prvom izlazu. @@ -1231,7 +1200,6 @@ ja = 一番目の出口です。 ko = 첫 번째 출구입니다. mr = पहिला निर्गमन घ्या - nb = Ta første avkjøring. nl = Neem de eerste afslag. pl = Zjedź pierwszym zjazdem. pt = Saia na primeira saída. @@ -1260,7 +1228,7 @@ es = Tome la segunda salida. eu = Hartu bigarren irteera. fa = دومین خروجی را داخل شوید. - fi = Poistu toisesta liittymästä. + fi = Poistu toisessa liittymässä. fr = Prenez la deuxième sortie. hi = दूसरा एग्जिट लें। hr = Izađite na drugom izlazu. @@ -1270,7 +1238,6 @@ ja = 二番目の出口です。 ko = 두 번째 출구입니다. mr = दुसरा निर्गमन घ्या - nb = Ta andre avkjøring. nl = Neem de tweede afslag. pl = Zjedź drugim zjazdem. pt = Saia na segunda saída. @@ -1299,7 +1266,7 @@ es = Tome la tercera salida. eu = Hartu hirugarren irteera. fa = سومین خروجی را داخل شوید. - fi = Poistu kolmannesta liittymästä. + fi = Poistu kolmannessa liittymässä. fr = Prenez la troisième sortie. hi = तीसरा एग्जिट लें। hr = Izađite na trećem izlazu. @@ -1309,7 +1276,6 @@ ja = 三番目の出口です。 ko = 세 번째 출구입니다. mr = तिसरा निर्गमन घ्या - nb = Ta tredje avkjøring. nl = Neem de derde afslag. pl = Zjedź trzecim zjazdem. pt = Saia na terceira saída. @@ -1338,7 +1304,7 @@ es = Tome la cuarta salida. eu = Hartu laugarren irteera. fa = چهارمین خروجی را داخل شوید. - fi = Poistu neljännestä liittymästä. + fi = Poistu neljännessä liittymässä. fr = Prenez la quatrième sortie. hi = चौथा एग्जिट लें। hr = Izađite na četvrtom izlazu. @@ -1348,7 +1314,6 @@ ja = 四番目の出口です。 ko = 네 번째 출구입니다. mr = चौथा निर्गमन घ्या - nb = Ta fjerde avkjøring. nl = Neem de vierde afslag. pl = Zjedź czwartym zjazdem. pt = Saia na quarta saída. @@ -1377,7 +1342,7 @@ es = Tome la quinta salida. eu = Hartu bosgarren irteera. fa = پنجمین خروجی را داخل شوید. - fi = Poistu viidennestä liittymästä. + fi = Poistu viidennessä liittymässä. fr = Prenez la cinquième sortie. hi = पाँचवाँ एग्जिट लें। hr = Izađite na petom izlazu. @@ -1387,7 +1352,6 @@ ja = 五番目の出口です。 ko = 다섯 번째 출구입니다. mr = पाचवा निर्गमन घ्या - nb = Ta femte avkjøring. nl = Neem de vijfde afslag. pl = Zjedź piątym zjazdem. pt = Saia na quinta saída. @@ -1416,7 +1380,7 @@ es = Tome la sexta salida. eu = Hartu seigarren irteera. fa = ششمین خروجی را داخل شوید. - fi = Poistu kuudennesta liittymästä. + fi = Poistu kuudennessa liittymässä. fr = Prenez la sixième sortie. hi = छठा एग्जिट लें। hr = Izađite na šestom izlazu. @@ -1426,7 +1390,6 @@ ja = 六番目の出口です。 ko = 여섯 번째 출구입니다. mr = सहावा निर्गमन घ्या - nb = Ta sjette avkjøring. nl = Neem de zesde afslag. pl = Zjedź szóstym zjazdem. pt = Saia na sexta saída. @@ -1455,7 +1418,7 @@ es = Tome la séptima salida. eu = Hartu zazpigarren irteera. fa = هفتمین خروجی را داخل شوید. - fi = Poistu seitsemännestä liittymästä. + fi = Poistu seitsemännessä liittymässä. fr = Prenez la septième sortie. hi = सातवाँ एग्जिट लें। hr = Izađite na sedmom izlazu. @@ -1465,7 +1428,6 @@ ja = 七番目の出口です。 ko = 일곱 번째 출구입니다. mr = सातवा निर्गमन घ्या - nb = Ta sjuende avkjøring. nl = Neem de zevende afslag. pl = Zjedź siódmym zjazdem. pt = Saia na sétima saída. @@ -1494,7 +1456,7 @@ es = Tome la octava salida. eu = Hartu zortzigarren irteera. fa = هشتمین خروجی را داخل شوید. - fi = Poistu kahdeksannesta liittymästä. + fi = Poistu kahdeksannessa liittymässä. fr = Prenez la huitième sortie. hi = आठवाँ एग्जिट लें। hr = Izađite na osmom izlazu. @@ -1504,7 +1466,6 @@ ja = 八番目の出口です。 ko = 여덟 번째 출구입니다. mr = आठवा निर्गमन घ्या - nb = Ta åttende avkjøring. nl = Neem de achtste afslag. pl = Zjedź ósmym zjazdem. pt = Saia na oitava saída. @@ -1533,7 +1494,7 @@ es = Tome la novena salida. eu = Hartu bederatzigarren irteera. fa = نهمین خروجی را داخل شوید. - fi = Poistu yhdeksännestä liittymästä. + fi = Poistu yhdeksännessä liittymässä. fr = Prenez la neuvième sortie. hi = नौवें निकास को लें। hr = Izađite na devetom izlazu. @@ -1543,7 +1504,6 @@ ja = 九番目の出口です。 ko = 아홉 번째 출구입니다. mr = नववा निर्गमन घ्या - nb = Ta niende avkjøring. nl = Neem de negende afslag. pl = Zjedź dziewiątym zjazdem. pt = Saia na nona saída. @@ -1572,7 +1532,7 @@ es = Tome la décima salida. eu = Hartu hamargarren irteera. fa = دهمین خروجی را داخل شوید. - fi = Poistu kymmenennestä liittymästä. + fi = Poistu kymmenennessä liittymässä. fr = Prenez la dixième sortie. hi = दसवाँ एग्जिट लें। hr = Izađite na desetom izlazu. @@ -1582,7 +1542,6 @@ ja = 十番目の出口です。 ko = 열 번째 출구입니다. mr = दहावा निर्गमन घ्या - nb = Ta tiende avkjøring. nl = Neem de tiende afslag. pl = Zjedź dziesiątym zjazdem. pt = Saia na décima saída. @@ -1611,7 +1570,7 @@ es = Tome la undécima salida. eu = Hartu hamaikagarren irteera. fa = یازدهمین خروجی را داخل شوید. - fi = Poistu yhdennestätoista liittymästä. + fi = Poistu yhdennessätoista liittymässä. fr = Prenez la onzième sortie. hi = ग्‍यारहवाँ एग्जिट लें। hr = Izađite na jedanaestom izlazu. @@ -1621,7 +1580,6 @@ ja = 十一番目の出口です。 ko = 열한 번째 출구입니다. mr = अकरावा निर्गमन घ्या - nb = Ta ellevte avkjøring. nl = Neem de elfde afslag. pl = Zjedź jedenastym zjazdem. pt = Saia na décima primeira saída. @@ -1660,11 +1618,10 @@ ja = 五十フィート先 ko = 오십 피트 앞 mr = पन्नास फुटांत - nb = Om femti fot nl = Over vijftig voet pl = Za pięćdziesiąt stóp pt = A cinquenta pés - pt-BR = Em cinquenta pés + pt-BR = A cinquenta pés ro = După cincizeci de picioare ru = Через пятьдесят футов sk = Po päťdesiatich stopách @@ -1699,11 +1656,10 @@ ja = 百フィート先 ko = 백 피트 앞 mr = शंभर फुटात - nb = Om hundre fot nl = Over honderd voet pl = Za sto stóp pt = A cem pés - pt-BR = Em cem pés + pt-BR = A cem pés ro = După o sută de picioare ru = Через сто футов sk = Po sto stopách @@ -1738,11 +1694,10 @@ ja = 二百フィート先 ko = 이백 피트 앞 mr = दोनशे फुटांत - nb = Om to hundre fot nl = Over tweehonderd voet pl = Za dwieście stóp pt = A duzentos pés - pt-BR = Em duzentos pés + pt-BR = A duzentos pés ro = După două sute de picioare ru = Через двести футов sk = Po dvesto stopách @@ -1777,11 +1732,10 @@ ja = 三百フィート先 ko = 삼백 피트 앞 mr = तीनशे फुटांत - nb = Om tre hundre fot nl = Over driehonderd voet pl = Za trzysta stóp pt = A trezentos pés - pt-BR = Em trezentos pés + pt-BR = A trezentos pés ro = După trei sute de picioare ru = Через триста футов sk = Po tristo stopách @@ -1816,11 +1770,10 @@ ja = 四百フィート先 ko = 사백 피트 앞 mr = चारशे फुटांत - nb = Om fire hundre fot nl = Over vierhonderd voet pl = Za czterysta stóp pt = A quatrocentos pés - pt-BR = Em quatrocentos pés + pt-BR = A quatrocentos pés ro = După patru sute de picioare ru = Через четыреста футов sk = Po štyristo stopách @@ -1855,11 +1808,10 @@ ja = 五百フィート先 ko = 오백 피트 앞 mr = पाचशे फुटात - nb = Om fem hundre fot nl = Over vijfhonderd voet pl = Za pięćset stóp pt = A quinhentos pés - pt-BR = Em quinhentos pés + pt-BR = A quinhentos pés ro = După cinci sute de picioare ru = Через пятьсот футов sk = Po päťsto stopách @@ -1894,11 +1846,10 @@ ja = 六百フィート先 ko = 육백 피트 앞 mr = सहाशे फुटांत - nb = Om seks hundre fot nl = Over zeshonderd voet pl = Za sześćset stóp pt = A seiscentos pés - pt-BR = Em seiscentos pés + pt-BR = A seiscentos pés ro = După șase sute de picioare ru = Через шестьсот футов sk = Po šesťsto stopách @@ -1933,11 +1884,10 @@ ja = 七百フィート先 ko = 칠백 피트 앞 mr = सातशे फुटांत - nb = Om sju hundre fot nl = Over zevenhonderd voet pl = Za siedemset stóp pt = A setecentos pés - pt-BR = Em setecentos pés + pt-BR = A setecentos pés ro = După șapte sute de picioare ru = Через семьсот футов sk = Po sedemsto stopách @@ -1972,11 +1922,10 @@ ja = 八百フィート先 ko = 팔백 피트 앞 mr = आठशे फुटांत - nb = Om åtte hundre fot nl = Over achthonderd voet pl = Za osiemset stóp pt = A oitocentos pés - pt-BR = Em oitocentos pés + pt-BR = A oitocentos pés ro = După opt sute de picioare ru = Через восемьсот футов sk = Po osemsto stopách @@ -2011,11 +1960,10 @@ ja = 九百フィート先 ko = 구백 피트 앞 mr = नऊशे फुटांत - nb = Om ni hundre fot nl = Over negenhonderd voet pl = Za dziewięćset stóp pt = A novecentos pés - pt-BR = Em novecentos pés + pt-BR = A novecentos pés ro = După nouă sute de picioare ru = Через девятьсот футов sk = Po deväťsto stopách @@ -2050,11 +1998,10 @@ ja = 千フィート先 ko = 천 피트 앞 mr = एक हजार फुटात - nb = Om tusen fot nl = Over duizend voet pl = Za tysiąc stóp pt = A mil pés - pt-BR = Em mil pés + pt-BR = A mil pés ro = După o mie de picioare ru = Через тысячу футов sk = Po tisíc stopách @@ -2089,11 +2036,10 @@ ja = 千五百フィート先 ko = 천오백 피트 앞 mr = पंधराशे फुटांत - nb = Om femten hundre fot nl = Over vijftienhonderd voet pl = Za tysiąc pięćset stóp pt = A mil e quinhentos pés - pt-BR = Em mil e quinhentos pés + pt-BR = A mil e quinhentos pés ro = După o mie cinci sute de picioare ru = Через тысячу пятьсот футов sk = Po tisícpäťsto stopách @@ -2128,11 +2074,10 @@ ja = 二千フィート先 ko = 이천 피트 앞 mr = दोन हजार फुटात - nb = Om to tusen fot nl = Over tweeduizend voet pl = Za dwa tysiące stóp pt = A dois mil pés - pt-BR = Em dois mil pés + pt-BR = A dois mil pés ro = După două mii de picioare ru = Через две тысячи футов sk = Po dvetisíc stopách @@ -2167,11 +2112,10 @@ ja = 二千五百フィート先 ko = 이천오백 피트 앞 mr = पंचवीसशे फुटांत - nb = Om to tusen fem hundre fot nl = Over vijfentwintighonderd voet pl = Za dwa i pół tysiąca stóp pt = A dois mil e quinhentos pés - pt-BR = Em dois mil e quinhentos pés + pt-BR = A dois mil e quinhentos pés ro = După două mii cinci sute de picioare ru = Через две тысячи пятьсот футов sk = Po dvetisícpäťsto stopách @@ -2206,11 +2150,10 @@ ja = 三千フィート先 ko = 삼천 피트 앞 mr = तीन हजार फुटात - nb = Om tre tusen fot nl = Over drieduizend voet pl = Za trzy tysiące stóp pt = A três mil pés - pt-BR = Em três mil pés + pt-BR = A três mil pés ro = După trei mii de picioare ru = Через три тысячи футов sk = Po tritisíc stopách @@ -2245,11 +2188,10 @@ ja = 三千五百フィート先 ko = 삼천오백 피트 앞 mr = पस्तीसशे फुटांत - nb = Om tre tusen fem hundre fot nl = Over vijfendertighonderd voet pl = Za trzy i pół tysiąca stóp pt = A três mil e quinhentos pés - pt-BR = Em três mil e quinhentos pés + pt-BR = A três mil e quinhentos pés ro = După trei mii cinci sute de picioare ru = Через три тысячи пятьсот футов sk = Po tritisícpäťsto stopách @@ -2284,11 +2226,10 @@ ja = 四千フィート先 ko = 사천 피트 앞 mr = चार हजार फुटात - nb = Om fire tusen fot nl = Over vierduizend voet pl = Za cztery tysiące stóp pt = A quatro mil pés - pt-BR = Em quatro mil pés + pt-BR = A quatro mil pés ro = După patru mii de picioare ru = Через четыре тысячи футов sk = Po štyritisíc stopách @@ -2323,11 +2264,10 @@ ja = 四千五百フィート先 ko = 사천오백 피트 앞 mr = पंचेचाळीसशे फुटांत - nb = Om fire tusen fem hundre fot nl = Over vijfenveertighonderd voet pl = Za cztery i pół tysiąca stóp pt = A quatro mil e quinhentos pés - pt-BR = Em quatro mil e quinhentos pés + pt-BR = A quatro mil e quinhentos pés ro = După patru mii cinci sute de picioare ru = Через четыре тысячи пятьсот футов sk = Po štyritisícpäťsto stopách @@ -2362,11 +2302,10 @@ ja = 五千フィート先 ko = 오천 피트 앞 mr = पाच हजार फुटात - nb = Om fem tusen fot nl = Over vijfduizend voet pl = Za pięć tysięcy stóp pt = A cinco mil pés - pt-BR = Em cinco mil pés + pt-BR = A cinco mil pés ro = După cinci mii de picioare ru = Через пять тысяч футов sk = Po päťtisíc stopách @@ -2401,11 +2340,10 @@ ja = 一マイル先 ko = 일 마일 앞 mr = एक मैल मध्ये - nb = Om en mile nl = Over één mijl pl = Za jedną milę pt = A uma milha - pt-BR = Em uma milha + pt-BR = A uma milha ro = După o milă ru = Через одну милю sk = Po jednej míli @@ -2440,11 +2378,10 @@ ja = 一.五マイル先 ko = 일점오 마일 앞 mr = दीड मैल मध्ये - nb = Om halvannen mile nl = Over anderhalve mijl pl = Za półtorej mili pt = A uma milha e meia - pt-BR = Em uma milha e meia + pt-BR = A uma milha e meia ro = După o milă și jumătate ru = Через полторы мили sk = Po jeden a pol míli @@ -2479,11 +2416,10 @@ ja = 二マイル先 ko = 이 마일 앞 mr = दोन मैल मध्ये - nb = Om to mile nl = Over twee mijl pl = Za dwie mile pt = A duas milhas - pt-BR = Em duas milhas + pt-BR = A duas milhas ro = După două mile ru = Через две мили sk = Po dvoch míľach @@ -2517,7 +2453,7 @@ ja = この先にある自動速度違反取締装置 ko = 전방에 카메라 mr = पुढे कॅमेरा आहे - nb = Kamera foran + nb = Kommer til kamera nl = Camera in zicht pl = Kamera z przodu pt = Câmera à frente @@ -2533,3 +2469,4 @@ vi = Máy ảnh phía trước zh-Hans = 在摄像头前 zh-Hant = 在攝像頭前 + diff --git a/data/strings/strings.txt b/data/strings/strings.txt index 50ef76765e..e591e6f508 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -178,7 +178,7 @@ es = Descargar mapas et = Lae kaarte eu = Deskargatu mapak - fa = دانلود نقشه‌ها + fa = دانلود نقشه ها fi = Lataa karttoja fr = Télécharger des cartes he = הורד קבצי מפות @@ -216,10 +216,10 @@ da = Der skete en fejl ved download, tryk for at prøve igen. de = Herunterladen fehlgeschlagen. Antippen für einen neuen Versuch. el = Η λήψη απέτυχε. Αγγίξτε για να προσπαθήσετε ξανά. - es = Error durante la descarga. Pulse para intentarlo de nuevo. + es = Error durante la descarga, iniciar otra vez et = Allalaadimine ebaõnnestus. Puuduta uuesti proovimiseks. eu = Errore bat gertatu da deskargatzean, hasi berriro - fa = دانلود ناموفق بود. برای تلاش مجدد لمس کنید + fa = دانلود ناموفق بود . برای تلاش مجدد لمس کنید fi = Lataus epäonnistui, yritä uudelleen koskettamalla fr = Échec lors du téléchargement. Toucher de nouveau pour un essai de plus. he = הורדת הקובץ נכשלה. לחץ שוב לניסיון נוסף @@ -345,7 +345,7 @@ eu = Idatzi iritzia fa = نظر خود را بیان کنید fi = Jätä arviointi - fr = Laisser un commentaire + fr = Laisser une critique he = הבע דעתך hu = Ajánlás írása id = Tulis Ulasan @@ -409,7 +409,7 @@ da = Mil de = Meilen el = Μίλια - es = Millas + es = Milla et = Miilid eu = Milia fa = مایل @@ -521,7 +521,7 @@ zh-Hant = 稍後 [search] - comment = View and button titles for accessibility, please also edit it in iphone/plist.txt + comment = View and button titles for accessibility tags = android,ios en = Search ar = البحث @@ -654,10 +654,10 @@ da = Du har alle lokationstjenester for denne enhed eller applikation slukket. Slå dem venligst til i Indstillinger. de = Ortungsdienste sind für dieses Gerät oder die App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen. el = Οι υπηρεσίες εντοπισμού τοποθεσίας είναι προς το παρόν απενεργοποιημένες σε αυτή τη συσκευή ή για αυτή την εφαρμογή. Ενεργοποιήστε τις από τις Ρυθμίσεις. - es = No se puede acceder a los servicios de localización en este dispositivo o aplicación. Por favor, actívelos en los ajustes. + es = No se puede acceder a los servicios de localización. Por favor, activelo en los ajustes. et = Seadme või rakenduse kõik asukohateenused on praegu välja lülitatud. Luba need Seadetes. eu = Ezin da kokapen-zerbitzuetara sartu. Mesedez, aktibatu ezarpenetan. - fa = سرویس موقعیت مکانی شما غیر فعال است .لطفا جهت کارکرد صحیح نرم افزار آن را فعال کنید. + fa = سرویس موقعیت مکانی شما غیر فعال است .لطفا جهت کارکرد صحیح نرم افزار ان را فعال کنید. fi = Laitteen tai sovelluksen kaikki sijaintipalvelut ovat tällä hetkellä poissa käytöstä. Ota ne käyttöön Asetukset-valikossa. fr = Tous les services de localisation de cet appareil sont désactivés, ou ils le sont pour cette application. Veuillez les activer dans les paramètres. he = שרותי המיקום של מכשיר או ישום זה זה כבויים. הכנס ל "הגדרות" Settings)) כדי להדליקם. @@ -980,7 +980,7 @@ es = La aplicación requiere OpenGL acelerado por hardware. Lamentablemente, su dispositivo no es compatible. et = Rakendus vajab riistvaralist OpenGL tuge. Kahjuks Sinu seade ei ole toetatud. eu = Aplikazioak hardware-azeleratutako OpenGL behar du. Zoritxarrez, zure gailua ez da onartzen. - fa = نیازمند است. متاسفانه دستگاه شما از آن پشتیبانی نمی‌کندOpenGLبرنامه برای اجرا به + fa = نیازمند است. متاسفانه دستگاه شما از ان پشتیبانی نمی کندOpenGLبرنامه برای اجرا به fi = Laitteistokiihdytetty OpenGL vaaditaan. Valitettavasti laitteesi ei ole tuettu. fr = L'accélération OpenGL matérielle est exigée. Malheureusement, votre appareil n'est pas pris en charge. he = נדרש מאיץ חומרה OpenGL. לצערינו מכשיר זה אינו נתמך. @@ -1058,7 +1058,7 @@ da = Frakobl venligst USB-kabel eller indsæt et memory kort for at bruge Organic Maps de = Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um Organic Maps zu verwenden el = Αποσυνδέστε το καλώδιο USB ή τοποθετήστε την κάρτα μνήμης για να χρησιμοποιήσετε το Organic Maps - es = Por favor, desconecte el cable USB o inserte una memoria SD para usar Organic Maps + es = Por favor desconectar el cable USB o insertar la memoria SD para usar Organic Maps et = Organic Maps kasutamiseks palun ühenda USB kaabel lahti või sisesta mälukaart eu = Mesedez, deskonektatu USB kablea edo sartu SD memoria Organic Maps erabiltzeko fi = Irrota USB-kaapeli tai syötä muistikortti käyttääksesi Organic Maps -sovellusta @@ -1098,10 +1098,10 @@ da = Frigør venligst plads på dit SD-kort/USB lager først for at bruge denne app de = Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen el = Ελευθερώσετε χώρο αποθήκευσης στην SD κάρτα/USB πρώτα προκειμένου να χρησιμοποιήσετε την εφαρμογή - es = Por favor, libere primero espacio en la memoria SD/almacenamiento USB para usar la aplicación + es = Por favor liberar espacio en la memoria SD/almacenamiento USB para usar la aplicación et = Rakenduse kasutamiseks palun vabasta kõigepealt piisavalt ruumi mälukaardil/USB salvestusseadmel eu = Mesedez, egin lekua SD memorian/USB biltegian aplikazioa erabiltzeko - fa = لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید + fa = لطفا مقداری از فضای ذخیره سازی را آزاد نمایید fi = Vapauta ensin tilaa SD-kortilta/USB-massamuistilta käyttääksesi sovellusta fr = Veuillez d'abord libérer de l'espace sur la carte SD/le stockage USB afin d'utiliser l'appli he = אנא פנה שטח אחסון על ה SD card/USB כדי להשתמש בישום @@ -1138,7 +1138,7 @@ da = Før du starter, så lad os downloade det generelle verdenskort til din enhed.\nIt behøver %@ af data. de = Bevor Sie starten, laden Sie die allgemeine Weltkarte auf Ihr Gerät herunter.\nEs werden %@ Speicherplatz benötigt. el = Πριν ξεκινήσετε τη χρήση της εφαρμογής, επιτρέψτε μας να κατεβάσουμε το γενικό παγκόσμιο χάρτη στη συσκευή σας. \nIt θα χρησιμοποιήσει %@ αποθηκευτικού χώρου. - es = Antes de comenzar, permita que descarguemos en tu dispositivo un mapamundi general.\nSe requieren %@ de almacenamiento. + es = Antes de comenzar, permite que descarguemos en tu dispositivo un mapamundi general.\nSe requieren %@ de datos. et = Ennem rakenduse kasutamise alustamist luba meil laadida seadmesse alla maailma üldkaart.\nSee kasutab %@ mälumahtu. eu = Hasi baino lehen, utzi mundu-mapa orokor bat zure gailura deskargatzeko.\nDatuen %@ beharrezkoa da. fa = قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم.\nمقدار %@ از حافظه شما اشغال می شود. @@ -1258,7 +1258,7 @@ da = Download %@? de = %@ herunterladen? el = Να γίνει λήψη %@; - es = ¿Descargar %@? + es = Descargar %@? et = Laadida alla %@? eu = %@ deskargatu? fa = دانلود %@? @@ -1298,10 +1298,10 @@ da = Opdater %@? de = %@ aktualisieren? el = Να γίνει ενημέρωση %@; - es = ¿Actualizar %@? + es = Actualizar %@? et = Värskendada %@? eu = %@ eguneratzeko? - fa = آپدیت %@? + fa = اپدیت %@? fi = Päivitetäänkö %@? fr = Mettre %@ à jour ? he = לעדכן %@? @@ -1613,7 +1613,7 @@ zh-Hant = 收藏夾 [bookmarks] - comment = "Bookmarks" dialog title, please also edit it in iphone/plist.txt + comment = "Bookmarks" dialog title tags = android,ios en = Bookmarks ar = الإشارات المرجعية @@ -1627,7 +1627,7 @@ es = Marcadores et = Järjehoidjad eu = Markagailuak - fa = نشانه‌ها + fa = نشانه ها fi = Kirjanmerkit fr = Signets he = רשימות אתרים @@ -1750,7 +1750,7 @@ es = Dirección et = Aadress eu = Norabidea - fa = آدرس + fa = ادرس fi = Osoite fr = Adresse he = כתובת @@ -1829,7 +1829,7 @@ da = Indstillinger de = Einstellungen el = Ρυθμίσεις - es = Ajustes + es = Configuración et = Seaded eu = Ezarpenak fa = تنظیمات @@ -1873,7 +1873,7 @@ es = Guardar mapas en et = Salvesta kaardid asukohta eu = Mapak gordetzeko - fa = ذخیره نقشه‌ها در + fa = ذخیره نقشه ها در fi = Tallenna kartat kohteeseen fr = Enregistrer les cartes dans hu = Térképek mentése ide: @@ -1914,7 +1914,7 @@ es = Seleccione el lugar donde deben descargarse los mapas et = Vali asukoht, kuhu kaardid tuleks alla laadida eu = Hautatu mapak non deskargatu behar diren - fa = مسیری را که نقشه‌ها باید در آن دانلود شود را انتخاب کنید + fa = مسیری را که نقشه ها باید در ان دانلود شود را انتخاب کنید fi = Valitse karttojen latauskohde fr = Sélectionner l'emplacement où les cartes devraient être téléchargées he = בחר הכתובת במחשבך לשמירת המפות שתוריד @@ -1952,10 +1952,10 @@ da = Kort de = Karten el = Χάρτες - es = Mapas descargados + es = Mapas et = Kaardid eu = Mapak - fa = نقشه‌ها + fa = نقشه ها fi = Kartat fr = Cartes téléchargées he = מפות @@ -1988,7 +1988,6 @@ be = Унутранае прыватнае сховішча ca = Emmagatzematge privat intern de = Interner persönlicher Speicher - es = Almacenamiento interno privado et = Sisemine privaatne salvestusruum fr = Stockage interne privé nl = Intern persoonlijk geheugen @@ -2006,7 +2005,6 @@ be = Унутранае абагуленае сховішча ca = Emmagatzematge compartit intern de = Interner gemeinsamer Speicher - es = Almacenamiento interno compartido et = Sisemine jagatud salvestusruum fr = Stockage interne partagé nl = Intern gedeeld geheugen @@ -2024,7 +2022,6 @@ be = SD-карта ca = Targeta SD de = SD-Karte - es = Tarjeta SD et = SD-kaart fr = Carte SD nl = SD-kaart @@ -2042,7 +2039,6 @@ be = Знешняе абагульнае сховішча ca = Emmagatzematge compartit extern de = Externer gemeinsamer Speicher - es = Almacenamiento externo compartido et = Väline jagatud salvestusruum fr = Stockage externe partagé nl = Extern gedeeld geheugen @@ -2060,7 +2056,6 @@ be = %1$@ вольна з %2$@ ca = %1$@ lliures de %2$@ de = %1$@ frei von %2$@ - es = %1$@ libres de %2$@ et = %1$@ vaba ruumist %2$@ fr = %1$@ libres sur %2$@ nl = %1$@ beschikbaar van %2$@ @@ -2085,7 +2080,7 @@ es = ¿Mover mapas? et = Teisaldada kaardid? eu = Mapak mugitu? - fa = آیا نقشه‌ها جابه‌جا شود؟ + fa = ایا نقشه ها جابه جا شود؟ fi = Siirrä karttoja? fr = Déplacer les cartes ? he = להעביר המפות? @@ -2118,7 +2113,6 @@ ar = فشلت عملية نقل ملفات الخرائط ca = S'ha produït un error en moure els fitxers de mapes de = Fehler beim Verschieben der Karten - es = Error al mover los archivos de mapas et = Kaardipaanide teisaldamine ebaõnnestus fr = Erreur lors du déplacement des cartes nl = Fout bij het verplaatsen van kaartbestanden @@ -2183,7 +2177,7 @@ es = Unidades de medida et = Mõõtühikud eu = Neurketa-unitateak - fa = واحد اندازه‌گیری + fa = واحد اندازه گیری fi = Mittayksiköt fr = Unités de mesure he = יחידות מדידה @@ -2311,7 +2305,7 @@ eu = Janariak fa = عطاری fi = Elintarvikkeet - fr = Epiceries + fr = Les courses hu = Termékek id = Toserba it = Alimentari @@ -2404,7 +2398,7 @@ mr = पेट्रोल nb = Drivstoff nl = Benzine - pl = Stacja paliw + pl = Stacja benzynowa pt = Combustível pt-BR = Combustível ro = Benzinărie @@ -2638,7 +2632,7 @@ es = Cajero automático et = Pangaautomaat eu = Kutxazain automatikoa - fa = خود‌پرداز + fa = خود پرداز fi = Pankkiautomaatti fr = DAB he = כספומט @@ -3089,7 +3083,7 @@ es-MX = Agua et = Vesi eu = Ura - fa = آب + fa = اب fi = Vesi fr = Eau he = מים @@ -3131,7 +3125,7 @@ es = Caravanas et = Haagiselamud eu = Karabanak - fa = RV برای + fa = RV ﯼﺍﺮﺑ fi = RV tilat fr = Aménagements pour camping-car he = םינאוורק רובע @@ -3172,7 +3166,7 @@ es = Notas et = Märkmed eu = Notak - fa = یادداشت‌ها + fa = یادداشت ها fi = Muistiinpanot fr = Notes he = הערות @@ -3210,7 +3204,7 @@ da = Organic Maps bogmærker er blevet delt med dig de = Organic Maps-Lesezeichen mit Ihnen geteilt el = Κοινοποιήθηκαν αγαπημένα Organic Maps με σας - es = Marcadores de Organic Maps compartidos con usted + es = Marcapáginas de Organic Maps compartidos contigo et = Organic Maps järjehoidjaid jagati Sinuga eu = Organic Maps markatzaileak zurekin partekatu dira fi = Jaetut Organic Maps-kirjanmerkit @@ -3245,7 +3239,7 @@ be = Вітаю!\n\nУ далучаным файле мае закладкі з дататка Organic Maps. Калі ласка, адчыніце іх калі ў вас усталяваны Organic Maps. Калі не, спампуйце дадатак для вашай прылады iOS альбо Andriod па спасылцы: https://omaps.app/get?kmz\n\nПрыемных падарожжаў з Organic Maps! ca = Hola!\n\nAdjunto els meus marcadors de l'aplicació Organic Maps. Obriu-los si teniu l'Organic Maps instal·lat. O, si no teniu l'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://omaps.app/get?kmz\n\nGaudiu viatjant amb l'Organic Maps! de = Hallo!\n\nIm Anhang sind meine Lesezeichen der Organic Maps App. Sie können sie mit Organic Maps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://omaps.app/get?kmz für iOS oder Android herunterladen.\n\nViel Spaß beim Reisen mit Organic Maps! - es = Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz\n¡Disfrute viajando con Organic Maps! + es = Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábrelos si tienes instalado Organic Maps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este link: https://omaps.app/get?kmz\n¡Disfruta viajando con Organic Maps! et = Tere!\nManuses on minu järjehoidjad rakendusest Organic Maps. Palun ava need kui Sul on Organic Maps paigaldatud. Või kui ei ole, lae rakendus alla oma iOS või Android seadmesse, järgides seda linki: https:omaps.appget?kmz\n\nNaudi reisimist Organic Maps-iga! eu = Kaixo!\nNire markatzaileak Mapak organikoak aplikaziotik erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin! fr = Bonjour !\n\nVous trouverez ci-joint mes signets de l'appli Organic Maps. Veuillez les ouvrir si vous avez installé Organic Maps. Si vous ne l'avez pas, téléchargez l'application pour votre appareil iOS ou Android en suivant ce lien : https://omaps.app/get?kmz\n\nBon voyage avec Organic Maps! @@ -3272,10 +3266,10 @@ da = Indlæser Bogmærker de = Lesezeichen werden geladen el = Φόρτωση αγαπημένων - es = Cargando marcadores + es = Cargando favoritos et = Järjehoidjate laadimine eu = Markatzaileak kargatzen - fa = در حال بارگیری نشانه‌ها + fa = در حال بارگیری نشانه ها fi = Ladataan kirjanmerkkejä fr = Chargement des signets he = טוען רשימות אתרים @@ -3313,10 +3307,10 @@ da = Bogmærkerne er indlæst! Du kan nu finde dem på kortet eller i Bogmærke Manager sektionen. de = Lesezeichen erfolgreich geladen! Sie können diese nun auf Ihrer Karte oder im Lesezeichen-Manager anzeigen. el = Τα αγαπημένα φορτώθηκαν με επιτυχία! Μπορείτε να τα βρείτε στο χάρτη ή στην οθόνη Διαχείριση αγαπημένων. - es = ¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores. + es = ¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestión de favoritos. et = Järjehoidjad edukalt laetud! Leiad need kaardil või järjehoidjate halduri ekraanil. eu = Gogokoak behar bezala kargatu dira! Mapan edo kudeatu gogokoak pantailan aurki ditzakezu. - fa = نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید + fa = نشانه ها با موفقیت بارگذاری شد!شما می توانید ان ها را در نقشه یا بخش مدیریت نشانه ها بیابید fi = Kirjanmerkkien lataaminen onnistui! Löydät ne joko kartalta tai kirjanmerkkien hallinnasta. fr = Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l'écran du Gestionnaire de signets. he = רשימת האתרים הועלתה בהצלחה! תוכל למצוא אותה על המפה או במסך נהול רשימות האתרים. @@ -3354,12 +3348,12 @@ da = Bogmærkerne kunne ikke indlæses. Fil kan være skadet eller defekte. de = Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein. el = Η μεταφόρτωση των αγαπημένων απέτυχε. Το αρχείο μπορεί να είναι κατεστραμμένο ή ελαττωματικό. - es = La carga de marcadores ha fallado. El archivo puede estar corrupto o ser defectuoso. + es = La carga de favoritos ha fallado. El archivo puede estar corrupto o ser defectuoso. et = Järjehoidjate laadimine ebaõnnestus. Fail võib olla vigane. eu = Ezin izan da gogokoak kargatu. Fitxategia hondatuta edo akastuna izan daiteke. - fa = بارگذاری نشانه‌ها با شکست مواجه شد.ممکن است فایل آسیب دیده یا معیوب باشد + fa = بارگذاری نشانه ها با شکست مواجح شد.ممکن است فایل اسیب دیده یا معیوب باشد fi = Kirjanmerkkien lähetys epäonnistui. Tiedosto saattaa olla vioittunut. - fr = Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux. + fr = Échec lors du téléversement des signets. Le fichier peut être corrompu ou défectueux. he = טעינת רשימת האתרים נכשלה. יתכן שהקובץ פגום. hu = Könyvjelzők feltöltése sikertelen. A fájl sérült lehet. id = Gagal mengunggah penanda lokasi. Berkas mungkin rusak. @@ -3435,7 +3429,7 @@ da = Din lokation er ikke blevet bestemt endnu de = Ihr Standort konnte noch nicht ermittelt werden el = Η τοποθεσία σας δεν έχει καθοριστεί ακόμη - es = Su ubicación aún no ha sido determinada + es = Tu ubicación aún no ha sido determinada et = Sinu asukoht ei ole veel määratud eu = Zure kokapena ez da oraindik zehaztu fa = مکان شما هنوز مشخص نشده است @@ -3554,15 +3548,15 @@ be = Гэй, глядзі дзе я зараз на мапе! %1$@ альбо %2$@ Няма офлайн-мапаў? Спампуй тут: https://omaps.app/get bg = Хей, виж текущото ми местоположение в Organic Maps! %1$@ или %2$@ ca = Mira la meva ubicació en l'Organic Maps! %1$@ o %2$@ No teniu mapes sense connexió? Baixeu-los aquí: https://omaps.app/get - cs = Ahoj, zkoukni mojí lokaci v Organic Maps! %1$@ nebo %2$@ Nemáš offline mapy? Stáhni tady: https://omaps.app/get + cs = Koukni kde jsem. Otevři odkaz: %1$@ nebo %2$@ da = Hey, tjek min nuværende lokation ud på Organic Maps! %1$@ or %2$@. Har du ikke offline kort? Download her: https://omaps.app/get de = Hey, sieh dir meinen aktuellen Standort auf Organic Maps an! %1$@ oder %2$@ Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get el = Έλεγξε την τρέχουσα τοποθεσία μου στο Organic Maps! %1$@ ή %2$@ στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get - es = ¡Mira mi ubicación actual en Organic Maps!. %1$@ o %2$@ ¿No tienes mapas offline? Descarga aquí: https://omaps.app/get + es = Mira mi ubicación actual en Organic Maps!. %1$@ o %2$@ ¿No tienes mapas offline? Descarga aquí: https://omaps.app/get et = Hei, vaata minu hetkeasukohta Organic Maps kaardil! %1$@ või %2$@ Võrguühenduseta kaardid puuduvad? Lae siit: https://omaps.app/get eu = Ikusi nire uneko kokapena Organic Maps-en! %1$@ edo %2$@ Ez al duzu lineaz kanpoko maparik? Deskargatu hemen: https://omaps.app/get fi = Hei, katso sijaintini Organic Maps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://omaps.app/get - fr = Hé, regardez ma position actuelle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get + fr = Hé, regarde ma position actuelle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get he = . אין ברשותך מפות לא מקוונות? הורד Organic Maps! %1$@ or %2$@ הי, בדוק את מיקומי הנוכחי ב. https://omaps.app/get הורד אותן מ: hu = Nézd meg a Organic Maps helyzetemet! %1$@ vagy %2$@ A program letöltése: https://omaps.app/get id = Hei, lihat lokasiku saat ini di Organic Maps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: https://omaps.app/get @@ -3598,11 +3592,11 @@ da = Hey, tjek min knappenål på Organic Maps kortet ud! de = Hey, sieh dir meine Stecknadel auf der Organic Maps-Karte an! el = Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps! - es = ¡Mira mi marcador en el mapa de Organic Maps! + es = Mira mi marcador en el mapa de Organic Maps! et = Hei, vaata minu asukoha märget Organic Maps kaardil! eu = Begiratu nire markatzailea Map organikoak mapan! fi = Hei, katso merkintäni Organic Maps-kartalla - fr = Hé, regardez mon signet sur la carte Organic Maps ! + fr = Hé, regarde mon signet sur la carte Organic Maps ! he = הי, בדוק את הסיכה שלי במפה של Organic Maps! hu = Nézze meg a Organic Maps jelzőmet id = Hei, lihat pinku di peta Organic Maps @@ -3638,11 +3632,11 @@ da = Hey, tjek min nuværende lokation ud på Organic Maps kortet! de = Hey, sieh dir meinen aktuellen Standort auf der Organic Maps-Karte an el = Έλεγξε την τρέχουσα τοποθεσία μου στο χάρτη Organic Maps! - es = ¡Mira mi ubicación actual en el mapa en Organic Maps! + es = Mira mi ubicación actual en el mapa en Organic Maps! et = Hei, vaata minu hetkeasukohta Organic Maps kaardil! eu = Ikusi nire uneko kokapena mapan Organic Maps-en! fi = Hei, kurkkaa tämänhetkinen sijaintini Organic Maps:n kartalla! - fr = Hé, regardez ma position actuelle sur la carte Organic Maps ! + fr = Hé, regarde ma position actuelle sur la carte Organic Maps ! he = היי, בדקו את המיקום הנוכחי שלי במפה של Organic Maps! hu = Nézze meg a helyzetemet a Organic Maps térképen! id = Hei, lihat lokasiku saat ini di peta Organic Maps! @@ -3682,7 +3676,7 @@ et = Tere,\n\nOlen praegu siin: %1$@. Ava see link %2$@ või see %3$@, et näha seda kohta kaardil.\n\nAitäh. eu = Kaixo:\n\nOrain hemen nago: %1$@. Egin klik esteka honetan %2$@ edo %3$@ honetan mapan ikusteko.\n\nEskerrik asko. fi = Hei,n\nOlen nyt täällä: %1$@. Klikkaa linkkiä %2$@ tai %3$@ nähdäksesi paikan kartalla. Kiitos. - fr = Bonjour,\n\nJe suis actuellement ici : %1$@. Cliquez sur ce lien %2$@ ou sur celui-ci %3$@ pour voir l'endroit sur la carte.\n\nMerci. + fr = Bonjour,\n\nJe suis actuellement ici : %1$@. Clique sur ce lien %2$@ ou sur celui-ci %3$@ pour voir l'endroit sur la carte.\n\nMerci. he = הי, n\nI\ אני כאן: %1$@. הקש על הלינק %2$@ או על %3$@ כדי לראות את המקום על המפה. \n\n תודה. hu = Üdvözlöm!\n\nJelenleg itt vagyok: %1$@ Kattintson erre a hivatkozásra %2$@ vagy erre %3$@, hogy lássa a helyet a térképen.\n\nKöszönöm. id = Hai,\n\nSekarang saya ada di sini: %1$@. Klik tautan ini %2$@ atau yang ini %3$@ untuk melihat tempatnya di peta.\n\nTerima kasih. @@ -3802,7 +3796,7 @@ es = Copiado al portapapeles: %1$@ et = Kopeeritud vahemällu: %1$@ eu = Arbelean kopiatu da: %1$@ - fa = کپی در کلیپ‌برد: %1$@ + fa = کپی در کلیپ برد :%1$@ fi = Kopioitu leikepöydälle: %1$@ fr = Copié dans le presse-papiers : %1$@ he = הועתקו לזכרון זמני %1$@ @@ -3967,9 +3961,9 @@ es = Datos de OpenStreetMap: %@ et = OpenStreetMap andmed: %@ eu = OpenStreetMap datuak: %@ - fa = OpenStreetMap: %@ داده‌های + fa = OpenStreetMap: %@ ﯼﺎﻫ ﻩﺩﺍﺩ fi = OpenStreetMap-tiedot: %@ - fr = Données OpenStreetMap : %@ + fr = Données OpenStreetMap : %@ he = OpenStreetMap: %@ ינותנ hu = OpenStreetMap adatok: %@ id = Data OpenStreetMap: %@ @@ -4165,7 +4159,6 @@ be = Агульныя налады bg = Общи настройки ca = Configuració general - cs = Obecná nastavení de = Allgemeine Einstellungen es = Ajustes generales et = Üldseaded @@ -4193,7 +4186,6 @@ be = Інфармацыя bg = Информация ca = Informació - cs = Informace de = Information es = Información et = Teave @@ -4266,7 +4258,7 @@ es = Botones de zoom et = Zoomi nupud eu = Zoom botoiak - fa = دکمه‌های بزرگنمایی + fa = دکمه های درشت نمایی fi = Zoomauspainikkeet fr = Boutons de zoom he = כפתורי זום @@ -4547,7 +4539,7 @@ es = Edificios en 3D et = 3D hooned eu = 3D eraikinak - fa = ساختمان‌های سه بعدی + fa = ساختمان های سه بعدی fi = 3D-rakennukset fr = Bâtiments en 3D hu = 3D-s épületek @@ -4786,7 +4778,7 @@ es = Zoom automático et = Automaatne zoom eu = Zoom automatikoa - fa = بزرگنمایی خودکار + fa = بزرگ نمایی خودکار fi = Automaattinen zoomaus fr = Zoom automatique hu = Automatikus nagyítás @@ -5059,7 +5051,7 @@ es = Permite registrar el recorrido realizado durante un determinado periodo de tiempo y verlo en el mapa. Tenga en cuenta que la activación de esta función aumenta el consumo de la batería. El registro del recorrido se eliminará automáticamente del mapa una vez vencido dicho periodo de tiempo. et = See valik võimaldab salvestada läbitud tee teatud ajaks ja näha seda kaardil. Pange tähele: selle funktsiooni aktiveerimine suurendab aku kasutust. Rada eemaldatakse automaatselt kaardilt pärast ajaintervalli möödumist. eu = Denbora tarte jakin batean egindako ibilbidea erregistratu eta mapan ikusteko aukera ematen du. Kontuan izan funtzio hau aktibatzea bateriaren kontsumoa handitzen dela. Ibilbide-erregistroa automatikoki kenduko da mapatik denbora-tarte hori igaro ondoren. - fa = با این قابلیت شما می توانید مسیری که می پیمایید را در یک دوره مشخص ضبط نماید و آن را بر روی نقشه ببینید.لطفا توجه نمایید:فعال سازی این قابلیت باعث افزایش مصرف باتری موبایل شما می شود.مسیر به طور خودکار بعد از مدت مشخص شده حذف خواهد شد + fa = با این قابلیت شما می توانید مسیری که می پیمایید را در یک دوره مشخص ضبط نماید و ان را بر روی نقشه ببینید.لطفا توجه نمایید:فعال سازی این قابلیت باعث افزایش مصرف باتری موبایل شما می شود.مسیر به طور خودکار بعد از مدت مشخص شده حذف خواهد شد fi = Toiminnon avulla voit tallentaa kuljetun reitin tietyltä ajalta ja nähdä sen kartalla: Huomautus: tämän toiminnon aktivoiminen lisää akun käyttöä. Reitti poistetaan kartalta automaattisesti ajanjakson päätyttyä. fr = Ceci vous permet d’enregistrer le chemin emprunté pendant un certain temps et de le voir sur la carte. Veuillez noter : l’activation de cette fonction entraîne une grande utilisation de la batterie. La route sera supprimée automatiquement de la carte lorsque l’intervalle de temps sera arrivé à expiration. hu = Ez lehetővé teszi a bejárt útvonal rögzítését és megtekintését a térképen bizonyos időre. Kérjük, vegye figyelembe, hogy ezen funkció aktiválásával megnöveli az akkumulátor használatát. Az útvonal automatikusan törlődik a térképről az időtartam lejártával. @@ -5168,8 +5160,6 @@ tags = android en = Menu ca = Menú - es = Menú - fr = Menu pl = Menu ru = Меню uk = Меню @@ -5222,13 +5212,13 @@ be = Навіны bg = Новини ca = Notícies - cs = Novinky + cs = Zprávy da = Nyheder de = News el = Νέα es = Noticias et = Uudised - fa = اخبار + fa = ﺭﺎﺒﺧﺍ fi = Uutiset fr = Nouvelles he = תוֹשׁדָחֲ @@ -5269,11 +5259,6 @@ tags = android,ios en = [matrix] - [mastodon] - comment = Text in menu - tags = android,ios - en = Mastodon - [facebook] comment = Text in menu tags = android,ios @@ -5447,7 +5432,7 @@ es = Preguntas frecuentes et = Korduma kippuvad küsimused eu = Maiz galderak - fa = پرسش‌های زیاد پرسیده شده + fa = ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ fi = Kysymykset ja vastaukset fr = Foire aux questions he = תובושתו תולאש @@ -5476,10 +5461,10 @@ [donate] comment = Button in the main menu - tags = android,ios + tags = android en = Donate ar = ﻉﺮﺒﺘﻳ - be = Падтрымаць грашыма + be = Ахвяраваць bg = Дарете ca = Donatiu cs = Darovat @@ -5489,7 +5474,7 @@ es = Donar et = Anneta eu = Dohaintza eman - fa = حمایت مالی + fa = ﺪﯿﻨﮐ ﺍﺪﻫﺍ fi = Lahjoittaa fr = Faire un don he = םוֹרתְלִ @@ -5509,8 +5494,8 @@ sv = Donera sw = Changia th = บริจาค - tr = Bağış yapın - uk = Підтримати грошима + tr = Bağış Yapın + uk = Пожертвувати vi = Quyên tặng zh-Hans = 捐 zh-Hant = 捐 @@ -5609,7 +5594,7 @@ da = Rapportér fejl de = Fehler melden el = Αναφορά σφάλματος - es = Informar de un fallo + es = Hay un error et = Teata veast eu = Errore bat dago fa = گزارش خطا @@ -5650,10 +5635,10 @@ da = Emailklienten er ikke blevet sat op. Venligst konfigurér den eller brug en anden måde til at kontakte os på %@ de = Der Email-Client ist noch nicht eingerichtet worden. Konfigurieren Sie ihn bitte oder nutzen Sie eine andere Möglichkeit, uns unter %@ zu erreichen. el = Το πρόγραμμα-client ηλεκτρονικού ταχυδρομείου έχει δεν έχει ρυθμιστεί. Ρυθμίστε το ή χρησιμοποιήστε άλλο τρόπο να επικοινωνήσετε μαζί μας στη διεύθυνση %@ - es = No se ha configurado el cliente de correo electrónico. Por favor, configúrelo o utilice alguna otra forma de ponerse en contacto con nosotros en %@ + es = No se ha configurado el cliente de correo electrónico. Por favor, configúralo o utiliza alguna otra forma de ponerte en contacto con nosotros en %@ et = E-posti klienti ei ole seadistatud. Palun seadistage see või kasutage mõnda muud võimalust meiega ühenduse võtmiseks aadressil %@ eu = Posta elektronikoko bezeroa ez da konfiguratu. Mesedez, konfigura ezazu edo erabili beste moduren bat gurekin harremanetan jartzeko %@ helbidean - fa = کلاینت ایمیل شما پیکربندی نشده است.لطفا آن را پیکربندی کنید یا از طریق دیگر با ما تماس بگیرید %@ + fa = کلاینت ایمیل شما پیکربندی نشده است.لطفا ان را پیکربندی کنید یا از طریق دیگر با ما تماس بگیرید %@ fi = Sähköpostisovellusta ei ole asetettu. Ole hyvä ja määritä sähköpostiasetukset tai ota meihin yhteyttä toista kautta osoitteessa %@ fr = Le client de courriel n'a pas été configuré. Veuillez le faire ou employer tout autre moyen pour nous contacter à %@ he = יישום הדוא"ל לא הוגדר. אנא קבעו את תצורתו או השתמשו בכל דרך אחרת על מנת ליצור עמנו קשר בכתובת %@ @@ -5735,7 +5720,7 @@ es = Calibración de la brújula et = Kompassi kalibreerimine eu = Konpas kalibrazioa - fa = تنظیم کردن قطب نما + fa = تنظیم کردن قظب نما fi = Kompassin kalibrointi fr = Étalonnage de la boussole he = כיול המצפן @@ -5776,7 +5761,7 @@ es = Actualizar todos et = Värskenda kõik eu = Eguneratu guztiak - fa = آپدیت همه + fa = اپدیت همه fi = Päivitä kaikki fr = Tout mettre à jour hu = Mindegyik frissítése @@ -6016,7 +6001,7 @@ es = Mapas et = Kaardid eu = Mapak - fa = نقشه‌ها + fa = نقشه ها fi = Kartat fr = Cartes hu = Térképek @@ -6057,7 +6042,7 @@ eu = Deskargatu guztiak fa = دانلود همه fi = Lataa kaikki - fr = Tout télécharger + fr = Télécharger tout hu = Mindegyik letöltése id = Unduh semua it = Scarica tutte @@ -6172,7 +6157,7 @@ es = Actualizar et = Värskenda eu = Eguneratzeko - fa = بروزرسانی + fa = به روز رسانی fi = Päivitä fr = Mettre à jour he = לְעַדְכֵּן @@ -6215,7 +6200,7 @@ eu = Porrota fa = ناموفق fi = Epäonnistunut - fr = Echec + fr = A échoué he = נכשלה hu = Sikertelen id = Gagal @@ -6251,10 +6236,10 @@ da = For at slette kortet skal du stoppe navigeringen. de = Zum Löschen der Karte bitte Navigation unterbrechen. el = Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση. - es = Para eliminar el mapa, por favor, detenga la navegación. + es = Para eliminar el mapa, por favor, detén la navegación. et = Kaardi kustutamiseks palun lõpeta navigeerimine. eu = Mapa kentzeko, utzi nabigazioa. - fa = برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید + fa = برای حذف نقشه لطفا مسیر یابی را متوقف کنید fi = Pysäytä navigointi poistaaksesi kartan. fr = Veuillez interrompre la navigation pour supprimer la carte. hu = Kérjük, állítsa le a navigációt a térkép törléséhez. @@ -6294,7 +6279,7 @@ es = Sólo se pueden crear rutas que estén totalmente contenidas en un mapa de una sola región. et = Luua saab ainult täielikult ühe regiooni kaardi piiridesse jäävaid marsruute. eu = Eskualde bakarreko mapa batean guztiz bilduta dauden ibilbideak soilik sor daitezke. - fa = تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند. + fa = تنها مسیر هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند. fi = Vain kokonaisuudessaan yhdelle kartalle mahtuvia reittejä voidaan luoda. fr = Les itinéraires ne peuvent être créés que s'ils sont entièrement contenus dans la carte d'une seule région. he = ניתן ליצור רק מסלולים שמוכלים במלואם בתוך מפה אחת. @@ -6457,7 +6442,7 @@ es = Actualizar mapa et = Värskenda kaart eu = Eguneratu mapa - fa = بروزرسانی نقشه + fa = به روز رسانی نقشه fi = Päivitä kartta fr = Mise à jour carte he = עדכן מפה @@ -6500,7 +6485,7 @@ eu = Google Play Zerbitzuak fa = خدمات Google Play fi = Google Play Palvelut - fr = Services Google Play + fr = Services Google Play hi = Google Play सेवाएं hu = Google Play-szolgáltatások in = Layanan Google Play @@ -6536,7 +6521,7 @@ da = Anvend Google Play Services til at få din aktuelle placering de = Nutzen Sie die Google Play-Dienste, um Ihren aktuellen Standort zu erhalten el = Χρησιμοποιήστε υπηρεσίες Google Play για να προσδιορίσετε την τρέχουσα τοποθεσία σας - es = Usar los servicios de Google Play para obtener su ubicación actual + es = Usar los servicios de Google Play para obtener tu ubicación actual et = Kasuta Google Play teenuseid oma hetkeasukoha määramiseks eu = Erabili Google Play zerbitzuak zure uneko kokapena lortzeko fa = استفاده از Google Play Services برای تعیین موقعیت کنونی شما @@ -6579,7 +6564,7 @@ es = Descargue todos los mapas de su ruta et = Lae alla kõik kaardid oma marsruudil eu = Deskargatu zure ibilbidearen mapa guztiak - fa = دانلود تمامی نقشه‌ها در طول مسیر‌تان + fa = دانلود تمامی نقشه ها در طول مسیر تان fi = Lataa karttoja matkalla fr = Téléchargez toutes les cartes le long de votre itinéraire hu = Tölts le térképeket az útvonal mellett @@ -6616,10 +6601,10 @@ da = Ved at oprette en rute kræver det, at alle kort fra din placering til destination er downloadede og opdaterede. de = Zum Erstellen einer Route müssen alle Karten von Ihrem Standort bis zum Ziel heruntergeladen und aktualisiert worden sein. el = Για να δημιουργήσετε μια διαδρομή, πρέπει να κατεβάσετε και να ενημερώσετε όλους τους χάρτες από τη θέση σας στον προορισμό σας. - es = Para crear una ruta es necesario descargar y actualizar todos los mapas desde su ubicación a su destino. + es = Para crear una ruta es necesario descargar y actualizar todos los mapas de la ubicación de destino. et = Marsruudi loomiseks on meil vaja alla laadida ja värskendada kõiki sinu lähte- ja sihtkoha vahele jäävaid kaarte. eu = Ibilbide bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatu eta eguneratzea. - fa = به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه‌های شما از مبدا تا مقصد را بروزرسانی کنیم. + fa = به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه های شما از مبدا تا مقصد را به روز رسانی کنیم. fi = Reitin luominen vaatii karttojen lataamisen ja päivityksen oman sijaintisi ja kohteeen väliltä. fr = La création d'un itinéraire nécessite que toutes les cartes de votre localisation vers votre destination soient téléchargées et actualisées. hu = Útvonal tervezéséhez a kiindulási pont és a célútvonal összes térképét szükséges letölteni és frissíteni. @@ -6698,7 +6683,7 @@ es = marcador et = järjehoidja eu = Markatzailea - fa = نشانه‌ها + fa = نشانه ها fi = kirjanmerkki fr = signet he = סימניה @@ -6814,7 +6799,7 @@ da = Dine beskrivelser (tekst eller html) de = Ihre Beschreibungen (Text oder HTML) el = Οι περιγραφές σας (κείμενο ή html) - es = Sus descripciones (texto o html) + es = Tus descripciones (texto o html) et = Sinu kirjeldused (tekst või html) eu = Zure deskribapenak (testua edo html) fa = توضیحات شما (متن یا (html @@ -6979,7 +6964,7 @@ es-MX = Azul et = Sinine eu = Urdina - fa = آبی + fa = ابی fi = Sininen fr = Bleu hu = Kék @@ -7063,7 +7048,7 @@ eu = Morea fa = بنفش fi = Violetti - fr = Violet + fr = Pourpre hu = Lila id = Tím it = Viola @@ -7306,7 +7291,7 @@ es-MX = Cian et = Siniroheline eu = Zian - fa = فیروزه‌ای + fa = فیروزه ای fi = Sinivihreä fr = Cyan hu = Cián @@ -7388,7 +7373,7 @@ es-MX = Lima et = Laimiroheline eu = Karea - fa = زرد لیمویی + fa = زرد لیویی fi = Limen värinen fr = Vert citron hu = Lime @@ -7713,7 +7698,7 @@ es = — Actúe con cautela en las rutas con zonas fronterizas: las rutas creadas por nuestra aplicación en ocasiones pueden atravesar las fronteras de países en lugares no autorizados; et = - Olge piiritsoonides marsruutidega ettevaatlik: meie rakenduse loodud marsruudid võivad mõnikord ületada riigipiire volitamata kohtades. eu = — Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan; - fa = —در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر‌هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز‌های کشور‌ها را رد کند که این در بعضی مناطق غیر مجاز است. + fa = —در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز های کشور ها را رد کند که این در بعضی مناطق غیر مجاز است. fi = — Ole varovainen reittien suhteen raja-alueilla: sovelluksemme luomat reitit voivat toisinaan ylittää maiden rajoja luvattomissa paikoissa; fr = — Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l'application peuvent parfois franchir des frontières étatiques dans des zones interdites; hu = — A határmenti útvonalakon közlekedjen óvatosan: az alkalmazásunk által létrehozott útvonalak néha olyan helyeken szelhetik át az országhatárokat, amelyek nem engedélyezettek; @@ -7869,10 +7854,10 @@ da = Tjek venligst dit GPS-signal. Din placering registreres mere præcist, hvis wi-fi er slået til. de = Bitte prüfen Sie Ihr GPS-Signal. WLAN verbessert Ihre Standortgenauigkeit. el = Ελέγξτε το σήμα GPS. Η ενεργοποίηση του Wi-Fi θα βελτιώσει την ακρίβεια της τοποθεσίας σας. - es = Verifique la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación. + es = Verifique la señal del GPS. Activar Wi-Fi mejorará la precisión de su ubicación. et = Palun kontrolli GPS signaali. WiFi lubamine parandab asukoha täpsust. eu = Egiaztatu GPS seinalea. Wi-Fi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da. - fa = لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت‌یابی فعال کنید. + fa = لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت یابی فعال کنید. fi = Tarkista GPS-signaali. Wi-Fi-signaalin käyttöönotto parantaa sijainnin tarkkuutta. fr = Vérifiez le signal GPS. Activez le Wi-Fi pour améliorer la précision de votre localisation. he = בדוק את אות ה-GPS שלך. הפעלת ה-Wi-Fi תשפר את הדיוק בזיהוי המיקום שלך. @@ -7992,7 +7977,7 @@ es = Descargar archivos requeridos et = Lae alla vajalikud failid eu = Deskargatu beharrezko fitxategiak - fa = دانلود فایل‌های مورد نیاز + fa = دانلود فایل های مورد نیاز fi = Lataa tarvittavat tiedostot fr = Téléchargez les fichiers requis he = הורד את הקבצים הדרושים @@ -8271,7 +8256,7 @@ es = Seleccione un punto de inicio cercano a una carretera. et = Palun vali alguspunkt teele lähemal. eu = Hautatu errepide batetik gertu abiapuntua. - fa = لطفا نقطه شروع را نزدیک‌تر به جاده انتخاب کنید. + fa = لطفا نقطه شروع رانزدیک تر به جاده انتخاب کنید. fi = Valitse lähempänä tietä oleva aloituskohta. fr = Choisissez un point de départ à proximité d'une route. he = בחר נקודת התחלה הקרובה יותר לכביש כלשהו. @@ -8313,7 +8298,7 @@ eu = Helmuga ezarri fa = تنظیم مقصد fi = Muuta määränpäätä - fr = Ajustez la destination + fr = Modifiez la destination he = כוונן יעד hu = Pontosítsa célállomását id = Sesuaikan tujuan @@ -8391,9 +8376,9 @@ es = Seleccione un punto de destino cercano a una carretera. et = Palun vali sihtkoht teele lähemal. eu = Hautatu helmuga puntu bat errepide batetik gertu. - fa = لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید. + fa = لطفا مقصد تعیین شده را نزدیک تر به جاده انتخاب نمایید. fi = Valitse lähempänä tietä oleva määränpää. - fr = Choisissez un lieu de destination à proximité d'une route. + fr = Choisissez une destination à proximité d'une route. he = בחר נקודת יעד הקרובה יותר לכביש כלשהו. hu = Kérjük, válasszon egy úthoz közelebb eső célállomást. id = Pilih titik tujuan yang lebih dekat dengan jalan. @@ -8592,7 +8577,7 @@ eu = Saiatu berriro fa = لطفا دوباره تلاش کنید fi = Yritä uudelleen - fr = Veuillez réessayer + fr = Réessayer he = נסה שוב hu = Kérjük, próbálja újra id = Mohon coba lagi @@ -8670,7 +8655,7 @@ es = ¿Desea descargar el mapa y crear una ruta mejor que abarque más de un mapa? et = Kas sooviksid kaardi alla laadida ja luua optimaalsema rohkem kui ühte kaarti hõlmava marsruudi? eu = Mapa deskargatu eta mapa bat baino gehiago hartzen duen ibilbide hobe bat sortu nahi duzu? - fa = ایا مایل به دانلود نقشه و ایجاد مسیر‌های بهینه بیشتری که نقشه‌های بیشتری را پوشش میدهد هستید؟ + fa = ایا مایل به دانلود نقشه و ایجاد مسیر های بهینه بیشتری که نقشه های بیشتری را پوشش میدهد هستید؟ fi = Haluatko ladata kartan ja luoda paremman reitin, joka ylettyy usealle kartalle? fr = Voulez-vous télécharger la carte et créer un itinéraire plus direct s'étendant sur plus d'une carte? he = האם ברצונך להוריד את המפה וליצור מסלול מיטבי יותר, הכולל יותר מאשר מפה אחת? @@ -8710,7 +8695,7 @@ es = Descargue mapas adicionales para crear una ruta mejor que cruce los límites de este mapa. et = Lae alla täiendavad kaardid, et luua parem, selle kaardi piire ületav marsruut. eu = Deskargatu mapa osagarriak mapa honen mugak gainditzen dituen ibilbide hobea sortzeko. - fa = دانلود نقشه‌های اضافی برای ایجاد مسیری بهتر که حاشیه‌های این نقشه را رد می کند. + fa = دانلود نقشه های اضافی برای ایجاد مسیری بهتر که حاشیه های این نقشه را رد می کند. fi = Lataa kartta ja luo parempi reitti, joka ylittää tämän kartan reunan. fr = Téléchargez des cartes pour créer un itinéraire plus direct sortant des limites de cette carte. he = הורד את המפה כדי ליצור מסלול מיטבי יותר, החוצה את הגבול של מפה זו. @@ -8749,10 +8734,10 @@ da = For at begynde at søge efter og oprette ruter bedes du downloade kortet, så du ikke længere har behov for en internetforbindelse. de = Um mit der Suche und dem Erstellen von Routen zu beginnen, laden Sie bitte die Karte herunter. Sie benötigen danach keine Internetverbindung mehr. el = Για να ξεκινήσετε την αναζήτηση και τη δημιουργία διαδρομών, κατεβάστε το χάρτη. Μετά από αυτό δεν θα χρειάζεστε πλέον σύνδεση στο Internet. - es = Para empezar a buscar y crear rutas, descargue el mapa. Después de eso, ya no necesitará una conexión a Internet. + es = Para empezar a buscar y crear rutas, descargue el mapa. Después de eso ya no necesitarás una conexión a Internet. et = Marsruutide otsimise ja loomise alustamiseks lae kaart alla. Pärast seda ei ole Interneti-ühendus enam vajalik. eu = Ibilbideak bilatzen eta sortzen hasteko, deskargatu mapa. Horren ondoren, ez duzu Interneterako konexiorik beharko. - fa = برای شروع جستجو و مسیر‌یابی لطفا نقشه رادانلود کنید بعد از آن دیگر نیازی به اتصال به اینترنت ندارید و برنامه کاملا آفلاین اجرا می شود. + fa = برای شروع جستوجو و مسیر یابی لطفا نقشه رادانلود کنید بعد از ان دیگر نیازی به اتصال به اینترنت ندارید و برنامه کاملا افلاین اجرا می شود. fi = Lataa kartta jotta voit käyttää hakua ja luoda reittejä. Tämän jälkeen et tarvitse enää Internet-yhteyttä. fr = Pour commencer à rechercher et à créer des itinéraires, veuillez télécharger la carte. Après cela, vous n'aurez plus besoin d'une connexion Internet. he = על מנת להתחיל לחפש וליצור מסלולים, הורידו בבקשה את המפה ולא תזדקקו יותר לחיבור לאינטרנט. @@ -8789,7 +8774,7 @@ da = Vælk kortet de = Karte auswählen el = Επιλέξτε χάρτη - es = Seleccionar mapa + es = Seleccionar el mapa et = Vali kaart eu = Hautatu mapa fa = انتخاب نقشه @@ -9029,7 +9014,7 @@ es = Categorías et = Kategooriad eu = Kategoriak - fa = دسته‌بندی‌ها + fa = دسته بندی ها fi = Luokat fr = Catégories hu = Kategóriák @@ -9100,11 +9085,11 @@ be = Нічога не знойдзена. bg = За съжаление не са намерени резултати. ca = Ups! No s'ha trobat cap resultat. - cs = Omlouváme se, nic nebylo nalezeno. + cs = Omlouvám se, nic nenalezeno. da = Desværre, jeg fandt ikke noget. de = Leider wurde nichts gefunden. el = Ωχ, δεν βρέθηκαν αποτελέσματα. - es = Lo siento, no se han encontrado resultados. + es = Lo siento, no he encontrado nada. et = Vabandust, tulemusi ei leitud. eu = Barkatu, ez dut ezer aurkitu. fa = متاسفانه چیزی پیدا نشد @@ -9143,10 +9128,10 @@ da = Prøv en anden forespørgsel. de = Versuchen Sie bitte eine andere Suchanfrage. el = Δοκιμάστε να αλλάξετε τα κριτήρια αναζήτησής σας. - es = Por favor, pruebe con otra consulta. + es = Por favor, prueba con otra consulta. et = Proovi muuta otsingutingimusi. eu = Mesedez, saiatu beste kontsulta bat. - fa = با تغییر در معیار‌های جستجو دوباره امتحان کنید + fa = با تغییر در معیار های جست و جو دوباره امتحان کنید fi = Yritä jotain toista hakusanaa. fr = Veuillez essayer un autre mot-clé. hu = Próbáljon másik lekérdezést. @@ -9185,7 +9170,7 @@ es = Historial de búsquedas et = Otsinguajalugu eu = Bilaketa-historia - fa = سوابق جستجو + fa = سوابق جست وجو fi = Hakuhistoria fr = Historique de recherche hu = Előző keresések @@ -9224,7 +9209,7 @@ es = Ver búsquedas recientes. et = Vaata hiljutisi otsinguid. eu = Ikusi azken bilaketak. - fa = مشاهده جستجو‌های اخیر + fa = مشاهده جست وجو های اخیر fi = Siirry nopeasti aikaisempaan hakuun. fr = Accédez rapidement aux dernières recherches. hu = Aktuális keresés gyors elérése. @@ -9263,7 +9248,7 @@ es = Eliminar el historial de búsqueda et = Tühjenda otsinguajalugu eu = Ezabatu bilaketa-historia - fa = پاک کردن سابقه جستجوها + fa = پاک کردن سابقه جست وجو ها fi = Poista hakuhistoria fr = Effacer l'historique de recherche hu = A keresési előzmények törlése @@ -9328,7 +9313,7 @@ da = Din lokalitet de = Ihr Standort el = Η τοποθεσία σας - es = Su ubicación + es = Tu ubicación et = Sinu asukoht eu = Zure kokapena fa = موقعیت شما @@ -9406,7 +9391,7 @@ da = Fra de = Von el = Διαδρομή από - es = Ruta desde + es = Desde et = Marsruut lähtekohast eu = Hemendik fa = مسیر از @@ -9484,10 +9469,10 @@ da = Navigation er kun tilgængelig fra din nuværende lokalitet. de = Die Navigation ist nur von Ihrem aktuellen Standort verfügbar. el = Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας. - es = La navegación solo está disponible desde su ubicación actual. + es = La navegación solo está disponible desde tu ubicación actual. et = Navigeerimine on saadaval ainult Sinu praegusest asukohast. eu = Nabigazioa zure uneko kokapenetik soilik dago erabilgarri. - fa = مسیر‌یابی فقط از موقعیت کنونی شما قابل انجام است. + fa = مسیر یابی فقط از موقعیت کنونی شما قابل انجام است. fi = Navigointi onnistuu vain nykyisestä sijainnistasi. fr = La navigation est uniquement disponible à partir de votre emplacement actuel. hu = A navigáció csak a jelenlegi helyzetéből érhető el. @@ -9523,10 +9508,10 @@ da = Ønsker du, at vi planlægger en rute fra din nuværende placering? de = Soll eine Route von Ihrem aktuellen Standort aus berechnet werden? el = Θέλετε να σχεδιάσουμε μια διαδρομή από την τρέχουσα θέση σας; - es = ¿Quiere que planeemos un ruta desde su ubicación actual? + es = ¿Quieres que planeemos un ruta desde tu ubicación actual? et = Kas soovid, et planeeriksime marsruudi Sinu praegusest asukohast? eu = Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu? - fa = آیا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟ + fa = ایا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟ fi = Haluatko valita vaihtoehtoisen reitin? fr = Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ? hu = Szeretne útvonaltervet készíttetni a jelenlegi pozíciójától? @@ -9920,7 +9905,7 @@ eu = Modu erraza fa = حالت ساده fi = Yksinkertainen tila - fr = Mode simplifié + fr = Mode simple hu = Egyszerű mód id = Mode Sederhana it = Modalità semplice @@ -10110,12 +10095,12 @@ da = Du har ændret verdenskortet. Lad andre det vide! Fortæl dine venner og redigér det sammen. de = Sie haben die Weltkarte geändert. Behalten Sie das nicht für sich! Erzählen Sie Ihren Freunden davon und bearbeiten Sie sie zusammen. el = Έχετε αλλάξει τον παγκόμιο χάρτη. Μην το κρατάτε για τον εαυτό σας! Πείτε το στους φίλους σας και κάντε τις αλλαγές μαζί. - es = Ha cambiado el mapa del mundo. ¡No se lo guarde para usted! Dígaselo a sus amigos y edítenlo juntos. + es = Has cambiado el mapa del mundo. No te lo guardes para ti. Díselo a tus amigos y edítenlo juntos. et = Oled muutnud maailmakaarti. Ära hoia seda ainult enda teada! Rääki ka oma sõpradele ja muutke seda koos. eu = Munduko mapa aldatu duzu. Ez ezazu zeuretzat gorde. Esan zure lagunei eta editatu elkarrekin. fa = شما نقشه جهان را تغییر دادید.این افتخار را پیش خود نگه ندارید!به دوستانتان درموردش بگویید و با یکدیگر ویرایش کنید. fi = Olet muuttanut maailmankarttaa. Älä piilota tätä! Kerro ystävillesi ja muokatkaa sitä yhdessä. - fr = Vous avez modifié la carte du monde ! Ne le cachez pas ! Dites-le à vos amis, et modifiez-la ensemble. + fr = Vous avez modifié la carte du monde ! Ne le cachez pas ! Dites-le à vos amis, et modifiez-le ensemble. hu = Megváltoztattad a világ térképét. Ne titkold el mások elől! Mondd el a barátaidnak, és szerkesszétek közösen! id = Anda telah mengubah peta dunia. Jangan menyembunyikan ini! Katakan kepada teman-teman Anda, dan edit bersama. it = Hai modificato la mappa del mondo. Non tenerlo per te! Dillo ai tuoi amici e modificatela insieme. @@ -10188,10 +10173,10 @@ da = Beskriv problemet i detaljer, så OpenStreetMap-fællesskabet kan løse fejlen. de = Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Gemeinschaft den Fehler beheben kann. el = Περιγράψτε το πρόβλημα αναλυτικά ώστε η Κοινότητα OpenStreetMap να διορθώσει το σφάλμα. - es = Por favor, describa el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error. + es = Por favor, describe el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error. et = Palun kirjelda probleemi üksikasjalikult, et OpenStreetMap kommuun saaks selle parandada. eu = Mesedez, deskribatu arazoa xehetasunez, OpenStreetMap komunitateak akatsa konpondu dezan. - fa = لطفا مشکلتان را با جزئیات توضیح دهید بطوری که انجمن OSM بتوانند آن را برطرف کنند. + fa = لطفا مشکلتان را با جزئیات توضیح دهید بطوری که انجمن OSM بتوانند ان را برطرف کنند. fi = Kuvaile ongelmaa yksityiskohtaisesti, jotta OpenStreetMap-yhteisö voi korjata vian. fr = Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de réparer l'erreur. hu = Kérjük, írd le részletesen a problémát, hogy az OpenStreetMap csapata kijavíthassa. @@ -10227,10 +10212,10 @@ da = Eller gør det selv på https://www.openstreetmap.org/ de = Oder kümmern Sie sich selbst darum auf https://www.openstreetmap.org/ el = Ή κάντε το μόνοι σας στη διεύθυνση https://www.openstreetmap.org/ - es = O hágalo usted mismo en https://www.openstreetmap.org/ + es = O hazlo tú mismo en https://www.openstreetmap.org/ et = Või tee seda ise aadressil https://www.openstreetmap.org/ eu = Edo egin ezazu zeure burua https://www.openstreetmap.org/ helbidean - fa = یا خودتان آن را انجام دهید در وبسایت https://www.openstreetmap.org/ + fa = یا خودتان ان را انجام دهید در وبسایت https://www.openstreetmap.org/ fi = Tai tee se itse osoitteessa https://www.openstreetmap.org/ fr = Ou faites-le vous-même sur https://www.openstreetmap.org/ hu = Vagy végezd el te magad a javítást itt: https://www.openstreetmap.org/ @@ -10386,7 +10371,7 @@ es = Сerrado por mantenimiento et = Suletud hoolduseks eu = Mantentze-lanetarako itxita - fa = به علت تعمیرات بسته است + fa = به علت تعمییرات بسته است fi = Suljettu huoltoa varten fr = Fermé pour cause de maintenance hu = Karbantartás miatt nem elérhető @@ -10427,7 +10412,7 @@ eu = Toki bikoiztua fa = مکان تکراری fi = Paikan kaksoiskappale - fr = Lieu en doublon + fr = Lieu doublon hu = Duplikált hely id = Tempat ganda it = Luogo duplicato @@ -10546,7 +10531,7 @@ eu = Egunero fa = روزانه fi = Päivittäin - fr = Quotidien + fr = Tous les jours hu = Naponta id = Setiap Hari it = Tutti i giorni @@ -10585,7 +10570,7 @@ eu = 24/7 fa = شبانه روزی fi = Päivin ja öin - fr = 24/24 et 7/7 + fr = Jour et nuit he = יום ולילה hu = Nappal és éjszaka id = siang dan malam @@ -10620,7 +10605,7 @@ da = Fridag i dag de = Heute geschlossen el = Κλειστό σήμερα - es = Cerrado hoy + es = Día libre hoy et = Täna suletud eu = Gaur atseden eguna fa = امروز تعطیل است @@ -10659,7 +10644,7 @@ da = Fridag de = Geschlossen el = Κλειστό - es = Cerrado + es = Día libre et = Suletud eu = Egun librea fa = تعطیل است @@ -10964,10 +10949,10 @@ da = Ingen konto på OpenStreetMap? de = Kein Konto bei OpenStreetMap? el = Δεν έχετε λογαριασμό OpenStreetMap; - es = ¿No tiene cuenta en OpenStreetMap? + es = ¿No tienes cuenta en OpenStreetMap? et = Puudub OpenStreetMap konto? eu = Ez al duzu OpenStreetMap konturik? - fa = آیا حساب OpenStreetMap ندارید؟ + fa = ایا حساب OpenStreetMap ندارید؟ fi = Eikö sinulla ole OpenStreetMap tiliä? fr = Vous n'avez pas de compte sur OpenStreetMap? hu = Nem rendelkezel még OpenStreetMap-felhasználói fiókkal? @@ -11161,7 +11146,7 @@ es = Iniciar sesión en OpenStreetMap et = Logi sisse OpenStreetMap-i eu = Hasi saioa OpenStreetMap-en - fa = شوید OpenStreetMap وارد + fa = ﺪﯾﻮﺷ OpenStreetMap ﺩﺭﺍﻭ fi = Kirjaudu OpenStreetMapiin fr = Se connecter à OpenStreetMap he = OpenStreetMap-ל סנכיה @@ -11237,7 +11222,7 @@ da = Glemt adgangskode? de = Passwort vergessen? el = Ξαχάσατε τον κωδικό πρόσβασης; - es = ¿Ha olvidado su contraseña? + es = ¿Has olvidado tu contraseña? et = Unustasid oma salasõna? eu = Pasahitza ahaztu al duzu? fa = رمز عبور خود را فراموش کردید؟ @@ -11360,7 +11345,7 @@ eu = Azken karga fa = اخرین بروزرسانی fi = Viimeisin lisäys - fr = Dernier envoi + fr = Dernier téléchargement hu = Utolsó frissítés id = Pengunggahan terakhir it = Ultimo caricamento @@ -11712,8 +11697,7 @@ es = Ingrese un nombre de calle et = Palun sisesta tänava nimi eu = Sartu kale-izena - fa = نام خیابان را وارد کنید - fr = Veuillez entrer un nom de rue + fa = ﺪﯿﻨﮐ ﺩﺭﺍﻭ ﺍﺭ ﻥﺎﺑﺎﯿﺧ ﻡﺎﻧ it = Inserire il nome della via mr = कृपया रस्त्याचे नाव जोडा nl = Voer een straatnaam in a.u.b. @@ -11774,7 +11758,7 @@ da = Vælg en gade de = Eine Straße wählen el = Επιλέξτε μια οδό - es = Elija una calle + es = Elegir una calle et = Vali tänav eu = Kale bat aukeratu fa = انتخاب یک خیابان @@ -11854,7 +11838,7 @@ es = Cocina et = Köök eu = Sukaldea - fa = غذا‌خوری + fa = غذا خوری fi = Ruokalaji fr = Cuisine hu = Konyha @@ -12003,7 +11987,6 @@ ar = إضافة رقم هاتف ca = Afegeix un telèfon de = Telefon hinzufügen - es = Añadir teléfono et = Lisa telefon fr = Ajouter un numéro de téléphone it = Aggiungi numero @@ -12108,7 +12091,7 @@ es = Todos los cambios en los mapas se borrarán junto con el mapa. et = Kõik Sinu kaardimuudatused kustutatakse koos kaardiga. eu = Maparen aldaketa guztiak maparekin batera ezabatuko dira. - fa = تمام ویرایش‌های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد. + fa = تمام ویرایش های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد. fi = Kaikki karttaan tehdyt muutokset poistetaan kartan mukana. fr = Toutes vos modifications de la carte seront supprimées avec elle. hu = A térképekkel együtt minden rajtuk végzett módosítás is törlésre kerül. @@ -12147,7 +12130,7 @@ es = Autodescarga de mapas et = Värskenda kaarte eu = Mapak deskargatu automatikoki - fa = بروزرسانی نقشه‌ها + fa = بروزرسانی نقشه ها fi = Päivitä kartat fr = Mettre à jour les cartes hu = Térképek frissítése @@ -12186,7 +12169,7 @@ es = Para crear una ruta, es necesario actualizar todos los mapas y volver a planificar la ruta. et = Marsruudi loomiseks tuleb värskendada kõiki kaarte ja seejärel planeerida marsruuti uuesti. eu = Ibilbide bat sortzeko, beharrezkoa da mapa guztiak eguneratzea eta ibilbidea berriro planifikatzea. - fa = برای ایجاد مسیر شما نیازمند بروزرسانی تمامی نقشه‌ها هستید سپس می توانید دوباره مسیرتان را برنامه ریزی کنید + fa = برای ایجاد مسیر شما نیازمند بروزرسانی تمامی نقشه ها هستید سپس می توانید دوباره مسیرتان را برنامه ریزی کنید fi = Sinun täytyy päivittää kaikki kartat ja suunnitella reitti uudelleen luodaksesi uuden reitin. fr = Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l'itinéraire. hu = Útvonal létrehozásához frissítsd az összes térképet, majd tervezd meg újra az útvonalat. @@ -12300,7 +12283,7 @@ da = Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet. de = Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass Ihr Gerät mit dem Internet verbunden ist. el = Ελέγξτε τις ρυθμίσεις σας και βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet. - es = Por favor, verifique los ajustes y asegúrese de que su dispositivo esté conectado a Internet. + es = Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet. et = Palun kontrolli seadeid ning seadme Interneti-ühendust. eu = Mesedez, egiaztatu ezarpenak eta ziurtatu zure gailua Internetera konektatuta dagoela. fa = لطفا تنظیمات خود را بازبینی کنید و مطمئن شوید که ابزار شما به اینترنت متصل است. @@ -12339,7 +12322,7 @@ da = Ikke nok plads de = Nicht genug Speicherplatz el = Δεν υπάρχει αρκετός χώρος - es = No hay suficiente espacio + es = Sin espacio suficiente et = Ei ole piisavalt ruumi eu = Leku nahikoa ez fa = فظای کافی موجود نیست @@ -12378,10 +12361,10 @@ da = Fjern unødvendig data de = Bitte entfernen Sie unnötige Daten el = Διαγράψτε τυχόν μη απαραίτητα δεδομένα - es = Por favor, elimine los datos innecesarios + es = Por favor, elimina los datos innecesarios et = Palun kustuta ebavajalikud andmed eu = Ezabatu beharrezkoak ez diren datuak - fa = لطفا داده‌های غیر ضروری را از دستگاه خود حذف کنید + fa = لطفا داده های غیر ضروری را از دستگاه خود حذف کنید fi = Poista tarpeeton data fr = Veuillez supprimer les données inutiles hu = Kérjük, töröld a szükségtelen adatokat @@ -12495,7 +12478,7 @@ da = Træk kortet for at vælge objektets korrekte placering. de = Ziehen Sie die Karte, um den Standort des Objektes zu korrigieren. el = Σύρετε τον χάρτη για να επιλέξετε τη σωστή θέση του αντικειμένου. - es = Arrastre el mapa para seleccionar la ubicación correcta del objeto. + es = Arrastra el mapa para seleccionar la ubicación correcta del objeto. et = Objekti õige asukoha valimiseks lohista kaarti. eu = Arrastatu mapa objektuaren kokapen zuzena hautatzeko. fa = برای انتخاب مکان صحیح شئی نقشه را بکشید. @@ -12615,7 +12598,7 @@ es = Todas las categorías et = Kõik kategooriad eu = Kategoria guztiak - fa = همه دسته‌بندی‌ها + fa = همه دسته بندی ها fi = Kaikki kategoriat fr = Toutes les catégories hu = Minden kategória @@ -12851,7 +12834,7 @@ eu = Beste arazo bat fa = مشکلی دیگر fi = Eri ongelma - fr = Autre problème + fr = Un problème différent hu = Különböző problémaDifferent problem id = Masalah yang berbeda it = Un problema diverso @@ -12890,7 +12873,7 @@ eu = Negozioa gehitu fa = اضافه کردن یک تجارت fi = Lisää organisaatio - fr = Ajouter une entreprise + fr = Ajouter une organisation hu = Szervezet hozzáadása id = Tambahkan organisasi it = Aggiungi attività @@ -12927,7 +12910,7 @@ es = Añadir lugares nuevos al mapa y editar los lugares actuales directamente desde la aplicación. et = Lisa kaardile uusi kohti ja muuda olemasolevaid otse rakenduses. eu = Gehitu toki berriak mapan eta editatu uneko tokiak zuzenean aplikaziotik. - fa = اضافه کردن مکان به نقشه و ویرایش آن مستقیما از طریق این اپلیکیشن. + fa = اضافه کردن مکان به نقشه و ویرایش ان مستقیما از طریق این اپلیکیشن. fi = Lisää karttaan uusia paikkoja ja muokkaa sovelluksessa olevia karttoja suoraan sovelluksessa. fr = Ajoutez de nouveaux lieux sur la carte et modifiez les lieux existants directement depuis l'appli. hu = Adj hozzá új helyeket a térképhez, és szerkeszd a meglévőket közvetlenül az alkalmazásból. @@ -13044,10 +13027,10 @@ es = Todos los datos del mapa provienen del proyecto OpenStreetMap. Es como Wikipedia para mapas donde puedes agregar o editar lugares, y están disponibles para millones de usuarios en todo el mundo. et = Kõik kaardiandmed pärinevad OpenStreetMapi projektist. See on nagu Vikipeedia kaartide jaoks, kus saate kohti lisada või muuta ja need muutuvad kättesaadavaks miljonitele kasutajatele üle kogu maailma. eu = Maparen datu guztiak OpenStreetMap proiektutik datoz. Tokiak gehitu edo edita ditzakezun mapetarako Wikipedia bezalakoa da, eta mundu osoko milioika erabiltzaileren eskura jartzen dira. - fa = تمام داده‌های نقشه از پروژه OpenStreetMap می‌آید. این مثل ویکی‌پدیا برای نقشه‌هاست که شما می‌توانید مکان را اضافه یا ویرایش کنید ﻭ ﺁنها ﺑﺮﺍﯼ ﻣﯿﻠﯿﻮن‌ها ﮐﺎﺭﺑﺮ ﺩﺭ ﺳﺮﺍﺳﺮ ﺟﻬﺎﻥ ﺩﺭ ﺩﺳﺘﺮﺱ ﻗﺮﺍﺭ ﻣﯽﮔﯿﺮﻧﺪ. + fa = .ﺪﻧﺮﯿﮔu200cﯽﻣ ﺭﺍﺮﻗ ﺱﺮﺘﺳﺩ ﺭﺩ ﻥﺎﻬﺟ ﺮﺳﺍﺮﺳ ﺭﺩ ﺮﺑﺭﺎﮐ ﺎﻫu200cﻥﻮﯿﻠﯿﻣ ﯼﺍﺮﺑ ﺎﻫu200cﻥﺁ ﻭ fi = Kaikki karttatiedot tulevat OpenStreetMap-projektista. Se on kuin karttojen Wikipedia, jossa voit lisätä tai muokata paikkoja, ja ne ovat miljoonien käyttäjien saatavilla kaikkialla maailmassa. fr = Toutes les données géographiques proviennent du projet OpenStreetMap. Le principe est similaire à Wikipedia: vous pouvez ajouter et modifier des lieux et ils deviendront accessibles à des millions d'utilisateurs partout dans le monde. - he = כל נתוני המפה מגיעים מפרויקט OpenStreetMap. זה כמו ויקיפדיה למפות, שבה אתה יכול להוסיף או לערוך מקומות, והם הופכים לזמינים למיליוני משתמשים בכל רחבי העולם. + he = .םלועה יבחר לכב םישמתשמ ינוילימל תונימזל תוכפוה ןהו ,תומוקמ ךורעל וא ףיסוהל לו hu = Minden térképadat az OpenStreetMap projektből származik. Olyan ez, mint a Wikipédia a térképekhez, ahol helyeket adhat hozzá vagy szerkeszthet, és a felhasználók milliói számára válnak elérhetővé szerte a világon. id = Semua data peta berasal dari proyek OpenStreetMap. Ini seperti Wikipedia untuk peta tempat Anda dapat menambahkan atau mengedit tempat, dan peta tersebut tersedia bagi jutaan pengguna di seluruh Dunia. it = Tutti i dati della mappa provengono dal progetto OpenStreetMap. È come Wikipedia per le mappe in cui puoi aggiungere o modificare luoghi e diventano disponibili per milioni di utenti in tutto il mondo. @@ -13081,7 +13064,7 @@ da = Log på så andre brugere kan se ændringerne som du har foretaget. de = Melden Sie sich an, damit andere Benutzer Ihre Änderungen sehen können. el = Συνδεθείτε ώστε άλλοι χρήστες να μπορούν να δουν τις αλλαγές που έχετε κάνει - es = Inicie sesión en OpenStreetMap.org para que otros usuarios puedan ver los cambios que haya efectuado. + es = Inicia sesión para que otros usuarios puedan ver los cambios que has efectuado. et = Logi sisse OpenStreetMap.org keskkonda, et teised kasutajad näeksid Sinu tehtud muudatusi. eu = Hasi saioa beste erabiltzaileek zuk egindako aldaketak ikus ditzaten. fa = وارد شوید تا دیگر کاربران نیز بتوانند تغییرات ایجاد شده توسط شما را ببینند @@ -13121,10 +13104,10 @@ da = For at opdatere app'en skal du bruge mere plads. Slet unødvendig data. de = Zum Herunterladen benötigen Sie mehr Platz. Bitte löschen Sie unnötige Daten. el = Για να το κατεβάσετε, χρειάζεστε περισσότερο χώρο. Διαγράψτε τυχόν μη απαραίτητα δεδομένα. - es = Necesita más espacio para descargar. Por favor, elimine los datos innecesarios. + es = Necesitas más espacio para descargar. Por favor, elimina los datos innecesarios. et = Alla laadimiseks vajad rohkem ruumi. Palun kustuta ebavajalikke andmeid. eu = Leku gehiago behar duzu deskargatzeko. Ezabatu beharrezkoak ez diren datuak. - fa = برای دانلود، شما نیازمند فضای ذخیره سازی بیشتری هستید.لطفا داده‌های غیر ضروری خود را حذف کنید. + fa = برای دانلود,شما نیازمند فضای ذخیره سازی بیشتری هستید.لطفا داده های غیر ضروری خود را حذف کنید. fi = Tarvitset lisää tilaa ladataksesi. Poista tarpeeton data. fr = Pour télécharger, vous avez besoin de plus d'espace. Veuillez supprimer les données non nécessaires. hu = A letöltéshez több szabad tárhelyre van szükség. Kérjük, töröld a szükségtelen adatokat. @@ -13163,7 +13146,7 @@ es = He mejorado los mapas de Organic Maps et = Parandasin Organic Maps kaarte eu = Organic Maps mapak hobetu ditut - fa = من نقشه‌های Organic Maps را بهبود بخشیدم + fa = من نقشه های Organic Maps را بهبود بخشیدم fi = Paransin Organic Maps-karttoja fr = J'ai amélioré les cartes de Organic Maps hu = Én fejlesztettem a Organic Maps térképeket @@ -13273,14 +13256,14 @@ be = Гэта можа быць даволі дорага з некаторымі тарыфнымі планамі альбо ў роўмінгу. bg = Това може да бъде значително скъпо при някои планове или при роуминг. ca = Això podria ser força car amb algunes tarifes d'itinerància de dades. - cs = Toto by mohlo být s některými tarify nebo roamingem výrazně dražší. + cs = Toto by mohli být s některými tarify nebo roamingem výrazně dražší. da = Dette kan blive dyrt med nogle abonnementer eller hvis du er i roamingtilstand. de = Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden. el = Αυτό μπορεί να είναι σημαντικά πιο ακριβό για μερικά πακέτα ή στην περίπτωση περιαγωγής es = Podría ser muy caro con ciertos planes o con itinerancia de datos. et = See võib mõningate lepingute või roamingu korral olla märgatavalt kallim. eu = Oso garestia izan daiteke plan batzuekin edo datu-ibiltaritzarekin. - fa = این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد. + fa = این کار می تواند برای شما در بعضی طرح ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد. fi = Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä. fr = Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement. hu = Ez jelentősen drága lehet némely előfizetés vagy roaming keretein belül. @@ -13383,44 +13366,44 @@ zh-Hant = 樓層數（最大 %d） [error_enter_correct_storey_number] - comment = Error message in Editor when a user tries to set the number of floors for a building higher than %d floors + comment = Error message in Editor when a user tries to set the number of floors for a building higher than 25 tags = android,ios - en = The number of floors must non exceed %d - ar = يجب ألا يتجاوز عدد طوابق المبنى %d - be = Колькасць паверхаў павінна быць не больш за %d - bg = Броят на етажите не трябва да надвишава %d - ca = El nombre de plantes no pot excedir de %d - cs = Opravte počet poschodí, max. %d - da = Rediger bygningen med maksimum %d etager - de = Das Gebäude kann nicht mehr als %d Etagen haben - el = Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d - es = El número de plantas no debe superar %d - et = Korruste arv ei või olla üle %d - eu = Landare kopurua ez da %detik gorakoa izan behar - fa = تعداد طبقات نباید بیش از %d باشد - fi = Muokkaa kerroksia, enintään %d kerrosta - fr = Le nombre d'étages ne doit pas dépasser %d - hu = Ez az épület legfeljebb %d emeletes lehet - id = Edit bangunan dengan maksimum %d lantai - it = Il numero di piani non deve superare %d - ja = 最高%d階までのビルを編集 - ko = 최대 %d층까지 입력하세요 - mr = मजल्यांची संख्या %d पेक्षा जास्त नसावी - nb = Rediger bygningen med maks. %d etasjer - nl = Het gebouw mag niet meer dan %d verdiepingen hebben - pl = Edytuj budynek z maksymalną liczbą %d pięter - pt = O número de pisos não pode ser maior que %d - pt-BR = O número de andares não pode ser maior que %d - ro = Numărul de etaje nu trebuie să depășească %d - ru = Количество этажей не должно превышать %d - sk = Upraviť s maximálne %d poschodiami - sv = Redigera byggnaden med max %d våningar - th = แก้ไขอาคารที่มีจำนวนชั้นมากกว่า %d - tr = Kat sayısı %d'i geçmemelidir - uk = Редагуйте будівлі висотою максимум %d поверхів - vi = Sửa tòa nhà có tối đa %d tầng - zh-Hans = 最多可编辑 %d 层的建筑 - zh-Hant = 編輯最多 %d 層的建築 + en = The number of floors must non exceed 25 + ar = يجب ألا يتجاوز عدد طوابق المبنى 25 + be = Колькасць паверхаў павінна быць не больш за 25 + bg = Броят на етажите не трябва да надвишава 25 + ca = El nombre de plantes no pot excedir de 25 + cs = Opravte počet poschodí, max. 25 + da = Rediger bygningen med maksimum 25 etager + de = Das Gebäude kann nicht mehr als 25 Etagen haben + el = Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους 25 + es = El número de plantas no debe superar 25 + et = Korruste arv ei või olla üle 25 + eu = Landare kopurua ez da 25etik gorakoa izan behar + fa = تعداد طبقات نباید بیش از 25 باشد + fi = Muokkaa kerroksia, enintään 25 kerrosta + fr = Le nombre d'étages ne doit pas dépasser 25 + hu = Legfeljebb 25 emeletes épület szerkesztése + id = Edit bangunan dengan maksimum 25 lantai + it = Il numero di piani non deve superare 25 + ja = 最高25階までのビルを編集 + ko = 최대 25층까지 입력하세요 + mr = मजल्यांची संख्या २५ पेक्षा जास्त नसावी + nb = Rediger bygningen med maks. 25 etasjer + nl = Bewerk het gebouw met maximaal 25 verdiepingen + pl = Edytuj budynek z maksymalną liczbą 25 pięter + pt = Editar o edifício com um máximo de 25 pisos + pt-BR = O número de andares não pode ultrapassar 25 + ro = Numărul de etaje nu trebuie să depășească 25 + ru = Количество этажей не должно превышать 25 + sk = Upraviť s maximálne 25 poschodiami + sv = Redigera byggnaden med max 25 våningar + th = แก้ไขอาคารที่มีจำนวนชั้นมากกว่า 25 + tr = Kat sayısı 25'i geçmemelidir + uk = Редагуйте будівлі висотою максимум 25 поверхів + vi = Sửa tòa nhà có tối đa 25 tầng + zh-Hans = 编辑最多 25 层的建筑 + zh-Hant = 編輯最多 25 層的建築 [editor_zip_code] tags = android,ios @@ -13475,9 +13458,9 @@ es = Introduzca el código postal correcto et = Sisesta korrektne postiindeks eu = Mesedez, idatzi posta-kode zuzena - fa = یک کد‌ پستی معتبر وارد کنید + fa = یک کد پستی معتبر وارد کنید fi = Anna kelvollinen postinumero - fr = Entrer un code postal correct + fr = Entrer le code postal correct hu = Írja be a helyes irányítószámot id = Masukkan Kode Pos yang benar it = Inserire il codice postale corretto @@ -13555,7 +13538,7 @@ es-MX = Enviar nota a los editores de OSM et = Saada märkus OSM muutjatele eu = Bidali oharra OSM editoreei - fa = ارسال یادداشت به ویرایش‌کنندگان OSM + fa = ارسال یادداشت به ویرایشکنندگان OSM fi = Lähetä muistilapun OSM-toimittajille fr = Informer les éditeurs OSM hu = Küldjön jegyzetet az OSM editornak @@ -13595,7 +13578,7 @@ es = Comentario detallado et = Üksikasjalik kommentaar eu = Iruzkin zehatza - fa = اظهار نظر بیشتر + fa = اظهارنظر بیشتر fi = Yksityiskohtainen kommentti fr = Commentaire détaillé hu = Részletes megjegyzés @@ -13790,7 +13773,7 @@ es = Descargue mapas para encontrar la ubicación y navegar sin conexión. et = Lae alla kaardid asukoha otsimiseks ja võrguühenduseta navigeerimise kasutamiseks. eu = Deskargatu mapak kokapena aurkitzeko eta lineaz kanpo nabigatzeko. - fa = برای جست وجو یک مکان و استفاده از قابلیت ناوبری، نقشه‌ها را دانلود کنید. + fa = برای جست وجو یک مکان و استفاده از قابلیت ناوبری, نقشه ها را دانلود کنید. fi = Lataa kartattoja löytääksesi paikkoja ja navigoidaksesi offline-tilassa. fr = Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne hu = Töltse le a szükséges térképeket, hogy megtalálja a helyet és internet nélkül is navigálhasson. @@ -13830,7 +13813,7 @@ es = ¿Continuar detectando su ubicación actual? et = Jätka oma hetkeasukoha määramist? eu = Zure uneko kokapena detektatzen jarraitu nahi duzu? - fa = آیا یافتن مکان‌تان را ادامه می دهید؟ + fa = ایا یافتن مکان تان را ادامه می دهید؟ fi = Jatketaanko nykyisen sijaintisi havaitsemista? fr = Continuer la détection de votre emplacement actuel ? hu = Folytatja tartózkodási helyének keresését? @@ -14101,7 +14084,7 @@ da = Slå adgang til geoposition til i enhedens indstillinger de = Aktivieren Sie den Zugang zur Positionsbestimmung in den Geräteeinstellungen el = Ενεργοποίηση πρόσβασης γεωγραφικού εντοπισμού τοποθεσίας στις ρυθμίσεις της συσκευής - es = Active el acceso a la geolocalización en los ajustes del dispositivo + es = Activa el acceso a la geolocalización en los ajustes del dispositivo et = Luba seadme seadetes juurdepääs geograafilisele asukohale eu = Aktibatu geokokapenerako sarbidea gailuaren ezarpenetan fa = سرویس موقعیت مکانی خود را در بخش تنظیمات فعال کنید. @@ -14146,7 +14129,7 @@ eu = 1. Ireki ezarpenak fa = 1. بازکردن تنظیمات fi = 1. Avaa asetukset - fr = 1. Ouvrir les paramètres + fr = 1. Ouvrir Paramètres he = 1. פתחו את "הגדרות" (Settings) hu = 1. Nyissa meg a Beállításokat id = 1. Buka Pengaturan @@ -14415,7 +14398,6 @@ eu = oina fa = فوت fi = ft - fr = ft hu = ft id = kaki ja = フィート @@ -14715,7 +14697,7 @@ es = Editar marcador et = Muuda järjehoidjat eu = Editatu laster-marka - fa = ویرایش نشانه‌ها + fa = ویرایش نشانه ها fi = Muokkaa kirjanmerkkiä fr = Éditer le signet hu = Könyvjelző szerkesztése @@ -14754,7 +14736,7 @@ es = Nombre del marcador et = Järjehoidja nimi eu = Laster-markaren izena - fa = نام نشانه‌ها + fa = نام نشانه ها fi = Kirjanmerkin nimi fr = Nom du signet hu = Könyvjelző neve @@ -14792,7 +14774,7 @@ es = Notas personales et = Isiklikud märkmed eu = Ohar pertsonalak - fa = یاداشت‌های شخصی + fa = یاداشت های شخصی fi = Henkilökohtaiset merkinnät fr = Remarques personnelles hu = Jegyzet @@ -14832,7 +14814,7 @@ eu = Ezabatu laster-marka fa = حذف نشانه fi = Poista kirjanmerkki - fr = Supprimer le signet + fr = Supprimer signet hu = Könyvjelző törlése id = Hapus Bookmark it = Elimina luogo preferito @@ -14947,7 +14929,7 @@ es = ¿Restablecer todos los cambios locales? et = Loobu kõigist kohalikest muudatustest? eu = Tokiko aldaketa guztiak berrezarri nahi dituzu? - fa = آیا تغییرات محلی را نادیده می گیرید؟ + fa = ایا تغییرات محلی را نادیده می گیرید؟ fi = Nollataanko kaikki paikalliset muutokset? fr = Abandonner toutes les modifications locales ? hu = Elveti az összes helyi módosítást? @@ -15025,7 +15007,7 @@ es = ¿Eliminar el lugar añadido? et = Kustuta lisatud koht? eu = Gehitutako tokia ezabatu? - fa = آیا مکان ثبت شده حذف شود؟ + fa = ایا مکان ثبت شده حذف شود؟ fi = Poistetaanko lisätty paikka? fr = Supprimer le lieu ajouté ? hu = Eltávolít egy hozzáadott objektumot? @@ -15136,9 +15118,7 @@ be = Калі ласка, укажыце прычыну выдалення ca = Indiqueu per què esborreu el lloc de = Geben Sie bitte den Grund für die Löschung an - es = Indique por favor la razón para eliminar el lugar et = Palun märgi põhjus koha kustutamiseks - fr = Veuillez indiquer la raison pour laquelle vous effacez cet endroit it = Indicare il motivo dell' eliminazione del luogo mr = कृपया ठिकाण हटवण्याचे कारण सूचित करा nl = Graag de reden voor verwijdering aangeven @@ -15165,7 +15145,7 @@ eu = …gehi fa = بیشتر…. fi = …Näytä - fr = …plus + fr = …Afficher la suite hu = …tovább id = …selebihnya it = …di più @@ -15200,7 +15180,7 @@ da = Indtast korrekt telefonnummer de = Geben Sie eine gültige Telefonnummer ein el = Εισάγετε έναν έγκυρο αριθμό τηλεφώνου - es = Introduzca un número de teléfono correcto + es = Introduce un número de teléfono correcto et = Sisesta kehtiv telefoninumber eu = Mesedez, idatzi telefono-zenbaki zuzena fa = شماره تلفن معتبری وارد نمایید @@ -15239,7 +15219,7 @@ da = Indtast en gyldig webadresse de = Geben Sie eine gültige Internetadresse ein el = Εισάγετε μια έγκυρη διεύθυνση ιστοτόπου - es = Introduzca una dirección web válida + es = Introduce una dirección web válida et = Sisesta kehtiv veebiaadress eu = Mesedez, sartu baliozko web-helbide bat fa = ادرس وب معتبری وارد نمایید @@ -15278,7 +15258,7 @@ da = Indtast en gyldig emailadresse de = Geben Sie eine gültige Email-Adresse ein el = Εισάγετε ένα έγκυρο email - es = Introduzca un email válido + es = Introduce un email válido et = Sisesta kehtiv e-posti aadress eu = Sartu baliozko posta elektroniko bat fa = ایمیل معتبری وارد نمایید @@ -15312,7 +15292,7 @@ ar = أدخل اسم صفحة أو حساب أو عنوان ويب خاص بفيسبوك صالح ca = Introduïu una adreça web de Facebook, un compte o un nom de pàgina vàlids de = Geben Sie eine gültige Facebook-Webadresse, ein Konto oder einen Seitennamen ein - es = Introduzca una dirección web, una cuenta o un nombre de página de Facebook válidos + es = Introduce una dirección web, una cuenta o un nombre de página de Facebook válidos et = Sisesta kehtiv Facebooki veebiaadress, konto või lehekülje nimi eu = Mesedez, idatzi baliozko Facebook-eko web-helbide, kontu edo orri-izena fr = Saisissez une adresse web, un compte ou un nom de page Facebook valide @@ -15332,7 +15312,7 @@ ar = أدخل اسم حساب أو عنوان ويب خاص بإنستغرام صالح ca = Introduïu una adreça web d'Instagram o un nom de compte vàlids de = Geben Sie eine gültige Instagram-Webadresse oder einen Kontonamen ein - es = Introduzca una dirección web o un nombre de cuenta de Instagram válidos + es = Introduce una dirección web o un nombre de cuenta de Instagram válidos et = Sisesta kehtiv Instagrami veebiaadress või konto nimi eu = Sartu baliozko Instagram kontuaren izena edo web helbidea fr = Saisissez une adresse web, un nom de compte Instagram valide @@ -15372,7 +15352,7 @@ ar = أدخل اسم حساب أو عنوان ويب خاص بموقع VK صالح ca = Introduïu una adreça web de VK o un nom de compte vàlids de = Geben Sie eine gültige VK-Webadresse oder einen Kontonamen ein - es = Introduzca una dirección web o un nombre de cuenta de VK válidos + es = Introduce una dirección web o un nombre de cuenta de VK válidos et = Sisesta kehtiv VK veebiaadress või konto nimi eu = Mesedez, idatzi baliozko web helbide bat edo VK kontuaren izena fr = Saisissez une adresse web, un nom de compte VK valide @@ -15392,9 +15372,7 @@ be = Упішыце вэб-адрас LINE старонкі або LINE ID ca = Introduïu una adreça web de LINE o un ID LINE vàlids de = Geben Sie eine gültige LINE-Webadresse oder LINE ID ein - es = Introduzca una dirección web o ID de LINE válidos et = Sisesta kehtiv LINE veebiaadress või LINE ID - fr = Entrez une adresse web ou un ID de LINE valide it = Inserisca un indirizzo web LINE valido o un ID LINE nl = Voer een geldig LINE-webadres of een LINE ID in pl = Wpisz prawidłowy url LINE lub LINE ID @@ -15493,10 +15471,10 @@ da = Ønsker du at sende det til alle brugere? de = An alle Benutzer senden? el = Θέλετε να το στείλετε σε όλους τους χρήστες; - es = ¿Quiere enviarlo a todos los usuarios? + es = ¿Quieres enviarlo a todos los usuarios? et = Kas soovid saata selle kõigile kasutajatele? eu = Erabiltzaile guztiei bidali nahi diezu? - fa = آیا می خواهید آن را برای دیگر کاربران ارسال کنید؟ + fa = ایا می خواهید ان را برای دیگر کاربران ارسال کنید؟ fi = Haluatko lähettää sen kaikille käyttäjille? fr = Souhaitez-vous l’envoyer à tous les utilisateurs ? hu = Szeretnéd elküldeni az összes felhasználónak? @@ -15538,7 +15516,7 @@ eu = Ziurtatu ez duzula datu pertsonalik sartu. fa = مطمئن شوید که هیچ اطلاعات شخصی وارد نکرده باشد. fi = Varmistat, ettet syöttänyt henkilökohtaisia tietojasi. - fr = Assurez-vous de n’avoir pas saisi de données personnelles. + fr = Assurez-vous de n’avoir saisi aucunes données personnelles. hu = Győződj meg arról, hogy nem adsz meg semmilyen személyes információt. id = Pastikan Anda tidak memasukkan data pribadi apa pun. it = Assicurati di non aver inserito alcun dato personale. @@ -15575,7 +15553,7 @@ es = Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta. et = OpenStreetMap muutjad kontrollivad muudatused üle ja võtavad küsimuste korral Sinuga ühendust. eu = OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero. - fa = ویرایشگران OpenStreetMap ﺗﻐﯿﯿﺮﺍﺕ ﺭﺍ ﺑﺮﺭﺳﯽ ﮐﺮﺩﻩ ﻭ ﺩﺭ ﺻﻮﺭﺕ ﺩﺍﺷﺘﻦ ﻫﺮﮔﻮﻧﻪ ﺳﻮﺍﻝ ﺑﺎ ﺷﻤﺎ ﺗﻤﺎﺱ ﺧﻮﺍﻫﻨﺪ ﮔﺮﻓﺖ. + fa = .ﺖﻓﺮﮔ ﺪﻨﻫﺍﻮﺧ ﺱﺎﻤﺗ ﺎﻤﺷ ﺎﺑ ﻝﺍﻮﺳ ﻪﻧﻮﮔﺮﻫ ﻦﺘﺷﺍﺩ ﺕﺭﻮﺻ ﺭﺩ ﻭ ﻩﺩﺮﮐ ﯽﺳﺭﺮﺑ ﺍﺭ ﺕﺍﺮﯿﯿﻐﺗ Ope fi = OpenStreetMap-editorit tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää. fr = Les éditeurs d'OpenStreetMap vérifieront vos modifications et vous contacteront s'ils ont des questions. he = .ןהשלכ תולאש םהל שי םא רשק ךתיא ורציו םייונישה תא וקדבי OpenStreetMap יכרוע @@ -15653,7 +15631,7 @@ es = ¿Desactivar la grabación de su ruta recientemente recorrida? et = Keela oma hiljuti läbitud marsruudi salvestamine? eu = Bidaiatutako azken ibilbidearen grabaketa desaktibatu nahi duzu? - fa = غیرفعال‌سازی ذخیره مسیر اخیرا طی شده + fa = غیرفعال سازی ذخیره مسیر اخیرا طی شده fi = Poistetaanko viimeisen matkareitin tallennus? fr = Souhaitez-vous désactiver l'enregistrement de vos itinéraires récents ? hu = Megszakítod a legutóbb megtett utad rögzítését? @@ -15771,7 +15749,7 @@ es = Organic Maps usa tu geolocalización en segundo plano para registrar tu ruta recorrida recientemente. et = Organic Maps kasutab Sinu geograafilist asukohta taustal Sinu hiljuti läbitud teekonna salvestamiseks. eu = Organic Maps-ek zure geokokapena erabiltzen du atzeko planoan egindako azken ibilbidea erregistratzeko. - fa = Organic Maps از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر‌هایی که اخیرا سفر کرده اید استفاده می کند. + fa = Organic Maps از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر هایی که اخیرا سفر کرده اید استفاده می کند. fi = MAPS.SE käyttää taustalla geosijaintia sinun viimeisen matkareitin tallentamiseksi. fr = Organic Maps utilise votre géolocalisation en arrière-plan pour enregistrer vos itinéraires récents. hu = A Organic Maps a geopozíciód használatával a háttérben rögzíti a legutóbb megtett utad. @@ -15804,7 +15782,7 @@ be = Organic Maps — гэта хуткія і бясплатныя мапы без рэкламы, якія працуюць без Інтэрнэту і не шпіёняць за вамі. Усе картаграфічныя дадзеныя бяруцца з OpenStreetMap.org, там вы зможаце самастойна выпраўляць памылкі і дадаваць новыя аб'екты. Organic Maps — гэта праект з адкрытым зыходным кодам, які ствараецца энтузіястамі ў вольны час. Будзем рады вашай падтрымцы і зваротнай сувязі! bg = Organic Maps е безплатно приложение за офлайн карти с отворен код. Без реклами. Без проследяване. Ако видите грешка на картата, моля, поправете я в OpenStreetMap. Проектът е създаден от ентусиасти в свободното ни време, така че имаме нужда от вашата отзиви и подкрепа. ca = Organic Maps és una aplicació de mapes sense connexió, ràpida, de codi lliure, gratuïta, sense anuncis ni seguiment. Els mapes es basen en les dades col·laboratives d'OpenStreetMap. Podeu corregir errors del mapa i afegir-hi característiques. L'Organic Maps és un projecte de codi obert creat per entusiastes en el seu temps lliure. Els vostres comentaris i suport són molt apreciats! - cs = Organic Maps je bezplatná offline mapová aplikace s otevřeným zdrojovým kódem. Žádné reklamy. Žádné sledování. Pokud na mapě uvidíte chybu, opravte ji v OpenStreetMap. Projekt vytvářejí nadšenci v našem volném čase, takže potřebujeme vaši zpětnou vazbu a podporu. + cs = Organic Maps jsou bezplatná offline mapová aplikace s otevřeným zdrojovým kódem. Žádné reklamy. Žádné sledování. Pokud na mapě vidíte chybu, opravte ji v OpenStreetMap. Projekt vytvářejí nadšenci v našem volném čase, takže potřebujeme vaši zpětnou vazbu a podporu. da = Organic Maps er en gratis og open source offline kortapplikation. Ingen annoncer. Ingen sporing. Hvis du ser en fejl på kortet, skal du rette den i OpenStreetMap. Projektet er skabt af entusiaster i vores fritid, så vi har brug for din feedback og support. de = Organic Maps ist eine schnelle und kostenlose Offline-Karten-App ohne Werbung und Tracking. Die Karten basieren auf den Daten von OpenStreetMap.org, so dass Sie selbst Kartenfehler beheben und Orte hinzufügen können. Organic Maps ist ein Open-Source-Projekt, das von Enthusiasten in ihrer Freizeit entwickelt wird. Ihr Feedback und Ihre Unterstützung sind sehr willkommen! el = Οι Organic Maps είναι μια δωρεάν και ανοιχτού κώδικα εφαρμογή χαρτών εκτός σύνδεσης. Χωρίς διαφημίσεις. Χωρίς εντοπισμό. Εάν δείτε κάποιο σφάλμα στον χάρτη, διορθώστε το στο OpenStreetMap. Το έργο δημιουργείται από λάτρεις στον ελεύθερο χρόνο μας, επομένως χρειαζόμαστε τα σχόλια και την υποστήριξή σας. @@ -16200,14 +16178,14 @@ be = Мабільны інтэрнэт неабходны для апавяшчэнняў аб абнаўленні мапы і для адлюстравання падрабязнай інфармацыі аб месцах і закладках. bg = Мобилните данни са необходими за показване на подробна информация за местата, като например снимки, цени и отзиви. ca = Es necessita Internet mòbil per a les notifiacions d'actualitzacions del mapa i per a mostrar informació detallada dels llocs i marcadors. - cs = K zobrazení podrobných informací o místech, jako jsou fotografie, ceny a recenze je třeba mobilní internet. + cs = Ke zobrazení podrobných informací o místech, jako jsou fotografie, ceny a recenze, je třeba mobilní internet. da = Mobile internet er nødvendigt til visning af detaljerede oplysninger om steder, såsom fotos, priser og anmeldelser. de = Es wird mobiles Internet benötigt, um über Kartenaktualisierungen informiert zu werden und genauere Informationen über Orte anzuzeigen. el = Απαιτείται πρόσβαση στο Ίντερνετ μέσω δικτύου κινητής για την εμφάνιση αναλυτικών πληροφοριών για τις τοποθεσίες, όπως φωτογραφίες, τιμές και κριτικές. es = Se necesita Internet móvil para mostrar información detallada de los lugares, como fotografías, precios y reseñas. et = Mobiilne internet on vajalik kaardi värskendamise märguannete jaoks ning kohtade ja järjehoidjate üksikasjaliku teabe kuvamiseks. eu = Internet mugikorra behar da tokiei buruzko informazio zehatza bistaratzeko, hala nola argazkiak, prezioak eta iritziak. - fa = برای نمایش جزئیات مکان مانند تصاویر قیمت‌ها و بازخورد‌ها به اینترنت همراه نیاز است + fa = برای نمایش جزئیات مکان مانند تصاویر قیمت ها و بازخورد ها به اینترنت همراه نیاز است fi = Mobiili-internet vaaditaan paikkojen lisätietojen näyttämiseen, kuten valokuviin, hintoihin ja arvioihin. fr = L'Internet mobile est nécessaire pour afficher des informations détaillées sur les lieux, telles que les photos, les prix et les avis. hu = Mobil internetre van szükség helyszínekre vonatkozó részletes információ, mint például fotók, árak és szemlék megjelenítéséhez. @@ -16324,7 +16302,7 @@ es = Para mostrar los datos de tráfico, deben actualizarse los mapas. et = Liiklusinfo kuvamiseks tuleb kaardid värskendada. eu = Trafiko datuak bistaratzeko, mapak eguneratu behar dira. - fa = برای نمایش ترافیک، نقشه می بایستی بروزرسانی شود. + fa = برای نمایش ترافیک,نقشه می بایستی بروزرسانی شود. fi = Liikennetietojen näyttämiseksi kartat on päivitettävä. fr = Pour afficher les données de circulation, les cartes doivent être actualisées. hu = Forgalmi adatok megjelenítéséhez a térképeket frissíteni kell. @@ -16681,7 +16659,7 @@ es = Utilizamos el sistema TTS para las instrucciones de voz. Muchos dispositivos de Android usan Google TTS. Puede descargar o actualizarlo desde Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) et = Hääljuhiste jaoks kasutame TTS süsteemi. Paljud Android-seadmed kasutavad Google'i TTS-i, saate selle alla laadida või värskendada teenusest Google Play (https:play.google.comstoreappsdetails?id=com.google.android.tts) eu = TTS sistema erabiltzen dugu ahots-argibideetarako. Android gailu askok Google TTS erabiltzen dute. Google Play-tik deskargatu edo egunera dezakezu (https://play.google.com/store/apps/details?idu003dcom.google.android.tts) - fa = ما از TTS سیستم برای دستورالعمل‌های صوتی استفاده می کنیم. بسیاری از دستگاه‌های Android از Google TTS استفاده می کنند، شما می توانید آن را از Google Play دانلود کنید (https://play.google.com/store/apps/details؟id=com.google.android.tts) + fa = ما از TTS سیستم برای دستورالعمل های صوتی استفاده می کنیم. بسیاری از دستگاه های Android از Google TTS استفاده می کنند، شما می توانید آن را از Google Play دانلود کنید (https://play.google.com/store/apps/details؟id=com.google.android.tts) fi = Käytämme ääniohjeisiin tekstistä puheeksi -järjestelmää. Monet Android-laitteet käyttävät Googlen tekstistä puheeksi -sovellusta, jonka voit ladata tai päivittää Google Playssä (https://play.google.com/store/apps/details?id=com.google.android.tts) fr = Nous utilisons le système TTS pour les instructions vocales. De nombreux appareils Android utilisent Google TTS, vous pouvez le télécharger ou le mettre à jour depuis Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) hu = TTS rendszert használunk a hangnavigációhoz. Sok Android-os készülék használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts) @@ -16714,14 +16692,14 @@ be = Для некаторых моў вам спатрэбіцца ўсталяваць сінтэзатар маўлення альбо дадатковы моўны пакет з крамы дадаткаў (Google Play, Galaxy Store, App Gallery, FDroid).\Зайдзіце на вашай прыладзе ў Налады → Мова і ўвод → Маўленне → Сінтэз маўлення.\nТут вы можаце задаць налады сінтэза маўлення (напрыклад, спампаваць моўны пакет для выкарыстання без падключэння да інтэрнэту) альбо выбраць іншы сінтэзатар маўлення. bg = За някои езици може да се наложи да инсталирате допълнителен синтезатор на реч (TTS) от магазина за приложения (Google Play Магазин, Galaxy Store).\nЗа да настроите синтезатора на реч, отидете в Настройки → Езици и въвеждане → Синтезиран говор.\nТук можете да инсталирате допълнителни езикови пакети или да изберете синтезатор на реч. ca = Per a algunes llengües, haureu d'instal·lar un sintetizador de veu o un paquet de llengua addicional des de la botiga d'apliacions (Google Play, Galazy Store, FDroid).\nObriu la configuració de l'aparell → Idioma i entrada → Veu → Sortidda de text a veu.\nAquí podeu gestionar la configuració de la síntesi de veu (per exemple, baixar un paquet de llengua per a ús sense connexió) i triar un altre motor de síntesi de veu. - cs = U některých jazyků je třeba nainstalovat jiný hlasový syntetizátor nebo další jazykové sady z obchodu s aplikacemi (Google Play, Galaxy Store, App Gallery, FDroid).\nOtevřete nastavení vašeho zařízení → Jazyky a zadávání → Hlasové zadávání → Převod textu na řeč. \nZde můžete spravovat nastavení pro syntézu řeči (například stáhnout jazykový balíček pro použití offline) a vybrat jiný modul převodu textu na řeč. + cs = U některých jazyků je třeba nainstalovat jiný hlasový syntetizátor nebo další jazykové sady z obchodu s aplikacemi (Google Play, Galaxy Store, App Gallery, FDroid).\nOtevřete zařízení → Nastavení jazyka a zadávání → Hlasitost → Převod textu na řeč. \nZde můžete spravovat nastavení pro syntézu řeči (například stáhnout jazykový balíček pro použití offline) a vybrat jiný modul převodu textu na řeč. da = For nogle sprog skal du installere en anden talesyntese eller en yderligere sprogpakke fra appbutiken (Google Play, Galaxy Store, App Gallery, FDroid).\nÅbn enhedens indstillinger → Sprog og input → Tale → Tekst til tale. Her kan du administrere indstillingerne for talesyntese (f. eks downloade en sprogpakke til brug offline) og vælge et andet tekst-til-tale program. de = Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid). \nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe. Hier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen. el = Για μερικές γλώσσες θα χρειαστεί να εγκαταστήσετε συνθεσάιζερ ομιλίας ή συμπληρωματικό πακέτο γλώσσας από το app store (Google Play, Galaxy Store, App Gallery, FDroid).\nΑνοίξτε τις Ρυθμίσεις της συσκευής σας → Γλώσσα και εισαγωγή → Ομιλία → Μετατροπή κειμένου σε ομιλία.\nΕδώ μπορείτε να διαχειριστείτε τις ρυθμίσεις της σύνθεσης ομιλίας (για παράδειγμα, μπορείτε να κατεβάσετε πακέτο γλώσσας για χρήση εκτός σύνδεσης) και να επιλέξετε άλλη μηχανή μετατροπής κειμένου σε ομιλία. es = Para algunos idiomas, debe instalar otro sintetizador de voz o un paquete de idioma adicional desde la tienda de aplicaciones (Google Play, Galaxy Store, App Gallery, FDroid). Abra los Ajustes de su dispositivo → Idioma e introducción → Voz → Opciones texto a voz. Aquí puede administrar la configuración de síntesis de voz (por ejemplo, descargar un paquete de idioma para poder usarlo sin conexión) o seleccionar otro motor de texto a voz. - et = Mõne keele puhul peate paigaldama kõnesüntesaatori või täiendava keelepaketi rakenduste poest (Google Play, Galaxy Store, App Gallery, FDroid).\nAvage oma seadme seaded → Keel ja sisend → Kõne → Tekst kõneks väljund.\nSiin saate hallata kõnesünteesi seadeid (näiteks alla laadida keelepaketti võrguühenduseta kasutamiseks) ja valida mõne muu teksti kõneks muutmise mootori. + et = Mõne keele puhul peate paigaldama kõnesüntesaatori või täiendava keelepaketi rakenduste poest (Google Play, Galaxy Store, App Gallery, FDroid).\nAvage oma seadme seaded → Keel ja sisend → Kõne → Tekst kõneks väljund .\nSiin saate hallata kõnesünteesi seadeid (näiteks alla laadida keelepaketti võrguühenduseta kasutamiseks) ja valida mõne muu teksti kõneks muutmise mootori. eu = Zenbait hizkuntzatan, beste ahots-sintetizadore bat edo hizkuntza-pakete gehigarri bat instalatu behar duzu aplikazio-dendatik (Google Play, Galaxy Store, App Gallery, FDroid). Ireki gailua Ezarpenak > Hizkuntza eta sarrera > Hizkera > Hizketarako testurako aukerak. Hemen ahots-sintesiaren ezarpenak kudea ditzakezu (adibidez, hizkuntza pakete bat deskargatu, konexiorik gabe erabiltzeko) edo testu-hizketarako beste motor bat hauta dezakezu. - fa = برای بعضی از زبان‌ها، شما باید speech synthesizer یا یک بسته زبان دیگر را از فروشگاه برنامه (بازار Google Play، Galaxy Store) نصب کنید. \n تنظیمات دستگاه خود را باز کنید. → زبان و ورودی → گفتار → خروجی متن به گفتار. می توانید تنظیمات برای ترکیب گفتار (به عنوان مثال، بسته‌های زبان را برای استفاده آفلاین دانلود کنید) را مدیریت کنید و یک موتور دیگر متن به گفتار را انتخاب کنید. + fa = برای بعضی از زبان ها، شما باید speech synthesizer یا یک بسته زبان دیگر را از فروشگاه برنامه (بازار Google Play، Galaxy Store) نصب کنید. \n تنظیمات دستگاه خود را باز کنید. → زبان و ورودی → گفتار → خروجی متن به گفتار. می توانید تنظیمات برای ترکیب گفتار (به عنوان مثال، بسته های زبان را برای استفاده آفلاین دانلود کنید) را مدیریت کنید و یک موتور دیگر متن به گفتار را انتخاب کنید. fi = Joidenkin kielien osalta sinun täytyy asentaa toinen puhesyntetisaattori tai lisäkielipaketti sovelluskaupasta (Google Play, Galaxy Store, App Gallery, FDroid). Avaa laitteen asetukset → Kieli ja syöttötapa → Puhe → Teksistä puheeksi -toisto. Täällä voit hallita puhesynteesin asetuksia (esimerkiksi ladata offline-tilassa käytettävän kielipaketin) ja valita toisen tekstistä puheeksi -moottorin. fr = Pour certaines langues, il vous faudra installer un autre logiciel de synthèse vocale ou un pack de langue supplémentaire depuis l’app store (Google Play, Galaxy Store, App Gallery, FDroid). Ouvrez les paramètres de votre appareil → Langue et saisie → Reconnaissance vocale → Saisie vocale. Ici, vous pouvez gérer les paramètres pour la synthèse vocale (par exemple, télécharger un pack de langue pour une utilisation en mode hors ligne) et sélectionner un autre moteur de saisie vocale. hu = Egyes nyelveknél másik beszédszintetizátort vagy további nyelvi csomagot kell telepítenie az alkalmazás-áruházból (Google Play, Galaxy Store, App Gallery, FDroid). Nyissa meg a készülék beállításait → Nyelv és bevitel → Beszéd → Szöveg-beszéd átalakító kimenet. Itt kezelheti a beszédszintézis beállításokat (például nyelvi csomag letöltése kapcsolat nélküli használatra) és másik szövegfelolvasót jelölhe tki. @@ -17325,7 +17303,7 @@ es-MX = Problema de acceso al almacenamiento et = Salvestusruumi ligipääsu probleem eu = Biltegiratze sarbidearen arazoa - fa = مشکل دسترسی به ذخیره‌سازی + fa = مشکل دسترسی به ذخیره سازی fi = Ongelma tallennustilan käyttämisessä fr = Problème d'accès au stockage hu = Tároló hozzáférési hiba @@ -17368,7 +17346,7 @@ eu = Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi-sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support@organicmaps.app helbidera fa = ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@organicmaps.app تماس بگیرید fi = Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista ja ota yhteyttä osoitteeseen support@organicmaps.app - fr = Le stockage externe n'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@organicmaps.app + fr = Le stockage externe n'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier et nous contacter via support@organicmaps.app hu = Külső tároló nem áll rendelkezésre, valószínűleg az SD-kártyát eltávolították vagy sérült, vagy rendszerfájl csak olvasható. Ellenőrizze, és lépjen kapcsolatba velünk a support@organicmaps.app címen id = Penyimpanan eksternal tidak tersedia, mungkin Kartu SD sudah dilepaskan, rusak, atau sistem berkasnya hanya dapat dibaca. Silakan periksa dan beri tahu kami di alamat support@ maps.me it = Archivio esterno non disponibile, probabilmente la scheda SD è stata rimossa, è danneggiata o il file system è di sola lettura. Controllala o contattaci su support@organicmaps.app @@ -17530,7 +17508,7 @@ es-MX = Listas et = Loetelud eu = Zerrendak - fa = لیست‌ها + fa = لیست ها fi = Listat fr = Listes hu = List @@ -17661,8 +17639,7 @@ fa:one = %d نشانه fa:other = %d نشانه‌ها fi = %d kirjanmerkkiä - fr:one = %d signet - fr:other = %d signets + fr = %d signets hu = könyvjelzők %d id = %d markah it:one = %d preferito @@ -17744,7 +17721,6 @@ be = Імпартаваць закладкі bg = Импортиране на отметки ca = Importa marcadors - cs = Importovat záložky de = Lesezeichen importieren es = Importar marcadores et = Impordi järjehoidjad @@ -18064,7 +18040,7 @@ es-MX = El nombre no puede quedar vacío et = Nimi ei saa olla tühi eu = Izena ezin da hutsik egon - fa = نام نمی‌تواند خالی باشد + fa = نام نمیتواند خالی باشد fi = Nimi ei voinut olla tyhjä fr = Le nom ne peut pas être vide hu = A név nem lehet üres @@ -18224,7 +18200,7 @@ da = Vælg venligst et andet navn de = Bitte wähle einen anderen Namen el = Επιλέξτε άλλο όνομα - es = Por favor elija otro nombre + es = Por favor elige otro nombre es-MX = Por favor elige otro nombre et = Palun vali teine nimi eu = Mesedez, aukeratu beste izen bat @@ -18305,13 +18281,13 @@ da = Vent venligst… de = Bitte warten… el = Παρακαλώ περιμένετε… - es = Por favor, espere… + es = Por favor espera… es-MX = Por favor, espere… et = Palun oota… eu = Itxaron mesedez… fa = لطفا صبر کنید… fi = Odota… - fr = Veuillez patienter… + fr = S'il vous plaît, attendez… hu = Kérlek várj… id = Mohon tunggu… it = Attendere… @@ -18475,8 +18451,8 @@ el:other = έχουν βρεθεί %d αρχεία. Θα τα δείτε μετά τη μετατροπή. es-MX:one = Se encontró %d archivo. Lo verás después de la conversión. es-MX:other = Se han encontrado %d archivos. Los verás después de la conversión. - es:one = Se encontró %d archivo. Lo verá después de la conversión. - es:other = Se han encontrado %d archivos. Los verá después de la conversión. + es:one = Se encontró %d archivo. Lo verás después de la conversión. + es:other = Se han encontrado %d archivos. Los verás después de la conversión. et:one = %d fail leiti. Näed seda peale teisendamist. et:other = %d faili leiti. Näed neid peale teisendamist. fa:one = %d فایل پیدا شد. بعد از تبدیل آن را می‌بینید. @@ -18485,6 +18461,7 @@ fi:other = %d tiedostoa on löytynyt. Näet heidät muuntamisen jälkeen. fr:one = %d fichier a été trouvé. Vous le verrez après la conversion. fr:other = %d fichiers ont été trouvés. Vous les verrez après la conversion. + fr:zero = %d fichier a été trouvé. Vous le verrez après la conversion. hu:one = %d fájlt találtunk. Látni fogja őket a megtérés után. hu:other = %d fájl található. Látni fogja őket a megtérés után. id:one = %d file ditemukan. Anda akan melihatnya setelah mengonversi. @@ -18833,15 +18810,14 @@ de:other = %d Objekte el = %d μέρος es-MX = %d lugar - es:one = %d objeto - es:other = %d objetos + es:one = %d objecto + es:other = %d objectos et:one = %d objekt et:other = %d objekti fa:one = %d شیء fa:other = %d شیء fi = %d paikka - fr:one = %d objet - fr:other = %d objets + fr = lieu %d hu = %d hely id = tempat %d it:one = %d oggetto @@ -19076,7 +19052,7 @@ da = Vi kan anvende dine data til at forbedre brugeroplevelsen på Organic Maps. Ændringerne træder i kraft, når du har genstartet appen. de = Wir können Ihre Daten nutzen, um Organic Maps weiterzuentwickeln und zu verbessern. Die Änderungen werden nach dem Neustart der App wirksam werden. el = Μπορεί να χρησιμοποιήσουμε τα δεδομένα σας για να βελτιώσουμε την εμπειρία του Organic Maps. Οι αλλαγές θα ενεργοποιηθούν μετά την επανεκκίνηση της εφαρμογής. - es = Puede que utilicemos sus datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después dw que reinicie la aplicación. + es = Puede que utilicemos vuestros datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después que reinicie la aplicación. es-MX = Puede que utilicemos sus datos para mejorar la experiencia de Organic Maps. Los cambios surtirán efecto después de que reinicie la aplicación. et = õime kasutada teie andmeid Organic Maps kasutuskogemuse parandamiseks. Muudatused jõustuvad pärast rakenduse taaskäivitamist. eu = Zure datuak Organic Maps-en esperientzia hobetzeko erabil ditzakegu. Aldaketak aplikazioa berrabiarazi ondoren jarriko dira indarrean. @@ -19113,11 +19089,11 @@ be = Палітыка прыватнасці bg = Политика за поверителност ca = Normes de confidencialitat - cs = Zásady ochrany osobních údajů + cs = Politika důvěrnosti da = Privatlivspolitik de = Datenschutzerklärung el = Πολιτική απορρήτου - es = Política de privacidad + es = Política de Privacidad es-MX = Política de Privacidad et = Privaatsuspoliitika eu = Pribatutasun-politika @@ -19286,7 +19262,7 @@ es-MX = Capas del mapa et = Kaardikihid eu = Mapa geruzak - fa = لایه‌های نقشه + fa = لایه های نقشه fi = Karttatasot fr = Couches de carte hu = Térképrétegek @@ -19406,7 +19382,7 @@ da = For at tilføje et bogmærke, så tryk et sted på kort og så på stjerneikonet de = Zum Hinzufügen eine Lesezeichens tippen Sie in der Karte auf den Ort und dann unten auf das Sternchen el = Για να προσθέσετε σελιδοδείκτη, πατήστε ένα μέρος στο χάρτη και μετά πατήστε το αστεράκι - es = Para agregar un marcador, toque un lugar en el mapa y después toque el icono de la estrella + es = Para agregar un marcador, toque un lugar en el mapa y después toque el ícono de estrella es-MX = Para añadir un marcador, toque un lugar en el mapa y después toque el ícono de estrella et = Järjehoidja lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni eu = Pin bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa @@ -19526,7 +19502,6 @@ bg = Популярно ca = Popular de = Beliebt - es = Popular et = Populaarne fa = مشهور fr = Populaire @@ -19552,13 +19527,13 @@ da = Eksporter fil de = Datei exportieren el = Αρχείο Εξαγωγής - es = Exportar archivo + es = Exportar como archivo es-MX = Exportar archivo et = Ekspordi fail eu = Esportatu fitxategi gisa fa = ارسال فایل fi = Viedä tiedosto - fr = Exporter le fichier + fr = Exporter comme fichier hu = Fájl exportálása id = File ekspor it = Esportare il file @@ -19589,17 +19564,17 @@ be = Налады спіса bg = Настройки на списък ca = Configuració de la llista - cs = Nastavení seznamu + cs = Nástroje seznamu da = Listeindstillinger de = Listeneinstellungen el = Ρυθμίσεις Λίστας - es = Ajustes de la lista + es = Configurar lista es-MX = Ajustes de lista et = Loetelu seaded eu = Zerrenda konfiguratu fa = تنظیمات لیست fi = Listan asetukset - fr = Paramètres de la liste + fr = Paramètres liste hu = Lista beállításai id = Pengaturan Daftar it = Impostazioni elenco @@ -19640,7 +19615,7 @@ eu = Zerrenda ezabatu fa = حذف لیست fi = Poista lista - fr = Supprimer la liste + fr = Supprimer liste hu = Törölni a listát id = Hapus Daftar it = Cancella elenco @@ -19674,13 +19649,13 @@ da = Skjul på kort de = Auf der Karte ausblenden el = Κρύψε από τον χάρτη - es = Ocultar del mapa + es = Ocultar en el mapa es-MX = Ocultar del mapa et = Peida kaardil eu = Ezkutatu mapan fa = پنهان کردن از نقشه fi = Piilota kartalta - fr = Masquer sur la carte + fr = Masquer de la carte hu = Lefedés a térképen id = Sembunyikan dari peta it = Nascondi sulla mappa @@ -19756,7 +19731,7 @@ da = Begrænset adgang de = Privater Zugriff el = Περιορισμένη πρόσβαση - es = Acceso limitado + es = Acceso privado es-MX = Acceso limitado et = Piiratud ligipääs eu = Sarbide pribatua @@ -19844,7 +19819,7 @@ eu = Pribatua fa = خصوصی fi = Henkilökohtainen - fr = Privé + fr = Personnel hu = Privát id = Pribadi it = Personale @@ -19964,7 +19939,7 @@ es-MX = Cámaras de velocidad et = Kiiruskaamerad eu = Abiadura kamerak - fa = دوربین‌های سرعت + fa = دوربین های سرعت fi = Nopeuskamerat fr = Radars de vitesse hu = Sebességmérő kamerák @@ -20207,11 +20182,11 @@ da = Auto - Advar om fartkameraer, hvis der er en risiko for, at hastighedsgrænsen overskrides\nAltid - Advar altid om fartkameraer\nAldrig - Advar aldrig om fartkameraer de = Auto - Vor Blitzern warnen, wenn die Gefahr einer Geschwindigkeitsüberschreitung besteht\nImmer - Immer vor Blitzern warnen\nNiemals - Niemals vor Blitzern warnen el = Αυτόματο- Να ειδοποιούμαι για κάμερες αν υπάρχει κίνδυνος να υπερβώ το όριο ταχύτητας\nΠάντα- Πάντα να ειδοποιούμαι για κάμερες\nΠοτέ- Ποτέ να μην ειδοποιούμαι για κάμερες - es = Auto - Advierte sobre las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - Siempre alerta sobre las cámaras\nNunca - Nunca advierte acerca de las cámaras + es = Auto - advierte sobre las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - siempre alerta sobre las cámaras\nNunca - nunca advierte acerca de las cámaras es-MX = Automático - Aviso de las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - Siempre dar aviso de las cámaras de velocidad\nNunca - Nunca dar aviso de las cámaras de velocidad et = Automaatne - kiiruskaamerate hoiatused, kui on oht ületada piirkiirust\nAlati - hoiata alati kiiruskaamerate eest\nMitte kunagi - ära kunagi hoiata kiiruskaamerate eest eu = Auto - abiadura-kamerei buruz ohartarazten du abiadura muga gainditzeko arriskua badago\nBeti - beti erne kamerei buruz\nInoiz - inoiz ez abisatu kamerari buruz - fa = خودکار- در صورتی که خطر تجاوز از سرعت مجاز وجود داشت، نسبت به دوربین‌های کنترل سرعت هشدار دهد\nهمیشه-همیشه درباره دوربین‌های کنترل سرعت هشدار دهد\nهرگز-هرگز درباره دوربین‌های کنترل سرعت هشدار ندهد + fa = خودکار- در صورتی که خطر تجاوز از سرعت مجاز وجود داشت، نسبت به دوربین های کنترل سرعت هشدار دهد\nهمیشه-همیشه درباره دوربین های کنترل سرعت هشدار دهد\nهرگز-هرگز درباره دوربین های کنترل سرعت هشدار ندهد fi = Auto - Varoita nopeuskameroista, jos tuntuu siltä, että nopeusrajan ylitys on mahdollista\nAina - Varoita kameroista aina\nEi koskaan - älä koskaan varoita kameroista fr = Auto - Alerte sur les radars en cas de risque de dépassement de la limite de vitesse\nToujours - Toujours avertir des radars\nJamais - Jamais avertir à propos des radars hu = Autó - Figyelmeztetés a sebesség kamerákról, ha van kockázat a sebesség korlátozás megsértéséről\nMindig - Mindig figyelmeztet a kamerákról\nSoha - Soha ne figyelmezet a kamerákról @@ -20244,7 +20219,7 @@ be = Рэжым захавання энергіі bg = Режим пестене на енергия ca = Mode d'estalvi d'energia - cs = Režim spořič baterie + cs = Nízkoenergetický režim da = Strømsparetilstand de = Stromsparmodus el = Λειτουργία εξοικονόμησης ενέργειας @@ -20285,7 +20260,7 @@ be = Калі ўключаны рэжым захавання энергіі, дадатак пачынае выключаць энергазатратныя функцыі ў залежнасці ад зарада батарэі bg = Ако е активиран режима пестене на енергия, приложението ще деактивира функциите, консумиращи енергия, в зависимост от текущия заряд на телефона. ca = Si està seleccionat el mode automàtic, l'aplicació desactivarà funcions que consumeixen energia, depenent del nivell de càrrega actual de la bateria - cs = Pokud je zapnut automatický režim spořiče baterie, aplikace začne vypínat funkce vybíjející baterii, v závislosti na její momentální úrovni nabití. + cs = Pokud je nízkoenergetický režim zapojen, příloha bude vypínat funkce, které mrhají energii v závislosti na nynější nabíjení telefonu da = Når automatisk tilstand er valgt, begynder applikationen at deaktivere funktioner, med højt batteri-strømforbrug, afhængigt af det aktuelle batteriniveau de = Wenn der Stromsparmodus aktiviert ist, wird die App stromintensive Funktionen je nach aktuellem Ladezustand des Akkus deaktivieren el = Εάν η λειτουργία εξοικονόμησης ενέργειας είναι ενεργοποιημένη, η εφαρμογή θα κλείνει τις λειτουργίες που καταναλώνουν ενέργεια ανάλογα με την τρέχουσα φόρτιση του τηλεφώνου @@ -20326,7 +20301,7 @@ be = Ніколі bg = Никога ca = Mai - cs = Nikdy nepoužívat + cs = Nikdy da = Aldrig de = Niemals el = Ποτέ @@ -20367,7 +20342,7 @@ be = Аўтаматычна bg = Автоматично ca = Automàtic - cs = Automatický + cs = Auto da = Automatisk de = Auto el = Αυτόματα @@ -20408,7 +20383,7 @@ be = Максімальнае захаванне энергіі bg = Максимално пестене на енергия ca = Estalvi d'energia màxim - cs = Maximální šetření baterií + cs = Maximální šetření energií da = Maksimum strømbesparelse de = Maximale Stromsparung el = Μέγιστη εξοικονόμηση ενέργειας @@ -20449,7 +20424,7 @@ be = Опцыя ўключае запіс журнала падзей для мэтаў дыягностыкі. Гэта можа дапамагчы нашай камандзе вырашаць праблемы з дадаткам. Уключайце гэтую опцыю часова каб запісаць і паслаць нам дэталёвую інфармацыю пра знойденую вамі праблему. bg = Тази настройка е разрешена, за да се записват действия за диагностични цели, които помагат на нашия екип да идентифицира проблеми с приложението. Временно активирайте тази настройка само за изпращане на подробна информация за проблема, който сте открили с приложението. ca = L'opció activa el registre amb finalitats de diagnòstic. Pot ser útil per al nostre equip per a identificar problemes amb l'aplicació. Activeu aquesta opció temporalment per a enregistgrar i enviar-nos informes detallats sobre el vostre problema. - cs = Možnost zapne odesílání dat za diagnostickými účely. To nám pomáhá při řešení problémů s aplikací. Dočasně povolte pro nahrávání a odesílání logů našemu týmu o vašem problému. + cs = Daná možnost se zapojuje pro protokolování činností za účelem diagnostiky. To pomáhá týmu odhalit problémy s přílohou. Zapojujte možnost jenom na požádání podržení Organic Maps. da = Indstillingen aktiverer logning til diagnostiske formål. Det kan være nyttigt for vores supportere, der fejlfinder problemer med appen. Aktiver kun denne mulighed på anmodning fra Organic Maps support. de = Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik aufzuzeichnen. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des Organic Maps-Supports. el = Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του Organic Maps. @@ -20494,7 +20469,7 @@ da = Online redigering de = Online bearbeiten el = Επεξεργάζεται online - es = Edición en línea + es = Se edita en línea es-MX = Se edita en línea et = Online muutmine eu = Sarean editatzen da @@ -20531,15 +20506,15 @@ be = Налады пракладкі маршрута bg = Опции за маршрутизация ca = Opcions de la ruta - cs = Možnosti trasy + cs = Možnosti řízení da = Køre muligheder de = Routenbeschränkungen el = Ρυθμίσεις παράκαμψης - es = Opciones de enrutamiento + es = Configuración de desvío es-MX = Ajustes de desvío et = Marsruutimise valikud eu = Birbidali ezarpenak - fa = گزینه‌های رانندگی + fa = گزینه های رانندگی fi = Kiertotien asetukset fr = Paramètres des itinéraires hu = Útvonaltervezési lehetőségek @@ -20621,7 +20596,7 @@ es-MX = Carreteras de peaje et = Tasulised teed eu = Ordainpeko errepideak - fa = جاده‌های دارای عوارض + fa = جاده های دارای عوارض fi = Maksulliset tiet fr = Routes à péage hu = Díjköteles utak @@ -20662,7 +20637,7 @@ es-MX = Caminos de tierra et = Katteta teed eu = Asfaltatu gabeko errepideak - fa = جاده‌های آسفالت نشده + fa = جاده های آسفالت نشده fi = Päällystämättömät tiet fr = Routes non revêtues hu = Burkolatlan utak @@ -20703,7 +20678,7 @@ es-MX = Cruces de ferri et = Praamiületused eu = Ferry pasabideak - fa = گذرگاه‌های جاده‌ای + fa = گذرگاه های جاده ای fi = Lauttaliikenne fr = Traversées en ferry hu = Kompátkelők @@ -20744,7 +20719,7 @@ es-MX = Autopistas et = Kiirteed eu = Autobideak - fa = بزرگراه‌ها + fa = بزرگراه ها fi = Valtatiet fr = Autoroutes hu = Autópályák @@ -20781,7 +20756,7 @@ da = Det er ikke muligt at beregne rute de = Route kann nicht berechnet werden el = Δεν είναι δυνατή η δημιουργία διαδρομής - es = No se puede calcular la ruta + es = No se puede construir una ruta es-MX = No se puede construir una ruta et = Marsruudi arvutamine ei õnnestu eu = Ezin da ibilbiderik eraiki @@ -20822,11 +20797,11 @@ da = Desværre kunne vi ikke finde en rute med den aktuelle opsætning. Ændre opsætningen, og prøv igen de = Leider konnten wir keine Route mit den gewählten Optionen erstellen. Ändern Sie die Einstellungen und versuchen Sie es erneut el = Δυστυχώς, δεν μπορούσαμε να δημιουργήσουμε μια διαδρομή με τις καθορισμένες επιλογές. Αλλάξτε τις ρυθμίσεις και δοκιμάστε πάλι - es = Desafortunadamente, no pudimos encontrar una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo + es = Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambia la configuración y vuelve a intentarlo es-MX = Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo et = Kahjuks ei leidnud me marsruuti tõenäoliselt teie valitud võimaluste tõttu. Muutke seadeid ja proovige uuesti. eu = Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik egin. Aldatu ezarpenak eta saiatu berriro - fa = متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید + fa = متأسفانه، احتمالاً به دلیل گزینه های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید fi = Valitettavasti emme voineet luoda reittiä valituilla vaihtoehdoilla. Vaihda asetuksia ja yritä uudelleen fr = Malheureusement, nous n'avons pas pu créer l'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez hu = Sajnos nem találunk útvonalat, valószínűleg az általad meghatározott lehetőségek miatt. Kérjük változtass a beállításokon és próbáld újra @@ -20863,11 +20838,11 @@ da = Definer veje du vil undgå de = Umwege einstellen el = Ρύθμιση της διαδρομής παράκαμψης - es = Defina las carreteras a evitar + es = Personaliza la ruta de desvío es-MX = Configurar rutas de desvío et = Määra välditavad teed eu = Pertsonalizatu saihesbidearen ibilbidea - fa = جاده‌های لغو شده را تعریف نمایید + fa = جاده های لغو شده را تعریف نمایید fi = Muodosta kiertotietä fr = Définissez les routes à éviter hu = Elkerülendő utak meghatározása @@ -20900,17 +20875,17 @@ be = Налады пракладкі маршрута ўключаны bg = Разрешени опции за маршрутизиране ca = Paràmetres de ruta activats - cs = Možnosti trasy aktivní + cs = Možnosti směrování byly povoleny da = Køre muligheder aktiveret de = Routenbeschränkungen aktiv el = Ρυθμίσεις δραστηριοποιούνται - es = Opciones de enrutamiento habilitadas + es = Configuración de desvío activada es-MX = Ajustes de desvío habilitados et = Marsruutimise valikud lubatud eu = Birbidaltze ezarpena aktibatuta dago - fa = گزینه‌های مسیریابی فعال شد + fa = گزینه های مسیریابی فعال شد fi = Kiertotien asetukset on päällä - fr = Paramètres d'itinéraire activés + fr = Paramètres d'itinéraire activées hu = Útvonaltervezési lehetőségek bekapcsolva id = Opsi perutean diaktifkan it = Opzioni di deviazione abilitate @@ -21028,7 +21003,7 @@ es-MX = Cruce de ferri et = Praamiületus eu = Ferry zeharkaldia - fa = گذرگاه جاده‌ای + fa = گذرگاه جاده ای fi = Lauttaliikenne fr = Traversées en ferry hu = Kompátkelők @@ -21069,7 +21044,7 @@ es-MX = Evitar las carreteras de peaje et = Väldi tasulisi teid eu = Saihestu ordainpeko errepideak - fa = اجتناب از جاده‌های دارای عوارض + fa = اجتناب از جاده های دارای عوارض fi = Vältä maksullisia teitä fr = Éviter les routes à péage hu = Díjköteles utak elkerülése @@ -21110,7 +21085,7 @@ es-MX = Evitar los caminos de tierra et = Väldi katteta teid eu = Saihestu asfaltatu gabeko errepideak - fa = اجتناب از جاده‌های آسفالت نشده + fa = اجتناب از جاده های آسفالت نشده fi = Vältä maanteitä fr = Éviter les routes non revêtues hu = Burkolatlan utak elkerülése @@ -21151,7 +21126,7 @@ es-MX = Evitar los trasbordadores de ferri et = Väldi praamiületusi eu = Ferryak saihestu - fa = اجتناب از گذرگاه‌های کشتی + fa = اجتناب از گذرگاه های کشتی fi = Vältä lautan käyttöä fr = Éviter les traversées en ferry hu = Kompátkelők elkerülése @@ -21227,7 +21202,7 @@ da = Destination de = Ziel el = Προορισμός - es = Destino + es = Objetivo es-MX = Objetivo et = Sihtkoht eu = Helburua @@ -21313,7 +21288,7 @@ eu = Bilaketa-emaitzak fa = نتایج جستجو fi = Hakutulokset - fr = Résultats de la recherche + fr = Résultats de recherche hu = Keresési eredmények id = Hasil pencarian it = Risultati di ricerca @@ -21387,7 +21362,7 @@ da = Vil du genopbygge en rute igen? de = Möchten Sie die Route neu erstellen? el = Θα θέλατε να τροποποιήσετε τη διαδρομή; - es = ¿Quiere reconstruir la ruta? + es = ¿Quieres reconstruir la ruta? es-MX = ¿Quiere reconstruir la ruta? et = Kas soovid marsruudi uuesti luua? eu = Ibilbidea berreraiki nahi duzu? @@ -21507,10 +21482,8 @@ ref = yes be = Ёсць ca = sí - es = sí et = jah fa = بلی - fr = oui he = כן nl = ja ru = Есть @@ -21522,9 +21495,7 @@ ref = no be = Няма ca = no - es = no et = ei - fr = non nl = nee tr = Yok @@ -21538,7 +21509,7 @@ da = Du er ankommet! de = Sie sind angekommen! el = Έχετε φτάσει! - es = ¡Ya ha llegado! + es = ¡Llegaste! es-MX = ¡Ya llegó! et = Oled kohal! eu = Iritsi zara! @@ -21578,7 +21549,7 @@ da = Keyboard er ikke tilgængelig under kørsel de = Die Tastatur ist unterwegs nicht verfügbar el = Το πληκτρολόγιο δεν είναι διαθέσιμο κατά τη διάρκεια οδήγησης - es = Teclado no disponible durante la conducción + es = Teclado no disponible durante el movimiento es-MX = El teclado no está disponible durante el movimiento et = Klaviatuur ei ole sõidu ajal kasutatav eu = Teklatua ez dago erabilgarri mugimenduan zehar @@ -21618,7 +21589,7 @@ da = Det er ikke muligt at beregne rute fra din nuværende position de = Vom aktuellen Standort aus kann keine Route erstellt werden el = Δεν είναι δυνατή η δημιουργία διαδρομής από την τρέχουσα τοποθεσία σας - es = No se puede construir la ruta desde su ubicación actual + es = No se puede construir la ruta desde la ubicación actual es-MX = No se puede construir una ruta desde la ubicación actual et = Sinu praegusest asukohast ei õnnestu marsruuti luua eu = Ezin da ibilbidea eraiki uneko kokapenetik @@ -21658,7 +21629,7 @@ da = Det er ikke muligt at beregne rute til din destination. Vælg en anden destination de = Zu diesem Endpunkt kann keine Route erstellt werden. Bitte wählen Sie einen anderen Endpunkt el = Δεν είναι δυνατή η δημιουργία διαδρομής μέχρι τον προορισμό σας. Επιλέξτε ένα άλλο σημείο - es = No se puede construir una ruta al destino. Elija por favor otro punto + es = No se puede construir la ruta al punto final. Elige otra es-MX = No se puede construir una ruta hasta el punto final. Seleccione otra et = Ei õnnestu luua marsruuti Sinu asukohta. Palun vali teine punkt eu = Ezin da sortu amaiera punturako ibilbidea. aukeratu beste bat @@ -21698,7 +21669,7 @@ da = Intet GPS signal. Flyt til et område med dækning de = Kein GPS-Signal. Gehen Sie in das offene Gelände el = Δεν υπάρχει σήμα GPS. Μετακινήστε σε μια ανοικτή τοποθεσία - es = No hay señal GPS. Muévase por favor a una zona abierta + es = No hay señal GPS. Ve a una zona abierta es-MX = No hay señal de GPS. Vaya a una zona abierta et = GPS signaal puudub. Palun liigu avaramasse kohta eu = Ez dago GPS seinalerik. Joan eremu ireki batera @@ -21738,7 +21709,7 @@ da = Det er ikke muligt at beregne rute. Vælg andre forbindelses-punkter for ruten de = Es kann keine Route erstellt werden. Bitte wählen Sie andere Routenpunkte el = Δεν είναι δυνατή η δημιουργία διαδρομής. Επιλέξτε άλλα σημεία διαδρομής - es = No se puede construir una ruta. Especifique por favor otros puntos de ruta + es = No se puede construir una ruta. Elige otros puntos de ruta es-MX = No se puede construir una ruta. Seleccione otros puntos de ruta et = Marsruudi loomine ei õnnestu. Palun määra muud marsruudipunktid eu = Ezin da ibilbiderik eraiki. Aukeratu beste bide-puntu batzuk @@ -21778,11 +21749,11 @@ da = Download manglende kort til din enhed, for at lave ruten de = Laden Sie die fehlenden Karten herunter, um die Route zu erstellen el = Για να χτίσετε διαδρομή, κατεβάστε χάρτες που λείπουν στη συσκευή - es = Para construir una ruta, descargue los mapas faltantes en su dispositivo + es = Para construir una ruta, descarga los mapas ausentes en tu dispositivo es-MX = Al construir ruta, descargue los mapas ausentes en su dispositivo et = Marsruudi loomiseks lae puuduvad kaardid alla oma seadmesse eu = Ibilbide bat eraikitzeko, deskargatu falta diren mapak zure gailura - fa = برای ایجاد مسیر، نقشه‌های ناقص را روی دستگاه خود را دانلود کنید + fa = برای ایجاد مسیر، نقشه های ناقص را روی دستگاه خود را دانلود کنید fi = Luodaksesi reitin lataa puuttuvat kartat fr = Pour créer l'itinéraire, téléchargez les cartes manquantes sur votre appareil hu = Útvonal létrehozásához töltsd le a hiányzó térképeket az eszközre @@ -21818,7 +21789,7 @@ da = Der opstod en fejl. Genstart programmet de = Es ist ein Fehler aufgetreten. Bitte starten Sie die App neu el = Παρουσιάστηκε σφάλμα. Κάντε επανεκκίνηση της εφαρμογής - es = Ocurrió un error. Reinicie la aplicación + es = Ocurrió un error. Reinicia la aplicación es-MX = Ocurrió un error. Reinicie la aplicación et = Tekkis viga. Palun taaskäivita rakendus eu = Akats bat gertatu da. Berrabiarazi aplikazioa @@ -21858,7 +21829,7 @@ da = Rute vil blive beregnet igen, ud fra din nuværende position de = Die Route wird von Ihrem derzeitigen Standort aus neu erstellt werden el = Η διαδρομή θα ξαναδημιουργηθεί από την τρέχουσα τοποθεσία σας - es = La ruta se reconstruirá desde su ubicación actual + es = La ruta se reconstruirá desde tu ubicación actual es-MX = La ruta se reconstruirá desde su ubicación actual et = Marsruut luuakse uuesti sinu hetkeasukohast eu = Ibilbidea zure uneko kokapenetik berregin egingo da @@ -22025,7 +21996,7 @@ eu = Saihestu asfaltatu gabekoa fa = پرهیز از خاکی fi = Vain päällyste - fr = Eviter les routes non revêtues + fr = Pas de route non revêtue hu = Földút kerülése id = Hindari tanah it = No sterrate @@ -22099,7 +22070,7 @@ da = Undgå færger de = Fähren vermeiden el = Χωρίς πορθμεία - es = Evitar ferris + es = Sin ferri es-MX = Sin ferri et = Väldi praame eu = Ferryrik ez @@ -22179,7 +22150,7 @@ da = Undgå betaling de = Mautstr. vermeiden el = Χωρίς διόδια - es = Evitar peaje de pago + es = Sin peaje es-MX = Sin peaje et = Väldi tasulisi teid eu = Bidesaria ez @@ -22219,7 +22190,7 @@ da = Radarkontrol de = Blitzer el = Κάμερες - es = Cám.velocidad + es = Cám.velocidad. es-MX = Cám.velocidad. et = Kiiruskaamerad eu = Abiadura kamera. @@ -22259,13 +22230,13 @@ da = Radar advarsel de = Blitzerwarnung el = Πληροφ. γιαόρια - es = Alerta velocidad + es = Alerta velocidad. es-MX = Alerta velocidad. et = Kiiruse hoiatused eu = Abiadura alerta. fa = هشدارهای سرعت fi = Nopeuskamerat - fr = Avertissements radars de vitesse + fr = Infos radars de vitesse hu = Sebességjelzés id = Info kecepatan it = Info autovelox @@ -22303,7 +22274,7 @@ es-MX = Descargue mapas en la aplicación Organic Maps en su dispositivo et = Palun lae alla kaardid oma seadme Organic Maps rakenduses eu = Deskargatu mapak zure gailuko Organic Maps aplikazioan - fa = لطفا نقشه‌ها را در نرم افزار Organic Maps روی دستگاه خود دانلود کنید + fa = لطفا نقشه ها را در نرم افزار Organic Maps روی دستگاه خود دانلود کنید fi = Lataa kartat laitteesi Organic Maps-sovelluksessa fr = Téléchargez des cartes dans l'application Organic Maps sur votre appareil hu = Kérjük, töltsd le a térképeket a Organic Maps alkalmazásban az eszközödre @@ -22427,7 +22398,7 @@ es-MX = Ordenar marcadores et = Sorteeri järjehoidjad eu = Ordenatu laster-markak - fa = مرتب سازی نشانه‌ها + fa = مرتب سازی نشانهها fi = Järjestä kirjanmerkit fr = Trier les signets hu = Könyvelzők rendezése @@ -22590,7 +22561,7 @@ eu = Dataren arabera ordenatzeko fa = مرتب سازی بر اساس تاریخ fi = Järjestä: päivämäärä - fr = Classer par date + fr = Classer pa date hu = Dátum szerint id = Urutkan per tanggal it = Ordina per data @@ -23118,7 +23089,7 @@ es-MX = Museos et = Muuseumid eu = Museoak - fa = موزه‌ها + fa = موزهها fi = Museot fr = Musées hu = Múzeumok @@ -23514,7 +23485,7 @@ da = Benzintankstationer de = Tankstellen el = Πρατήρια βενζίνης - es = Gasolineras + es = Gasolinera es-MX = Gasolinería et = Tanklad eu = Erregai-geltokia @@ -23802,7 +23773,7 @@ da = Vælg venligst et start- eller stoppunkt, tættere på metrostationen de = Wählen Sie einen zu einer U-Bahn-Station nähergelegenen Start- oder Endpunkt el = Επιλέξτε το σημείο έναρξης ή τέλους διαδρομής πιο κοντά στο σταθμό του μετρό - es = Elija por favor el punto de inicio o fin de ruta más cercano a una estación de metro + es = Elige el punto de inicio o fin de ruta más cercano al metro es-MX = Elija el punto de inicio o fin de ruta más cercano al metro et = Palun vali metroojaamale lähemal asuv algus- või lõpp-punkt eu = Aukeratu metrotik hurbilen dagoen ibilbidearen hasiera edo amaiera puntua @@ -23884,13 +23855,13 @@ da = For at aktivere og bruge de topografiske lag, opdater venligst eller download kortet for området de = Um die Topographieebene nutzen zu können, aktualisieren Sie die Karte des betreffenden Gebiets oder laden Sie diese herunter el = Για να χρησιμοποιήσετε τοπογραφικά στρώματα, ενημερώστε ή κατεβάστε τον χάρτη της επιθυμητής περιοχής - es = Para usar la altitud de relieve, actualice o descargue el mapa del área deseada + es = Para usar la altitud de relieve, actualiza o descarga el mapa del área deseada es-MX = Para usar la altitud de relieve, actualice o descargue el mapa del área deseada et = Topograafilise kihi aktiveerimiseks ja kasutamiseks värskenda või lae alla piirkonna kaart eu = Erliebe-altuera erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa fa = برای فعال سازی و استفاده از لایه توپوگرافی نقشه منطقه را به روزرسانی یا دانلود کنید fi = Päivitä tai lataa haluamasi alueen kartta, voidaksesi käyttää korkeuskäyriä - fr = Pour activer et utiliser la couche topographique, mettez à jour ou téléchargez la carte de l'endroit désiré + fr = Pour utiliser les lignes d'altitude, mettez à jour ou téléchargez la carte de l'endroit désiré hu = A topográfiai réteg aktiválásához és használatához kérjük frissítse vagy töltse le az adott terület térképét id = Untuk mengaktifkan dan menggunakan lapisan topografi, silakan perbarui atau unduh peta area it = Per utilizzare la modalità topografica, aggiornate o scaricate la mappa dell'area interessata @@ -24012,7 +23983,7 @@ eu = Erraza fa = آسان fi = Helppo - fr = Facile + fr = Faible hu = Könnyű id = Mudah it = Facile @@ -24092,7 +24063,7 @@ eu = Gogorra fa = دشوار fi = Vaikea - fr = Difficile + fr = Haut hu = Nehéz id = Sulit it = Difficile @@ -24332,7 +24303,7 @@ da = Afs.: de = Entf.: el = Απόστ.: - es = Dist.: + es = Distancia: es-MX = Distancia: et = Kaugus: eu = Distantzia: @@ -24373,7 +24344,7 @@ da = Tid: de = Dauer: el = Διαρκ: - es = Tiempo: + es = Lapso: es-MX = Lapso: et = Aeg: eu = Hutsunea: @@ -24414,7 +24385,7 @@ da = Zoom ind for at udforske isolinjekort de = Karte vergrößern, um Höhenlinien sichtbar zu machen el = Μεγεθύνετε για να δείτε περιγράμματα - es = Amplíe el mapa para ver las isolíneas + es = Amplía el mapa para ver las isolíneas es-MX = Amplíe el mapa para ver las isolíneas et = Isojoonte sirvimiseks suurenda kaarti eu = Handitu mapa isolineak ikusteko @@ -24454,7 +24425,7 @@ da = Opdaterer de = Aktualisierung el = Ενημέρωση - es = Actualizando + es = Actualización es-MX = Actualización et = Värskendamine eu = Eguneratu @@ -24494,7 +24465,7 @@ da = Downloader de = Herunterladen el = Φόρτωση - es = Descargando + es = Cargando es-MX = Cargando et = Allalaadimine eu = Kargatzen @@ -24532,7 +24503,7 @@ bg = Изтегляне на картата на света ca = Baixa el mapa mundial de = Herunterladen der Weltkarte - es = Descarga el mapa mundial + es = Descarga mapa mundial et = Maailma kaardi allalaadimine eu = Deskargatu munduko mapa fi = Lataa maailmankartta @@ -24554,9 +24525,8 @@ ar = تعذر إنشاء المجلد ونقل الملفات على الذاكرة الداخلية للجهاز أو على بطاقة SD ca = No s'ha pogut crear la carpeta ni moure els fitxers a la memòria interna de l'aparell o targeta SD de = Ordner kann nicht erstellt und Dateien können nicht auf den Gerätespeicher oder die SD-Karte verschoben werden - es = No se ha podido crear la carpeta y mover los ficheros en la memoria interna del dispositivo o en la tarjeta SD et = Seadme sisemällu või mälukaardile ei saa kausta luua ja faile teisaldada - fr = Impossible de créer un dossier et de déplacer les fichiers vers la mémoire interne de l'appareil ou la carte SD + fr = Impossible de créer un dossier et de déplacer des fichiers sur la mémoire interne de l'appareil ou sur la carte SD mr = उपकरणाच्या अंतर्गत मेमरी किंवा SD-card वर फोल्डर तयार करण्यात आणि फायली हलविण्यात अक्षम nl = Het lukt niet om een map aan te maken en bestanden naar het interne geheugen of een SD-kaart te verplaatsen pl = Nie udało się stworzyć folderu i przenieść plików do pamięci wewnętrznej lub karty SD @@ -24571,9 +24541,7 @@ ar = حدث خطأ في التخزين ca = Error de disc de = Speicherfehler - es = Error de disco et = Salvestusseadme viga - fr = Erreur disque mr = डिस्क त्रुटी nl = Schijffout pl = Błąd pamięci @@ -24590,7 +24558,7 @@ bg = Неуспешно свързване ca = Error de connexió de = Verbindungsfehler - es = Fallo de conexión + es = Problema de conexión et = Ühenduse viga eu = Konexio arazoa fi = Yhteysvirhe @@ -24644,7 +24612,7 @@ eu = Utzi pantailari lo egiten fa = اجازه دهید صفحه نمایش بخوابد fi = Salli näytön lepotila - fr = Autoriser l'écran à se mettre en veille + fr = Autoriser l'écran à dormir he = אפשר למסך לישון hu = Hagyja aludni a képernyőt id = Izinkan layar untuk tidur @@ -24676,7 +24644,7 @@ be = Дазваляе экрану засынаць пасля перыяда бездзеяння. bg = Когато е разрешено, екранът ще бъде оставен да заспи след определен период на неактивност. ca = Si l'opció està activa, es pot apagar la pantalla després d'un període d'inactivitat. - cs = Je-li tato možnost povolena, bude obrazovce po určité době nečinnosti umožněno usnout. + cs = Je-li tato možnost povolena, bude obrazovka po určité době nečinnosti umožněna usnout. da = Når den er aktiveret, får skærmen lov til at sove efter en periode med inaktivitet. de = Wenn diese Option aktiviert ist, kann der Bildschirm nach einer gewissen Zeit der Inaktivität in den Ruhezustand versetzt werden. el = Όταν είναι ενεργοποιημένη, η οθόνη θα αφεθεί να κοιμηθεί μετά από περίοδο αδράνειας. @@ -24685,7 +24653,7 @@ eu = Gaituta dagoenean, pantailak lo egin ahal izango du jarduerarik gabe egon ondoren. fa = درصورت فعال بودن ، بعد از یک دوره عدم فعالیت به صفحه اجازه خواب داده می شود. fi = Kun tämä asetus on käytössä, näyttö menee lepotilaan käyttämättömyyden jälkeen. - fr = Lorsque ce paramètre est activé, l'écran se mettra en veille après une période d'inactivité. + fr = Lorsqu'il est activé, l'écran sera autorisé à s'éteindre après une période d'inactivité. he = כאשר מופעל המסך יורשה לישון לאחר תקופה של חוסר פעילות. hu = Ha engedélyezve van, akkor a képernyő inaktivitás után alszik. id = Jika diaktifkan, layar akan diizinkan untuk tidur setelah beberapa saat tidak aktif. @@ -24716,9 +24684,7 @@ ar = إظهار التطبيق فوق شاشة القفل be = Паказваць на экране блакіроўкі ca = Mostra en la pantalla de bloqueig - cs = Zobrazit na uzamčené obrazovce de = Auf dem Sperrbildschirm anzeigen - es = Mostrar en la pantalla de bloqueo et = Kuva lukustusekraanil fr = Afficher sur l'écran de verrouillage hu = Megjelenítés a zárolt képernyőn @@ -24739,11 +24705,9 @@ ar = عند التفعيل، لن تحتاج لفتح قفل جهازك كل مرة أثناء تشغيل التطبيق be = Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы дадатку. ca = Si està activa, no cal desblocar l'aparell cada vegada mentre l'aplicació està funcionant. - cs = Pokud je funkce povolena, nemusíte pokaždé odemykat zařízení při spuštěné aplikaci. de = Wenn aktiviert, muss das Gerät nicht jedes Mal entsperrt werden, wenn die App ausgeführt wird. - es = Cuando está habilitado, no tiene que desbloquear su dispositivo mientras la aplicación se está ejecutando. et = Kui lubatud, ei pea te seadet iga kord avama, kui rakendus töötab. - fr = Lorsqu'il est activé, vous n'avez pas besoin de déverrouiller votre appareil à chaque fois que l'application est en fonctionnement. + fr = Lorsqu'il est activé, vous n'avez pas besoin de déverrouiller votre appareil à chaque fois quand l'application fonctionne. hu = Ha engedélyezve van, nem kell minden alkalommal feloldanod a telefonod, amíg az alkalmazás fut. it = Quando è abilitata, non è necessario sbloccare il dispositivo ogni volta mentre l'app è in esecuzione. mr = चालू असल्यास, ऍप चालू असताना प्रत्येक वेळी तुम्हाला तुमचे उपकरण अनलॉक करण्याची आवश्यकता नाही. @@ -24771,7 +24735,7 @@ es-MX = Debe actualizar sus mapas descargados et = Värskenda oma alla laetud kaarte eu = Eguneratu deskargatutako mapak - fa = نقشه‌های دانلود شده خود را به روز کنید + fa = نقشه های دانلود شده خود را به روز کنید fi = Päivitä ladatut kartat fr = Mettez à jour vos cartes téléchargées fr-CA = Mettez à jour vos cartes téléchargées @@ -24816,7 +24780,7 @@ es-MX = Actualizar los mapas mantiene actualizada también la información acerca de los objetos et = Kaartide värskendamine hoiab objektide info ajakohasena eu = Maparen freskatzeak objektuen informazioa eguneratuta mantentzen du - fa = بروزرسانی نقشه‌ها اطلاعات مربوط به اشیا را به روز نگه می دارد + fa = به روز رسانی نقشه ها اطلاعات مربوط به اشیا را به روز نگه می دارد fi = Karttojen päivittäminen pitää kohteita koskevat tiedot ajan tasalla fr = Actualiser les cartes permet d'actualiser également les informations sur les objets fr-CA = La mise à jour des cartes permet d'avoir des informations à jour sur les objets @@ -25060,7 +25024,7 @@ es = Datos de mapas de OpenStreetMap et = OpenStreetMap kaardiandmed eu = Maparen datuak OpenStreetMap-en - fa = OpenStreetMap داده‌های نقشه از + fa = OpenStreetMap ﺯﺍ ﻪﺸﻘﻧ ﯼﺎﻫ ﻩﺩﺍﺩ fi = OpenStreetMapin karttatiedot fr = Données cartographiques d'OpenStreetMap he = OpenStreetMap-מ הפמ ינותנ @@ -25087,7 +25051,7 @@ zh-Hant = 來自 OpenStreetMap 的地圖數據 [telegram_url] - comment = Telegram group url for the "?" About page + comment = Telegram group url for the help page tags = android,ios en = https://t.me/OrganicMapsApp be = https://t.me/OrganicMapsRu @@ -25096,17 +25060,7 @@ tr = https://t.me/OrganicMapsTR [instagram_url] - comment = Instagram account url for the "?" About page + comment = Instagram account url for the help page tags = android,ios en = https://www.instagram.com/organicmaps.app tr = https://www.instagram.com/organicmapstr - - [translated_om_site_url] - comment = Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content - tags = android,ios - en = https://organicmaps.app/ - be = https://organicmaps.app/ru/ - cs = https://organicmaps.app/cs/ - it = https://organicmaps.app/it/ - ru = https://organicmaps.app/ru/ - tr = https://organicmaps.app/tr/ diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 067f54e27b..4f9c9fef2f 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -229,7 +229,7 @@ da = Lufthavn de = Flughafen el = Αεροδρόμιο - es = Aeropuerto internacional + es = Aeropuerto et = Rahvusvaheline lennujaam eu = Aireportua fa = فرودگاه @@ -342,7 +342,7 @@ pt = Pista de aeroporto ou aeródromo pt-BR = Pista de aeroporto ou aeródromo ru = Взлётно-посадочная полоса - tr = Pist + tr = Koşu yolu uk = Злітно-посадкова смуга zh-Hans = 机场跑道 zh-Hant = 機場跑道 @@ -465,7 +465,7 @@ cs = Bankomat da = Hæveautomat de = Geldautomat - es = Cajero automático + es = Cajero et = Pangaautomaat eu = Kutxazain automatikoa fa = خودپرداز @@ -546,7 +546,7 @@ ar = مكان نزهة cs = Piknik da = Picnic - de = Grillplatz + de = Picknickplatz el = Χώρος εκδρομής es = Picnic et = Piknikuala @@ -619,7 +619,7 @@ da = Cykelparkering de = Fahrradständer el = Χώρος στάθμευσης ποδηλάτων - es = Aparcamiento de bicicletas + es = Aparcamiento de bicis et = Jalgrattaparkla eu = Bizikleta aparkalekua fa = پارکینگ دوچرخه @@ -1026,7 +1026,7 @@ eu = Kargatzeko geltokia fa = ایستگاه شارژ fi = Latausasema - fr = Borne de recharge + fr = Station de recharge hu = Töltő állomás id = Pusat Pengisian Daya it = Stazione di ricarica @@ -1049,9 +1049,6 @@ zh-Hans = 充电站 zh-Hant = 充電站 - [type.amenity.charging_station.motorcar] - ref = type.amenity.charging_station - [type.amenity.childcare] en = Nursery ar = حضانة @@ -1121,46 +1118,6 @@ zh-Hans = 电影院 zh-Hant = 電影院 - [type.leisure.bowling_alley] - en = Bowling Alley - ar = ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ - be = Боўлінг - bg = Боулинг писта - ca = Bolera - cs = Bowlingová dráha - da = Bowling bane - de = Bowlingbahn - el = Αίθουσα σφαιρίσεως - es = Bolera - et = Bowlingusaal - eu = Bolatokia - fa = ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ - fi = Keilarata - fr = Salle de bowling - he = גנילואב םלוא - hu = Tekepálya - id = Arena Bowling - it = Sala da bowling - ja = ボーリング場 - ko = 볼링장 - mr = गोलंदाजी गल्ली - nb = Bowlinghall - nl = Bowlingbaan - pl = Kręgielnia - pt = Pista de bowling - pt-BR = Pista de boliche - ro = Popicărie - ru = Боулинг - sk = Bowlingová dráha - sv = Bowlinghall - sw = Njia ya Bowling - th = ลานโบว์ลิ่ง - tr = Bowling pisti - uk = Боулінг - vi = Sân chơi bowling - zh-Hans = 保龄球馆 - zh-Hant = 保齡球館 - [type.amenity.clinic] en = Clinic ar = عيادة @@ -1636,7 +1593,7 @@ fr = Caserne de pompiers hu = Tűzoltóság id = Kantor pemadam kebakaran - it = Squadra antincendio + it = Scuadra antincendio ja = 消防署 ko = 소방서 mr = अग्निशमन केंद्र @@ -1731,7 +1688,7 @@ mr = पेट्रोल पंप nb = Bensinstasjon nl = Tankstation - pl = Stacja paliw + pl = Stacja benzynowa pt = Posto de combustível pt-BR = Posto de combustível ro = Benzinărie @@ -1786,7 +1743,6 @@ ref = type.amenity.grave_yard en = Christian Graveyard be = Хрысціянскія могілкі - es = Cementerio cristiano et = Kristlik surnuaed it = Cimitero cristiano ja = キリスト教墓地 @@ -1842,7 +1798,7 @@ da = Jagtsted de = Hochsitz el = Βάση σκόπευσης - es = Puesto de caza + es = Galería de caza et = Jahipidamise koht eu = Ehiza galeria fa = شکارگاه @@ -2050,7 +2006,7 @@ da = Motorcykelparkering de = Motorrad-Parkplatz el = Χώρος στάθμευσης μοτοσικλετών - es = Aparcamiento de motocicletas + es = Aparcamiento de motos et = Mootorrataste parkimine eu = Motoentzako aparkalekua fa = پارکینگ موتورسیکلت @@ -2378,6 +2334,12 @@ zh-Hans = 地下停车场 zh-Hant = 地下停車場 + [type.amenity.parking_entrance.private] + ref = type.amenity.parking_entrance + + [type.amenity.parking_entrance.permissive] + ref = type.amenity.parking_entrance + [type.amenity.parking_entrance] en = Parking entrance ar = ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ @@ -2388,6 +2350,7 @@ de = Parkplatzeinfahrt el = Είσοδος στάθμευσης es = Entrada al aparcamiento + es-MX = Entrada al aparcamiento et = Parkla sissepääs eu = Aparkalekuaren sarrera fa = ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ @@ -2415,12 +2378,6 @@ zh-Hans = 停车场入口 zh-Hant = 停車場入口 - [type.amenity.parking_entrance.private] - ref = type.amenity.parking_entrance - - [type.amenity.parking_entrance.permissive] - ref = type.amenity.parking_entrance - [type.amenity.parking_space] en = Parking Space ar = مكان لوقوف السيارات @@ -2990,7 +2947,7 @@ da = Postboks de = Briefkasten el = Ταχυδρομική θυρίδα - es = Buzón de correos + es = Buzón et = Postkast eu = Postontzia fa = صندوق پست @@ -4355,7 +4312,7 @@ da = Vandstation de = Wasseranschluss el = Παροχή νερού - es = Fuente de agua para caravanas + es = Fuente de agua et = Haagiselamu veepunkt eu = Ur iturria fa = شیر آب قابل شرب @@ -4829,7 +4786,7 @@ da = Betalingsstation de = Mautstelle el = Σταθμός διοδίων - es = Cabina de peaje + es = Peaje et = Tolliputka eu = Bidesaria fa = گیشه عوارضی @@ -5544,7 +5501,7 @@ bg = Сладкарски изделия cs = Cukrářské výrobky da = Konfekture - de = Süßwarenladen + de = Konditor el = Ζαχαροπλάστης es = Confitería et = Maiustused @@ -5738,7 +5695,7 @@ da = Blikkenslager de = Heizung, Lüftung und Klimatisierung el = Ψυκτικός - es = Calefacción, ventilación y aire acondicionado + es = Aire acondicionado et = Õhkkonditsioneer eu = Aire girotua fa = گرمایش و تهویه‌هوا @@ -7873,7 +7830,7 @@ ar = مطبخ محلي cs = Místní kuchyně da = Lokalt køkken - de = Lokale Küche + de = Regional el = Τοπική es = Cocina local et = Kohalik @@ -8421,7 +8378,7 @@ ar = مطبخ إقليمي cs = Regionální kuchyně da = Regionalt køkken - de = Regionale Küche + de = Regional el = Περιφερειακή es = Cocina regional et = Piirkondlik @@ -9003,7 +8960,6 @@ en = Emergency ar = طوارئ de = Notfall - es = Emergencia et = Hädaabi fr = Urgence it = Emergenza @@ -9094,7 +9050,7 @@ da = Nødtelefon de = Notruftelefon el = Τηλέφωνο έκτακτης ανάγκης - es = Teléfono de emergencias + es = Teléfono de emergencia et = Hädaabi telefon eu = Larrialdi zenbakia fa = تلفن اضطراری @@ -9123,7 +9079,6 @@ zh-Hant = 緊急電話 [type.entrance] - comment = This is for secondary entrances, for main entrances see type.entrance.main en = Entrance ar = مدخل cs = Vchod @@ -9158,47 +9113,6 @@ zh-Hans = 入口 zh-Hant = 入口 - [type.entrance.main] - comment = This is for main/primary entrances, for secondary entrances see type.entrance - en = Main Entrance - ar = ﻲﺴﻴﺋﺮﻟﺍ ﻞﺧﺪﻤﻟﺍ - be = Галоўны ўваход - bg = Главния вход - ca = Entrada principal - cs = Hlavní vchod - da = Hovedindgang - de = Haupteingang - el = Κύρια είσοδος - es = Entrada principal - et = Peasissekäik - eu = Sarrera Nagusia - fa = ﯽﻠﺻﺍ ﯼﺩﻭﺭﻭ - fi = Pääsisäänkäynti - fr = Entrée principale - he = תישארה הסינכ - hu = Főbejárat - id = Pintu masuk utama - it = Entrata principale - ja = 正面玄関 - ko = 정문 - mr = मुख्य प्रवेशद्वार - nb = Hovedinngang - nl = Hoofdingang - pl = Główne wejście - pt = Entrada principal - pt-BR = Entrada principal - ro = Intrarea principala - ru = Главный вход - sk = Hlavný vchod - sv = Huvudentré - sw = Mlango Mkuu - th = ทางเข้าหลัก - tr = Ana giriş - uk = Головний вхід - vi = Lối vào chính - zh-Hans = 主要入口 - zh-Hant = 主要入口 - [type.healthcare.laboratory] en = Medical Laboratory ar = مختبر طبي @@ -9277,325 +9191,12 @@ zh-Hans = 物理治疗师 zh-Hant = 物理治療師 - [type.healthcare.alternative] - en = Alternative medicine - ar = الطب البديل - be = Альтэрнатыўная медыцына - bg = Алтернативна медицина - cs = Alternativní medicína - da = Alternativ medicin - de = Alternative Medizin - el = Εναλλακτική ιατρική - es = Medicina alternativa - et = Alternatiivne meditsiin - eu = Medikuntza alternatiboa - fa = طب جایگزین - fi = Vaihtoehtoinen lääketiede - fr = Médecine alternative - he = רפואה אלטרנטיבית - hu = Alternatív gyógyászat - id = Pengobatan alternatif - it = Medicina alternativa - ja = 代替医療 - ko = 대체 약품 - mr = पर्यायी औषध - nb = Alternativ medisin - nl = Alternatieve geneeskunde - pl = Medycyna alternatywna - pt = Medicina alternativa - pt-BR = Medicina alternativa - ro = Medicină alternativă - ru = Альтернативная медицина - sk = Alternatívna medicína - sv = Alternativ medicin - sw = Dawa mbadala - th = การแพทย์ทางเลือก - tr = Alternatif tıp - uk = Альтернативна медицина - vi = Liều thuốc thay thế - zh-Hans = 替代医学 - zh-Hant = 替代藥物 - - [type.healthcare.audiologist] - en = Audiology - ar = السمع - be = Аўдыялогія - bg = Аудиология - cs = Audiologie - da = Audiologi - de = Audiologie - el = Ακοολογία - es = Audiología - et = Audioloogia - eu = Audiologia - fa = شنوایی شناسی - fi = Audiologia - fr = Audiologie - he = אודיולוגיה - hu = Audiológia - id = Audiologi - it = Audiologia - ja = オーディオロジー - ko = 청력학 - mr = ऑडिओलॉजी - nb = Audiologi - nl = Audiologie - pl = Audiologia - pt = Audiologia - pt-BR = Fonoaudiologia - ro = Audiologie - ru = Аудиология - sk = Audiológia - sv = Audiologi - sw = Mtaalamu wa kusikia - th = โสตวิทยา - tr = Odyoloji - uk = Аудіологія - vi = Thính học - zh-Hans = 听力学家 - zh-Hant = 聽力學 - - [type.healthcare.blood_donation] - en = Blood donation center - ar = مركز التبرع بالدم - be = Цэнтр донарства крыві - bg = Център за кръводаряване - cs = Centrum dárcovství krve - da = Center for bloddonation - de = Blutspendezentrum - el = Κέντρο αιμοδοσίας - es = Centro de donación de sangre - et = Vereloovutuskeskus - eu = Odol Emate Zentroa - fa = مرکز اهدای خون - fi = Verenluovutuskeskus - fr = Centre de don du sang - he = מרכז תרומת דם - hu = Véradó központ - id = Pusat Donor Darah - it = Centro di donazione del sangue - ja = 献血センター - ko = 헌혈센터 - mr = रक्तदान केंद्र - nb = Bloddonasjonssenter - nl = Bloeddonatiecentrum - pl = Centrum krwiodawstwa - pt = Centro de Doação de Sangue - pt-BR = Hemocentro - ro = Centrul de donare de sânge - ru = Центр донорства крови - sk = Centrum darcovstva krvi - sv = Centrum för blodgivning - sw = Kituo cha Uchangiaji Damu - th = ศูนย์รับบริจาคโลหิต - tr = Kan Bağışı Merkezi - uk = Центр донорства крові - vi = Trung tâm hiến máu - zh-Hans = 献血中心 - zh-Hant = 捐血中心 - - [type.healthcare.optometrist] - en = Optometry - ar = قياس البصر - be = Оптаметрыя - bg = Оптометрия - cs = Optometrie - da = Optometri - de = Optometrie - el = Οπτομετρία - es = Optometría - et = Optomeetria - eu = Optometria - fa = بینایی سنجی - fi = Optometria - fr = Optométrie - he = אופטומטריה - hu = Optometria - id = Optometri - it = Optometria - ja = オプトメトリー - ko = 검안 - mr = ऑप्टोमेट्री - nb = Optometri - nl = Optometrie - pl = Optometria - pt = Optometria - pt-BR = Optometria - ro = Optometrie - ru = Оптометрия - sk = Optometria - sv = Optometri - sw = Optometry - th = ทัศนมาตรศาสตร์ - tr = Optometri - uk = Оптометрія - vi = Khúc xạ nhãn khoa - zh-Hans = 验光师 - zh-Hant = 驗光 - - [type.healthcare.podiatrist] - en = Podiatry - ar = علاج الأرجل - be = Подологія - bg = Подиология - cs = Podiatrie - da = Fodterapi - de = Podologie - el = Ποδιατρική - es = Podología - et = Jalaravi - eu = Podologia - fa = پزشکی پا - fi = Jalkaterapia - fr = Podologie - he = פודיאטריה - hu = Podiatria - id = Podiatri - it = Podologia - ja = 足病学 - ko = 발병학 - mr = पोडियाट्री - nb = Fotterapi - nl = Podologie - pl = Podiatria - pt = Podiatria - pt-BR = Podiatria - ro = Podiatrie - ru = Подиатрия - sk = Podiatria - sv = Fotvård - sw = Matibabu ya miguu - th = แก้โรคเท้า - tr = Podiatri - uk = Подологія - vi = khoa bàn chân - zh-Hans = 足疗师 - zh-Hant = 足病學 - - [type.healthcare.psychotherapist] - en = Psychotherapy - ar = العلاج النفسي - be = Псіхатэрапія - bg = Психотерапия - cs = Psychoterapie - da = Psykoterapi - de = Psychotherapie - el = Ψυχοθεραπεία - es = Psicoterapia - et = Psühhoteraapia - eu = Psikoterapia - fa = روان درمانی - fi = Psykoterapia - fr = Psychothérapie - he = פסיכותרפיה - hu = Pszichoterápia - id = Psikoterapi - it = Psicoterapia - ja = 心理療法 - ko = 심리치료 - mr = मानसोपचार - nb = Psykoterapi - nl = Psychotherapie - pl = Psychoterapia - pt = Psicoterapia - pt-BR = Psicoterapia - ro = Psihoterapie - ru = Психотерапия - sk = Psychoterapia - sv = Psykoterapi - sw = Tiba ya kisaikolojia - th = จิตบำบัด - tr = Psikoterapi - uk = Психотерапія - vi = Tâm lý trị liệu - zh-Hans = 心理治疗师 - zh-Hant = 心理治療 - - [type.healthcare.sample_collection] - en = Sample collection - ar = أخذ العينات - be = Збор аналізаў - bg = Вземане на проби - cs = Odběr vzorků - da = Prøvetagning - de = Probenahme - el = Δειγματοληψία - es = Muestreo - et = Proovivõtmine - eu = Laginketa - fa = نمونه برداری - fi = Näytteenotto - fr = Prélèvements biologiques - he = דְגִימָה - hu = Mintavétel - id = Pengambilan sampel - it = Campionamento - ja = サンプリング - ko = 견본 추출 - mr = नमुना - nb = Prøvetaking - nl = Bemonstering - pl = Próbkowanie - pt = Amostragem - pt-BR = Amostragem - ro = Eșantionare - ru = Сбор анализов - sk = Vzorkovanie|Zber vzoriek - sv = Provtagning - sw = Sampuli - th = การสุ่มตัวอย่าง - tr = Örnekleme - uk = Збір аналізів - vi = lấy mẫu - zh-Hans = 样本采集设施 - zh-Hant = 採樣 - - [type.healthcare.speech_therapist] - en = Logopedics - ar = علاج النطق - be = лагапедыя - bg = Логопедия - cs = Logopedie - da = Tale terapi - de = Logopedie - el = Λογοθεραπεία - es = Logopedia - et = Logopeedia - eu = Logopedia - fa = گفتار درمانی - fi = Logopedia - fr = Logopédie - he = ריפוי בדיבור - hu = Logopédia - id = Logopedik - it = Logopedia - ja = ロゴペディックス - ko = 대화 요법 - mr = स्पीच थेरपी - nb = Snakketerapi - nl = Logopedie - pl = Logopeda - pt = Terapia da fala - pt-BR = Terapia da fala - ro = Logopedie - ru = Логопедия - sk = Logopédia - sv = Logopedics - sw = Tiba ya hotuba - th = การบำบัดด้วยการพูด - tr = Logopedi - uk = Логопедія - vi = Ngôn ngữ trị liệu - zh-Hans = 语言治疗师 - zh-Hant = 言語治療 - [[Types: Roads]] [type.highway] en = Highway ar = طريق السريع de = Straße - es = Carretera et = Maantee it = Via ja = 道路 @@ -9612,7 +9213,6 @@ [type.highway.bridleway] en = Bridle Path de = Reitweg - es = Camino de caballos et = Valjarada fr = Chemin pour cavalier it = sentiero per cavalli @@ -9644,46 +9244,6 @@ pl = Tunel drogowy dla koni pt-BR = Túnel para cavaleiros - [type.highway.busway] - en = Dedicated bus road - ar = ﺺﺼﺨﻣ ﺕﻼﻓﺎﺣ ﻖﻳﺮﻃ - be = Выдзеленая аўтобусная дарога - bg = Обособен автобусен път - ca = Carretera dedicada a l'autobús - cs = Vyhrazená autobusová silnice - da = Dedikeret busvej - de = Eigene Busstraße - el = Αφιερωμένος δρόμος λεωφορείων - es = Carretera exclusiva para autobuses - et = Spetsiaalne bussitee - eu = Autobus errepidea - fa = ﺱﻮﺑﻮﺗﺍ ﯽﺻﺎﺼﺘﺧﺍ ﻩﺩﺎﺟ - fi = Oma bussitie - fr = Route réservée aux bus - he = ידועיי סובוטוא שיבכ - hu = Kijelölt buszút - id = Jalan khusus bus - it = Strada dedicata agli autobus - ja = バス専用道路 - ko = 버스전용도로 - mr = समर्पित बस रस्ता - nb = Dedikert bussvei - nl = Speciale busweg - pl = Dedykowana droga autobusowa - pt = Via exclusiva de autocarro - pt-BR = Via exclusiva de ônibus - ro = Drum dedicat autobuzului - ru = Выделенная автобусная дорога - sk = Vyhradená autobusová cesta - sv = Dedikerad bussväg - sw = Barabara ya basi iliyotengwa - th = ถนนทางเดินรถโดยเฉพาะ - tr = Özel otobüs yolu - uk = Виділена автобусна дорога - vi = Đường dành riêng cho xe buýt - zh-Hans = 巴士专用道 - zh-Hant = 巴士專用道 - [type.highway.bus_stop] en = Bus Stop ar = موقف حافلة @@ -9855,7 +9415,6 @@ [type.highway.footway.alpine_hiking] ref = type.highway.path de = Alpinwanderweg - es = Senderismo alpino et = Alpi matkarada nl = Alpine wandelpad pl = Ścieżka wspinaczkowa @@ -9867,7 +9426,6 @@ ref = type.highway.footway en = Pedestrian Zone ar = منطقة مشاة - es = Zona peatonal et = Jalakäijate ala mr = पादचारी झोन nl = Voetgangerszone @@ -9881,7 +9439,6 @@ ref = type.highway.road.bridge en = Pedestrian Bridge ar = جسر للمشاة - es = Puente peatonal et = Jalakäijate sild mr = पादचारी पूल nl = Voetgangersbrug @@ -9918,7 +9475,6 @@ [type.highway.footway.hiking] ref = type.highway.path de = Wanderweg - es = Sendero nl = Wandelpad pt = Caminho pedonal pt-BR = Caminho pedonal @@ -9941,7 +9497,6 @@ en = Pedestrian Tunnel ar = نفق للمشاة de = Fußgängertunnel - es = Túnel peatonal et = Jalakäijate tunnel mr = पादचारी बोगदा nl = Voetgangerstunnel @@ -10256,7 +9811,7 @@ da = Gade de = Fußgängerzone el = Οδός - es = Calle peatonal + es = Calle et = Jalakäijate tänav eu = Kalea fa = جاده @@ -10287,7 +9842,6 @@ [type.highway.pedestrian.area] ref = type.highway.pedestrian en = Pedestrian Zone - es = Zona peatonal et = Jalakäijate ala it = Area pedonale mr = पादचारी झोन @@ -10299,7 +9853,6 @@ [type.highway.pedestrian.bridge] ref = type.highway.road.bridge en = Pedestrian Bridge - es = Puente peatonal et = Jalakäijate sild mr = पादचारी पूल nl = Voetgangersbrug @@ -10311,7 +9864,6 @@ ref = type.highway.road.tunnel en = Pedestrian Tunnel de = Fußgängertunnel - es = Túnel peatonal et = Jalakäijate tunnel mr = पादचारी बोगदा nl = Voetgangerstunnel @@ -10760,7 +10312,6 @@ [type.highway.services] en = Service Area de = Raststätte - es = Área de servicio et = Teenindusala fr = Aire de service ja = サービスエリア @@ -10817,7 +10368,7 @@ da = Sti de = Stufen el = Διαδρομή - es = Escaleras + es = Camino et = Trepp eu = Bidea fa = مسیر @@ -10922,7 +10473,7 @@ da = Gade de = Straße el = Οδός - es = Pista + es = Calle et = Rada eu = Kalea fa = جاده @@ -12306,7 +11857,7 @@ da = Turisme de = Schiff el = Αξιοθέατο - es = Barco + es = Turismo et = Laev eu = Turismoa fa = گردشگری @@ -12492,7 +12043,6 @@ en = Internet ar = إنترنت el = Ίντερνετ - es = Internet et = Internet fa = وای فای ja = インターネット @@ -12512,7 +12062,6 @@ en = Internet ar = إنترنت لا سلكي el = Ίντερνετ - es = Internet et = Internet fa = وای فای ja = インターネット @@ -12567,7 +12116,6 @@ [type.landuse] en = Landuse de = Landnutzung - es = Uso del suelo et = Maakasutus ja = 土地利用 mr = भूमी उपयोग @@ -12700,7 +12248,6 @@ en = Commercial Area ar = منطقة تجارية de = Gewerbegebiet - es = Zona comercial et = Kommertspiirkond fr = Zone commerciale it = Area commerciale @@ -12719,7 +12266,6 @@ en = Construction ar = منطقة بناء de = Baustelle - es = Construcción et = Ehitus fr = Chantier de construction it = Cantiere @@ -12753,7 +12299,6 @@ en = Farm ar = مزرعة de = Bauernhof - es = Granja et = Talu ja = 農地 mr = शेत @@ -12806,7 +12351,6 @@ [type.landuse.farmyard] en = Farmyard de = Landwirtschaftlich genutzte Fläche - es = Granja et = Taluõu fr = Ferme it = Fattoria @@ -12824,7 +12368,6 @@ en = Field ar = حقل de = Feld - es = Campo et = Põld fr = Champ mr = क्षेत्र @@ -12878,7 +12421,7 @@ da = Skov de = Nadelwald el = Δάσος - es = Bosque de coníferas + es = Bosque et = Okaspuumets eu = Basoa fa = جنگل @@ -12913,7 +12456,7 @@ da = Skov de = Laubwald el = Δάσος - es = Bosque caducifolio + es = Bosque et = Heitlehine mets eu = Basoa fa = جنگل @@ -12948,7 +12491,7 @@ da = Skov de = Mischwald el = Δάσος - es = Bosque mixto + es = Bosque et = Segamets eu = Basoa fa = جنگل @@ -12979,7 +12522,6 @@ [type.landuse.garages] en = Garages de = Garagen - es = Garajes et = Garaažid it = Garage ja = ガレージ @@ -13034,7 +12576,6 @@ en = Greenfield ar = مساحة خضراء de = Rohbauland - es = Invernadero et = Ehituskrunt fr = Terrain vierge ja = 建設予定地 @@ -13050,7 +12591,6 @@ [type.landuse.greenhouse_horticulture] en = Greenhouse de = Gewächshaus-Fläche - es = Invernadero et = Kasvuhoone fr = Culture sous serre ja = 温室栽培 @@ -13067,7 +12607,6 @@ en = Industrial Land ar = منطقة صناعية de = Industriegebiet - es = Zona industrial et = Tööstusmaa fr = Zone industrielle it = Zona industriale @@ -13122,7 +12661,6 @@ [type.landuse.meadow] en = Meadow de = Wiese - es = Pradera et = Heinamaa fr = Prairie it = Radura @@ -13141,7 +12679,6 @@ en = Military Area ar = منطقة عسكرية de = Militärgebiet - es = Área militar et = Militaarala fr = Terrain militaire it = Area militare @@ -13160,7 +12697,6 @@ en = Orchard ar = بستان de = Obstplantage - es = Huerto et = Viljapuuaed fr = Vergers it = Frutteto @@ -13178,7 +12714,6 @@ [type.landuse.quarry] en = Quarry de = Steinbruch - es = Cantera et = Karjäär fr = Carrières it = Cava @@ -13233,7 +12768,6 @@ [type.landuse.recreation_ground] en = Recreation Ground de = Erholungsgebiet - es = Área recreativa et = Puhkeväljak it = Area divertimento ja = レクリエーション @@ -13285,7 +12819,6 @@ en = Residential Land ar = منطقة سكنية de = Wohngebiet - es = Zona residencial et = Elamumaa fr = Zone résidentielle it = Area residentiale @@ -13304,7 +12837,6 @@ en = Retail Land ar = منطقة متاجر de = Einzelhandelsgebiet - es = Zona comercial et = Jaekaubandusmaa fr = Zone commerciale it = Area commerciale @@ -13323,7 +12855,6 @@ en = Pond ar = مستنقع de = Saline - es = Estanque et = Tiik fr = Marais salant it = Salina @@ -13355,7 +12886,6 @@ en = Vineyard ar = حقل عنب de = Weinberg - es = Viñedo et = Viinamarjaistandus fr = Vignes it = Vigne @@ -13373,7 +12903,6 @@ [type.leisure] en = Leisure de = Freizeit - es = Ocio et = Lõõgastus it = Tempo libero ja = レジャー @@ -13585,7 +13114,6 @@ ref = type.leisure.garden en = Residential Garden be = Частный сад - es = Jardín residencial et = Elamu aed pl = Ogród przydomowy pt = Jardim residencial @@ -13633,7 +13161,6 @@ [type.leisure.ice_rink] en = Ice Rink de = Eislaufplatz - es = Pisa de patinaje et = Liuväli fr = Patinoire it = Pista di pattinaggio @@ -13650,7 +13177,6 @@ [type.leisure.landscape_reserve] en = Landscape Reserve - es = Reserva natural et = Maastikukaitseala ja = 自然保護区 nl = Landschapsreservaat @@ -13665,7 +13191,6 @@ en = Marina be = Прычал de = Jachthafen - es = Marina et = Marina it = Porto turistico ja = マリーナ @@ -13684,7 +13209,7 @@ da = Reservat de = Naturschutzgebiet el = Φυσικό απόθεμα - es = Reserva natural + es = Territorio reservado es-MX = Reserva et = Looduskaitseala eu = Erreserbatutako lurraldea @@ -13973,7 +13498,6 @@ [type.leisure.recreation_ground] en = Recreation Ground de = Freizeitgelände - es = Zona recreativa et = Puhkeväljak mr = मनोरंजन मैदान nl = Recreatieterrein @@ -14218,7 +13742,6 @@ [type.leisure.swimming_pool.private] ref = type.leisure.swimming_pool ar = مسبح خاص - es = Piscina privada et = Privaatne bassein it = Piscina privata nl = Privé zwembad @@ -14226,7 +13749,6 @@ [type.leisure.track] en = Track de = Laufbahn - es = Pista deportiva et = Jooksurada fr = Piste de course it = Pista da corsa @@ -14240,9 +13762,6 @@ uk = Бігова доріжка zh-Hans = 賽道 - [type.leisure.track.area] - ref = type.leisure.track - [type.leisure.water_park] en = Water Park ar = ملاهي مائية @@ -14281,7 +13800,6 @@ [type.leisure.beach_resort] en = Beach Resort ar = منتجع شاطئي - es = Resort de playa et = Rannakuurort mr = समुद्री रिसॉर्ट nl = Strandresort @@ -14307,7 +13825,6 @@ [type.man_made.breakwater] en = Breakwater de = Wellenbrecher - es = Rompeolas et = Lainemurdja fr = Brise-lames it = Frangiflutti @@ -14388,7 +13905,6 @@ be = Геадэзічны пункт de = Vermessungspunkt el = Γεωδαιτικό σημείο - es = Punto geodésico et = Uuringupunkt fr = Borne géodésique it = Punto geodetico @@ -14403,7 +13919,6 @@ en = Flagpole ar = سارية علم be = Флагшток - es = Mástil de bandera et = Lipumast fr = Mât de drapeau it = Alza bandiera @@ -14451,7 +13966,6 @@ [type.man_made.mast] en = Mast be = Мачта/вышка - es = Mástil et = Mast fr = Mât mr = डोलकाठी @@ -14464,7 +13978,6 @@ en = Pier ar = رصيف بحري de = Anlegestelle - es = Muelle et = Kai fr = Jetée it = Molo @@ -14481,7 +13994,6 @@ [type.man_made.pipeline] en = Pipeline - es = Tubería et = Torujuhe it = Condotto ja = パイプライン @@ -14497,7 +14009,6 @@ [type.man_made.pipeline.overground] en = Overground Pipeline - es = Tubería aérea et = Maapealne torujuhe ja = 地表のパイプライン mr = जमिनीवरील नळमार्ग @@ -14514,7 +14025,6 @@ ar = صومعة be = Сілас de = Silo - es = Silo et = Elevaator it = Silo mr = पेव(धान्यसाठा) @@ -14528,7 +14038,6 @@ en = Storage Tank be = Рэзервуар de = Speichertank - es = Cisterna et = Mahuti fr = Réservoir it = Cisterna @@ -14612,7 +14121,6 @@ [type.man_made.wastewater_plant] en = Wastewater treatment plant de = Kläranlage - es = Planta de tratamiento de aguas residuales et = Reoveepuhasti fr = Station d'épuration it = Impianto di trattamento delle acque reflue @@ -14770,7 +14278,6 @@ [type.man_made.works] en = Industrial Works de = Fabrik - es = Fábrica et = Vabrik it = Fabbrica ja = 工場 @@ -14793,7 +14300,6 @@ en = Military ar = جيش de = Militärisches Objekt - es = Militar et = Militaarobjekt it = Forze armate ja = 軍事 @@ -14838,7 +14344,6 @@ en = Mountain Pass be = Перавал de = Gebirgspass - es = Puerto de montaña et = Mäekuru fr = Col de montagne it = Passo @@ -16597,7 +16102,7 @@ ar = مكتب محامي cs = Právní kancelář da = Advokatkontor - de = Anwaltskanzlei + de = Anwaltsbüro el = Δικηγόρος es = Despacho de abogados et = Advokaat @@ -17553,7 +17058,6 @@ [type.power] en = Power de = Energie - es = Energía et = Energia it = Elettricità ja = 電力 @@ -17569,7 +17073,6 @@ [type.power.generator] en = Generator de = Generator - es = Generador et = Generaator it = Generatore ja = 発電機 @@ -17584,7 +17087,6 @@ [type.power.line] en = Power Line de = Hochspannungs-Freileitung - es = Línea eléctrica et = Elektriliin it = Cavo elettrico ja = 電力線 @@ -17601,7 +17103,6 @@ [type.power.line.underground] en = Underground Power Line de = Unterirdische Hochpannungsleitung - es = Línea eléctrica subterránea et = Maa-alune elektriliin ja = 地下電力線 mr = भूमिगत विद्युत तार @@ -17617,7 +17118,6 @@ [type.power.minor_line] en = Minor Power Line de = Nieder-/Mittelspannungsfreileitung - es = Línea eléctrica de baja tensión et = Madal-/Keskpinge elektriliin it = Cavo elettrico ja = 低圧電力線 @@ -17669,7 +17169,6 @@ [type.power.station] en = Power Station de = Umspannwerk - es = Estación eléctrica et = Elektrijaam ja = 変電所 mr = विद्युत घर @@ -17688,7 +17187,7 @@ da = Transformerstation de = Umspannwerk el = Υποσταθμός - es = Subestación eléctrica + es = Subestación et = Alajaam eu = Azpiestazioa fi = Muuntoasema @@ -17798,7 +17297,6 @@ [type.public_transport.platform] en = Platform - es = Plataforma et = Platvorm ja = 公共交通機関のプラットホーム mr = फलाट @@ -17813,7 +17311,6 @@ [type.railway] en = Railway de = Eisenbahn - es = Vía férrea et = Raudtee fr = Chemin de fer it = Ferrovia @@ -17832,7 +17329,6 @@ [type.railway.abandoned] en = Abandoned Railway de = Ehemalige Eisenbahnstrecke - es = Vía férrea abandonada et = Mahajäetud raudtee fr = Chemin de fer abandonné ja = 廃線 @@ -17875,7 +17371,6 @@ [type.railway.construction] en = Railway Construction de = Eisenbahnstrecke im Bau - es = Vía férrea en construcción et = Raudtee ehitus fr = Chemin de fer en construction it = Binari in costruzione @@ -17892,7 +17387,6 @@ [type.railway.crossing] en = Railway Crossing de = Bahnübergang - es = Paso a nivel et = Raudtee ülesõit fr = Traversée de voie ferrée ja = 歩行者用踏切 @@ -17907,7 +17401,6 @@ [type.railway.disused] en = Disused railway de = Stillgelegte Bahnstrecke - es = Vía férrea en desuso et = Kasutamata raudtee fr = Chemin de fer désaffecté ja = 休止線 @@ -17922,7 +17415,6 @@ [type.railway.funicular] en = Funicular de = Standseilbahn - es = Funicular et = Funikulöör fr = Funiculaire ja = ケーブルカー @@ -17968,7 +17460,6 @@ [type.railway.halt] ref = type.railway.station de = Haltepunkt - es = Punto de parada et = Murdepunkt pl = Przystanek kolejowy pt = Apeadeiro @@ -18125,7 +17616,6 @@ [type.railway.narrow_gauge] en = Narrow Gauge Rail de = Schmalspurbahn - es = Vía férrea de ancho estrecho et = Kitsarööpmeline raudtee ja = 狭軌鉄道 mr = अरुंदमापी रेल्वे @@ -18170,7 +17660,6 @@ en = Railway Platform be = Чыгуначная платформа de = Bahnsteig - es = Plataforma de vía férrea et = Raudteeplatvorm fr = Quai de gare ja = プラットホーム @@ -18803,7 +18292,6 @@ en = Subway Line en-GB = Metro Line de = U-Bahn - es = Línea de metro et = Metrooliin fr = Ligne de métro it = Binari della metrò @@ -19210,7 +18698,6 @@ [type.railway.tram] en = Tram Line de = Straßenbahn - es = Línea de tranvía et = Trammiliin fr = Voie de tramway it = Binari del tram @@ -19337,7 +18824,6 @@ [type.route] en = route de = Route - es = Ruta et = Tee it = Percorso ja = ルート @@ -19352,7 +18838,6 @@ [type.route.ferry] en = Ferry de = Fähre - es = Ruta de ferry et = Praam fr = Trajet de ferry it = Traghetto @@ -19522,7 +19007,7 @@ be = Напоі cs = Nápoje da = Drikkevarer - de = Getränkemarkt + de = Getränke el = Οινοπνευματώδη es = Bebidas et = Joogid @@ -19622,7 +19107,7 @@ ar = مكتبة لبيع الكتب cs = Knihkupectví da = Boghandel - de = Buchhandlung + de = Büchergeschäft el = Βιβλιοπωλείο es = Librería et = Raamatupood @@ -19694,7 +19179,7 @@ da = Bilforhandler de = Autohaus el = Αντιπροσωπεία αυτοκινήτων - es = Concesionario de coches + es = Venta de coches et = Autopood eu = Autoen salmenta fa = فروشگاه @@ -19830,8 +19315,6 @@ [type.shop.caravan] en = RV Dealership be = Продаж аўтадамоў - de = Wohnmobilhändler - es = Concesionario de caravanas et = Haagiselamute müük fr = Concessionnaire de caravanes et camping-cars nl = Caravan en camper verkoper @@ -19882,13 +19365,13 @@ da = Butik de = Schokoladengeschäft el = Κατάστημα - es = Chocolatería + es = Tienda et = Šokolaadipood eu = Denda fa = فروشگاه fi = Kauppa fr = Chocolatier - hu = Csokoládébolt + hu = Bolt id = Toko it = Choccolateria ja = チョコレート屋 @@ -19953,7 +19436,7 @@ da = Butik de = Kaffeegeschäft el = Κατάστημα - es = Tienda de café + es = Tienda et = Kohvipood eu = Denda fa = فروشگاه @@ -19986,7 +19469,7 @@ ar = متجر كمبيوتر cs = Obchod s počítači da = Computerforretning - de = Computerfachgeschäft + de = Computergeschäft el = Κατάστημα πληροφορικής es = Tienda de informática et = Arvutipood @@ -20163,7 +19646,7 @@ bg = Магазин за деликатеси cs = Prodejna lahůdek da = Delikatessebutik - de = Feinkostladen + de = Feinkostgeschäft el = Κατάστημα Delicatessen es = Tienda de delicatessen et = Delikatessipood @@ -20304,7 +19787,7 @@ ar = متجر إلكترونيات cs = Elektronika da = Elektronikbutik - de = Elektrofachgeschäft + de = Elektronik el = Ηλεκτρονικά es = Electrónica et = Elektroonika @@ -20375,7 +19858,7 @@ da = Butik de = Textilgeschäft el = Κατάστημα - es = Tienda de telas + es = Tienda et = Vabrikupood eu = Denda fa = فروشگاه @@ -20410,7 +19893,7 @@ bg = Магазин за селскостопански храни cs = Prodejna farmářských potravin da = Farm Food Shop - de = Hofladen + de = Hoflebensmittelladen el = Κατάστημα Αγροτικών Τροφίμων es = Tienda de alimentos de granja et = Talutoitude pood @@ -20517,7 +20000,7 @@ ar = معرض أثاث cs = Nábytek da = Møbelbutik - de = Möbelhaus + de = Möbelgeschäft el = Κατάστημα επίπλων es = Tienda de muebles et = Mööblipood @@ -20587,7 +20070,7 @@ ar = متجر هدايا cs = Obchod s dárkovým zbožím da = Gavebutik - de = Geschenkeladen + de = Geschenkladen el = Είδη δώρου es = Tienda de regalos et = Kingipood @@ -20736,7 +20219,7 @@ fa = ﺭﺍﺰﻓﺍ ﺖﺨﺳ ﻩﺎﮕﺷﻭﺮﻓ fr = Quincaillerie he = ןיינב ירמוחל תונח - hu = Barkácsüzlet + hu = Hardver üzlet ja = ホームセンター nl = IJzerwaren pl = Sklep z narzędziami @@ -20833,7 +20316,7 @@ ar = مجوهرات cs = Klenotnictví da = Smykkebutik - de = Juwelier + de = Juweliergeschäft el = Κοσμηματοπωλείο es = Joyería et = Ehted @@ -21077,7 +20560,7 @@ da = Butik de = Geldverleiher el = Κατάστημα - es = Prestamista + es = Tienda et = Rahalaenutaja eu = Denda fa = فروشگاه @@ -21148,7 +20631,7 @@ da = Butik de = Musikgeschäft el = Κατάστημα - es = Tienda de discos + es = Disquería et = Plaadipood eu = Denda fa = فروشگاه @@ -21184,7 +20667,7 @@ da = Butik de = Musikinstrumenteladen el = Κατάστημα - es = Instrumentos musicales + es = Tienda et = Muusikariistad eu = Denda fa = فروشگاه @@ -21289,13 +20772,13 @@ da = Fritidsudstyr de = Outdoor-Ausrüstung el = Εξοπλισμός υπαίθρου - es = Equipamiento de ocio al aire libre + es = Equipamiento et = Välisvarustus eu = Ekipamendua fa = فروشگاه fi = Ulkoiluvarusteet fr = Matériel de loisirs de plein air - hu = Túrafelszerelés + hu = Kültéri felszerelés id = Peralatan Outdoor it = Attrezzatura sportiva ja = アウトドア用品店 @@ -21325,7 +20808,7 @@ bg = Тестени изделия cs = Pečivo da = Bagværk - de = Konditorei + de = Gebäck el = Ζύμη es = Pastelería eu = Gozogintza @@ -21710,7 +21193,7 @@ da = Butik de = Teegeschäft el = Κατάστημα - es = Tienda de té + es = Tienda et = Teepood eu = Denda fa = فروشگاه @@ -21885,7 +21368,7 @@ da = Småtingsbutik de = Billigladen el = Παντοπωλείο - es = Tienda de variedades + es = Tienda de Variedades et = Odavpood eu = Barietate Denda fa = فروشگاه @@ -21992,7 +21475,7 @@ ar = متجر مشروبات روحية cs = Vinařství da = Vinhandel - de = Weinhandlung + de = Wein- und Spirituosengeschäft el = Οινοπωλείο es = Tienda de vinos et = Veinipood @@ -22069,7 +21552,7 @@ da = Kunstbutik de = Kunstgeschäft el = Κατάστημα Τεχνών - es = Tienda de arte + es = Tienda de artes et = Kunstipood eu = Arte Denda fa = ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ @@ -22447,9 +21930,9 @@ bg = Вътрешни декорации cs = Interiérové dekorace da = Indvendige dekorationer - de = Einrichtungsgeschäft + de = Innendekorationen el = Διακοσμήσεις εσωτερικών χώρων - es = Decoración de interiores + es = Decoraciones interiores et = Sisekujunduse kaunistused eu = Barruko Apaingarriak fa = ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ @@ -22563,7 +22046,7 @@ da = Kosttilskud de = Nahrungsergänzungsmittel el = Συμπληρώματα Διατροφής - es = Suplementos nutricionales + es = Suplementos Nutricionales et = Toidulisandid eu = Nutrizio osagarriak fa = ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ @@ -23573,7 +23056,7 @@ da = Skydning de = Schießen el = Κυνήγι - es = Tiro deportivo + es = Tiroteo es-MX = Tiroteo et = Laskmine eu = Tiroketa @@ -23960,7 +23443,7 @@ da = Futsal de = Futsal el = Futsal - es = Fútbol sala + es = Futsal et = Futsal eu = Areto-futbola fa = ﻝﺎﺴﺗﻮﻓ @@ -24163,7 +23646,7 @@ da = Bjerg logi de = Berghütte el = Ορεινό καταφύγιο - es = Refugio de montaña + es = Cabaña et = Mägimajutus eu = Kabina fi = Vuorimajoitus @@ -24452,7 +23935,7 @@ cs = Kempování de = Zeltplatz el = Κάμπινγκ - es = Camping + es = Campamento et = Telkimine eu = Kanpalekua fa = محل چادر زنی @@ -24548,7 +24031,7 @@ da = Turisme de = Galerie el = Αξιοθέατο - es = Galería + es = Turismo et = Galerii eu = Turismoa fa = گالری @@ -24644,7 +24127,6 @@ ar = فندق de = Hotel el = Ξενοδοχείο - es = Hotel et = Hotell fa = هتل fi = Hotelli @@ -24676,7 +24158,7 @@ da = Turistinformation de = Touristeninformation el = Τουριστικές πληροφορίες - es = Información turística + es = Información et = Turistiinfo eu = Informazioa fa = گردشگری @@ -24865,7 +24347,6 @@ ar = فندق رخيص de = Motel el = Μοτέλ - es = Motel et = Motell fa = هتل fi = Motelli @@ -24922,7 +24403,7 @@ da = Picnic de = Picknickplatz el = Χώρος εκδρομής - es = Zona de picnic + es = Picnic et = Piknikukoht eu = Piknika fa = مکان پیک نیک @@ -24956,7 +24437,6 @@ cs = Letovisko de = Resort el = Θέρετρο - es = Resort et = Kuurort fa = هتل fi = Lomakohteet @@ -25093,7 +24573,6 @@ cs = zoologická zahrada de = Zoo el = Ζωολογικός κήπος - es = Zoo et = Loomaaed fa = گردشگری fi = Eläintarha @@ -25121,7 +24600,6 @@ [type.traffic_calming] en = Traffic Calming de = Verkehrsberuhigung - es = Reducción de velocidad et = Liikluse rahustamine it = Rallentatore della velocità ja = 交通静穏化 @@ -25136,7 +24614,6 @@ [type.traffic_calming.bump] en = Traffic Bump de = kurze Bodenwelle - es = Banda reductora et = Liiklusee aeglustusmühk fi = Hidastetöyssy fr = Ralentisseur @@ -25154,7 +24631,6 @@ [type.traffic_calming.hump] en = Traffic Hump de = lange Bodenwelle - es = Resalte et = Liikluse aeglustussaar fr = Ralentisseur it = Dosso @@ -25170,7 +24646,6 @@ [type.waterway] en = Waterway de = Wasserweg - es = Curso de agua et = Veetee fi = Vesiväylä ja = 水域 @@ -25190,7 +24665,6 @@ da = Kanal de = Kanal el = Κανάλι - es = Canal et = Kanal fa = کانال اب fi = Kanaali @@ -25222,7 +24696,6 @@ da = Kanal de = Kanal el = Κανάλι - es = Canal et = Kanal fa = کانال اب fi = Kanaali @@ -25250,7 +24723,6 @@ [type.waterway.dam] en = Dam de = Staudamm - es = Presa et = Tamm fi = Pato fr = Barrage @@ -25268,7 +24740,6 @@ [type.waterway.ditch] en = Ditch de = Graben - es = Zanja et = Kraav fi = Oja fr = Fossé @@ -25289,7 +24760,6 @@ [type.waterway.dock] en = Waterway Dock de = Dock - es = Muelle et = Veetee dokk fi = Telakka fr = Cale @@ -25307,7 +24777,6 @@ [type.waterway.drain] en = Drain de = Abfluss - es = Desagüe et = Kuivenduskraav it = Canale di scolo ja = 用水路 @@ -25440,7 +24909,7 @@ da = Flod de = Bach el = Ποταμός - es = Arroyo + es = Río et = Oja eu = Ibai fa = رودخانه @@ -25476,7 +24945,7 @@ da = Flod de = Bach el = Ποταμός - es = Arroyo efímero + es = Río et = Jõgi eu = Ibai fa = رودخانه @@ -25512,7 +24981,7 @@ da = Flod de = Bach el = Ποταμός - es = Arroyo intermitente + es = Río et = Jõgi eu = Ibai fa = رودخانه @@ -25581,7 +25050,6 @@ [type.waterway.weir] en = Weir de = Wehr - es = Presa et = Pais fr = Seuil ja = 堰 @@ -25726,7 +25194,6 @@ [type.aerialway.j.bar] en = J-bar Lift de = Schlepplift - es = Telesilla barra en J et = Slepplift fr = Téléski nl = Sleeplift (J) @@ -25739,7 +25206,6 @@ [type.aerialway.magic_carpet] en = Magic Carpet de = Laufband - es = Alfombra mágica et = Võluvaip fr = Tapis roulant nl = Loopband @@ -25752,7 +25218,6 @@ [type.aerialway.platter] en = Platter Lift de = Tellerlift - es = Telesilla de disco et = Plaatlift fi = Sompahissi nl = Sleeplift @@ -25765,7 +25230,6 @@ [type.aerialway.rope_tow] en = Rope Tow de = Seillift - es = Telesilla de cuerda et = Köislift fi = Naruhissi nl = Touwlift @@ -25778,7 +25242,6 @@ [type.aerialway.t.bar] en = T-bar Lift de = T-Bügel-Lift - es = Telesilla barra en T et = Ankurlift fi = Ankkurihissi nl = Sleeplift (T-beugel) @@ -25791,7 +25254,6 @@ [type.piste_type] en = Piste Type de = Pistentyp - es = Tipo de pista et = Punkti liik nl = Pistesoort pt = Tipo de pista @@ -25803,7 +25265,6 @@ [type.piste_type.downhill] en = Downhill Ski Run de = Abfahrt - es = Pista de esquí alpino et = Mäesuusarada fi = Laskettelurinne fr = Piste de ski alpin @@ -25881,7 +25342,6 @@ [type.piste_type.nordic] en = Nordic Ski Trail de = Langlaufloipe - es = Pista de esquí nórdico et = Murdmaa suusarada fi = Latu fr = Piste de ski de fond @@ -25895,7 +25355,6 @@ [type.piste_type.sled] en = Sledding Piste de = Rodelbahn - es = Pista para trineos et = Kelgurada fi = Kelkkarata fr = Piste de luge @@ -25951,7 +25410,7 @@ da = Sted for arrangementer de = Veranstaltungszentrum el = Κέντρο εκδηλώσεων - es = Lugar para eventos + es = Lugar de los eventos et = Ürituste toimumiskoht eu = Ekitaldien Lekua fa = محل برگزاری رویدادها diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 1ddab4c6a9..1e07b0c044 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -63,6 +63,14 @@ area[landuse=railway], area[landuse=quarry] {z-index: 3;} +area[leisure=pitch], +area[leisure=stadium], +area[leisure=track][area?] +area[leisure=playground], +area[sport=multi], +area[sport=soccer], +{z-index: 5;} + area[landuse=forest] {z-index: 30;} @@ -70,15 +78,6 @@ area[leisure=park], area[leisure=garden] {z-index: 40;} -/* Should be greater than leisure=park */ -area[leisure=pitch], -area[leisure=stadium], -area[leisure=track][area?], -area[leisure=playground], -area[sport=multi], -area[sport=soccer], -{z-index: 41;} - area[landuse=farmland], area[landuse=farmyard], area[landuse=allotments], diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index a3f8c191d3..68345ceb93 100644 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -113,10 +113,10 @@ line[waterway], {text-position: center;fill-position: background;} node|z1-2[place=continent], -node|z9-[place=archipelago], -area|z9-[place=archipelago], -node|z9-[place=island], -area|z9-[place=island], +node|z10-[place=archipelago], +area|z10-[place=archipelago], +node|z10-[place=island], +area|z10-[place=island], node|z14-[natural=cape], area|z14-[natural=cape], node|z14-[place=islet], @@ -126,10 +126,10 @@ area|z14-[place=islet], node|z1-2[place=continent] {font-size: 12;text-color: @country_label;max-width: 5;-x-me-text-priority:16000;} -node|z9-[place=archipelago], -area|z9-[place=archipelago], -node|z9-[place=island], -area|z9-[place=island], +node|z10-[place=archipelago], +area|z10-[place=archipelago], +node|z10-[place=island], +area|z10-[place=island] {font-size: 8;text-color: @district_label;} node|z12-[place=archipelago], @@ -668,8 +668,7 @@ node|z16-[building]::int_name, area|z16-[addr:housenumber][addr:street]::int_name, node|z16-[addr:housenumber][addr:street]::int_name {text:int_name;text-color: @building_label;text-position: center;} -node|z19-[entrance], -node|z18-[entrance=main], +node|z18-[entrance], node|z18-[amenity=loading_dock], {text-color: @building_label;} @@ -717,11 +716,9 @@ area|z18-[addr:housenumber][addr:street]::int_name, node|z18-[addr:housenumber][addr:street]::int_name {font-size: 10;} -node|z19-[entrance], +node|z18-[entrance], node|z18-[amenity=loading_dock], {icon-image: entrance-s.svg;font-size: 10;text: ref;text-offset-x: 1;} -node|z18-[entrance=main], -{icon-image: main_entrance-s.svg;font-size: 10;text: ref;text-offset-x: 1;} node|z19-[entrance]::flats {text: "addr:flats";font-size: 12;text-offset-y: 10;} diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index e18f5c2a76..430a477cae 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -39,6 +39,9 @@ area[amenity], area[man_made], {-x-me-min-text-priority: 15300;} +node|z17-[leisure], +{z-index: 6;} + node|z17-[leisure=golf_course], area|z17-[leisure=golf_course] {z-index: 50;} @@ -116,17 +119,23 @@ area[vending=parking_tickets] node[shop], area[shop], +node[amenity=marketplace], +area[amenity=marketplace], node[amenity=veterinary], area[amenity=veterinary], node[leisure=playground], node[historic=ruins], area[historic=ruins], +node[historic=ship], +area[historic=ship], node[tourism=artwork][artwork_type=sculpture], area[tourism=artwork][artwork_type=sculpture], node[tourism=caravan_site], area[tourism=caravan_site], node[amenity=bicycle_parking], area[amenity=bicycle_parking], +node[amenity=dentist], +area[amenity=dentist], node[leisure=water_park], area[leisure=water_park], node[amenity=taxi], @@ -145,6 +154,10 @@ node[shop=money_lender], area[shop=money_lender], node[amenity=childcare], area[amenity=childcare], +node[amenity=post_office], +area[amenity=post_office], +node[amenity=car_sharing], +area[amenity=car_sharing], node[power=station], area[power=station], node[power=substation], @@ -184,10 +197,6 @@ node|z18-[sport=equestrian], area|z18-[sport=equestrian], node|z18-[sport=climbing], area|z18-[sport=climbing], -node|z18-[sport=9pin], -area|z18-[sport=9pin], -node|z18-[sport=10pin], -area|z18-[sport=10pin], node|z18-[sport=chess], area|z18-[sport=chess], {z-index: 2440;} @@ -252,12 +261,12 @@ node[amenity=bicycle_repair_station], area[amenity=bicycle_repair_station], node[amenity=car_wash], area[amenity=car_wash], -node[amenity=car_sharing], -area[amenity=car_sharing], node[amenity=car_rental], area[amenity=car_rental], node|z18-[office], area|z18-[office], +node[amenity=nightclub], +area[amenity=nightclub], node[amenity=fire_station], area[amenity=fire_station], node[amenity=atm], @@ -265,12 +274,7 @@ area[amenity=atm], node[amenity=bureau_de_change], node[shop=pawnbroker], area[shop=pawnbroker], -node[amenity=library], -area[amenity=library], -node[shop=charity], -area[shop=charity], -node[shop=second_hand], -area[shop=second_hand], +node[amenity=library] {z-index: 2500;} node[amenity=fuel], @@ -291,8 +295,6 @@ node[aerialway=magic_carpet], node[aerialway=platter], node[aerialway=rope_tow], node[railway=level_crossing], -node[amenity=marketplace], -area[amenity=marketplace], node[shop=supermarket], area[shop=supermarket], node[shop=car_repair][service=tyres], @@ -301,10 +303,6 @@ node[shop=caravan], area[shop=caravan], node[highway=services], area[highway=services], -node[amenity=post_office], -area[amenity=post_office], -node[amenity=dentist], -area[amenity=dentist], node[amenity=clinic], area[amenity=clinic], node[amenity=doctors], @@ -313,22 +311,6 @@ node[healthcare=laboratory], area[healthcare=laboratory], node[healthcare=physiotherapist], area[healthcare=physiotherapist], -node[healthcare=alternative], -area[healthcare=alternative], -node[healthcare=audiologist], -area[healthcare=audiologist], -node[healthcare=blood_donation], -area[healthcare=blood_donation], -node[healthcare=optometrist], -area[healthcare=optometrist], -node[healthcare=podiatrist], -area[healthcare=podiatrist], -node[healthcare=psychotherapist], -area[healthcare=psychotherapist], -node[healthcare=sample_collection], -area[healthcare=sample_collection], -node[healthcare=speech_therapist], -area[healthcare=speech_therapist], node[leisure=swimming_pool], area[leisure=swimming_pool], area[aeroway=heliport], @@ -343,10 +325,6 @@ node[amenity=courthouse], area[amenity=courthouse], node[amenity=cinema], area[amenity=cinema], -node[leisure=bowling_alley], -area[leisure=bowling_alley], -node[amenity=nightclub], -area[amenity=nightclub], node[amenity=police], area[amenity=police], node[amenity=prison], @@ -374,6 +352,10 @@ area[tourism=attraction][attraction=animal], node[amenity=cafe], area[amenity=cafe], +node[shop=charity], +area[shop=charity], +node[shop=second_hand], +area[shop=second_hand], node[amenity=theatre], area[amenity=theatre] {z-index: 2790;} @@ -392,9 +374,7 @@ area[amenity=bar] node[amenity=pub], area[amenity=pub], node[amenity=biergarten], -area[amenity=biergarten], -node[amenity=ice_cream], -area[amenity=ice_cream], +area[amenity=biergarten] {z-index: 2782;} node[historic=monument], @@ -461,9 +441,6 @@ area|z16-[tourism=attraction][attraction=animal], node[tourism=theme_park], area[tourism=theme_park] {z-index: 2872;} -node[historic=ship], -area[historic=ship], -{z-index: 2873;} node[tourism=gallery] {z-index: 2874;} node[tourism=museum], @@ -688,16 +665,16 @@ node|z12-[landuse=forest][!name], area|z12-[landuse=forest][!name] {} -node|z14-[natural=spring], -area|z14-[natural=spring], -node|z14-[natural=hot_spring], -area|z14-[natural=hot_spring] -{icon-image: drinking-water-s.svg; text-offset: 6; font-size: 10; icon-min-distance: 24; text-optional: true;} -node|z18-[natural=spring], -area|z18-[natural=spring], -node|z18-[natural=hot_spring], -area|z18-[natural=hot_spring] -{icon-image: drinking-water-m.svg; text-offset: 8;} +node|z14[natural=spring], +area|z14[natural=spring], +node|z14[natural=hot_spring], +area|z14[natural=hot_spring] +{icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;} +node|z15-[natural=spring], +area|z15-[natural=spring], +node|z15-[natural=hot_spring], +area|z15-[natural=hot_spring] +{icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;} node|z14[natural=geyser], area|z14[natural=geyser] @@ -759,10 +736,8 @@ node|z14-[amenity=bus_station]::int_name, area|z14-[amenity=bus_station]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;text-optional: true;} -area|z10-[aeroway=aerodrome][aerodrome=international], -node|z10-[aeroway=aerodrome][aerodrome=international], -area|z14-[aeroway=aerodrome], -node|z14-[aeroway=aerodrome], +area|z10-[aeroway=aerodrome], +node|z10-[aeroway=aerodrome], node|z15-[aerialway=station], node|z15-[aerialway=cable_car], node|z15-[aerialway=chair_lift], @@ -776,10 +751,8 @@ node|z15-[aerialway=platter], node|z15-[aerialway=rope_tow], node|z16-[amenity=ferry_terminal] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;} -area|z12-[aeroway=aerodrome][aerodrome=international]::int_name, -node|z12-[aeroway=aerodrome][aerodrome=international]::int_name, -area|z14-[aeroway=aerodrome]::int_name, -node|z14-[aeroway=aerodrome]::int_name, +area|z12-[aeroway=aerodrome]::int_name, +node|z12-[aeroway=aerodrome]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;} /* 3.1 Train Station */ @@ -930,22 +903,28 @@ node|z17-[amenity=ferry_terminal] /* 3.6 Airport */ +/* Manually define priority to avoid city names displacement */ area|z7-9[aeroway=aerodrome][aerodrome=international], node|z7-9[aeroway=aerodrome][aerodrome=international], -{icon-image: airport-s.svg;} +{ icon-image: airport-s.svg; -x-me-icon-priority: 10000 } area|z10[aeroway=aerodrome][aerodrome=international], node|z10[aeroway=aerodrome][aerodrome=international], -{icon-image: airport-s.svg;text-offset: 1;font-size: 10;} +{icon-image: airport-s.svg;text-offset: 1;font-size: 10;fill-opacity: 1;text-optional: true;} area|z11-13[aeroway=aerodrome][aerodrome=international], node|z11-13[aeroway=aerodrome][aerodrome=international], -{icon-image: airport-m.svg; text-offset: 1; font-size: 11;} +area|z12-13[aeroway=aerodrome][aerodrome=international], +node|z12-13[aeroway=aerodrome][aerodrome=international] +{icon-image: airport-m.svg;text-offset: 1;font-size: 11;-x-me-icon-priority: 3100;text-optional: true;} +area|z12-13[aeroway=aerodrome]::int_name, +node|z12-13[aeroway=aerodrome]::int_name, +{font-size: 10;text-optional: true;} area|z14-[aeroway=aerodrome], node|z14-[aeroway=aerodrome] -{icon-image: airport-m.svg;text-offset: 1;font-size: 12;} +{icon-image: airport-m.svg;text-offset: 1;font-size: 12;text-optional: true;} area|z14-[aeroway=aerodrome]::int_name, node|z14-[aeroway=aerodrome]::int_name, -{font-size: 11;} +{font-size: 11;text-optional: true;} area|z16-[aeroway=heliport], area|z16-[aeroway=helipad], @@ -1378,7 +1357,7 @@ area|z15[amenity=food_court] {icon-image: fastfood-m.svg;icon-min-distance: 28;} node|z15[amenity=bar], area|z15[amenity=bar] -{icon-image: bar-m.svg;icon-min-distance: 28;} +{icon-image: beer-m.svg;icon-min-distance: 28;} node|z15[amenity=pub], area|z15[amenity=pub], node|z15[amenity=biergarten], @@ -1398,7 +1377,7 @@ area|z16-[amenity=food_court] {icon-image: fastfood-m.svg;icon-min-distance: 12;} node|z16-[amenity=bar], area|z16-[amenity=bar] -{icon-image: bar-m.svg;icon-min-distance: 12;} +{icon-image: beer-m.svg;icon-min-distance: 12;} node|z16-[amenity=pub], area|z16-[amenity=pub], node|z16-[amenity=biergarten], @@ -1480,22 +1459,6 @@ node|z17-[healthcare=laboratory], area|z17-[healthcare=laboratory], node|z17-[healthcare=physiotherapist], area|z17-[healthcare=physiotherapist], -node|z17-[healthcare=alternative], -area|z17-[healthcare=alternative], -node|z17-[healthcare=audiologist], -area|z17-[healthcare=audiologist], -node|z17-[healthcare=blood_donation], -area|z17-[healthcare=blood_donation], -node|z17-[healthcare=optometrist], -area|z17-[healthcare=optometrist], -node|z17-[healthcare=podiatrist], -area|z17-[healthcare=podiatrist], -node|z17-[healthcare=psychotherapist], -area|z17-[healthcare=psychotherapist], -node|z17-[healthcare=sample_collection], -area|z17-[healthcare=sample_collection], -node|z17-[healthcare=speech_therapist], -area|z17-[healthcare=speech_therapist], node|z17-[amenity=dentist], area|z17-[amenity=dentist], node|z17-[amenity=casino], @@ -1514,8 +1477,6 @@ node|z17-[amenity=school], area|z17-[amenity=school], node|z17-[amenity=cinema], area|z17-[amenity=cinema], -node|z17-[leisure=bowling_alley], -area|z17-[leisure=bowling_alley], node|z17-[amenity=police], area|z17-[amenity=police], node|z17-[amenity=prison], @@ -1605,14 +1566,11 @@ area|z18-[craft] /* Declare _before_ all concrete shops to avoid icons override */ node|z16-[shop], -area|z16-[shop], -{icon-min-distance: 10;} -node|z18-[shop], -area|z18-[shop] +area|z16-[shop] {icon-image: shop-m.svg;text-offset: 1;font-size: 10;icon-min-distance: 10;} -node|z17-[shop=massage], -area|z17-[shop=massage] +node|z18-[shop=massage], +area|z18-[shop=massage] {icon-image: sauna-m.svg;font-size: 11;text-optional: true;} /* 5.1 Hospital */ @@ -1633,6 +1591,8 @@ node|z17[amenity=clinic], area|z17[amenity=clinic], node|z17[amenity=doctors], area|z17[amenity=doctors], +node|z17[healthcare=laboratory], +area|z17[healthcare=laboratory], {icon-image: hospital-m.svg;icon-min-distance: 4;text-optional: true;} node|z18-[amenity=hospital], node|z18-[building=hospital], @@ -1641,13 +1601,9 @@ node|z18-[amenity=clinic], area|z18-[amenity=clinic], node|z18-[amenity=doctors], area|z18-[amenity=doctors], -{icon-image: hospital-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=laboratory], -area|z17[healthcare=laboratory], -{icon-image: sample_collection-m.svg;} node|z18-[healthcare=laboratory], area|z18-[healthcare=laboratory], -{icon-image: sample_collection-m.svg;font-size: 11;text-optional: true;} +{icon-image: hospital-m.svg;font-size: 11;text-optional: true;} node|z17[amenity=dentist], area|z17[amenity=dentist] {icon-image: dentist-m.svg;} @@ -1660,54 +1616,6 @@ area|z17[healthcare=physiotherapist] node|z18-[healthcare=physiotherapist], area|z18-[healthcare=physiotherapist] {icon-image: physiotherapist-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=alternative], -area|z17[healthcare=alternative] -{icon-image: alternative-m.svg;} -node|z18-[healthcare=alternative], -area|z18-[healthcare=alternative] -{icon-image: alternative-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=audiologist], -area|z17[healthcare=audiologist] -{icon-image: audiologist-m.svg;} -node|z18-[healthcare=audiologist], -area|z18-[healthcare=audiologist] -{icon-image: audiologist-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=blood_donation], -area|z17[healthcare=blood_donation] -{icon-image: blood_donation-m.svg;} -node|z18-[healthcare=blood_donation], -area|z18-[healthcare=blood_donation] -{icon-image: blood_donation-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=optometrist], -area|z17[healthcare=optometrist] -{icon-image: optometrist-m.svg;} -node|z18-[healthcare=optometrist], -area|z18-[healthcare=optometrist] -{icon-image: optometrist-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=podiatrist], -area|z17[healthcare=podiatrist] -{icon-image: podiatrist-m.svg;} -node|z18-[healthcare=podiatrist], -area|z18-[healthcare=podiatrist] -{icon-image: podiatrist-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=psychotherapist], -area|z17[healthcare=psychotherapist] -{icon-image: psychotherapist-m.svg;} -node|z18-[healthcare=psychotherapist], -area|z18-[healthcare=psychotherapist] -{icon-image: psychotherapist-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=sample_collection], -area|z17[healthcare=sample_collection] -{icon-image: sample_collection-m.svg;} -node|z18-[healthcare=sample_collection], -area|z18-[healthcare=sample_collection] -{icon-image: sample_collection-m.svg;font-size: 11;text-optional: true;} -node|z17[healthcare=speech_therapist], -area|z17[healthcare=speech_therapist] -{icon-image: speech_therapist-m.svg;} -node|z18-[healthcare=speech_therapist], -area|z18-[healthcare=speech_therapist] -{icon-image: speech_therapist-m.svg;font-size: 11;text-optional: true;} node|z16-[amenity=veterinary], area|z16-[amenity=veterinary] @@ -2001,7 +1909,7 @@ area|z18-[amenity=place_of_worship][religion=taoist] node|z16-[amenity=nightclub], area|z16-[amenity=nightclub] -{icon-image: nightclub-m.svg;font-size: 11;} +{icon-image: bar-m.svg;font-size: 11;} node|z16[amenity=bank], area|z16[amenity=bank] @@ -2118,13 +2026,6 @@ node|z18-[amenity=cinema], area|z18-[amenity=cinema] {font-size: 11;text-optional: true;} -node|z17-[leisure=bowling_alley], -area|z17-[leisure=bowling_alley], -{icon-image: bowling_alley-m.svg;text-optional: true;} -node|z18-[leisure=bowling_alley], -area|z18-[leisure=bowling_alley], -{font-size: 11;text-optional: true;} - node|z17-[amenity=police], area|z17-[amenity=police] {icon-image: police-m.svg;text-optional: true;} @@ -2181,11 +2082,9 @@ node|z17-[office=lawyer], area|z17-[office=lawyer] {icon-image: lawyer-m.svg;icon-min-distance: 10;text-optional: true;} -node|z17-[amenity=telephone] -{icon-image: phone-m.svg;icon-min-distance: 30;} - +node|z17-[amenity=telephone], node|z17-[emergency=phone] -{icon-image: emergency-phone-m.svg;icon-min-distance: 30;} +{icon-image: phone-m.svg;icon-min-distance: 30;} node|z17-[amenity=recycling], area|z17-[amenity=recycling], @@ -2403,11 +2302,10 @@ node|z16[shop=clothes], area|z16[shop=clothes] {icon-image: clothes-m.svg;} node|z16[shop=computer], -area|z16[shop=computer] -{icon-image: computer-m.svg;} +area|z16[shop=computer], node|z16[shop=video_games], area|z16[shop=video_games] -{icon-image: video-games-m.svg;} +{icon-image: computer-m.svg;} node|z16[shop=tattoo], area|z16[shop=tattoo] {icon-image: hand-m.svg;} @@ -2470,13 +2368,12 @@ area|z16[shop=gift] {icon-image: gift-m.svg;} node|z16[shop=music], area|z16[shop=music], -{icon-image: music-m.svg;} node|z16[shop=video], area|z16[shop=video] {icon-image: media-m.svg;} node|z16[shop=musical_instrument], area|z16[shop=musical_instrument] -{icon-image: musical-instrument-m.svg;} +{icon-image: music-m.svg;} node|z16[shop=greengrocer], area|z16[shop=greengrocer] {icon-image: greengrocer-m.svg;} @@ -2591,11 +2488,10 @@ node|z17-[shop=clothes], area|z17-[shop=clothes] {icon-image: clothes-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=computer], -area|z17-[shop=computer] -{icon-image: computer-m.svg;icon-min-distance: 24;text-optional: true;} +area|z17-[shop=computer], node|z17-[shop=video_games], area|z17-[shop=video_games] -{icon-image: video-games-m.svg;icon-min-distance: 24;text-optional: true;} +{icon-image: computer-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=tattoo], area|z17-[shop=tattoo] {icon-image: hand-m.svg;icon-min-distance: 24;text-optional: true;} @@ -2658,13 +2554,12 @@ area|z17-[shop=gift] {icon-image: gift-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=music], area|z17-[shop=music], -{icon-image: music-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=video], area|z17-[shop=video] {icon-image: media-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=musical_instrument], area|z17-[shop=musical_instrument] -{icon-image: musical-instrument-m.svg;icon-min-distance: 24;text-optional: true;} +{icon-image: music-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=greengrocer], area|z17-[shop=greengrocer] {icon-image: greengrocer-m.svg;icon-min-distance: 24;text-optional: true;} diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index dbb2c02a37..8fc76007bc 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -172,9 +172,7 @@ line[route=hiking], line[highway=footway] {z-index: 600;} -line[highway=service], -line[highway=service][service=busway], -line[highway=busway], +line[highway=service] {z-index: 650;} line[highway=pedestrian], @@ -408,38 +406,38 @@ line|z15-[highway=trunk_link][tunnel?] line|z13[highway=motorway][bridge?]::bridgewhite, line|z13[highway=trunk][bridge?]::bridgewhite -{casing-width-add: 0.2;} +{casing-width: eval(prop("width")+0.2);} line|z14-16[highway=motorway][bridge?]::bridgewhite, line|z14-16[highway=trunk][bridge?]::bridgewhite, line|z14-16[highway=motorway_link][bridge?]::bridgewhite, line|z14-16[highway=trunk_link][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=motorway][bridge?]::bridgewhite, line|z17[highway=trunk][bridge?]::bridgewhite, line|z17[highway=motorway_link][bridge?]::bridgewhite, line|z17[highway=trunk_link][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=motorway][bridge?]::bridgewhite, line|z18-[highway=trunk][bridge?]::bridgewhite, line|z18-[highway=motorway_link][bridge?]::bridgewhite, line|z18-[highway=trunk_link][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z13-16[highway=motorway][bridge?]::bridgeblack, line|z13-16[highway=trunk][bridge?]::bridgeblack, line|z14-16[highway=motorway_link][bridge?]::bridgeblack, line|z14-16[highway=trunk_link][bridge?]::bridgeblack -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=motorway][bridge?]::bridgeblack, line|z17[highway=trunk][bridge?]::bridgeblack, line|z17[highway=motorway_link][bridge?]::bridgeblack, line|z17[highway=trunk_link][bridge?]::bridgeblack -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=motorway][bridge?]::bridgeblack, line|z18-[highway=trunk][bridge?]::bridgeblack, line|z18-[highway=motorway_link][bridge?]::bridgeblack, line|z18-[highway=trunk_link][bridge?]::bridgeblack -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 4.PRIMARY 8-22 ZOOM */ @@ -448,8 +446,8 @@ line|z8-10[highway=primary], line|z11-14[highway=primary], line|z11-14[highway=primary_link] {color: @primary_orange_medium;opacity: 1;} -line|z15-[highway=primary], -line|z15-[highway=primary_link] +line|z15-22[highway=primary], +line|z15-22[highway=primary_link] {color: @primary_orange_light;opacity: 1;} line|z14-[highway=primary][tunnel?], line|z14-[highway=primary_link][tunnel?] @@ -510,23 +508,23 @@ line|z15-[highway=primary_link][tunnel?] line|z14-16[highway=primary][bridge?]::bridgewhite, line|z14-16[highway=primary_link][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=primary][bridge?]::bridgewhite, line|z17[highway=primary_link][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=primary][bridge?]::bridgewhite, line|z18-[highway=primary_link][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=primary][bridge?]::bridgeblack, line|z14-16[highway=primary_link][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=primary][bridge?]::bridgeblack, line|z17[highway=primary_link][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=primary][bridge?]::bridgeblack, line|z18-[highway=primary_link][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 5.SECONDARY 10-22 ZOOM */ @@ -586,23 +584,23 @@ line|z18-[highway=secondary_link][tunnel?] line|z14-16[highway=secondary][bridge?]::bridgewhite, line|z14-16[highway=secondary_link][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=secondary][bridge?]::bridgewhite, line|z17[highway=secondary_link][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=secondary][bridge?]::bridgewhite, line|z18-[highway=secondary_link][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=secondary][bridge?]::bridgeblack, line|z14-16[highway=secondary_link][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=secondary][bridge?]::bridgeblack, line|z17[highway=secondary_link][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=secondary][bridge?]::bridgeblack, line|z18-[highway=secondary_link][bridge?]::bridgeblack -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 6.RESIDENTAL & TERTIARY 11-22 ZOOM */ @@ -675,28 +673,28 @@ line|z16-[highway=residential_link][tunnel?] line|z14-16[highway=tertiary][bridge?]::bridgewhite, line|z14-16[highway=tertiary_link][bridge?]::bridgewhite, line|z14-16[highway=residential][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=tertiary][bridge?]::bridgewhite, line|z17[highway=tertiary_link][bridge?]::bridgewhite, line|z17[highway=residential][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=tertiary][bridge?]::bridgewhite, line|z18-[highway=tertiary_link][bridge?]::bridgewhite, line|z18-[highway=residential][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=tertiary][bridge?]::bridgeblack, line|z14-16[highway=tertiary_link][bridge?]::bridgeblack, line|z14-16[highway=residential][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=tertiary][bridge?]::bridgeblack, line|z17[highway=tertiary_link][bridge?]::bridgeblack, line|z17[highway=residential][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=tertiary][bridge?]::bridgeblack, line|z18-[highway=tertiary_link][bridge?]::bridgeblack, line|z18-[highway=residential][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM */ @@ -706,8 +704,6 @@ line|z12-[highway=living_street], line|z12-[aeroway=runway], line|z14-[aeroway=taxiway], line|z15-[highway=service], -line|z15-[highway=service][service=busway], -line|z15-[highway=busway], {color: @unclassified; opacity: 1;} line|z16-[highway=unclassified][tunnel?], line|z16-[highway=living_street][tunnel?], @@ -762,42 +758,32 @@ line|z16-[highway=living_street][tunnel?], /* 7.3 Road, Street, Unclassified bridge 14-22 ZOOM */ line|z14-16[highway=unclassified][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=unclassified][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=unclassified][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=unclassified][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=unclassified][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=unclassified][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 7.4 Service 15-22 ZOOM */ -line|z15[highway=service], -line|z15[highway=service][service=busway], -line|z15[highway=busway], +line|z15[highway=service] {width: 1.2;} line|z15-16[highway=service][service=driveway] {width: 0;} -line|z16[highway=service], -line|z16[highway=service][service=busway], -line|z16[highway=busway], +line|z16[highway=service] {width: 1.6;} -line|z17[highway=service], -line|z17[highway=service][service=busway], -line|z17[highway=busway], +line|z17[highway=service] {width: 2;} -line|z18[highway=service], -line|z18[highway=service][service=busway], -line|z18[highway=busway], +line|z18[highway=service] {width: 3;} -line|z19-[highway=service], -line|z19-[highway=service][service=busway], -line|z19-[highway=busway], +line|z19-[highway=service] {width: 4;} /* 8.OTHERS ROADS 13-22 ZOOM */ @@ -811,13 +797,13 @@ line|z13-[highway=construction], line|z13-[highway=proposed] {color: @construction;opacity: 1;} line|z13-[highway=pedestrian][bridge?]::bridgewhite, -line|z15-[highway=footway][bridge?]::bridgewhite, +line|z13-[highway=footway][bridge?]::bridgewhite, line|z15-[highway=steps][bridge?]::bridgewhite, line|z16-[highway=road][bridge?]::bridgewhite, line|z16-[highway=service][bridge?]::bridgewhite {casing-linecap: butt;casing-color:@bridge_background;} line|z13-[highway=pedestrian][bridge?]::bridgeblack, -line|z15-[highway=footway][bridge?]::bridgeblack, +line|z13-[highway=footway][bridge?]::bridgeblack, line|z15-[highway=steps][bridge?]::bridgeblack, line|z16-[highway=road][bridge?]::bridgeblack, line|z16-[highway=service][bridge?]::bridgeblack @@ -871,34 +857,27 @@ line|z16-[highway=pedestrian][tunnel?] /* 8.3 Pedestrian & other brige 13-22 ZOOM */ line|z13[highway=pedestrian][bridge?]::bridgewhite, -{casing-width-add: -0.2;} +line|z13[highway=footway][bridge?]::bridgewhite, +{casing-width: eval(prop("width")-0.2);} line|z14-[highway=pedestrian][bridge?]::bridgewhite, -/* TODO: test this style before adding -line|z15-[highway=footway][bridge?]::bridgewhite, +line|z14-[highway=footway][bridge?]::bridgewhite, line|z15-[highway=steps][bridge?]::bridgewhite, -*/ line|z16-[highway=road][bridge?]::bridgewhite, line|z16-[highway=service][bridge?]::bridgewhite -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z16-[highway=pedestrian][bridge?]::bridgewhite, -/* TODO: test this style before adding line|z16-[highway=footway][bridge?]::bridgewhite -*/ -{casing-width-add: 0.2;} +{casing-width: eval(prop("width")+0.2);} line|z14-[highway=pedestrian][bridge?]::bridgeblack, -/* TODO: test this style before adding -line|z15-[highway=footway][bridge?]::bridgeblack, +line|z14-[highway=footway][bridge?]::bridgeblack, line|z15-[highway=steps][bridge?]::bridgeblack, -*/ line|z16-[highway=road][bridge?]::bridgeblack, line|z16-[highway=service][bridge?]::bridgeblack -{casing-width-add: 0.2;} +{casing-width: eval(prop("width")+0.2);} line|z16-[highway=pedestrian][bridge?]::bridgeblack, -/* TODO: test this style before adding line|z16-[highway=footway][bridge?]::bridgeblack, -*/ -{casing-width-add: 0.6;} +{casing-width: eval(prop("width")+0.6);} /* 8.4 Cycleway 13-22 ZOOM */ @@ -1032,30 +1011,27 @@ line|z19-[highway=steps] line|z17-[highway=footway][tunnel?]::tunnelBackground, line|z17-[highway=path][tunnel?]::tunnelBackground, +line|z17-[highway=steps][tunnel?]::tunnelBackground, { - casing-width-add: 0.5; + casing-width: eval(prop("width")+0.5); + casing-linecap: butt; casing-color: @bridge_background; } +line|z17-[highway=steps][tunnel?]::tunnelBackground, +{casing-width: eval(prop("width")/2 + 0.5);} line|z17-[highway=footway][tunnel?]::tunnelCasing, line|z17-[highway=path][tunnel?]::tunnelCasing, -{ - casing-width-add: 1; - casing-color: @bridge_casing; - casing-dashes: 2,2; -} - -line|z17-[highway=steps][tunnel?]::tunnelBackground, -{ - casing-width: 0.5; - casing-color: @bridge_background; -} line|z17-[highway=steps][tunnel?]::tunnelCasing, { - casing-width: 1; + casing-width: eval(prop("width")+1); + casing-linecap: butt; casing-color: @bridge_casing; casing-dashes: 2,2; } +line|z17-[highway=steps][tunnel?]::tunnelCasing, +{casing-width: eval(prop("width")/2 + 1);} + /* 8.9 Bridleway 14-22 ZOOM */ @@ -1183,54 +1159,33 @@ line|z14-[railway=yard][tunnel?] /* 9.3 Rail bridge 14-22 ZOOM */ -/* TODO -Replacment of eval()s with casing-width-add (https://github.com/organicmaps/kothic/pull/5) -led to addition of a few "new" (and incomplete, e.g. w/o color defined) bridge rules into the compiled style, -e.g. monorail lines widths were defined after the bridge section and hence they were not processed previously but are processed now. - -This definition is just a plug to keep these styles "disabled" for now, because a proper addition of them is a separate work: - - remove following definition - - add casing-color and z-index definitions to new bridges - - test visually -*/ -line|z14-[railway=tram][bridge?]::bridgewhite, -line|z14-[railway=monorail][bridge?]::bridgewhite, -line|z14-[railway=funicular][bridge?]::bridgewhite, -line|z14-[railway=narrow_gauge][bridge?]::bridgewhite, -line|z14-[railway=tram][bridge?]::bridgeblack, -line|z14-[railway=monorail][bridge?]::bridgeblack, -line|z14-[railway=funicular][bridge?]::bridgeblack, -line|z14-[railway=narrow_gauge][bridge?]::bridgeblack, -{casing-linecap: round;} - - line|z14-15[railway][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z16[railway][bridge?]::bridgewhite, -{casing-width-add: 1.2;} +{casing-width: eval(prop("width")+1.2);} line|z17-[railway][bridge?]::bridgewhite, -{casing-width-add: 1.4;} +{casing-width: eval(prop("width")+1.4);} line|z18-[railway=rail][bridge?]::bridgewhite, line|z18-[railway=subway][bridge?]::bridgewhite, line|z18-[railway=light_rail][bridge?]::bridgewhite, line|z18-[railway=yard][bridge?]::bridgewhite -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} line|z16[railway=rail][bridge?]::bridgeblack, line|z16[railway=subway][bridge?]::bridgeblack, line|z16[railway=light_rail][bridge?]::bridgeblack, line|z16[railway=yard][bridge?]::bridgeblack -{casing-width-add: 1.4;} +{casing-width: eval(prop("width")+1.4);} line|z17-[railway=rail][bridge?]::bridgeblack, line|z17-[railway=subway][bridge?]::bridgeblack, line|z17-[railway=light_rail][bridge?]::bridgeblack, line|z17-[railway=yard][bridge?]::bridgeblack -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[railway=rail][bridge?]::bridgeblack, line|z18-[railway=subway][bridge?]::bridgeblack, line|z18-[railway=light_rail][bridge?]::bridgeblack, line|z18-[railway=yard][bridge?]::bridgeblack -{casing-width-add: 2.2;} +{casing-width: eval(prop("width")+2.2);} /* 9.4 Monorail 14-22 ZOOM */ diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index 9126f63085..c44282a0db 100644 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -67,9 +67,7 @@ line[route=hiking], line[highway=footway] {z-index: 600;} -line[highway=service], -line[highway=service][service=busway], -line[highway=busway], +line[highway=service] {z-index: 650;} line[highway=pedestrian], @@ -384,8 +382,6 @@ line|z14-[highway=road], line|z14-[highway=living_street], line|z14-[highway=pedestrian], line|z16-[highway=service], -line|z16-[highway=service][service=busway], -line|z16-[highway=busway], {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;} line|z13[highway=unclassified] @@ -405,16 +401,12 @@ line|z16-17[highway=living_street], {font-size: 12;text-halo-color: @label_halo_light;} line|z16-17[highway=pedestrian], line|z16-17[highway=service], -line|z16-17[highway=service][service=busway], -line|z16-17[highway=busway], line|z16-17[highway=road], {font-size: 10;text-halo-color: @label_halo_light;} line|z18-[highway=unclassified], line|z18-[highway=living_street], line|z18-[highway=pedestrian], line|z18-[highway=service], -line|z18-[highway=service][service=busway], -line|z18-[highway=busway], line|z18-[highway=road], {font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;} diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss index c0508d0203..cddc165fe2 100644 --- a/data/styles/clear/include/Subways.mapcss +++ b/data/styles/clear/include/Subways.mapcss @@ -2,8 +2,6 @@ 3.2 Custom Subway Station -If adding a new city, make sure to add -the bbox to MatchCity() in generator/osm2type.cpp ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -94,13 +92,6 @@ node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway- node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-m.svg;text-optional: true;} node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-ubahn-s.svg;text-optional: true;} -/* Boston Subway Station*/ -node|z12-13[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;icon-min-distance: 1;} -node|z14[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;} -node|z15-16[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;} -node|z17-[railway=station][transport=subway][city=boston] {icon-image: subway-massachusetts-m.svg;text-optional: true;} -node|z17-[railway=subway_entrance][city=boston] {icon-image: subway-massachusetts-m.svg;text-optional: true;} - /* Bengaluru Subway Station*/ node|z13[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;} @@ -109,11 +100,13 @@ node|z17-[railway=station][transport=subway][city=bengalore] {icon-image: subway node|z17-[railway=subway_entrance][city=bengalore] {icon-image: subway-bengaluru-s.svg;text-optional: true;} /* Bilbao Subway Station*/ +/* TODO: add Bilbao Subway icon node|z13[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-s.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-s.svg;} node|z15-16[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;} node|z17-[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;text-optional: true;} node|z17-[railway=subway_entrance][city=bilbao] {icon-image: subway-bilbao-s.svg;text-optional: true;} +*/ /* Brasilia Subway Station*/ node|z13[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-s.svg;icon-min-distance: 1;} @@ -775,10 +768,10 @@ node|z15[railway=station][transport=subway][city=spb] {icon-image: subway-spb-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;} node|z15[railway=station][transport=subway][city=spb]::int_name {text-offset: 1;font-size: 10;text-halo-opacity: 0.8;} -node|z16[railway=station][transport=subway][city=spb] /* check */ +node|z16[railway=station][transport=subway][city=spb] check {icon-image: subway-spb-m.svg;text-offset: 1;font-size: 10;text-color: @district_label;text-halo-radius: 0;} node|z16[railway=station][transport=subway][city=spb]::int_name -{text-offset: 1;font-size: 9;text-color: @district_label;text-halo-radius: 0;} /* check */ +{text-offset: 1;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check /* Do not draw station metro icon, because entrances will be visible now */ node|z17-[railway=station][transport=subway][city=spb] @@ -863,6 +856,13 @@ node|z15-16[railway=station][transport=subway][city=valencia] {icon-image: subwa node|z17-[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;text-optional: true;} node|z17-[railway=subway_entrance][city=valencia] {icon-image: subway-valencia-s.svg;text-optional: true;} +/* Valencia Subway Station */ +node|z13[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-s.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-s.svg;} +node|z15-16[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;} +node|z17-[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;text-optional: true;} +node|z17-[railway=subway_entrance][city=valencia] {icon-image: subway-valencia-s.svg;text-optional: true;} + /* Vienna Subway Station */ node|z12-13[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-s.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-s.svg;} diff --git a/data/styles/clear/style-clear/symbols/alternative-m.svg b/data/styles/clear/style-clear/symbols/alternative-m.svg deleted file mode 100644 index a7ae7cc962..0000000000 --- a/data/styles/clear/style-clear/symbols/alternative-m.svg +++ /dev/null @@ -1,17 +0,0 @@ - - alternative-m - - - - - - - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/audiologist-m.svg b/data/styles/clear/style-clear/symbols/audiologist-m.svg deleted file mode 100644 index e55ff70ffb..0000000000 --- a/data/styles/clear/style-clear/symbols/audiologist-m.svg +++ /dev/null @@ -1,12 +0,0 @@ - - audiologist-m - - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/beauty-m.svg b/data/styles/clear/style-clear/symbols/beauty-m.svg index 39be63bfef..5bacbc6084 100644 --- a/data/styles/clear/style-clear/symbols/beauty-m.svg +++ b/data/styles/clear/style-clear/symbols/beauty-m.svg @@ -1,8 +1,10 @@ - - - - - - + + beauty-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beekeeper-m.svg b/data/styles/clear/style-clear/symbols/beekeeper-m.svg index baef91a8f1..cf474d7d76 100644 --- a/data/styles/clear/style-clear/symbols/beekeeper-m.svg +++ b/data/styles/clear/style-clear/symbols/beekeeper-m.svg @@ -3,6 +3,6 @@ - + diff --git a/data/styles/clear/style-clear/symbols/blood_donation-m.svg b/data/styles/clear/style-clear/symbols/blood_donation-m.svg deleted file mode 100644 index 698ecdceae..0000000000 --- a/data/styles/clear/style-clear/symbols/blood_donation-m.svg +++ /dev/null @@ -1,8 +0,0 @@ - - blood_donation-m - - - - - - diff --git a/data/styles/clear/style-clear/symbols/bowling_alley-m.svg b/data/styles/clear/style-clear/symbols/bowling_alley-m.svg deleted file mode 100644 index d2ef4eb530..0000000000 --- a/data/styles/clear/style-clear/symbols/bowling_alley-m.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/clear/style-clear/symbols/bus-m.svg b/data/styles/clear/style-clear/symbols/bus-m.svg index a2fecb965c..4c8715b7b9 100644 --- a/data/styles/clear/style-clear/symbols/bus-m.svg +++ b/data/styles/clear/style-clear/symbols/bus-m.svg @@ -1,8 +1,19 @@ - - - - - - + + bus-m + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bus-s.svg b/data/styles/clear/style-clear/symbols/bus-s.svg index f1ece3593b..f1fe635b34 100644 --- a/data/styles/clear/style-clear/symbols/bus-s.svg +++ b/data/styles/clear/style-clear/symbols/bus-s.svg @@ -1,8 +1,19 @@ - - - - - - + + bus-s + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/campsite-m.svg b/data/styles/clear/style-clear/symbols/campsite-m.svg index 20c4f3539d..fcf17d51e3 100644 --- a/data/styles/clear/style-clear/symbols/campsite-m.svg +++ b/data/styles/clear/style-clear/symbols/campsite-m.svg @@ -1,8 +1,10 @@ - - - - - - + + campsite-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/caravan-shop-m.svg b/data/styles/clear/style-clear/symbols/caravan-shop-m.svg index b9e67148c0..3d406d58fe 100644 --- a/data/styles/clear/style-clear/symbols/caravan-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/caravan-shop-m.svg @@ -1,8 +1,13 @@ - - - - - - + + caravan_shop-m + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/caravan_site-m.svg b/data/styles/clear/style-clear/symbols/caravan_site-m.svg index 6169305a5b..2d3806234e 100644 --- a/data/styles/clear/style-clear/symbols/caravan_site-m.svg +++ b/data/styles/clear/style-clear/symbols/caravan_site-m.svg @@ -1,8 +1,13 @@ - - - - - - + + caravan_site-m + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/clear/style-clear/symbols/cave-m.svg index 50ef07049c..49601675d8 100644 --- a/data/styles/clear/style-clear/symbols/cave-m.svg +++ b/data/styles/clear/style-clear/symbols/cave-m.svg @@ -1,4 +1,8 @@ - - + cave-m + + + + + diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/clear/style-clear/symbols/cave-s.svg index bc765d4c7d..d1bb6add3e 100644 --- a/data/styles/clear/style-clear/symbols/cave-s.svg +++ b/data/styles/clear/style-clear/symbols/cave-s.svg @@ -1,4 +1,8 @@ - - + cave-s + + + + + diff --git a/data/styles/clear/style-clear/symbols/computer-m.svg b/data/styles/clear/style-clear/symbols/computer-m.svg index ecc980e51e..d5609b4e86 100644 --- a/data/styles/clear/style-clear/symbols/computer-m.svg +++ b/data/styles/clear/style-clear/symbols/computer-m.svg @@ -1,6 +1,10 @@ - - - - + computer-m + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/clear/style-clear/symbols/dentist-m.svg index 62a13230e9..8ea9aa09a6 100644 --- a/data/styles/clear/style-clear/symbols/dentist-m.svg +++ b/data/styles/clear/style-clear/symbols/dentist-m.svg @@ -1,8 +1,10 @@ - - - - - - + + dentist-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dog_park-m.svg b/data/styles/clear/style-clear/symbols/dog_park-m.svg index c6a0d1d64b..788169d5ea 100644 --- a/data/styles/clear/style-clear/symbols/dog_park-m.svg +++ b/data/styles/clear/style-clear/symbols/dog_park-m.svg @@ -1,9 +1,10 @@ - dog_park-m - + + + diff --git a/data/styles/clear/style-clear/symbols/emergency-phone-m.svg b/data/styles/clear/style-clear/symbols/emergency-phone-m.svg deleted file mode 100644 index 7ee70712d8..0000000000 --- a/data/styles/clear/style-clear/symbols/emergency-phone-m.svg +++ /dev/null @@ -1,4 +0,0 @@ - - emergency-phone-m - - diff --git a/data/styles/clear/style-clear/symbols/entrance-s.svg b/data/styles/clear/style-clear/symbols/entrance-s.svg index f5b2bcae7f..7d85190250 100644 --- a/data/styles/clear/style-clear/symbols/entrance-s.svg +++ b/data/styles/clear/style-clear/symbols/entrance-s.svg @@ -1,6 +1,4 @@ - - - - - - + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/funicular-m.svg b/data/styles/clear/style-clear/symbols/funicular-m.svg index 881e0235c1..508009cd51 100644 --- a/data/styles/clear/style-clear/symbols/funicular-m.svg +++ b/data/styles/clear/style-clear/symbols/funicular-m.svg @@ -1,8 +1,10 @@ - - - - - - + + funicular-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gift-m.svg b/data/styles/clear/style-clear/symbols/gift-m.svg index 2100f2fa89..b88e86433b 100644 --- a/data/styles/clear/style-clear/symbols/gift-m.svg +++ b/data/styles/clear/style-clear/symbols/gift-m.svg @@ -1,8 +1,10 @@ - - - + + gift-m + + - - + + + diff --git a/data/styles/clear/style-clear/symbols/hairdresser-m.svg b/data/styles/clear/style-clear/symbols/hairdresser-m.svg index bde3024bc3..ed1878cff1 100644 --- a/data/styles/clear/style-clear/symbols/hairdresser-m.svg +++ b/data/styles/clear/style-clear/symbols/hairdresser-m.svg @@ -1,8 +1,10 @@ - - - - - - + + hairdresser-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hardware-m.svg b/data/styles/clear/style-clear/symbols/hardware-m.svg new file mode 100644 index 0000000000..5313e27135 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hardware-m.svg @@ -0,0 +1,10 @@ + + hardware-m + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/historic-ship-m.svg b/data/styles/clear/style-clear/symbols/historic-ship-m.svg index 2f5bc7b9c8..67155eae03 100644 --- a/data/styles/clear/style-clear/symbols/historic-ship-m.svg +++ b/data/styles/clear/style-clear/symbols/historic-ship-m.svg @@ -1,6 +1,10 @@ - - - - + historic-ship-m + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ice_cream-m.svg b/data/styles/clear/style-clear/symbols/ice_cream-m.svg index bbb6616206..2c5d7a7273 100644 --- a/data/styles/clear/style-clear/symbols/ice_cream-m.svg +++ b/data/styles/clear/style-clear/symbols/ice_cream-m.svg @@ -1,6 +1,10 @@ - - - - + ice_cream-m + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/main_entrance-s.svg b/data/styles/clear/style-clear/symbols/main_entrance-s.svg deleted file mode 100644 index aac781f75d..0000000000 --- a/data/styles/clear/style-clear/symbols/main_entrance-s.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg index 63947a0883..3e15f15c9e 100644 --- a/data/styles/clear/style-clear/symbols/military-m.svg +++ b/data/styles/clear/style-clear/symbols/military-m.svg @@ -1,15 +1,14 @@ - military-m - - - - - - - - - - \ No newline at end of file + military-m + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mountain-pass.svg b/data/styles/clear/style-clear/symbols/mountain-pass.svg index 4fb5c4c98c..fd2fbbdc26 100644 --- a/data/styles/clear/style-clear/symbols/mountain-pass.svg +++ b/data/styles/clear/style-clear/symbols/mountain-pass.svg @@ -1,4 +1,6 @@ - - + mountain-pass + + + diff --git a/data/styles/clear/style-clear/symbols/music-m.svg b/data/styles/clear/style-clear/symbols/music-m.svg index b013772721..3e1df80668 100644 --- a/data/styles/clear/style-clear/symbols/music-m.svg +++ b/data/styles/clear/style-clear/symbols/music-m.svg @@ -1,5 +1,10 @@ - + + music-m + + - + + + diff --git a/data/styles/clear/style-clear/symbols/musical-instrument-m.svg b/data/styles/clear/style-clear/symbols/musical-instrument-m.svg deleted file mode 100644 index 3e1df80668..0000000000 --- a/data/styles/clear/style-clear/symbols/musical-instrument-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - music-m - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg b/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg index a30d40cad1..6142e07c1f 100644 --- a/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg +++ b/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg @@ -1,8 +1,10 @@ - - - - - - + + newsagent_shop-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/nightclub-m.svg b/data/styles/clear/style-clear/symbols/nightclub-m.svg deleted file mode 100644 index 08bd84e21f..0000000000 --- a/data/styles/clear/style-clear/symbols/nightclub-m.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/clear/style-clear/symbols/optometrist-m.svg b/data/styles/clear/style-clear/symbols/optometrist-m.svg deleted file mode 100644 index 7bf18245e7..0000000000 --- a/data/styles/clear/style-clear/symbols/optometrist-m.svg +++ /dev/null @@ -1,9 +0,0 @@ - - optometrist-m - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/peakt-m.svg b/data/styles/clear/style-clear/symbols/peakt-m.svg index 5fbdf6f07b..fb16dcafd3 100644 --- a/data/styles/clear/style-clear/symbols/peakt-m.svg +++ b/data/styles/clear/style-clear/symbols/peakt-m.svg @@ -1,4 +1,8 @@ - - + peakt-m + + + + + diff --git a/data/styles/clear/style-clear/symbols/peakt-s.svg b/data/styles/clear/style-clear/symbols/peakt-s.svg index bd5141d011..a290746e1c 100644 --- a/data/styles/clear/style-clear/symbols/peakt-s.svg +++ b/data/styles/clear/style-clear/symbols/peakt-s.svg @@ -1,4 +1,8 @@ - - + peakt-s + + + + + diff --git a/data/styles/clear/style-clear/symbols/podiatrist-m.svg b/data/styles/clear/style-clear/symbols/podiatrist-m.svg deleted file mode 100644 index cf76522f12..0000000000 --- a/data/styles/clear/style-clear/symbols/podiatrist-m.svg +++ /dev/null @@ -1,11 +0,0 @@ - - podiatrist-m - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/psychotherapist-m.svg b/data/styles/clear/style-clear/symbols/psychotherapist-m.svg deleted file mode 100644 index b223f105fc..0000000000 --- a/data/styles/clear/style-clear/symbols/psychotherapist-m.svg +++ /dev/null @@ -1,13 +0,0 @@ - - psychotherapist-m - - - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/sample_collection-m.svg b/data/styles/clear/style-clear/symbols/sample_collection-m.svg deleted file mode 100644 index 7a0683318c..0000000000 --- a/data/styles/clear/style-clear/symbols/sample_collection-m.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/speech_therapist-m.svg b/data/styles/clear/style-clear/symbols/speech_therapist-m.svg deleted file mode 100644 index d46e2c57d8..0000000000 --- a/data/styles/clear/style-clear/symbols/speech_therapist-m.svg +++ /dev/null @@ -1,13 +0,0 @@ - - speech_therapist-m - - - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/stadium-m.svg b/data/styles/clear/style-clear/symbols/stadium-m.svg index b75c7139f9..690cf60b3e 100644 --- a/data/styles/clear/style-clear/symbols/stadium-m.svg +++ b/data/styles/clear/style-clear/symbols/stadium-m.svg @@ -1,6 +1,10 @@ - - - - + stadium-m + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/stadium-s.svg b/data/styles/clear/style-clear/symbols/stadium-s.svg index 34cb219d26..5a8b6a6c9f 100644 --- a/data/styles/clear/style-clear/symbols/stadium-s.svg +++ b/data/styles/clear/style-clear/symbols/stadium-s.svg @@ -1,6 +1,10 @@ - - - - + stadium-s + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg b/data/styles/clear/style-clear/symbols/stationery_shop-m.svg index 32cc8c9d88..616c1a663f 100644 --- a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg +++ b/data/styles/clear/style-clear/symbols/stationery_shop-m.svg @@ -1,8 +1,10 @@ - - - - - - + + stationery_shop-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-bilbao-m.svg b/data/styles/clear/style-clear/symbols/subway-bilbao-m.svg deleted file mode 100644 index 466e822f13..0000000000 --- a/data/styles/clear/style-clear/symbols/subway-bilbao-m.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/subway-bilbao-s.svg b/data/styles/clear/style-clear/symbols/subway-bilbao-s.svg deleted file mode 100644 index 75ccbcb8fa..0000000000 --- a/data/styles/clear/style-clear/symbols/subway-bilbao-s.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg b/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg index 72f7d1a5e0..ba40922c87 100644 --- a/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg b/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg index 80458e94ab..4eadd3f16f 100644 --- a/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sweets-m.svg b/data/styles/clear/style-clear/symbols/sweets-m.svg index 6ff2752577..3160450b22 100644 --- a/data/styles/clear/style-clear/symbols/sweets-m.svg +++ b/data/styles/clear/style-clear/symbols/sweets-m.svg @@ -1,8 +1,10 @@ - - - - - - + + sweets-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taxi-m.svg b/data/styles/clear/style-clear/symbols/taxi-m.svg index 7a9c041ab0..f0eb249706 100644 --- a/data/styles/clear/style-clear/symbols/taxi-m.svg +++ b/data/styles/clear/style-clear/symbols/taxi-m.svg @@ -1,8 +1,10 @@ - - - - - - + + taxi-m + + + + + + diff --git a/data/styles/clear/style-clear/symbols/video-games-m.svg b/data/styles/clear/style-clear/symbols/video-games-m.svg deleted file mode 100644 index 6a69a11721..0000000000 --- a/data/styles/clear/style-clear/symbols/video-games-m.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/styles/clear/style-clear/symbols/viewpoint-m.svg b/data/styles/clear/style-clear/symbols/viewpoint-m.svg index bb8f581597..54f424e1ea 100644 --- a/data/styles/clear/style-clear/symbols/viewpoint-m.svg +++ b/data/styles/clear/style-clear/symbols/viewpoint-m.svg @@ -1,9 +1,10 @@ - - viewpoint-m - - + viewpoint-m + + + + + - \ No newline at end of file + + diff --git a/data/styles/clear/style-clear/symbols/viewpoint-s.svg b/data/styles/clear/style-clear/symbols/viewpoint-s.svg index 1517b006b4..8d0252b4c4 100644 --- a/data/styles/clear/style-clear/symbols/viewpoint-s.svg +++ b/data/styles/clear/style-clear/symbols/viewpoint-s.svg @@ -1,8 +1,10 @@ - viewpoint-s - - - - \ No newline at end of file + viewpoint-s + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/volcano-l.svg b/data/styles/clear/style-clear/symbols/volcano-l.svg new file mode 100644 index 0000000000..04e74d9f0d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/volcano-l.svg @@ -0,0 +1,11 @@ + + volcano-l + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/volcano-m.svg b/data/styles/clear/style-clear/symbols/volcano-m.svg index afc754029c..9484680634 100644 --- a/data/styles/clear/style-clear/symbols/volcano-m.svg +++ b/data/styles/clear/style-clear/symbols/volcano-m.svg @@ -1,4 +1,11 @@ - - + volcano-m + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/volcano-s.svg b/data/styles/clear/style-clear/symbols/volcano-s.svg index a1b31edea7..08b89500c8 100644 --- a/data/styles/clear/style-clear/symbols/volcano-s.svg +++ b/data/styles/clear/style-clear/symbols/volcano-s.svg @@ -1,4 +1,11 @@ - - + volcano-s + + + + + + + + diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss index 378b96eca1..02936e19a2 100644 --- a/data/styles/clear/style-night/style.mapcss +++ b/data/styles/clear/style-night/style.mapcss @@ -23,7 +23,7 @@ colors GuiText-opacity: 0.7; MyPositionAccuracy-color: #FFFFFF; MyPositionAccuracy-opacity: 0.06; - Selection-color: #FFFFFF; + Selection-color: #4BB9E6; Selection-opacity: 0.64; Route-color: #0087FF; RouteOutline-color: #055FCD; diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/clear/style-night/symbols/airport-m.svg index 4611aa2279..a566487cde 100644 --- a/data/styles/clear/style-night/symbols/airport-m.svg +++ b/data/styles/clear/style-night/symbols/airport-m.svg @@ -1,10 +1,10 @@ airport-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/clear/style-night/symbols/airport-s.svg index 5004195aae..6ebec333c7 100644 --- a/data/styles/clear/style-night/symbols/airport-s.svg +++ b/data/styles/clear/style-night/symbols/airport-s.svg @@ -1,10 +1,10 @@ airport-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/clear/style-night/symbols/alcohol-m.svg index 391ecb6902..87e095ead7 100644 --- a/data/styles/clear/style-night/symbols/alcohol-m.svg +++ b/data/styles/clear/style-night/symbols/alcohol-m.svg @@ -1,10 +1,10 @@ alcohol-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/alpine_hut-m.svg b/data/styles/clear/style-night/symbols/alpine_hut-m.svg index 9f96663080..c22161fa50 100644 --- a/data/styles/clear/style-night/symbols/alpine_hut-m.svg +++ b/data/styles/clear/style-night/symbols/alpine_hut-m.svg @@ -1,10 +1,10 @@ alpine_hut-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/alternative-m.svg b/data/styles/clear/style-night/symbols/alternative-m.svg deleted file mode 100644 index fc17b2a83d..0000000000 --- a/data/styles/clear/style-night/symbols/alternative-m.svg +++ /dev/null @@ -1,17 +0,0 @@ - - alternative-m - - - - - - - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/america-football-m.svg b/data/styles/clear/style-night/symbols/america-football-m.svg index 6cc071deea..4d28afc0b7 100644 --- a/data/styles/clear/style-night/symbols/america-football-m.svg +++ b/data/styles/clear/style-night/symbols/america-football-m.svg @@ -1,12 +1,12 @@ america-football-m - + - - + + - + diff --git a/data/styles/clear/style-night/symbols/apartment-m.svg b/data/styles/clear/style-night/symbols/apartment-m.svg index 1d8bc6804d..10636172c5 100644 --- a/data/styles/clear/style-night/symbols/apartment-m.svg +++ b/data/styles/clear/style-night/symbols/apartment-m.svg @@ -1,10 +1,10 @@ apartment-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/archery-m.svg b/data/styles/clear/style-night/symbols/archery-m.svg index 37138aac92..0d7365da8a 100644 --- a/data/styles/clear/style-night/symbols/archery-m.svg +++ b/data/styles/clear/style-night/symbols/archery-m.svg @@ -2,7 +2,7 @@ archery-m - + diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/clear/style-night/symbols/atm-m.svg index 622273da31..5ea09dd739 100644 --- a/data/styles/clear/style-night/symbols/atm-m.svg +++ b/data/styles/clear/style-night/symbols/atm-m.svg @@ -1,10 +1,10 @@ atm-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/audiologist-m.svg b/data/styles/clear/style-night/symbols/audiologist-m.svg deleted file mode 100644 index 93c9253156..0000000000 --- a/data/styles/clear/style-night/symbols/audiologist-m.svg +++ /dev/null @@ -1,12 +0,0 @@ - - audiologist-m - - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/australian-football-m.svg b/data/styles/clear/style-night/symbols/australian-football-m.svg index 933b9d6c42..f6e1e98287 100644 --- a/data/styles/clear/style-night/symbols/australian-football-m.svg +++ b/data/styles/clear/style-night/symbols/australian-football-m.svg @@ -2,7 +2,7 @@ australian-football-m - + diff --git a/data/styles/clear/style-night/symbols/badminton-m.svg b/data/styles/clear/style-night/symbols/badminton-m.svg index 2665f75ce4..e51c183299 100644 --- a/data/styles/clear/style-night/symbols/badminton-m.svg +++ b/data/styles/clear/style-night/symbols/badminton-m.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/bakery-m.svg b/data/styles/clear/style-night/symbols/bakery-m.svg index eb47383c66..9117b9107a 100644 --- a/data/styles/clear/style-night/symbols/bakery-m.svg +++ b/data/styles/clear/style-night/symbols/bakery-m.svg @@ -1,10 +1,10 @@ bakery-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bank-m.svg b/data/styles/clear/style-night/symbols/bank-m.svg index 1505881819..73229506cb 100644 --- a/data/styles/clear/style-night/symbols/bank-m.svg +++ b/data/styles/clear/style-night/symbols/bank-m.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/banknote-m.svg b/data/styles/clear/style-night/symbols/banknote-m.svg index be5974588a..471f9857b4 100644 --- a/data/styles/clear/style-night/symbols/banknote-m.svg +++ b/data/styles/clear/style-night/symbols/banknote-m.svg @@ -1,10 +1,10 @@ banknote-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/clear/style-night/symbols/bar-m.svg index 7cb6e7255e..9b9ccfec8e 100644 --- a/data/styles/clear/style-night/symbols/bar-m.svg +++ b/data/styles/clear/style-night/symbols/bar-m.svg @@ -1,10 +1,10 @@ bar-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/baseball-m.svg b/data/styles/clear/style-night/symbols/baseball-m.svg index c6f7894da9..5d05385e95 100644 --- a/data/styles/clear/style-night/symbols/baseball-m.svg +++ b/data/styles/clear/style-night/symbols/baseball-m.svg @@ -2,10 +2,10 @@ baseball-m - - - - + + + + diff --git a/data/styles/clear/style-night/symbols/basketball-m.svg b/data/styles/clear/style-night/symbols/basketball-m.svg index b4c6df5ddc..f9d30eeda2 100644 --- a/data/styles/clear/style-night/symbols/basketball-m.svg +++ b/data/styles/clear/style-night/symbols/basketball-m.svg @@ -2,15 +2,15 @@ basketball-m - - - - - - - - - + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bbq-m.svg b/data/styles/clear/style-night/symbols/bbq-m.svg index 5740bbe5f5..90b34002f8 100644 --- a/data/styles/clear/style-night/symbols/bbq-m.svg +++ b/data/styles/clear/style-night/symbols/bbq-m.svg @@ -1,10 +1,10 @@ bbq-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bcontrol-m.svg b/data/styles/clear/style-night/symbols/bcontrol-m.svg index 1d62f28609..d1872e57f9 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-m.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-m.svg @@ -1,10 +1,10 @@ bcontrol-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/beach-m.svg b/data/styles/clear/style-night/symbols/beach-m.svg index db22c0f88a..b22af797b8 100644 --- a/data/styles/clear/style-night/symbols/beach-m.svg +++ b/data/styles/clear/style-night/symbols/beach-m.svg @@ -1,10 +1,10 @@ beach-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/beauty-m.svg b/data/styles/clear/style-night/symbols/beauty-m.svg index b648de5426..4375549219 100644 --- a/data/styles/clear/style-night/symbols/beauty-m.svg +++ b/data/styles/clear/style-night/symbols/beauty-m.svg @@ -1,8 +1,10 @@ - - - - - - + + beauty-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/beekeeper-m.svg b/data/styles/clear/style-night/symbols/beekeeper-m.svg index 46afea7983..8407c75828 100644 --- a/data/styles/clear/style-night/symbols/beekeeper-m.svg +++ b/data/styles/clear/style-night/symbols/beekeeper-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/beer-m.svg b/data/styles/clear/style-night/symbols/beer-m.svg index 0dfc46c2e8..d898ab34e8 100644 --- a/data/styles/clear/style-night/symbols/beer-m.svg +++ b/data/styles/clear/style-night/symbols/beer-m.svg @@ -1,10 +1,10 @@ beer-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bench.svg b/data/styles/clear/style-night/symbols/bench.svg index c9ac85abda..5303348a7d 100644 --- a/data/styles/clear/style-night/symbols/bench.svg +++ b/data/styles/clear/style-night/symbols/bench.svg @@ -1,7 +1,7 @@ bench - - + + diff --git a/data/styles/clear/style-night/symbols/bicycle-m.svg b/data/styles/clear/style-night/symbols/bicycle-m.svg index c5b47b4bd5..b8dbd4f15e 100644 --- a/data/styles/clear/style-night/symbols/bicycle-m.svg +++ b/data/styles/clear/style-night/symbols/bicycle-m.svg @@ -1,10 +1,10 @@ bicycle-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bicycle-rental.svg b/data/styles/clear/style-night/symbols/bicycle-rental.svg index 4be2a89035..3c3c25b736 100644 --- a/data/styles/clear/style-night/symbols/bicycle-rental.svg +++ b/data/styles/clear/style-night/symbols/bicycle-rental.svg @@ -1,10 +1 @@ -bike-parking-m - - - - - - - - - +bike-parking-m diff --git a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg index 0e09d7af55..2dc9a423db 100644 --- a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg +++ b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg @@ -1 +1 @@ -america-football-m +america-football-m diff --git a/data/styles/clear/style-night/symbols/bike-parking-m.svg b/data/styles/clear/style-night/symbols/bike-parking-m.svg index bb716868aa..f2617c407b 100644 --- a/data/styles/clear/style-night/symbols/bike-parking-m.svg +++ b/data/styles/clear/style-night/symbols/bike-parking-m.svg @@ -1,10 +1,10 @@ bike-parking-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/blacksmith-m.svg b/data/styles/clear/style-night/symbols/blacksmith-m.svg index c0a0152b7e..6975c0ff5e 100644 --- a/data/styles/clear/style-night/symbols/blacksmith-m.svg +++ b/data/styles/clear/style-night/symbols/blacksmith-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/blood_donation-m.svg b/data/styles/clear/style-night/symbols/blood_donation-m.svg deleted file mode 100644 index 8024dd4b07..0000000000 --- a/data/styles/clear/style-night/symbols/blood_donation-m.svg +++ /dev/null @@ -1,8 +0,0 @@ - - blood_donation-m - - - - - - diff --git a/data/styles/clear/style-night/symbols/board.svg b/data/styles/clear/style-night/symbols/board.svg index 9144cf121d..90ab556451 100644 --- a/data/styles/clear/style-night/symbols/board.svg +++ b/data/styles/clear/style-night/symbols/board.svg @@ -8,5 +8,5 @@ - + diff --git a/data/styles/clear/style-night/symbols/book-shop-m.svg b/data/styles/clear/style-night/symbols/book-shop-m.svg index 7874fe1e53..7818eee4c2 100644 --- a/data/styles/clear/style-night/symbols/book-shop-m.svg +++ b/data/styles/clear/style-night/symbols/book-shop-m.svg @@ -1,10 +1,10 @@ book-shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bookmaker-m.svg b/data/styles/clear/style-night/symbols/bookmaker-m.svg index 575c1a13bb..fbc2ac8f85 100644 --- a/data/styles/clear/style-night/symbols/bookmaker-m.svg +++ b/data/styles/clear/style-night/symbols/bookmaker-m.svg @@ -1,10 +1,10 @@ bookmaker-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/bowling-m.svg b/data/styles/clear/style-night/symbols/bowling-m.svg index 508a5aa377..53bfdfd3f4 100644 --- a/data/styles/clear/style-night/symbols/bowling-m.svg +++ b/data/styles/clear/style-night/symbols/bowling-m.svg @@ -2,12 +2,12 @@ bowls-m - - - - - - + + + + + + diff --git a/data/styles/clear/style-night/symbols/bowling_alley-m.svg b/data/styles/clear/style-night/symbols/bowling_alley-m.svg deleted file mode 100644 index bb99e3110f..0000000000 --- a/data/styles/clear/style-night/symbols/bowling_alley-m.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/styles/clear/style-night/symbols/brewery-m.svg b/data/styles/clear/style-night/symbols/brewery-m.svg index 7425296375..33a399d4dd 100644 --- a/data/styles/clear/style-night/symbols/brewery-m.svg +++ b/data/styles/clear/style-night/symbols/brewery-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/buddhist-m.svg b/data/styles/clear/style-night/symbols/buddhist-m.svg index 5a97555bdf..852682ba32 100644 --- a/data/styles/clear/style-night/symbols/buddhist-m.svg +++ b/data/styles/clear/style-night/symbols/buddhist-m.svg @@ -1,10 +1,10 @@ buddhist-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/buddhist-s.svg b/data/styles/clear/style-night/symbols/buddhist-s.svg index 5bf8554354..684be77259 100644 --- a/data/styles/clear/style-night/symbols/buddhist-s.svg +++ b/data/styles/clear/style-night/symbols/buddhist-s.svg @@ -1,10 +1,10 @@ buddhist-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/bus-m.svg b/data/styles/clear/style-night/symbols/bus-m.svg index e73a5fcc4a..3f687238b1 100644 --- a/data/styles/clear/style-night/symbols/bus-m.svg +++ b/data/styles/clear/style-night/symbols/bus-m.svg @@ -1,8 +1,19 @@ - - - - - - + + bus-m + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bus-s.svg b/data/styles/clear/style-night/symbols/bus-s.svg index 543a1a4198..da4590025e 100644 --- a/data/styles/clear/style-night/symbols/bus-s.svg +++ b/data/styles/clear/style-night/symbols/bus-s.svg @@ -1,8 +1,19 @@ - - - - - - + + bus-s + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/butcher-m.svg b/data/styles/clear/style-night/symbols/butcher-m.svg index 002c5709f3..0a618d3ff9 100644 --- a/data/styles/clear/style-night/symbols/butcher-m.svg +++ b/data/styles/clear/style-night/symbols/butcher-m.svg @@ -1,10 +1,10 @@ butcher-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/cable-car-m.svg b/data/styles/clear/style-night/symbols/cable-car-m.svg index e405cacc81..8233f1dbf8 100644 --- a/data/styles/clear/style-night/symbols/cable-car-m.svg +++ b/data/styles/clear/style-night/symbols/cable-car-m.svg @@ -1 +1 @@ -cable-car-m +cable-car-m diff --git a/data/styles/clear/style-night/symbols/cable-car-s.svg b/data/styles/clear/style-night/symbols/cable-car-s.svg index 31b11abf42..3d4a109a45 100644 --- a/data/styles/clear/style-night/symbols/cable-car-s.svg +++ b/data/styles/clear/style-night/symbols/cable-car-s.svg @@ -1 +1 @@ -cable-car-s +cable-car-s diff --git a/data/styles/clear/style-night/symbols/cafe-m.svg b/data/styles/clear/style-night/symbols/cafe-m.svg index e8e9c601a4..1e3c5b227d 100644 --- a/data/styles/clear/style-night/symbols/cafe-m.svg +++ b/data/styles/clear/style-night/symbols/cafe-m.svg @@ -1,10 +1,10 @@ cafe-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/clear/style-night/symbols/campsite-m.svg index d5578d2bb6..b8b92790a5 100644 --- a/data/styles/clear/style-night/symbols/campsite-m.svg +++ b/data/styles/clear/style-night/symbols/campsite-m.svg @@ -1,8 +1,10 @@ - - - - - - + + campsite-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-part-m.svg b/data/styles/clear/style-night/symbols/car-part-m.svg index 894f993362..55283c21f7 100644 --- a/data/styles/clear/style-night/symbols/car-part-m.svg +++ b/data/styles/clear/style-night/symbols/car-part-m.svg @@ -1,10 +1,10 @@ car-part-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/clear/style-night/symbols/car-repair-m.svg index 83e648128c..6351376fd6 100644 --- a/data/styles/clear/style-night/symbols/car-repair-m.svg +++ b/data/styles/clear/style-night/symbols/car-repair-m.svg @@ -1,10 +1,10 @@ car-repair-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/car-repair-s.svg b/data/styles/clear/style-night/symbols/car-repair-s.svg index 3ebfdd50f4..004494c0cf 100644 --- a/data/styles/clear/style-night/symbols/car-repair-s.svg +++ b/data/styles/clear/style-night/symbols/car-repair-s.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/car-wash-m.svg b/data/styles/clear/style-night/symbols/car-wash-m.svg index 3b4f547421..4f24a2a0c6 100644 --- a/data/styles/clear/style-night/symbols/car-wash-m.svg +++ b/data/styles/clear/style-night/symbols/car-wash-m.svg @@ -1,10 +1,10 @@ car-wash-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/car_sharing-m.svg b/data/styles/clear/style-night/symbols/car_sharing-m.svg index 3a638b3a37..a8bf1fa9d3 100644 --- a/data/styles/clear/style-night/symbols/car_sharing-m.svg +++ b/data/styles/clear/style-night/symbols/car_sharing-m.svg @@ -1,10 +1,10 @@ car_sharing-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/car_shop-m.svg b/data/styles/clear/style-night/symbols/car_shop-m.svg index 5387027713..7d0dc3a0b3 100644 --- a/data/styles/clear/style-night/symbols/car_shop-m.svg +++ b/data/styles/clear/style-night/symbols/car_shop-m.svg @@ -1,10 +1,10 @@ car_shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/caravan-shop-m.svg b/data/styles/clear/style-night/symbols/caravan-shop-m.svg index 833578bed0..f72dedd351 100644 --- a/data/styles/clear/style-night/symbols/caravan-shop-m.svg +++ b/data/styles/clear/style-night/symbols/caravan-shop-m.svg @@ -1,8 +1,13 @@ - - - - - - + + caravan_shop-m + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/caravan_site-m.svg b/data/styles/clear/style-night/symbols/caravan_site-m.svg index f238a59e53..844a37c2e8 100644 --- a/data/styles/clear/style-night/symbols/caravan_site-m.svg +++ b/data/styles/clear/style-night/symbols/caravan_site-m.svg @@ -1,8 +1,13 @@ - - - - - - + + caravan_site-m + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/carpenter-m.svg b/data/styles/clear/style-night/symbols/carpenter-m.svg index f65a4fcbe3..3c5182086e 100644 --- a/data/styles/clear/style-night/symbols/carpenter-m.svg +++ b/data/styles/clear/style-night/symbols/carpenter-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/casino-m.svg b/data/styles/clear/style-night/symbols/casino-m.svg index a95fb04bef..d2317d481a 100644 --- a/data/styles/clear/style-night/symbols/casino-m.svg +++ b/data/styles/clear/style-night/symbols/casino-m.svg @@ -1,10 +1,10 @@ casino-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg index fbf9479fc4..645a9c3762 100644 --- a/data/styles/clear/style-night/symbols/cave-m.svg +++ b/data/styles/clear/style-night/symbols/cave-m.svg @@ -1,4 +1,8 @@ - - + cave-m + + + + + diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg index d6f1dfd2b6..1b19a26948 100644 --- a/data/styles/clear/style-night/symbols/cave-s.svg +++ b/data/styles/clear/style-night/symbols/cave-s.svg @@ -1,4 +1,8 @@ - - + cave-s + + + + + diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg index 0d2ad7ffd7..1156d0fa1e 100644 --- a/data/styles/clear/style-night/symbols/cemetery-m.svg +++ b/data/styles/clear/style-night/symbols/cemetery-m.svg @@ -2,8 +2,8 @@ tomb-m - - + + diff --git a/data/styles/clear/style-night/symbols/charging-station-m.svg b/data/styles/clear/style-night/symbols/charging-station-m.svg index 48299fa99b..412a26ff9d 100644 --- a/data/styles/clear/style-night/symbols/charging-station-m.svg +++ b/data/styles/clear/style-night/symbols/charging-station-m.svg @@ -1,10 +1,10 @@ charging-station-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/charging-station-s.svg b/data/styles/clear/style-night/symbols/charging-station-s.svg index 9180e7c0cb..b5a30c6877 100644 --- a/data/styles/clear/style-night/symbols/charging-station-s.svg +++ b/data/styles/clear/style-night/symbols/charging-station-s.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/charity_shop-m.svg b/data/styles/clear/style-night/symbols/charity_shop-m.svg index a8a6d7f917..625f1c8e91 100644 --- a/data/styles/clear/style-night/symbols/charity_shop-m.svg +++ b/data/styles/clear/style-night/symbols/charity_shop-m.svg @@ -1,8 +1,8 @@ shop-m - - + + - + diff --git a/data/styles/clear/style-night/symbols/chemist-m.svg b/data/styles/clear/style-night/symbols/chemist-m.svg index 5b752c9399..90727f869b 100644 --- a/data/styles/clear/style-night/symbols/chemist-m.svg +++ b/data/styles/clear/style-night/symbols/chemist-m.svg @@ -1,10 +1,10 @@ chemist-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/chess-m.svg b/data/styles/clear/style-night/symbols/chess-m.svg index 4fcabb1117..79bcab644c 100644 --- a/data/styles/clear/style-night/symbols/chess-m.svg +++ b/data/styles/clear/style-night/symbols/chess-m.svg @@ -1 +1 @@ - + diff --git a/data/styles/clear/style-night/symbols/chimney-m.svg b/data/styles/clear/style-night/symbols/chimney-m.svg index b40bd347bc..fb28d59345 100644 --- a/data/styles/clear/style-night/symbols/chimney-m.svg +++ b/data/styles/clear/style-night/symbols/chimney-m.svg @@ -41,47 +41,63 @@ id="Page-1" stroke="none" stroke-width="1" + fill="none" fill-rule="evenodd" - fill="#777777" + style="fill:#ffffff;fill-opacity:1;opacity:0.6" transform="matrix(1.3436877,0,0,1.3436877,-3.6630472,-4.1242524)"> + fill="#FFFFFF" + fill-rule="nonzero" + style="fill:#ffffff;fill-opacity:1"> + transform="translate(8,6)" + style="fill:#ffffff;fill-opacity:1"> + points="3.5294118,10.235294 0.70588235,10.235294 0.70588235,9.5294118 3.5294118,9.5294118 " + style="fill:#ffffff;fill-opacity:1" /> + points="2.1176471,12 0.70588235,12 0.70588235,10.941176 2.1176471,10.941176 " + style="fill:#ffffff;fill-opacity:1" /> + id="polygon14692" + points="2.4705882,8.8235294 0.70588235,8.8235294 0.70588235,7.7647059 2.4705882,7.7647059 " + style="fill:#ffffff;fill-opacity:1" /> + points="5.6470588,12 2.8235294,12 2.8235294,10.941176 5.6470588,10.941176 " + style="fill:#ffffff;fill-opacity:1" /> + points="5.6470588,8.8235294 3.1764706,8.8235294 3.1764706,7.7647059 5.6470588,7.7647059 " + style="fill:#ffffff;fill-opacity:1" /> + points="5.6470588,10.235294 4.2352941,10.235294 4.2352941,9.5294118 5.6470588,9.5294118 " + style="fill:#ffffff;fill-opacity:1" /> + points="3.1764706,1.0588235 2.4705882,1.0588235 2.4705882,0.35294118 3.1764706,0.35294118 " + style="fill:#ffffff;fill-opacity:1" /> + points="1.4117647,2.1176471 0.70588235,2.1176471 0.70588235,1.4117647 1.4117647,1.4117647 " + style="fill:#ffffff;fill-opacity:1" /> + points="1.7647059,3.8823529 1.0588235,3.8823529 1.0588235,3.1764706 1.7647059,3.1764706 " + style="fill:#ffffff;fill-opacity:1" /> + points="6.3529412,5.6470588 3.1764706,5.6470588 0,5.6470588 0,7.0588235 3.1764706,7.0588235 6.3529412,7.0588235 " + style="fill:#ffffff;fill-opacity:1" /> + id="path14708" + style="fill:#ffffff;fill-opacity:1" /> diff --git a/data/styles/clear/style-night/symbols/christian-m.svg b/data/styles/clear/style-night/symbols/christian-m.svg index c7fc2a125f..ea1c9877fc 100644 --- a/data/styles/clear/style-night/symbols/christian-m.svg +++ b/data/styles/clear/style-night/symbols/christian-m.svg @@ -1,10 +1,10 @@ christian-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/christian-s.svg b/data/styles/clear/style-night/symbols/christian-s.svg index 52101b0830..158c0aabb6 100644 --- a/data/styles/clear/style-night/symbols/christian-s.svg +++ b/data/styles/clear/style-night/symbols/christian-s.svg @@ -1,10 +1,10 @@ christian-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/clear/style-night/symbols/cinema-m.svg index afc215b3c3..de8b4e203f 100644 --- a/data/styles/clear/style-night/symbols/cinema-m.svg +++ b/data/styles/clear/style-night/symbols/cinema-m.svg @@ -1,10 +1,10 @@ cinema-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/climbing-m.svg b/data/styles/clear/style-night/symbols/climbing-m.svg index 1c2e2a4a5a..b197eb0e45 100644 --- a/data/styles/clear/style-night/symbols/climbing-m.svg +++ b/data/styles/clear/style-night/symbols/climbing-m.svg @@ -2,10 +2,10 @@ climbing-m - - - - + + + + diff --git a/data/styles/clear/style-night/symbols/clothes-m.svg b/data/styles/clear/style-night/symbols/clothes-m.svg index 5f644c653a..a336e08e99 100644 --- a/data/styles/clear/style-night/symbols/clothes-m.svg +++ b/data/styles/clear/style-night/symbols/clothes-m.svg @@ -1,10 +1,10 @@ clothes-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/college-m.svg b/data/styles/clear/style-night/symbols/college-m.svg index 8b45b86d81..67f5187273 100644 --- a/data/styles/clear/style-night/symbols/college-m.svg +++ b/data/styles/clear/style-night/symbols/college-m.svg @@ -1,10 +1,10 @@ college-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/college-s.svg b/data/styles/clear/style-night/symbols/college-s.svg index 6596491b99..cc71f126d9 100644 --- a/data/styles/clear/style-night/symbols/college-s.svg +++ b/data/styles/clear/style-night/symbols/college-s.svg @@ -1,10 +1,10 @@ college-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/computer-m.svg b/data/styles/clear/style-night/symbols/computer-m.svg index 8ce8950c2c..c903c3b742 100644 --- a/data/styles/clear/style-night/symbols/computer-m.svg +++ b/data/styles/clear/style-night/symbols/computer-m.svg @@ -1,6 +1,10 @@ - - - - + computer-m + + + + + + + diff --git a/data/styles/clear/style-night/symbols/copyshop-m.svg b/data/styles/clear/style-night/symbols/copyshop-m.svg index bed631d70a..164c8d9188 100644 --- a/data/styles/clear/style-night/symbols/copyshop-m.svg +++ b/data/styles/clear/style-night/symbols/copyshop-m.svg @@ -1,10 +1,10 @@ copyshop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/cricket-m.svg b/data/styles/clear/style-night/symbols/cricket-m.svg index c0fc6b5373..3f87692bae 100644 --- a/data/styles/clear/style-night/symbols/cricket-m.svg +++ b/data/styles/clear/style-night/symbols/cricket-m.svg @@ -2,11 +2,11 @@ cricket-m - - - - - + + + + + diff --git a/data/styles/clear/style-night/symbols/curling-m.svg b/data/styles/clear/style-night/symbols/curling-m.svg index 839bd6df73..1f3f826ef6 100644 --- a/data/styles/clear/style-night/symbols/curling-m.svg +++ b/data/styles/clear/style-night/symbols/curling-m.svg @@ -2,12 +2,12 @@ curling-m - - - - - - + + + + + + diff --git a/data/styles/clear/style-night/symbols/dentist-m.svg b/data/styles/clear/style-night/symbols/dentist-m.svg index 98eb40e4d5..4625ac4e81 100644 --- a/data/styles/clear/style-night/symbols/dentist-m.svg +++ b/data/styles/clear/style-night/symbols/dentist-m.svg @@ -1,8 +1,10 @@ - - - - - - + + dentist-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/department_store-m.svg b/data/styles/clear/style-night/symbols/department_store-m.svg index 74fa917f05..d2b044a712 100644 --- a/data/styles/clear/style-night/symbols/department_store-m.svg +++ b/data/styles/clear/style-night/symbols/department_store-m.svg @@ -1,10 +1,10 @@ department_store-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/diving-m.svg b/data/styles/clear/style-night/symbols/diving-m.svg index e7a07d4856..71dfc4c6d8 100644 --- a/data/styles/clear/style-night/symbols/diving-m.svg +++ b/data/styles/clear/style-night/symbols/diving-m.svg @@ -2,7 +2,7 @@ diving-m - + diff --git a/data/styles/clear/style-night/symbols/dog_park-m.svg b/data/styles/clear/style-night/symbols/dog_park-m.svg index 078c23c272..edd0c353b3 100644 --- a/data/styles/clear/style-night/symbols/dog_park-m.svg +++ b/data/styles/clear/style-night/symbols/dog_park-m.svg @@ -1,11 +1,10 @@ - - dog_park-m - - - - - - \ No newline at end of file + dog_park-m + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/doityourself-m.svg b/data/styles/clear/style-night/symbols/doityourself-m.svg index 7300d02563..37ec1b25de 100644 --- a/data/styles/clear/style-night/symbols/doityourself-m.svg +++ b/data/styles/clear/style-night/symbols/doityourself-m.svg @@ -1,10 +1,10 @@ doityourself-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/dot-m.svg b/data/styles/clear/style-night/symbols/dot-m.svg index 143cc2df22..77840de3e9 100644 --- a/data/styles/clear/style-night/symbols/dot-m.svg +++ b/data/styles/clear/style-night/symbols/dot-m.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/data/styles/clear/style-night/symbols/driving_school-m.svg b/data/styles/clear/style-night/symbols/driving_school-m.svg index db7a5c20ad..a578135315 100644 --- a/data/styles/clear/style-night/symbols/driving_school-m.svg +++ b/data/styles/clear/style-night/symbols/driving_school-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/dump-station-m.svg b/data/styles/clear/style-night/symbols/dump-station-m.svg index b1da0e8a3d..f9aaa82572 100644 --- a/data/styles/clear/style-night/symbols/dump-station-m.svg +++ b/data/styles/clear/style-night/symbols/dump-station-m.svg @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/data/styles/clear/style-night/symbols/electrician-m.svg b/data/styles/clear/style-night/symbols/electrician-m.svg index 1680830d60..4e29680322 100644 --- a/data/styles/clear/style-night/symbols/electrician-m.svg +++ b/data/styles/clear/style-night/symbols/electrician-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/electronics-m.svg b/data/styles/clear/style-night/symbols/electronics-m.svg index d40fad4898..4d50dae5c9 100644 --- a/data/styles/clear/style-night/symbols/electronics-m.svg +++ b/data/styles/clear/style-night/symbols/electronics-m.svg @@ -1,10 +1,10 @@ electronics-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/elevator.svg b/data/styles/clear/style-night/symbols/elevator.svg index c2e75f6cdc..817792f976 100644 --- a/data/styles/clear/style-night/symbols/elevator.svg +++ b/data/styles/clear/style-night/symbols/elevator.svg @@ -1,5 +1,5 @@ - + diff --git a/data/styles/clear/style-night/symbols/embassy-m.svg b/data/styles/clear/style-night/symbols/embassy-m.svg index 3762a642c2..941c2b8418 100644 --- a/data/styles/clear/style-night/symbols/embassy-m.svg +++ b/data/styles/clear/style-night/symbols/embassy-m.svg @@ -1,10 +1,10 @@ embassy-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/emergency-phone-m.svg b/data/styles/clear/style-night/symbols/emergency-phone-m.svg deleted file mode 100644 index 0a35b1f7ab..0000000000 --- a/data/styles/clear/style-night/symbols/emergency-phone-m.svg +++ /dev/null @@ -1,4 +0,0 @@ - - emergency-phone-m - - diff --git a/data/styles/clear/style-night/symbols/entrance-s.svg b/data/styles/clear/style-night/symbols/entrance-s.svg index 3e43194d5e..4a760265b1 100644 --- a/data/styles/clear/style-night/symbols/entrance-s.svg +++ b/data/styles/clear/style-night/symbols/entrance-s.svg @@ -1,6 +1,4 @@ - - - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/equestrian-m.svg b/data/styles/clear/style-night/symbols/equestrian-m.svg index 0f3d7dbf05..53b90722ca 100644 --- a/data/styles/clear/style-night/symbols/equestrian-m.svg +++ b/data/styles/clear/style-night/symbols/equestrian-m.svg @@ -2,10 +2,10 @@ equestrian-m - - - - + + + + diff --git a/data/styles/clear/style-night/symbols/erotic-m.svg b/data/styles/clear/style-night/symbols/erotic-m.svg index 640e5221e9..e1327a2950 100644 --- a/data/styles/clear/style-night/symbols/erotic-m.svg +++ b/data/styles/clear/style-night/symbols/erotic-m.svg @@ -1,10 +1,10 @@ erotic-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/fastfood-m.svg b/data/styles/clear/style-night/symbols/fastfood-m.svg index 0b7eb09c52..02eb9939a6 100644 --- a/data/styles/clear/style-night/symbols/fastfood-m.svg +++ b/data/styles/clear/style-night/symbols/fastfood-m.svg @@ -1,10 +1,10 @@ fastfood-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/fire_station-m.svg b/data/styles/clear/style-night/symbols/fire_station-m.svg index bf77ea4221..260ae433d1 100644 --- a/data/styles/clear/style-night/symbols/fire_station-m.svg +++ b/data/styles/clear/style-night/symbols/fire_station-m.svg @@ -1,10 +1,10 @@ fire_station-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/florist-m.svg b/data/styles/clear/style-night/symbols/florist-m.svg index 9965fe3c50..f27ff396f1 100644 --- a/data/styles/clear/style-night/symbols/florist-m.svg +++ b/data/styles/clear/style-night/symbols/florist-m.svg @@ -1,10 +1,10 @@ florist-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg b/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg index fbdf3c2d4c..3e56827792 100644 --- a/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg +++ b/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/fuel-m.svg b/data/styles/clear/style-night/symbols/fuel-m.svg index c514fe15ae..01db8e217a 100644 --- a/data/styles/clear/style-night/symbols/fuel-m.svg +++ b/data/styles/clear/style-night/symbols/fuel-m.svg @@ -1,10 +1,10 @@ fuel-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/fuel-s.svg b/data/styles/clear/style-night/symbols/fuel-s.svg index 74fe8e91cd..d4789ba467 100644 --- a/data/styles/clear/style-night/symbols/fuel-s.svg +++ b/data/styles/clear/style-night/symbols/fuel-s.svg @@ -1,10 +1,10 @@ fuel-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/funeral_directors-m.svg b/data/styles/clear/style-night/symbols/funeral_directors-m.svg index 774b14b10e..5481770ef8 100644 --- a/data/styles/clear/style-night/symbols/funeral_directors-m.svg +++ b/data/styles/clear/style-night/symbols/funeral_directors-m.svg @@ -1,10 +1,10 @@ funeral_directors-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/clear/style-night/symbols/funicular-m.svg index 0b244d1f55..56c9697a24 100644 --- a/data/styles/clear/style-night/symbols/funicular-m.svg +++ b/data/styles/clear/style-night/symbols/funicular-m.svg @@ -1,8 +1,10 @@ - - - - - - + + funicular-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/furniture-m.svg b/data/styles/clear/style-night/symbols/furniture-m.svg index 0e305de303..c99d423d60 100644 --- a/data/styles/clear/style-night/symbols/furniture-m.svg +++ b/data/styles/clear/style-night/symbols/furniture-m.svg @@ -1,10 +1,10 @@ furniture-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/gallery-m.svg b/data/styles/clear/style-night/symbols/gallery-m.svg index da1344df69..091c8523ce 100644 --- a/data/styles/clear/style-night/symbols/gallery-m.svg +++ b/data/styles/clear/style-night/symbols/gallery-m.svg @@ -1,10 +1,10 @@ gallery-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/garden_center-m.svg b/data/styles/clear/style-night/symbols/garden_center-m.svg index e23cb3cbcd..8d214942cb 100644 --- a/data/styles/clear/style-night/symbols/garden_center-m.svg +++ b/data/styles/clear/style-night/symbols/garden_center-m.svg @@ -1,10 +1,10 @@ garden_center-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/gate-m.svg b/data/styles/clear/style-night/symbols/gate-m.svg index a7f2400f19..dabb027276 100644 --- a/data/styles/clear/style-night/symbols/gate-m.svg +++ b/data/styles/clear/style-night/symbols/gate-m.svg @@ -1,10 +1,10 @@ gate-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/gift-m.svg b/data/styles/clear/style-night/symbols/gift-m.svg index ef7f0b56e0..9239b91504 100644 --- a/data/styles/clear/style-night/symbols/gift-m.svg +++ b/data/styles/clear/style-night/symbols/gift-m.svg @@ -1,8 +1,10 @@ - - - - - - + + gift-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/golf-m.svg b/data/styles/clear/style-night/symbols/golf-m.svg index 413cdd5396..d9768b80e4 100644 --- a/data/styles/clear/style-night/symbols/golf-m.svg +++ b/data/styles/clear/style-night/symbols/golf-m.svg @@ -2,10 +2,10 @@ golf-m - - - - + + + + diff --git a/data/styles/clear/style-night/symbols/greengrocer-m.svg b/data/styles/clear/style-night/symbols/greengrocer-m.svg index 4d872dfeef..fa16394580 100644 --- a/data/styles/clear/style-night/symbols/greengrocer-m.svg +++ b/data/styles/clear/style-night/symbols/greengrocer-m.svg @@ -1,10 +1,10 @@ greengrocer-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/grocery-m.svg b/data/styles/clear/style-night/symbols/grocery-m.svg index 2ca3b33245..083512e5b3 100644 --- a/data/styles/clear/style-night/symbols/grocery-m.svg +++ b/data/styles/clear/style-night/symbols/grocery-m.svg @@ -1,10 +1,10 @@ grocery-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/guidepost.svg b/data/styles/clear/style-night/symbols/guidepost.svg index d7dafb2cf6..318f4cbc31 100644 --- a/data/styles/clear/style-night/symbols/guidepost.svg +++ b/data/styles/clear/style-night/symbols/guidepost.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/gym-m.svg b/data/styles/clear/style-night/symbols/gym-m.svg index 7df87b7177..5d20f02c7e 100644 --- a/data/styles/clear/style-night/symbols/gym-m.svg +++ b/data/styles/clear/style-night/symbols/gym-m.svg @@ -2,7 +2,7 @@ gym-m - + diff --git a/data/styles/clear/style-night/symbols/hairdresser-m.svg b/data/styles/clear/style-night/symbols/hairdresser-m.svg index 35fe5be74c..90c7b9a462 100644 --- a/data/styles/clear/style-night/symbols/hairdresser-m.svg +++ b/data/styles/clear/style-night/symbols/hairdresser-m.svg @@ -1,8 +1,10 @@ - - - - - - + + hairdresser-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/hand-m.svg b/data/styles/clear/style-night/symbols/hand-m.svg index fa1f052b09..d7034ebfe4 100644 --- a/data/styles/clear/style-night/symbols/hand-m.svg +++ b/data/styles/clear/style-night/symbols/hand-m.svg @@ -1,10 +1,10 @@ hand-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/handball-m.svg b/data/styles/clear/style-night/symbols/handball-m.svg index 853b55cea2..e0cbbc78cf 100644 --- a/data/styles/clear/style-night/symbols/handball-m.svg +++ b/data/styles/clear/style-night/symbols/handball-m.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/clear/style-night/symbols/helipad-m.svg index 4af8f68821..082d131c7f 100644 --- a/data/styles/clear/style-night/symbols/helipad-m.svg +++ b/data/styles/clear/style-night/symbols/helipad-m.svg @@ -1,10 +1,10 @@ helipad-m - + - + diff --git a/data/styles/clear/style-night/symbols/heliport-m.svg b/data/styles/clear/style-night/symbols/heliport-m.svg index 900586624a..854879f5aa 100644 --- a/data/styles/clear/style-night/symbols/heliport-m.svg +++ b/data/styles/clear/style-night/symbols/heliport-m.svg @@ -1,10 +1,10 @@ heliport-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/hindu-m.svg b/data/styles/clear/style-night/symbols/hindu-m.svg index f06b04c136..e07876b7b9 100644 --- a/data/styles/clear/style-night/symbols/hindu-m.svg +++ b/data/styles/clear/style-night/symbols/hindu-m.svg @@ -1,10 +1,10 @@ hindu-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/hindu-s.svg b/data/styles/clear/style-night/symbols/hindu-s.svg index 54ca198c3c..6474d25856 100644 --- a/data/styles/clear/style-night/symbols/hindu-s.svg +++ b/data/styles/clear/style-night/symbols/hindu-s.svg @@ -1,10 +1,10 @@ hindu-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/historic-ship-m.svg b/data/styles/clear/style-night/symbols/historic-ship-m.svg index b7a520d665..c32a7f201f 100644 --- a/data/styles/clear/style-night/symbols/historic-ship-m.svg +++ b/data/styles/clear/style-night/symbols/historic-ship-m.svg @@ -1,6 +1,10 @@ - - - - + historic-ship-m + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hockey-m.svg b/data/styles/clear/style-night/symbols/hockey-m.svg index ad7b9987c3..09f7718901 100644 --- a/data/styles/clear/style-night/symbols/hockey-m.svg +++ b/data/styles/clear/style-night/symbols/hockey-m.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/home-m.svg b/data/styles/clear/style-night/symbols/home-m.svg index 9edad316e8..ba711223e7 100644 --- a/data/styles/clear/style-night/symbols/home-m.svg +++ b/data/styles/clear/style-night/symbols/home-m.svg @@ -1,10 +1,10 @@ home-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/clear/style-night/symbols/hospital-m.svg index d12ea28b3f..9a28975b31 100644 --- a/data/styles/clear/style-night/symbols/hospital-m.svg +++ b/data/styles/clear/style-night/symbols/hospital-m.svg @@ -1,10 +1,10 @@ hospital-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/clear/style-night/symbols/hospital-s.svg index 577871ca29..da44eb73bd 100644 --- a/data/styles/clear/style-night/symbols/hospital-s.svg +++ b/data/styles/clear/style-night/symbols/hospital-s.svg @@ -1,10 +1,10 @@ hospital-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/hostel-m.svg b/data/styles/clear/style-night/symbols/hostel-m.svg index b2a2a37356..3c2a117408 100644 --- a/data/styles/clear/style-night/symbols/hostel-m.svg +++ b/data/styles/clear/style-night/symbols/hostel-m.svg @@ -1,10 +1,10 @@ hostel-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/hotel-m.svg b/data/styles/clear/style-night/symbols/hotel-m.svg index 8cdc773cdf..eb824210f6 100644 --- a/data/styles/clear/style-night/symbols/hotel-m.svg +++ b/data/styles/clear/style-night/symbols/hotel-m.svg @@ -1,10 +1,10 @@ hotel-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/hunting-tower-m.svg b/data/styles/clear/style-night/symbols/hunting-tower-m.svg index 10ad90a3ab..9408dcb61b 100644 --- a/data/styles/clear/style-night/symbols/hunting-tower-m.svg +++ b/data/styles/clear/style-night/symbols/hunting-tower-m.svg @@ -1,10 +1,10 @@ hunting-tower-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/ice_cream-m.svg b/data/styles/clear/style-night/symbols/ice_cream-m.svg index 077fc58f1d..17b9ebfd72 100644 --- a/data/styles/clear/style-night/symbols/ice_cream-m.svg +++ b/data/styles/clear/style-night/symbols/ice_cream-m.svg @@ -1,6 +1,10 @@ - - - - + ice_cream-m + + + + + + + diff --git a/data/styles/clear/style-night/symbols/information-m.svg b/data/styles/clear/style-night/symbols/information-m.svg index 76559bf220..49d3643f56 100644 --- a/data/styles/clear/style-night/symbols/information-m.svg +++ b/data/styles/clear/style-night/symbols/information-m.svg @@ -1,10 +1,10 @@ information-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/internet_cafe-m.svg b/data/styles/clear/style-night/symbols/internet_cafe-m.svg index 43d310397a..5b42b1dd6b 100644 --- a/data/styles/clear/style-night/symbols/internet_cafe-m.svg +++ b/data/styles/clear/style-night/symbols/internet_cafe-m.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/jewelry-m.svg b/data/styles/clear/style-night/symbols/jewelry-m.svg index 7a5fbfd7a1..28d9450752 100644 --- a/data/styles/clear/style-night/symbols/jewelry-m.svg +++ b/data/styles/clear/style-night/symbols/jewelry-m.svg @@ -2,9 +2,9 @@ jewelry-m - + - + diff --git a/data/styles/clear/style-night/symbols/jewish-m.svg b/data/styles/clear/style-night/symbols/jewish-m.svg index c5980a94de..53df48905f 100644 --- a/data/styles/clear/style-night/symbols/jewish-m.svg +++ b/data/styles/clear/style-night/symbols/jewish-m.svg @@ -1,10 +1,10 @@ jewish-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/jewish-s.svg b/data/styles/clear/style-night/symbols/jewish-s.svg index 93178c6421..0733e1a8e2 100644 --- a/data/styles/clear/style-night/symbols/jewish-s.svg +++ b/data/styles/clear/style-night/symbols/jewish-s.svg @@ -1,10 +1,10 @@ jewish-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/clear/style-night/symbols/kindergarten-m.svg index 800ee62258..b031e36388 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-m.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-m.svg @@ -1,10 +1,10 @@ kindergarten-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/kiosk-m.svg b/data/styles/clear/style-night/symbols/kiosk-m.svg index 74b31403be..ff8d04888e 100644 --- a/data/styles/clear/style-night/symbols/kiosk-m.svg +++ b/data/styles/clear/style-night/symbols/kiosk-m.svg @@ -1,10 +1,10 @@ kiosk-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/language_school-m.svg b/data/styles/clear/style-night/symbols/language_school-m.svg index 177c85a56e..42bb2568dd 100644 --- a/data/styles/clear/style-night/symbols/language_school-m.svg +++ b/data/styles/clear/style-night/symbols/language_school-m.svg @@ -1,9 +1,9 @@ - - + + - - + + diff --git a/data/styles/clear/style-night/symbols/laundry-m.svg b/data/styles/clear/style-night/symbols/laundry-m.svg index 19aa3c7ad1..ca8111893d 100644 --- a/data/styles/clear/style-night/symbols/laundry-m.svg +++ b/data/styles/clear/style-night/symbols/laundry-m.svg @@ -1,10 +1,10 @@ laundry-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/lawyer-m.svg b/data/styles/clear/style-night/symbols/lawyer-m.svg index 8328a25076..ecd6e442ca 100644 --- a/data/styles/clear/style-night/symbols/lawyer-m.svg +++ b/data/styles/clear/style-night/symbols/lawyer-m.svg @@ -1,10 +1,10 @@ lawyer-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/library-m.svg b/data/styles/clear/style-night/symbols/library-m.svg index 2a641d4740..f7e1d23601 100644 --- a/data/styles/clear/style-night/symbols/library-m.svg +++ b/data/styles/clear/style-night/symbols/library-m.svg @@ -1,10 +1,10 @@ library-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/lift_gate-m.svg b/data/styles/clear/style-night/symbols/lift_gate-m.svg index 555892210d..9976301ab8 100644 --- a/data/styles/clear/style-night/symbols/lift_gate-m.svg +++ b/data/styles/clear/style-night/symbols/lift_gate-m.svg @@ -1,8 +1,8 @@ lift_gate-m - + - + diff --git a/data/styles/clear/style-night/symbols/lighthouse-m.svg b/data/styles/clear/style-night/symbols/lighthouse-m.svg index 657f4d1c85..43b81dbb58 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-m.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-m.svg @@ -1,10 +1,10 @@ lighthouse-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/lighthouse-s.svg b/data/styles/clear/style-night/symbols/lighthouse-s.svg index 8eef5ffc20..3526e5dd9a 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-s.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-s.svg @@ -1,10 +1,10 @@ lighthouse-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/mail-m.svg b/data/styles/clear/style-night/symbols/mail-m.svg index 518ca49cd7..3f28fe3305 100644 --- a/data/styles/clear/style-night/symbols/mail-m.svg +++ b/data/styles/clear/style-night/symbols/mail-m.svg @@ -1,10 +1,10 @@ mail-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/main_entrance-s.svg b/data/styles/clear/style-night/symbols/main_entrance-s.svg deleted file mode 100644 index 438e0aa3ba..0000000000 --- a/data/styles/clear/style-night/symbols/main_entrance-s.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/styles/clear/style-night/symbols/map.svg b/data/styles/clear/style-night/symbols/map.svg index bb765be676..0e68d4181f 100644 --- a/data/styles/clear/style-night/symbols/map.svg +++ b/data/styles/clear/style-night/symbols/map.svg @@ -8,5 +8,5 @@ - + diff --git a/data/styles/clear/style-night/symbols/marina-m.svg b/data/styles/clear/style-night/symbols/marina-m.svg index a181b727ff..197b552128 100644 --- a/data/styles/clear/style-night/symbols/marina-m.svg +++ b/data/styles/clear/style-night/symbols/marina-m.svg @@ -1,10 +1,10 @@ marina-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/marketplace-m.svg b/data/styles/clear/style-night/symbols/marketplace-m.svg index 5002e9cdd5..62abf204a6 100644 --- a/data/styles/clear/style-night/symbols/marketplace-m.svg +++ b/data/styles/clear/style-night/symbols/marketplace-m.svg @@ -1,10 +1,10 @@ marketplace-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/media-m.svg b/data/styles/clear/style-night/symbols/media-m.svg index 2f80c20bd3..9b4d6bf72d 100644 --- a/data/styles/clear/style-night/symbols/media-m.svg +++ b/data/styles/clear/style-night/symbols/media-m.svg @@ -1,10 +1,10 @@ media-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/media_shop-m.svg b/data/styles/clear/style-night/symbols/media_shop-m.svg index 6567664512..391d9707b6 100644 --- a/data/styles/clear/style-night/symbols/media_shop-m.svg +++ b/data/styles/clear/style-night/symbols/media_shop-m.svg @@ -1,10 +1,10 @@ media_shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg index 29bb7f9e49..ce335e6c81 100644 --- a/data/styles/clear/style-night/symbols/military-m.svg +++ b/data/styles/clear/style-night/symbols/military-m.svg @@ -1,15 +1,14 @@ - military-m - - - - - - - - - - \ No newline at end of file + military-m + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mobile_phone-m.svg b/data/styles/clear/style-night/symbols/mobile_phone-m.svg index d812f585df..4b04793999 100644 --- a/data/styles/clear/style-night/symbols/mobile_phone-m.svg +++ b/data/styles/clear/style-night/symbols/mobile_phone-m.svg @@ -1,10 +1,10 @@ mobile_phone-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/motel-m.svg b/data/styles/clear/style-night/symbols/motel-m.svg index b8ca186be4..70f2342158 100644 --- a/data/styles/clear/style-night/symbols/motel-m.svg +++ b/data/styles/clear/style-night/symbols/motel-m.svg @@ -1,10 +1,10 @@ motel-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg b/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg index 9e84d999e0..0807d07fbd 100644 --- a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg +++ b/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg @@ -1,10 +1,10 @@ motorcycle-parking-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg b/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg index d25e439e9c..5049b1df3e 100644 --- a/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg +++ b/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg @@ -1,10 +1,10 @@ motorcycle_shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/mountain-pass.svg b/data/styles/clear/style-night/symbols/mountain-pass.svg index 725ad9be2e..5b19e1ce2f 100644 --- a/data/styles/clear/style-night/symbols/mountain-pass.svg +++ b/data/styles/clear/style-night/symbols/mountain-pass.svg @@ -1,4 +1,6 @@ - - + mountain-pass + + + diff --git a/data/styles/clear/style-night/symbols/museum-m.svg b/data/styles/clear/style-night/symbols/museum-m.svg index 9e3888a6f7..33c750166a 100644 --- a/data/styles/clear/style-night/symbols/museum-m.svg +++ b/data/styles/clear/style-night/symbols/museum-m.svg @@ -1,10 +1,10 @@ museum-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/museum-s.svg b/data/styles/clear/style-night/symbols/museum-s.svg index 85f15dac31..39c92501de 100644 --- a/data/styles/clear/style-night/symbols/museum-s.svg +++ b/data/styles/clear/style-night/symbols/museum-s.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/music-m.svg b/data/styles/clear/style-night/symbols/music-m.svg index 5f07cac502..42d0386080 100644 --- a/data/styles/clear/style-night/symbols/music-m.svg +++ b/data/styles/clear/style-night/symbols/music-m.svg @@ -1,5 +1,10 @@ - - + + music-m + + + - + + + diff --git a/data/styles/clear/style-night/symbols/music_school-m.svg b/data/styles/clear/style-night/symbols/music_school-m.svg index 4188f849b6..3131fafdec 100644 --- a/data/styles/clear/style-night/symbols/music_school-m.svg +++ b/data/styles/clear/style-night/symbols/music_school-m.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/musical-instrument-m.svg b/data/styles/clear/style-night/symbols/musical-instrument-m.svg deleted file mode 100644 index 1b8b624273..0000000000 --- a/data/styles/clear/style-night/symbols/musical-instrument-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - music-m - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/muslim-m.svg b/data/styles/clear/style-night/symbols/muslim-m.svg index 5230356692..30fbb416fc 100644 --- a/data/styles/clear/style-night/symbols/muslim-m.svg +++ b/data/styles/clear/style-night/symbols/muslim-m.svg @@ -1,10 +1,10 @@ muslim-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/muslim-s.svg b/data/styles/clear/style-night/symbols/muslim-s.svg index 95dd835c2b..ceb4c0332f 100644 --- a/data/styles/clear/style-night/symbols/muslim-s.svg +++ b/data/styles/clear/style-night/symbols/muslim-s.svg @@ -1,10 +1,10 @@ muslim-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/newsagent_shop-m.svg b/data/styles/clear/style-night/symbols/newsagent_shop-m.svg index 68eceae93e..1996c298bc 100644 --- a/data/styles/clear/style-night/symbols/newsagent_shop-m.svg +++ b/data/styles/clear/style-night/symbols/newsagent_shop-m.svg @@ -1,8 +1,10 @@ - - - - - - + + newsagent_shop-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/nightclub-m.svg b/data/styles/clear/style-night/symbols/nightclub-m.svg deleted file mode 100644 index 02300963b4..0000000000 --- a/data/styles/clear/style-night/symbols/nightclub-m.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/styles/clear/style-night/symbols/office-m.svg b/data/styles/clear/style-night/symbols/office-m.svg index 8db0682061..bc083ad77d 100644 --- a/data/styles/clear/style-night/symbols/office-m.svg +++ b/data/styles/clear/style-night/symbols/office-m.svg @@ -1,10 +1,10 @@ office-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/optician-m.svg b/data/styles/clear/style-night/symbols/optician-m.svg index e0a098044f..672cc55737 100644 --- a/data/styles/clear/style-night/symbols/optician-m.svg +++ b/data/styles/clear/style-night/symbols/optician-m.svg @@ -1,10 +1,10 @@ optician-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/optometrist-m.svg b/data/styles/clear/style-night/symbols/optometrist-m.svg deleted file mode 100644 index fa42c92063..0000000000 --- a/data/styles/clear/style-night/symbols/optometrist-m.svg +++ /dev/null @@ -1,9 +0,0 @@ - - optometrist-m - - - - - - - diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-m.svg b/data/styles/clear/style-night/symbols/outdoor-shop-m.svg index b7748080c7..9d57599cfa 100644 --- a/data/styles/clear/style-night/symbols/outdoor-shop-m.svg +++ b/data/styles/clear/style-night/symbols/outdoor-shop-m.svg @@ -1,10 +1,10 @@ outdoor-shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/padel-m.svg b/data/styles/clear/style-night/symbols/padel-m.svg index 6d13387923..4ddfc0ce33 100644 --- a/data/styles/clear/style-night/symbols/padel-m.svg +++ b/data/styles/clear/style-night/symbols/padel-m.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/painter-m.svg b/data/styles/clear/style-night/symbols/painter-m.svg index 9253194849..f77ca41364 100644 --- a/data/styles/clear/style-night/symbols/painter-m.svg +++ b/data/styles/clear/style-night/symbols/painter-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/parking-m.svg b/data/styles/clear/style-night/symbols/parking-m.svg index 83715563bd..15d8bde670 100644 --- a/data/styles/clear/style-night/symbols/parking-m.svg +++ b/data/styles/clear/style-night/symbols/parking-m.svg @@ -1,10 +1,10 @@ parking-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/parking-meter-m.svg b/data/styles/clear/style-night/symbols/parking-meter-m.svg index 7067f65b31..cb104b55e9 100644 --- a/data/styles/clear/style-night/symbols/parking-meter-m.svg +++ b/data/styles/clear/style-night/symbols/parking-meter-m.svg @@ -1,7 +1,7 @@ parking-meter-m - - + + diff --git a/data/styles/clear/style-night/symbols/parking-s.svg b/data/styles/clear/style-night/symbols/parking-s.svg index 14983637c5..ce40d94a3b 100644 --- a/data/styles/clear/style-night/symbols/parking-s.svg +++ b/data/styles/clear/style-night/symbols/parking-s.svg @@ -1,10 +1,10 @@ parking-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/parking_entrance-m.svg b/data/styles/clear/style-night/symbols/parking_entrance-m.svg index 600dd11a82..9e3a3282ff 100644 --- a/data/styles/clear/style-night/symbols/parking_entrance-m.svg +++ b/data/styles/clear/style-night/symbols/parking_entrance-m.svg @@ -1,8 +1,8 @@ parking_entrance-m - + - + @@ -14,11 +14,11 @@ - + - - - + + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-m.svg b/data/styles/clear/style-night/symbols/parking_pay-m.svg index 54b93b9839..d093a26b5f 100644 --- a/data/styles/clear/style-night/symbols/parking_pay-m.svg +++ b/data/styles/clear/style-night/symbols/parking_pay-m.svg @@ -1,10 +1,10 @@ parking_pay-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/peakt-m.svg b/data/styles/clear/style-night/symbols/peakt-m.svg index 2882ea430f..f49b71f8af 100644 --- a/data/styles/clear/style-night/symbols/peakt-m.svg +++ b/data/styles/clear/style-night/symbols/peakt-m.svg @@ -1,4 +1,8 @@ - - + peakt-m + + + + + diff --git a/data/styles/clear/style-night/symbols/peakt-s.svg b/data/styles/clear/style-night/symbols/peakt-s.svg index 230d555877..cbc1de94e6 100644 --- a/data/styles/clear/style-night/symbols/peakt-s.svg +++ b/data/styles/clear/style-night/symbols/peakt-s.svg @@ -1,4 +1,8 @@ - - + peakt-s + + + + + diff --git a/data/styles/clear/style-night/symbols/pelota-m.svg b/data/styles/clear/style-night/symbols/pelota-m.svg index 733b828927..0ec281a558 100644 --- a/data/styles/clear/style-night/symbols/pelota-m.svg +++ b/data/styles/clear/style-night/symbols/pelota-m.svg @@ -1,4 +1,4 @@ - - + + diff --git a/data/styles/clear/style-night/symbols/petshop-m.svg b/data/styles/clear/style-night/symbols/petshop-m.svg index 281a6b90d2..cba3adb026 100644 --- a/data/styles/clear/style-night/symbols/petshop-m.svg +++ b/data/styles/clear/style-night/symbols/petshop-m.svg @@ -1,10 +1,10 @@ petshop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/pharmacy-m.svg b/data/styles/clear/style-night/symbols/pharmacy-m.svg index 5665794dd6..93d1bb072b 100644 --- a/data/styles/clear/style-night/symbols/pharmacy-m.svg +++ b/data/styles/clear/style-night/symbols/pharmacy-m.svg @@ -1,10 +1,10 @@ pharmacy-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/clear/style-night/symbols/phone-m.svg index 48a8279c01..0397ba4571 100644 --- a/data/styles/clear/style-night/symbols/phone-m.svg +++ b/data/styles/clear/style-night/symbols/phone-m.svg @@ -2,7 +2,7 @@ phone-m - + diff --git a/data/styles/clear/style-night/symbols/photo-shop-m.svg b/data/styles/clear/style-night/symbols/photo-shop-m.svg index 4007453635..69e2c83576 100644 --- a/data/styles/clear/style-night/symbols/photo-shop-m.svg +++ b/data/styles/clear/style-night/symbols/photo-shop-m.svg @@ -1,10 +1,10 @@ photo-shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/physiotherapist-m.svg b/data/styles/clear/style-night/symbols/physiotherapist-m.svg index dbbc08694d..8d86174917 100644 --- a/data/styles/clear/style-night/symbols/physiotherapist-m.svg +++ b/data/styles/clear/style-night/symbols/physiotherapist-m.svg @@ -1,7 +1,7 @@ - + physiotherapist-m picnic-m - + - + diff --git a/data/styles/clear/style-night/symbols/picnic_table-m.svg b/data/styles/clear/style-night/symbols/picnic_table-m.svg index 96979ce725..196f052f7b 100644 --- a/data/styles/clear/style-night/symbols/picnic_table-m.svg +++ b/data/styles/clear/style-night/symbols/picnic_table-m.svg @@ -1,8 +1,8 @@ picnic_table-m - + - + diff --git a/data/styles/clear/style-night/symbols/pitch-m.svg b/data/styles/clear/style-night/symbols/pitch-m.svg index 24ab6519c0..86b4ffd625 100644 --- a/data/styles/clear/style-night/symbols/pitch-m.svg +++ b/data/styles/clear/style-night/symbols/pitch-m.svg @@ -2,7 +2,7 @@ pitch-m - + diff --git a/data/styles/clear/style-night/symbols/place-of-worship-m.svg b/data/styles/clear/style-night/symbols/place-of-worship-m.svg index 407d6250b2..03d33f7521 100644 --- a/data/styles/clear/style-night/symbols/place-of-worship-m.svg +++ b/data/styles/clear/style-night/symbols/place-of-worship-m.svg @@ -1,10 +1,10 @@ place-of-worship-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/place-of-worship-s.svg b/data/styles/clear/style-night/symbols/place-of-worship-s.svg index cc287bd1c7..986b150132 100644 --- a/data/styles/clear/style-night/symbols/place-of-worship-s.svg +++ b/data/styles/clear/style-night/symbols/place-of-worship-s.svg @@ -1,10 +1,10 @@ place-of-worship-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/playground-m.svg b/data/styles/clear/style-night/symbols/playground-m.svg index 19aa2d2c44..fba841210e 100644 --- a/data/styles/clear/style-night/symbols/playground-m.svg +++ b/data/styles/clear/style-night/symbols/playground-m.svg @@ -1,3 +1,3 @@ - + diff --git a/data/styles/clear/style-night/symbols/plumber-m.svg b/data/styles/clear/style-night/symbols/plumber-m.svg index 0b61fc632c..1615759254 100644 --- a/data/styles/clear/style-night/symbols/plumber-m.svg +++ b/data/styles/clear/style-night/symbols/plumber-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/podiatrist-m.svg b/data/styles/clear/style-night/symbols/podiatrist-m.svg deleted file mode 100644 index 637967bc96..0000000000 --- a/data/styles/clear/style-night/symbols/podiatrist-m.svg +++ /dev/null @@ -1,9 +0,0 @@ - - podiatrist-m - - - - - - - diff --git a/data/styles/clear/style-night/symbols/police-m.svg b/data/styles/clear/style-night/symbols/police-m.svg index 7c87145856..f31b76e3ef 100644 --- a/data/styles/clear/style-night/symbols/police-m.svg +++ b/data/styles/clear/style-night/symbols/police-m.svg @@ -1,10 +1,10 @@ police-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/postbox-m.svg b/data/styles/clear/style-night/symbols/postbox-m.svg index 482587bcd8..758ed9134a 100644 --- a/data/styles/clear/style-night/symbols/postbox-m.svg +++ b/data/styles/clear/style-night/symbols/postbox-m.svg @@ -2,7 +2,7 @@ postbox-m - + diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/clear/style-night/symbols/power-m.svg index 1a44d93793..50ef83993d 100644 --- a/data/styles/clear/style-night/symbols/power-m.svg +++ b/data/styles/clear/style-night/symbols/power-m.svg @@ -1,4 +1,4 @@ - + diff --git a/data/styles/clear/style-night/symbols/prison-m.svg b/data/styles/clear/style-night/symbols/prison-m.svg index c585de5489..7cffdcdf60 100644 --- a/data/styles/clear/style-night/symbols/prison-m.svg +++ b/data/styles/clear/style-night/symbols/prison-m.svg @@ -1,10 +1,10 @@ prison-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/psychotherapist-m.svg b/data/styles/clear/style-night/symbols/psychotherapist-m.svg deleted file mode 100644 index 56e94187d6..0000000000 --- a/data/styles/clear/style-night/symbols/psychotherapist-m.svg +++ /dev/null @@ -1,13 +0,0 @@ - - psychotherapist-m - - - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/public-building-m.svg b/data/styles/clear/style-night/symbols/public-building-m.svg index 91a797c59d..ebf12d4c32 100644 --- a/data/styles/clear/style-night/symbols/public-building-m.svg +++ b/data/styles/clear/style-night/symbols/public-building-m.svg @@ -1,10 +1,10 @@ public-building-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/recycling-m.svg b/data/styles/clear/style-night/symbols/recycling-m.svg index eb2d00411b..6ddca3d0da 100644 --- a/data/styles/clear/style-night/symbols/recycling-m.svg +++ b/data/styles/clear/style-night/symbols/recycling-m.svg @@ -2,7 +2,7 @@ recycling-m - + diff --git a/data/styles/clear/style-night/symbols/restaurant-m.svg b/data/styles/clear/style-night/symbols/restaurant-m.svg index f5f5e19c32..416b69faca 100644 --- a/data/styles/clear/style-night/symbols/restaurant-m.svg +++ b/data/styles/clear/style-night/symbols/restaurant-m.svg @@ -1,10 +1,10 @@ restaurant-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/sample_collection-m.svg b/data/styles/clear/style-night/symbols/sample_collection-m.svg deleted file mode 100644 index 60191f315d..0000000000 --- a/data/styles/clear/style-night/symbols/sample_collection-m.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/sauna-m.svg b/data/styles/clear/style-night/symbols/sauna-m.svg index 96cbc51597..7660dbe8af 100644 --- a/data/styles/clear/style-night/symbols/sauna-m.svg +++ b/data/styles/clear/style-night/symbols/sauna-m.svg @@ -1,10 +1,10 @@ sauna-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/sawmill-m.svg b/data/styles/clear/style-night/symbols/sawmill-m.svg index f40b136815..be013650a9 100644 --- a/data/styles/clear/style-night/symbols/sawmill-m.svg +++ b/data/styles/clear/style-night/symbols/sawmill-m.svg @@ -1,8 +1,8 @@ - - + + - + diff --git a/data/styles/clear/style-night/symbols/school-m.svg b/data/styles/clear/style-night/symbols/school-m.svg index 39a1c7d269..715fb4364e 100644 --- a/data/styles/clear/style-night/symbols/school-m.svg +++ b/data/styles/clear/style-night/symbols/school-m.svg @@ -1,10 +1,10 @@ school-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/seafood-shop-m.svg b/data/styles/clear/style-night/symbols/seafood-shop-m.svg index da3f0cbf19..e536b0743d 100644 --- a/data/styles/clear/style-night/symbols/seafood-shop-m.svg +++ b/data/styles/clear/style-night/symbols/seafood-shop-m.svg @@ -1,10 +1,10 @@ seafood-shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/second_hand_shop-m.svg b/data/styles/clear/style-night/symbols/second_hand_shop-m.svg index ec2db32830..8b62e7b48d 100644 --- a/data/styles/clear/style-night/symbols/second_hand_shop-m.svg +++ b/data/styles/clear/style-night/symbols/second_hand_shop-m.svg @@ -1,8 +1,8 @@ second_hand-shop-m - - + + - + diff --git a/data/styles/clear/style-night/symbols/shelter-m.svg b/data/styles/clear/style-night/symbols/shelter-m.svg index 5782013edc..d05b8671ef 100644 --- a/data/styles/clear/style-night/symbols/shelter-m.svg +++ b/data/styles/clear/style-night/symbols/shelter-m.svg @@ -1,7 +1,7 @@ shelter-m - + diff --git a/data/styles/clear/style-night/symbols/shinto-m.svg b/data/styles/clear/style-night/symbols/shinto-m.svg index 7a8b8b2cf0..6ede189acb 100644 --- a/data/styles/clear/style-night/symbols/shinto-m.svg +++ b/data/styles/clear/style-night/symbols/shinto-m.svg @@ -1,10 +1,10 @@ shinto-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/shinto-s.svg b/data/styles/clear/style-night/symbols/shinto-s.svg index 1e380ba8d5..091e70c361 100644 --- a/data/styles/clear/style-night/symbols/shinto-s.svg +++ b/data/styles/clear/style-night/symbols/shinto-s.svg @@ -1,10 +1,10 @@ shinto-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/ship-m.svg b/data/styles/clear/style-night/symbols/ship-m.svg index fa7659c913..86d9b36f7a 100644 --- a/data/styles/clear/style-night/symbols/ship-m.svg +++ b/data/styles/clear/style-night/symbols/ship-m.svg @@ -1,10 +1,10 @@ ship-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/ship-s.svg b/data/styles/clear/style-night/symbols/ship-s.svg index dfe10c10b2..d000aa6741 100644 --- a/data/styles/clear/style-night/symbols/ship-s.svg +++ b/data/styles/clear/style-night/symbols/ship-s.svg @@ -1,10 +1,10 @@ ship-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/shoes-m.svg b/data/styles/clear/style-night/symbols/shoes-m.svg index 17198602df..a38be99b2b 100644 --- a/data/styles/clear/style-night/symbols/shoes-m.svg +++ b/data/styles/clear/style-night/symbols/shoes-m.svg @@ -1,10 +1,10 @@ shoes-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg index 95e125119f..4cde9f40b6 100644 --- a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg +++ b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg @@ -1,10 +1,10 @@ shop-bicycle-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/shop-m.svg b/data/styles/clear/style-night/symbols/shop-m.svg index 3ab0cef882..f43bad2852 100644 --- a/data/styles/clear/style-night/symbols/shop-m.svg +++ b/data/styles/clear/style-night/symbols/shop-m.svg @@ -1,10 +1,10 @@ shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/shop-s.svg b/data/styles/clear/style-night/symbols/shop-s.svg index 0fe21b7f4f..29228936af 100644 --- a/data/styles/clear/style-night/symbols/shop-s.svg +++ b/data/styles/clear/style-night/symbols/shop-s.svg @@ -1,10 +1,10 @@ shop-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/shower-m.svg b/data/styles/clear/style-night/symbols/shower-m.svg index 9791fa2324..fae0032f55 100644 --- a/data/styles/clear/style-night/symbols/shower-m.svg +++ b/data/styles/clear/style-night/symbols/shower-m.svg @@ -1,8 +1,8 @@ shower-m - + - + diff --git a/data/styles/clear/style-night/symbols/skateboard-m.svg b/data/styles/clear/style-night/symbols/skateboard-m.svg index 14a52e3328..52e24dba6e 100644 --- a/data/styles/clear/style-night/symbols/skateboard-m.svg +++ b/data/styles/clear/style-night/symbols/skateboard-m.svg @@ -1,3 +1,3 @@ - - + + diff --git a/data/styles/clear/style-night/symbols/skiing-m.svg b/data/styles/clear/style-night/symbols/skiing-m.svg index 64876116c1..39de6d3cd0 100644 --- a/data/styles/clear/style-night/symbols/skiing-m.svg +++ b/data/styles/clear/style-night/symbols/skiing-m.svg @@ -2,7 +2,7 @@ skiing-m - + diff --git a/data/styles/clear/style-night/symbols/soccer-m.svg b/data/styles/clear/style-night/symbols/soccer-m.svg index cd2ebdc62b..310a0a01f5 100644 --- a/data/styles/clear/style-night/symbols/soccer-m.svg +++ b/data/styles/clear/style-night/symbols/soccer-m.svg @@ -1,8 +1,8 @@ soccer-m - + - + diff --git a/data/styles/clear/style-night/symbols/speech_therapist-m.svg b/data/styles/clear/style-night/symbols/speech_therapist-m.svg deleted file mode 100644 index c89fdabefc..0000000000 --- a/data/styles/clear/style-night/symbols/speech_therapist-m.svg +++ /dev/null @@ -1,13 +0,0 @@ - - speech_therapist-m - - - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/sports-m.svg b/data/styles/clear/style-night/symbols/sports-m.svg index 56ea80d154..f02ddf1089 100644 --- a/data/styles/clear/style-night/symbols/sports-m.svg +++ b/data/styles/clear/style-night/symbols/sports-m.svg @@ -1,10 +1,10 @@ sports-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/stadium-m.svg b/data/styles/clear/style-night/symbols/stadium-m.svg index 46906a8501..a3e945bfdd 100644 --- a/data/styles/clear/style-night/symbols/stadium-m.svg +++ b/data/styles/clear/style-night/symbols/stadium-m.svg @@ -1,6 +1,10 @@ - - - - + stadium-m + + + + + + + diff --git a/data/styles/clear/style-night/symbols/stadium-s.svg b/data/styles/clear/style-night/symbols/stadium-s.svg index b0bd3085e8..78baac714c 100644 --- a/data/styles/clear/style-night/symbols/stadium-s.svg +++ b/data/styles/clear/style-night/symbols/stadium-s.svg @@ -1,6 +1,10 @@ - - - - + stadium-s + + + + + + + diff --git a/data/styles/clear/style-night/symbols/stationery_shop-m.svg b/data/styles/clear/style-night/symbols/stationery_shop-m.svg index 1883660683..192f02fca0 100644 --- a/data/styles/clear/style-night/symbols/stationery_shop-m.svg +++ b/data/styles/clear/style-night/symbols/stationery_shop-m.svg @@ -1,8 +1,10 @@ - - - - - - + + stationery_shop-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/storage-tank.svg b/data/styles/clear/style-night/symbols/storage-tank.svg index 9dba8d8047..485858fd7e 100644 --- a/data/styles/clear/style-night/symbols/storage-tank.svg +++ b/data/styles/clear/style-night/symbols/storage-tank.svg @@ -1,6 +1,6 @@ storage-tank - + diff --git a/data/styles/clear/style-night/symbols/subway-bilbao-m.svg b/data/styles/clear/style-night/symbols/subway-bilbao-m.svg deleted file mode 100644 index 7618dd5a40..0000000000 --- a/data/styles/clear/style-night/symbols/subway-bilbao-m.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-bilbao-s.svg b/data/styles/clear/style-night/symbols/subway-bilbao-s.svg deleted file mode 100644 index c5b8fabcff..0000000000 --- a/data/styles/clear/style-night/symbols/subway-bilbao-s.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg index 1621ad1723..34d97573b4 100644 --- a/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg +++ b/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg index 754a22accf..8c813cb28d 100644 --- a/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg +++ b/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg @@ -1,5 +1,11 @@ - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/clear/style-night/symbols/survey_point-m.svg index fce053aa41..f28fbe4e98 100644 --- a/data/styles/clear/style-night/symbols/survey_point-m.svg +++ b/data/styles/clear/style-night/symbols/survey_point-m.svg @@ -1,8 +1,8 @@ survey_point-m - + - + diff --git a/data/styles/clear/style-night/symbols/sweets-m.svg b/data/styles/clear/style-night/symbols/sweets-m.svg index dd46603bc6..9f43a69220 100644 --- a/data/styles/clear/style-night/symbols/sweets-m.svg +++ b/data/styles/clear/style-night/symbols/sweets-m.svg @@ -1,8 +1,10 @@ - - - - - - + + sweets-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/swimming-m.svg b/data/styles/clear/style-night/symbols/swimming-m.svg index fbdab41123..dcb6a0da67 100644 --- a/data/styles/clear/style-night/symbols/swimming-m.svg +++ b/data/styles/clear/style-night/symbols/swimming-m.svg @@ -1,8 +1,8 @@ swimming-m - - + + diff --git a/data/styles/clear/style-night/symbols/table-tennis-m.svg b/data/styles/clear/style-night/symbols/table-tennis-m.svg index fb8efa5677..f617db2238 100644 --- a/data/styles/clear/style-night/symbols/table-tennis-m.svg +++ b/data/styles/clear/style-night/symbols/table-tennis-m.svg @@ -1 +1 @@ - + diff --git a/data/styles/clear/style-night/symbols/taoist-m.svg b/data/styles/clear/style-night/symbols/taoist-m.svg index dc8b668228..87710954fc 100644 --- a/data/styles/clear/style-night/symbols/taoist-m.svg +++ b/data/styles/clear/style-night/symbols/taoist-m.svg @@ -1,10 +1,10 @@ taoist-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/taoist-s.svg b/data/styles/clear/style-night/symbols/taoist-s.svg index d2d9a7d1b7..214a0494a2 100644 --- a/data/styles/clear/style-night/symbols/taoist-s.svg +++ b/data/styles/clear/style-night/symbols/taoist-s.svg @@ -1,10 +1,10 @@ taoist-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/taxi-m.svg b/data/styles/clear/style-night/symbols/taxi-m.svg index 9c4e9d5016..06de4196a9 100644 --- a/data/styles/clear/style-night/symbols/taxi-m.svg +++ b/data/styles/clear/style-night/symbols/taxi-m.svg @@ -1,8 +1,10 @@ - - - - - - + + taxi-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/tennis-m.svg b/data/styles/clear/style-night/symbols/tennis-m.svg index 1153449a78..0fd838319c 100644 --- a/data/styles/clear/style-night/symbols/tennis-m.svg +++ b/data/styles/clear/style-night/symbols/tennis-m.svg @@ -2,10 +2,10 @@ tennis-m - - - - + + + + diff --git a/data/styles/clear/style-night/symbols/theatre-m.svg b/data/styles/clear/style-night/symbols/theatre-m.svg index 1587c6b64e..1ed4c5c802 100644 --- a/data/styles/clear/style-night/symbols/theatre-m.svg +++ b/data/styles/clear/style-night/symbols/theatre-m.svg @@ -1,10 +1,10 @@ theatre-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/theatre-s.svg b/data/styles/clear/style-night/symbols/theatre-s.svg index a5a0d05544..bc47afe177 100644 --- a/data/styles/clear/style-night/symbols/theatre-s.svg +++ b/data/styles/clear/style-night/symbols/theatre-s.svg @@ -1,10 +1,10 @@ theatre-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/theme_park-m.svg b/data/styles/clear/style-night/symbols/theme_park-m.svg index cf13cc4834..29c92b8b58 100644 --- a/data/styles/clear/style-night/symbols/theme_park-m.svg +++ b/data/styles/clear/style-night/symbols/theme_park-m.svg @@ -1,10 +1,10 @@ theme_park-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/theme_park-s.svg b/data/styles/clear/style-night/symbols/theme_park-s.svg index ca3be81166..cbf7e1ca00 100644 --- a/data/styles/clear/style-night/symbols/theme_park-s.svg +++ b/data/styles/clear/style-night/symbols/theme_park-s.svg @@ -1,10 +1,10 @@ theme_park-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/ticket-shop-m.svg b/data/styles/clear/style-night/symbols/ticket-shop-m.svg index b0114d8c10..44ac88b0b9 100644 --- a/data/styles/clear/style-night/symbols/ticket-shop-m.svg +++ b/data/styles/clear/style-night/symbols/ticket-shop-m.svg @@ -1,10 +1,10 @@ ticket-shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/tire-repair-m.svg b/data/styles/clear/style-night/symbols/tire-repair-m.svg index c719aac6d3..aa6a8225b7 100644 --- a/data/styles/clear/style-night/symbols/tire-repair-m.svg +++ b/data/styles/clear/style-night/symbols/tire-repair-m.svg @@ -1,10 +1,10 @@ tire-repair-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/toilets-m.svg b/data/styles/clear/style-night/symbols/toilets-m.svg index e4d782705e..f0363f4306 100644 --- a/data/styles/clear/style-night/symbols/toilets-m.svg +++ b/data/styles/clear/style-night/symbols/toilets-m.svg @@ -1,10 +1,10 @@ toilets-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/toll_booth-m.svg b/data/styles/clear/style-night/symbols/toll_booth-m.svg index a76e7a9a90..234f38bbdd 100644 --- a/data/styles/clear/style-night/symbols/toll_booth-m.svg +++ b/data/styles/clear/style-night/symbols/toll_booth-m.svg @@ -1,10 +1,10 @@ toll_booth-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/toll_booth-s.svg b/data/styles/clear/style-night/symbols/toll_booth-s.svg index 03148250ce..31a2becc20 100644 --- a/data/styles/clear/style-night/symbols/toll_booth-s.svg +++ b/data/styles/clear/style-night/symbols/toll_booth-s.svg @@ -1,10 +1,10 @@ toll_booth-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/clear/style-night/symbols/tomb-m.svg index b880bcabbc..79e5cc1f2c 100644 --- a/data/styles/clear/style-night/symbols/tomb-m.svg +++ b/data/styles/clear/style-night/symbols/tomb-m.svg @@ -2,8 +2,8 @@ tomb-m - - + + diff --git a/data/styles/clear/style-night/symbols/tourism-m.svg b/data/styles/clear/style-night/symbols/tourism-m.svg index 46795d316d..aaebb0e2bd 100644 --- a/data/styles/clear/style-night/symbols/tourism-m.svg +++ b/data/styles/clear/style-night/symbols/tourism-m.svg @@ -1,10 +1,10 @@ tourism-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/tourism-s.svg b/data/styles/clear/style-night/symbols/tourism-s.svg index 3e16642f77..336e7be115 100644 --- a/data/styles/clear/style-night/symbols/tourism-s.svg +++ b/data/styles/clear/style-night/symbols/tourism-s.svg @@ -1,10 +1,10 @@ tourism-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/toys-m.svg b/data/styles/clear/style-night/symbols/toys-m.svg index e63b26d34a..13895afe66 100644 --- a/data/styles/clear/style-night/symbols/toys-m.svg +++ b/data/styles/clear/style-night/symbols/toys-m.svg @@ -1,10 +1,10 @@ toys-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/train-m.svg b/data/styles/clear/style-night/symbols/train-m.svg index 359c01f8c7..eeb9f153f8 100644 --- a/data/styles/clear/style-night/symbols/train-m.svg +++ b/data/styles/clear/style-night/symbols/train-m.svg @@ -1,10 +1,10 @@ train-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/train-s.svg b/data/styles/clear/style-night/symbols/train-s.svg index 61c74c9835..854ad93889 100644 --- a/data/styles/clear/style-night/symbols/train-s.svg +++ b/data/styles/clear/style-night/symbols/train-s.svg @@ -1,10 +1,10 @@ train-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/tram-m.svg b/data/styles/clear/style-night/symbols/tram-m.svg index 23b1edaa35..b964aed68c 100644 --- a/data/styles/clear/style-night/symbols/tram-m.svg +++ b/data/styles/clear/style-night/symbols/tram-m.svg @@ -1,10 +1,10 @@ tram-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/tram-s.svg b/data/styles/clear/style-night/symbols/tram-s.svg index e8c0fc9979..e1bcfd6b88 100644 --- a/data/styles/clear/style-night/symbols/tram-s.svg +++ b/data/styles/clear/style-night/symbols/tram-s.svg @@ -1,10 +1,10 @@ tram-s - + - + - + diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg b/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg index 4d5c3b933e..d6fb0c5cae 100644 --- a/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg +++ b/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg @@ -1,10 +1,10 @@ travel_agency_shop-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/vending-m.svg b/data/styles/clear/style-night/symbols/vending-m.svg index 7e0a0865c4..a0ee4f8a38 100644 --- a/data/styles/clear/style-night/symbols/vending-m.svg +++ b/data/styles/clear/style-night/symbols/vending-m.svg @@ -2,7 +2,7 @@ vending-m - + diff --git a/data/styles/clear/style-night/symbols/veterinary-m.svg b/data/styles/clear/style-night/symbols/veterinary-m.svg index d8c80d134b..5606c74e69 100644 --- a/data/styles/clear/style-night/symbols/veterinary-m.svg +++ b/data/styles/clear/style-night/symbols/veterinary-m.svg @@ -1,10 +1,10 @@ veterinary-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/video-games-m.svg b/data/styles/clear/style-night/symbols/video-games-m.svg deleted file mode 100644 index 2c435b171b..0000000000 --- a/data/styles/clear/style-night/symbols/video-games-m.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/styles/clear/style-night/symbols/viewpoint-m.svg b/data/styles/clear/style-night/symbols/viewpoint-m.svg index 9950cc587c..0ec816a351 100644 --- a/data/styles/clear/style-night/symbols/viewpoint-m.svg +++ b/data/styles/clear/style-night/symbols/viewpoint-m.svg @@ -1,9 +1,10 @@ - - viewpoint-m - - - - - \ No newline at end of file + viewpoint-m + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/viewpoint-s.svg b/data/styles/clear/style-night/symbols/viewpoint-s.svg index 420aa3aa9a..0ceb3d399a 100644 --- a/data/styles/clear/style-night/symbols/viewpoint-s.svg +++ b/data/styles/clear/style-night/symbols/viewpoint-s.svg @@ -1,9 +1,10 @@ - viewpoint-s - - - - - - \ No newline at end of file + viewpoint-s + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/volcano-m.svg b/data/styles/clear/style-night/symbols/volcano-m.svg index 87d0205abf..541cff157d 100644 --- a/data/styles/clear/style-night/symbols/volcano-m.svg +++ b/data/styles/clear/style-night/symbols/volcano-m.svg @@ -1,4 +1,11 @@ - - + volcano-m + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/volcano-s.svg b/data/styles/clear/style-night/symbols/volcano-s.svg index 546002bf46..b47ff9cee2 100644 --- a/data/styles/clear/style-night/symbols/volcano-s.svg +++ b/data/styles/clear/style-night/symbols/volcano-s.svg @@ -1,4 +1,11 @@ - - + volcano-s + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/volleyball-m.svg b/data/styles/clear/style-night/symbols/volleyball-m.svg index 7efadedce5..bb09145cb6 100644 --- a/data/styles/clear/style-night/symbols/volleyball-m.svg +++ b/data/styles/clear/style-night/symbols/volleyball-m.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/data/styles/clear/style-night/symbols/waste-basket-m.svg b/data/styles/clear/style-night/symbols/waste-basket-m.svg index 815151089f..405d52c082 100644 --- a/data/styles/clear/style-night/symbols/waste-basket-m.svg +++ b/data/styles/clear/style-night/symbols/waste-basket-m.svg @@ -1,7 +1,7 @@ waste-basket-m - - + + diff --git a/data/styles/clear/style-night/symbols/waste-basket-s.svg b/data/styles/clear/style-night/symbols/waste-basket-s.svg index ef391a955f..bb771ffd6e 100644 --- a/data/styles/clear/style-night/symbols/waste-basket-s.svg +++ b/data/styles/clear/style-night/symbols/waste-basket-s.svg @@ -1,7 +1,7 @@ waste-basket-s - - + + diff --git a/data/styles/clear/style-night/symbols/windmill-m.svg b/data/styles/clear/style-night/symbols/windmill-m.svg index 416ef2029b..630424a5c8 100644 --- a/data/styles/clear/style-night/symbols/windmill-m.svg +++ b/data/styles/clear/style-night/symbols/windmill-m.svg @@ -1,10 +1,10 @@ windmill-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/yoga-m.svg b/data/styles/clear/style-night/symbols/yoga-m.svg index 8b459bedb0..71f8524bc3 100644 --- a/data/styles/clear/style-night/symbols/yoga-m.svg +++ b/data/styles/clear/style-night/symbols/yoga-m.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/data/styles/clear/style-night/symbols/zoo-m.svg b/data/styles/clear/style-night/symbols/zoo-m.svg index 09a9b3cf90..89aff4d643 100644 --- a/data/styles/clear/style-night/symbols/zoo-m.svg +++ b/data/styles/clear/style-night/symbols/zoo-m.svg @@ -1,10 +1,10 @@ zoo-m - + - + - + diff --git a/data/styles/clear/style-night/symbols/zoo-s.svg b/data/styles/clear/style-night/symbols/zoo-s.svg index a14f9dad3b..c5872e4042 100644 --- a/data/styles/clear/style-night/symbols/zoo-s.svg +++ b/data/styles/clear/style-night/symbols/zoo-s.svg @@ -1,10 +1,10 @@ zoo-s - + - + - + diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index aa7f6ae829..9b7e475284 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -57,6 +57,14 @@ area[landuse=railway], area[landuse=quarry] {z-index: 3;} +area[leisure=pitch], +area[leisure=stadium], +area[leisure=playground], +area[sport=multi], +area[sport=soccer], +{z-index: 5;} + + area[landuse=forest], area[leisure=nature_reserve] {z-index: 30;} @@ -65,14 +73,6 @@ area[leisure=park], area[leisure=garden] {z-index: 40;} -/* Should be greater than leisure=park */ -area[leisure=pitch], -area[leisure=stadium], -area[leisure=playground], -area[sport=multi], -area[sport=soccer], -{z-index: 41;} - area[landuse=farmland], area[landuse=allotments], area[natural=scrub], @@ -475,22 +475,22 @@ area|z16-[landuse=cemetery] area|z10[aeroway=aerodrome][aerodrome=international], area|z10[aeroway=aerodrome], -{fill-color: @aerodrome0;} +{fill-color: @aerodrome0;fill-opacity: 1;} area|z11[aeroway=aerodrome][aerodrome=international], area|z11[aeroway=aerodrome], -{fill-color: @aerodrome1;} +{fill-color: @aerodrome1;fill-opacity: 1;} area|z12-[aeroway=aerodrome][aerodrome=international], area|z12-[aeroway=aerodrome] -{fill-color: @aerodrome2;} +{fill-color: @aerodrome2;fill-opacity: 1;} area|z13[aeroway=aerodrome][aerodrome=international], area|z13[aeroway=aerodrome] -{fill-color: @aerodrome3;} +{fill-color: @aerodrome3;fill-opacity: 1;} area|z14[aeroway=aerodrome][aerodrome=international], area|z14[aeroway=aerodrome] -{fill-color: @aerodrome4;} +{fill-color: @aerodrome4;fill-opacity: 1;} area|z15-19[aeroway=aerodrome][aerodrome=international], area|z15-19[aeroway=aerodrome] -{fill-color: @aerodrome5;} +{fill-color: @aerodrome5; fill-opacity: 1;} /* 7.7 Religion */ area|z15-[landuse=churchyard] diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index cc41f221b3..1ac4a3e6af 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -38,6 +38,7 @@ area[amenity], area[man_made], {-x-me-min-text-priority: 15300;} +node|z17-[leisure], node[amenity=marketplace], area[amenity=marketplace] {z-index: 6;} @@ -153,6 +154,8 @@ area[amenity=bus_station], node[tourism=viewpoint] {z-index: 3050;} +area[aeroway=aerodrome], +node[aeroway=aerodrome], node[amenity=parking], area[amenity=parking], node[railway=station], @@ -248,15 +251,11 @@ node|z17-[railway=tram_stop]::int_name, area|z17-[railway=tram_stop]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} -area|z10-[aeroway=aerodrome][aerodrome=international], -node|z10-[aeroway=aerodrome][aerodrome=international], -area|z14-[aeroway=aerodrome], -node|z14-[aeroway=aerodrome], +area|z10-[aeroway=aerodrome], +node|z10-[aeroway=aerodrome], {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} -area|z12-[aeroway=aerodrome][aerodrome=international]::int_name, -node|z12-[aeroway=aerodrome][aerodrome=international]::int_name, -area|z14-[aeroway=aerodrome]::int_name, -node|z14-[aeroway=aerodrome]::int_name, +area|z12-[aeroway=aerodrome]::int_name, +node|z12-[aeroway=aerodrome]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} /* 3.1 Train Station */ @@ -318,22 +317,34 @@ area|z18-[railway=tram_stop] /* 3.6 Airport */ +/* Manually define priority to avoid city names displacement */ area|z7-9[aeroway=aerodrome][aerodrome=international], node|z7-9[aeroway=aerodrome][aerodrome=international], -{icon-image: airport-s.svg;} +{ icon-image: airport-s.svg; -x-me-icon-priority: 10000 } area|z10[aeroway=aerodrome][aerodrome=international], node|z10[aeroway=aerodrome][aerodrome=international], -{icon-image: airport-s.svg;text-offset: 1;font-size: 10;} -area|z11-13[aeroway=aerodrome][aerodrome=international], -node|z11-13[aeroway=aerodrome][aerodrome=international], -{icon-image: airport-m.svg; text-offset: 1; font-size: 11;} -area|z14-[aeroway=aerodrome], -node|z14-[aeroway=aerodrome] +{icon-image: airport-s.svg;text-offset: 1;font-size: 10;fill-opacity: 1;} +area|z11-14[aeroway=aerodrome][aerodrome=international], +node|z11-14[aeroway=aerodrome][aerodrome=international], +area|z12-14[aeroway=aerodrome], +node|z12-14[aeroway=aerodrome], +{icon-image: airport-m.svg;text-offset: 1;font-size: 11;-x-me-icon-priority: 3100;} +area|z12-14[aeroway=aerodrome]::int_name, +node|z12-14[aeroway=aerodrome]::int_name, +{font-size: 10;} +area|z15-16[aeroway=aerodrome], +node|z15-16[aeroway=aerodrome], {icon-image: airport-m.svg;text-offset: 1;font-size: 12;} -area|z14-[aeroway=aerodrome]::int_name, -node|z14-[aeroway=aerodrome]::int_name, +area|z15-16[aeroway=aerodrome]::int_name, +node|z15-16[aeroway=aerodrome]::int_name, {font-size: 11;} +area|z17-[aeroway=aerodrome], +node|z17-[aeroway=aerodrome], +{icon-image: airport-m.svg;text-offset: 1;font-size: 13;} +area|z17-[aeroway=aerodrome]::int_name, +node|z17-[aeroway=aerodrome]::int_name, +{font-size: 12;} area|z17-[aeroway=heliport], node|z17-[aeroway=heliport], diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 9af5696c92..c99b52f786 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -394,38 +394,38 @@ line|z15-[highway=trunk_link][tunnel?] line|z13[highway=motorway][bridge?]::bridgewhite, line|z13[highway=trunk][bridge?]::bridgewhite -{casing-width-add: 0.2;} +{casing-width: eval(prop("width")+0.2);} line|z14-16[highway=motorway][bridge?]::bridgewhite, line|z14-16[highway=trunk][bridge?]::bridgewhite, line|z14-16[highway=motorway_link][bridge?]::bridgewhite, line|z14-16[highway=trunk_link][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=motorway][bridge?]::bridgewhite, line|z17[highway=trunk][bridge?]::bridgewhite, line|z17[highway=motorway_link][bridge?]::bridgewhite, line|z17[highway=trunk_link][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=motorway][bridge?]::bridgewhite, line|z18-[highway=trunk][bridge?]::bridgewhite, line|z18-[highway=motorway_link][bridge?]::bridgewhite, line|z18-[highway=trunk_link][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z13-16[highway=motorway][bridge?]::bridgeblack, line|z13-16[highway=trunk][bridge?]::bridgeblack, line|z14-16[highway=motorway_link][bridge?]::bridgeblack, line|z14-16[highway=trunk_link][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=motorway][bridge?]::bridgeblack, line|z17[highway=trunk][bridge?]::bridgeblack, line|z17[highway=motorway_link][bridge?]::bridgeblack, line|z17[highway=trunk_link][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=motorway][bridge?]::bridgeblack, line|z18-[highway=trunk][bridge?]::bridgeblack, line|z18-[highway=motorway_link][bridge?]::bridgeblack, line|z18-[highway=trunk_link][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 4.PRIMARY 8-22 ZOOM */ @@ -496,23 +496,23 @@ line|z15-[highway=primary_link][tunnel?] line|z14-16[highway=primary][bridge?]::bridgewhite, line|z14-16[highway=primary_link][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=primary][bridge?]::bridgewhite, line|z17[highway=primary_link][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=primary][bridge?]::bridgewhite, line|z18-[highway=primary_link][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=primary][bridge?]::bridgeblack, line|z14-16[highway=primary_link][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=primary][bridge?]::bridgeblack, line|z17[highway=primary_link][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=primary][bridge?]::bridgeblack, line|z18-[highway=primary_link][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 5.SECONDARY 10-22 ZOOM */ @@ -571,23 +571,23 @@ line|z18-[highway=secondary_link][tunnel?] line|z14-16[highway=secondary][bridge?]::bridgewhite, line|z14-16[highway=secondary_link][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=secondary][bridge?]::bridgewhite, line|z17[highway=secondary_link][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=secondary][bridge?]::bridgewhite, line|z18-[highway=secondary_link][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=secondary][bridge?]::bridgeblack, line|z14-16[highway=secondary_link][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=secondary][bridge?]::bridgeblack, line|z17[highway=secondary_link][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=secondary][bridge?]::bridgeblack, line|z18-[highway=secondary_link][bridge?]::bridgeblack -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 6.RESIDENTAL & TERTIARY 11-22 ZOOM */ @@ -673,28 +673,28 @@ line|z16-[highway=residential_link][tunnel?], line|z14-16[highway=tertiary][bridge?]::bridgewhite, line|z14-16[highway=tertiary_link][bridge?]::bridgewhite, line|z14-16[highway=residential][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=tertiary][bridge?]::bridgewhite, line|z17[highway=tertiary_link][bridge?]::bridgewhite, line|z17[highway=residential][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=tertiary][bridge?]::bridgewhite, line|z18-[highway=tertiary_link][bridge?]::bridgewhite, line|z18-[highway=residential][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=tertiary][bridge?]::bridgeblack, line|z14-16[highway=tertiary_link][bridge?]::bridgeblack, line|z14-16[highway=residential][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=tertiary][bridge?]::bridgeblack, line|z17[highway=tertiary_link][bridge?]::bridgeblack, line|z17[highway=residential][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=tertiary][bridge?]::bridgeblack, line|z18-[highway=tertiary_link][bridge?]::bridgeblack, line|z18-[highway=residential][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM */ @@ -761,18 +761,18 @@ line|z16-[highway=living_street][tunnel?], /* 7.3 Road, Street, Unclassified bridge 14-22 ZOOM */ line|z14-16[highway=unclassified][bridge?]::bridgewhite, -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z17[highway=unclassified][bridge?]::bridgewhite, -{casing-width-add: 0.8;} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=unclassified][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=unclassified][bridge?]::bridgeblack, -{casing-width-add: 0.4;} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=unclassified][bridge?]::bridgeblack, -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=unclassified][bridge?]::bridgeblack, -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} /* 7.4 Service 15-22 ZOOM */ @@ -848,26 +848,26 @@ line|z19-[highway=ford] /*line|z13[highway=pedestrian][bridge?]::bridgewhite, line|z13[highway=footway][bridge?]::bridgewhite, -{casing-width: eval(prop("width")-0.2;} +{casing-width: eval(prop("width")-0.2);} line|z14-[highway=pedestrian][bridge?]::bridgewhite, line|z14-[highway=footway][bridge?]::bridgewhite, line|z16-[highway=steps][bridge?]::bridgewhite, line|z16-[highway=road][bridge?]::bridgewhite, line|z16-[highway=service][bridge?]::bridgewhite -{casing-width-add: 0;} +{casing-width: eval(prop("width"));} line|z16-[highway=pedestrian][bridge?]::bridgewhite, line|z16-[highway=footway][bridge?]::bridgewhite -{casing-width-add: 0.2;} +{casing-width: eval(prop("width")+0.2);} line|z14-[highway=pedestrian][bridge?]::bridgeblack, line|z14-[highway=footway][bridge?]::bridgeblack, line|z16-[highway=steps][bridge?]::bridgeblack, line|z16-[highway=road][bridge?]::bridgeblack, line|z16-[highway=service][bridge?]::bridgeblack -{casing-width-add: 0.2;} +{casing-width: eval(prop("width")+0.2);} line|z16-[highway=pedestrian][bridge?]::bridgeblack, line|z16-[highway=footway][bridge?]::bridgeblack, -{casing-width-add: 0.6;}*/ +{casing-width: eval(prop("width")+0.6);}*/ /* 8.4 Cycleway 13-22 ZOOM */ @@ -939,7 +939,7 @@ line|z19-[psurface=unpaved_bad] {width: 4;dashes: 6.3,2.7;} -line|z16-[highway=track], +line|z16[highway=track], {color: @track; opacity: 1; width: 1.1; dashes: 6,2.5;} line|z17[highway=track], {width: 1.4; dashes: 6,2.5;} @@ -949,9 +949,9 @@ line|z19-[highway=track], {width: 2.5; dashes: 7,3;} -line|z17-[highway=path], -line|z17-[route=hiking], -line|z17-[highway=footway][sac_scale], +line|z17[highway=path], +line|z17[route=hiking], +line|z17[highway=footway][sac_scale], {color: @path; opacity: 1; width: 0.9; dashes: 3.5,2;} line|z18[highway=path], line|z18[route=hiking], @@ -1118,46 +1118,33 @@ line|z14-[railway=yard][tunnel?] /* 9.3 Rail bridge 14-22 ZOOM */ -/* TODO - remove following rules - add casing-color and z-index definitions - to test these new bridge styles -*/ -line|z14-[railway=tram][bridge?]::bridgewhite, -line|z14-[railway=monorail][bridge?]::bridgewhite, -line|z14-[railway=narrow_gauge][bridge?]::bridgewhite, -line|z14-[railway=tram][bridge?]::bridgeblack, -line|z14-[railway=monorail][bridge?]::bridgeblack, -line|z14-[railway=narrow_gauge][bridge?]::bridgeblack, -{casing-linecap: round;} - line|z14-15[railway][bridge?]::bridgewhite, -{casing-width-add: 1;} +{casing-width: eval(prop("width")+1);} line|z16[railway][bridge?]::bridgewhite, -{casing-width-add: 1.2;} +{casing-width: eval(prop("width")+1.2);} line|z17-[railway][bridge?]::bridgewhite, -{casing-width-add: 1.4;} +{casing-width: eval(prop("width")+1.4);} line|z18-[railway=rail][bridge?]::bridgewhite, line|z18-[railway=subway][bridge?]::bridgewhite, line|z18-[railway=light_rail][bridge?]::bridgewhite, line|z18-[railway=yard][bridge?]::bridgewhite -{casing-width-add: 2;} +{casing-width: eval(prop("width")+2);} line|z16[railway=rail][bridge?]::bridgeblack, line|z16[railway=subway][bridge?]::bridgeblack, line|z16[railway=light_rail][bridge?]::bridgeblack , line|z16[railway=yard][bridge?]::bridgeblack , -{casing-width-add: 1.4;} +{casing-width: eval(prop("width")+1.4);} line|z17-[railway=rail][bridge?]::bridgeblack, line|z17-[railway=subway][bridge?]::bridgeblack, line|z17-[railway=light_rail][bridge?]::bridgeblack, line|z17-[railway=yard][bridge?]::bridgeblack -{casing-width-add: 1.6;} +{casing-width: eval(prop("width")+1.6);} line|z18-[railway=rail][bridge?]::bridgeblack, line|z18-[railway=subway][bridge?]::bridgeblack, line|z18-[railway=light_rail][bridge?]::bridgeblack, line|z18-[railway=yard][bridge?]::bridgeblack -{casing-width-add: 2.2;} +{casing-width: eval(prop("width")+2.2);} /* 9.4 Monorail 14-22 ZOOM */ diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss index 69c025afc9..1cb79e5da1 100644 --- a/data/styles/vehicle/style-night/style.mapcss +++ b/data/styles/vehicle/style-night/style.mapcss @@ -23,7 +23,7 @@ colors GuiText-opacity: 0.7; MyPositionAccuracy-color: #FFFFFF; MyPositionAccuracy-opacity: 0.06; - Selection-color: #FFFFFF; + Selection-color: #4BB9E6; Selection-opacity: 0.64; Route-color: #0087FF; RouteOutline-color: #055FCD; diff --git a/data/kml_test_data/test.kmz b/data/test.kmz similarity index 100% rename from data/kml_test_data/test.kmz rename to data/test.kmz diff --git a/data/types.txt b/data/types.txt index 4d06f72ea2..61dac08b5c 100644 --- a/data/types.txt +++ b/data/types.txt @@ -416,14 +416,14 @@ mapswithme *highway|motorway|tunnel *railway|light_rail|tunnel *area:highway|service -*healthcare|alternative -*healthcare|audiologist -*healthcare|blood_donation -*healthcare|optometrist +mapswithme +mapswithme +mapswithme +mapswithme *highway|road|tunnel *sport|archery -*healthcare|podiatrist -*healthcare|psychotherapist +mapswithme +mapswithme *highway|ford *area:highway|path *railway|siding @@ -432,10 +432,10 @@ mapswithme *railway|funicular *amenity|waste_transfer_station *historic|battlefield -*healthcare|sample_collection +mapswithme *sport|australian_football -*leisure|bowling_alley -*healthcare|speech_therapist +mapswithme +mapswithme mapswithme mapswithme *aerialway|t-bar @@ -854,10 +854,10 @@ mapswithme mapswithme mapswithme *mapswithme|grid -*highway|service|busway -*highway|busway -*highway|busway|bridge -*highway|busway|tunnel +mapswithme +mapswithme +mapswithme +mapswithme landuse|salt_pond mapswithme mapswithme @@ -880,7 +880,7 @@ mapswithme *area:highway|trunk mapswithme *entrance -*entrance|main +mapswithme mapswithme *tourism|artwork railway|subway|tunnel @@ -1402,7 +1402,7 @@ amenity|recycling|container *railway|station|subway|lille *railway|station|subway|lima *railway|station|subway|lisboa -*railway|station|subway|bilbao +mapswithme *railway|station|subway|lyon *railway|station|subway|malaga *railway|station|subway|manila diff --git a/data/visibility.txt b/data/visibility.txt index 8107c6050d..e3560119d1 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -338,20 +338,10 @@ world 00000000000000000000 + fire_hydrant 00000000000000000000 - phone 00000000000000000000 - {} - entrance 00000000000000000000 + - main 00000000000000000000 - - {} + entrance 00000000000000000000 - healthcare 00000000000000000000 + - alternative 00000000000000000000 - - audiologist 00000000000000000000 - - blood_donation 00000000000000000000 - laboratory 00000000000000000000 - - optometrist 00000000000000000000 - physiotherapist 00000000000000000000 - - podiatrist 00000000000000000000 - - psychotherapist 00000000000000000000 - - sample_collection 00000000000000000000 - - speech_therapist 00000000000000000000 - {} highway 00000000000000000000 + bridleway 00000000000000000000 + @@ -360,10 +350,6 @@ world 00000000000000000000 + tunnel 00000000000000000000 - {} bus_stop 00000000000000000000 - - busway 00000000000000000000 + - bridge 00000000000000000000 - - tunnel 00000000000000000000 - - {} construction 00000000000001111111 - cycleway 00000000000000000000 + bridge 00000000000000000000 - @@ -445,7 +431,6 @@ world 00000000000000000000 + service 00000000000000111111 + area 00000000000000111111 - bridge 00000000000000111111 - - busway 00000000000000111111 - driveway 00000000000000101111 - parking_aisle 00000000000000111111 - tunnel 00000000000000111111 - @@ -600,7 +585,6 @@ world 00000000000000000000 + {} leisure 00000000000000000000 + beach_resort 00000000001111111111 - - bowling_alley 00000000000000000000 - common 00000000000000000000 - dance 00000000000000000000 - dog_park 00000000000000000000 - @@ -849,7 +833,6 @@ world 00000000000000000000 + beijing 00000000000001111111 - bengalore 00000000000001111111 - berlin 00000000000001111111 - - bilbao 00000000000001111111 - brasilia 00000000000001111111 - brescia 00000000000001111111 - brussels 00000000000001111111 - diff --git a/docs/ANDROID_LOCATION_TEST.md b/docs/ANDROID_LOCATION_TEST.md deleted file mode 100644 index c88e142565..0000000000 --- a/docs/ANDROID_LOCATION_TEST.md +++ /dev/null @@ -1,102 +0,0 @@ -# Android Location Test Cases - -This document describes manual testing flows to validate location -implementation on Android. - -0. Initial start - -- Remove the app with all data and install it again; -- Enable Wi-Fi and Location (normal behavior); -- Start the app and ensure that system dialog about location permissions - appears on the top of splash screen; -- Grant "Precise" or "Approximately" (doesn't matter) permissions - for "Only this time". -- [fdroid only] Initial map download dialog should appear and suggest to - download map of your area (a check box); -- The main map screen should start with cool animation to your current location. - -1. GPS cold start - -- Disable Wi-Fi, disable Cellular Data, enable Location; -- Get under a roof and away from the open sky and any windows; -- Restart device, start the app, and wait 30 seconds until - "Continue detecting your current location?" appears; -- Don't tap any buttons in the dialog - the search for a location - should continue in the background until "Stop" is explicitly taped; -- Go out to have the open sky and wait 1-5 minutes GPS to find satellites - without locking device and switching to another apps. -- "Continue detecting your current location?" should disappear - automatically when location is found; -- The screen should be automatically on all the time during the process. - -This test-case should work with the same behavior regardless of - "Google Play Services" option in the app settings. - -2. Location disabled by user - -- Follow instructions from (1) until the dialog appears, - but press "Stop" button in the dialog; -- Check that location icon is crossed out; -- Switch to some other app and back; -- Check that location icon is crossed out; -- Kill the app and start it again; -- Check that location icon is crossed out; -- Tap on location icon; -- Ensure that location search has started; -- Wait until location is found under the open sky. - -This test-case should work with the same behavior regardless of - "Google Play Services" option in the app settings. - -3. Google location dialog (positive case) - -- Use Google flavor and enable Google Play Location in the app settings; -- Disable Wi-Fi, disable Cellular Data, disable Location; -- Start the app and initiate location search by tapping on location button; -- "For better experiences..." Google dialog should appear immediately; -- Tap "Enable" in the dialog and it should enable Location in the system; -- Location should start working as in (1) case. - -4. Google location dialog (negative case) - -- Try the same steps as in (3), but tap "No thanks" button in the dialog. -- Check that location icon is crossed out immediately; -- "For better experiences..." Google dialog should appear; -- Tap "No thanks" button again; -- Check that location icon is crossed out immediately; -- Switch to some other app and back; -- Check that location icon is still crossed out and - "For better experiences..." dialog doesn't appear automatically; -- Kill the app and start it again; -- Check that location icon is still crossed out and - "For better experiences..." dialog doesn't appear automatically; -- Tap on location button - "For better experiences..." dialog - should re-appear again. - -5. OM location dialog (negative case) - -- Use non-Google flavor or disable Google Play Location in the app settings; -- Disable Wi-Fi, disable Cellular Data, disable Location; -- Start the app and initiate location search by tapping on location button; -- "Please enable Location Services" information dialog should appear; -- Check that location icon is crossed out immediately; -- Switch to some other app and back; -- Check that location icon is still crossed out and - "Please enable Location Services" dialog doesn't appear automatically; -- Kill the app and start it again; -- Check that location icon is still crossed out and - "Please enable Location Services" dialog doesn't appear automatically; -- Tap on location button - "Please enable Location Services" dialog - should re-appear again. - -6. Location disabled when app is running - -- Disable Wi-Fi, disable Cellular Data, enable Location; -- Get location acquired in the app (the blue location arrow); -- Disable system Location by swiping down from Android's menu bar - to disable location via "Quick settings" panel WITHOUT switching - to Settings or any other apps; -- "Please enable Location Services" or "For better experiences..." - dialog should appear immediately, depending in Google Play Service - availability; -- Further taps on location button will lead to (4) or (5). diff --git a/docs/INSTALL.md b/docs/INSTALL.md index a53d9bb0c6..d625a84a4e 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -16,7 +16,7 @@ For _Windows_ you need to have [Git for Windows](https://git-scm.com/download/wi First of all get the source code. The full Organic Maps sources repository is ~8.5Gb in size, there are various [clone options](#special-cases-options) to reduce download size to suit your needs. -For _Windows_, enable [symlinks](https://git-scm.com/docs/git-config#Documentation/git-config.txt-coresymlinks) support in git first. The easiest way is to reinstall the latest [Git for Windows](https://gitforwindows.org/) with the "Enable Symlinks" checkbox checked. If you don't want to reinstall Git, then you can add `-c core.symlinks=true` parameter to the clone command below to enable symlinks for the repository. +For _Windows 10_ enable [symlinks](https://git-scm.com/docs/git-config#Documentation/git-config.txt-coresymlinks) support in git first: ```bash git config --global core.symlinks true @@ -68,9 +68,12 @@ Check `./configure.sh --help` to see how to copy the configs automatically from ### Preparing -You need a Linux or a Mac machine to build a desktop version of Organic Maps. [Windows](#windows) users can use the [WSL](https://learn.microsoft.com/en-us/windows/wsl/) (Windows Subsystem for Linux) and follow ["Linux or Mac"](#linux-or-mac) steps described below. +You need a Linux or a Mac machine to build a desktop version of Organic Maps. -### Linux or Mac +- We haven't compiled Organic Maps on Windows in a long time, though it is possible. + It is likely some make files should be updated. + If you succeed, please submit a tutorial. + You'll need to have python3, cmake, ninja in the PATH and also to have Qt5 installed. Ensure that you have at least 20GB of free space. @@ -129,38 +132,6 @@ _macOS:_ brew install cmake ninja qt@5 ``` -### Windows - -We haven't compiled Organic Maps on Windows *natively* in a long time, though it is possible. -Some files should be updated. There is a work in progress on [windows](https://github.com/organicmaps/organicmaps/tree/windows) branch. -Please contribute if you have time. -You'll need to have python3, cmake, ninja, and QT5 in the PATH, and Visual Studio 2022 or Visual Studio 2022 Build Tools installed. Use [Visual Studio Developer Command Prompt](https://learn.microsoft.com/en-us/visualstudio/ide/reference/command-prompt-powershell?view=vs-2022) or generate Visual Studio project files with CMake to build the project. - -However, it is possible to use the WSL (Windows Subsystem for Linux) to run GUI applications. - -#### Windows 11 (WSL) - -Since Windows 11 Build 22000 running GUI apps from the WSL is supported [out-of-the box](https://learn.microsoft.com/en-us/windows/wsl/tutorials/gui-apps). After [building](#building-1) the app you should be able to [run](#running) it without any additional steps. - -#### Windows 10 (WSL) - -For Windows 10 you should do these steps (taken from [here](https://techcommunity.microsoft.com/t5/windows-dev-appconsult/running-wsl-gui-apps-on-windows-10/ba-p/1493242), check this blog post if you have any problems): -1. Download and install [VcXsrv Windows X Server](https://sourceforge.net/projects/vcxsrv/). -2. Run _XLaunch_ app to launch X Server. During settings make sure "Disable access control" checkbox is selected. -3. (optionally) Click "Save configuration" and save configuration to some file (for example to _config.xlaunch_). With this you will be able to quickly run desktop app in the future. -4. When asked about firewall, allow access for public and private networks. -5. Add this line: - ```bash - export DISPLAY=$(ip route|awk '/^default/{print $3}'):0.0 - ``` - to _/etc/bash.bashrc_ file. -6. Close WSL and open it again. - -Now when you want to run the desktop app you just need to first launch the X Server on Windows (for example, by running previously saved _config.xlaunch_ file) and then you should be able to [build](#building-1) and [run](#running) the app from WSL. - -Running X Server is also required to run `generate_symbols.sh` script when you change icons for [styles](STYLES.md) - - ### Building To build a desktop app: @@ -178,14 +149,6 @@ Besides _desktop_ there are other targets like _generator_tool_, to see a full l tools/unix/build_omim.sh -d help ``` -#### Build issues - -- If you get "not enough memory" errors during builds, you may disable - [CMake Unity Builds](https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html) by `export UNITY_DISABLE=1` - or by passing `-DUNITY_DISABLE=1` option to `cmake` invocation. Or you can reduce Unity build batch size from - the default `50` to a lower value (2-16) by `export UNITY_BUILD_BATCH_SIZE=8`. - Note that these changes may significantly increase the build time. - ### Running The generated binaries appear in `../omim-build-`. @@ -238,19 +201,6 @@ ln -s ../data/ data Some tests [are known to be broken](https://github.com/organicmaps/organicmaps/issues?q=is%3Aissue+is%3Aopen+label%3ATests). -### Debug commands - -Desktop app has some "hidden" debug commands that you can trigger by entering them in Offline Search input. - -For example you can switch theme which is very useful for checking [styles](STYLES.md) changes. -To switch themes you can enter this commands: -- `?light` - Day theme -- `?dark` - Night theme -- `?vlight` - Day theme for vehicle navigation -- `?vdark` - Night theme for vehicle navigation - -There are also other commands for turning on/off isolines, antialiasing, etc. Check [the code](https://github.com/organicmaps/organicmaps/blob/6ae19b40c2b7a515338eb128547df05da13bdb78/map/framework.cpp#L2570-L2671) to learn about them. - ### More options To make the desktop app display maps in a different language add a `-lang` option, e.g. for russian language: @@ -303,12 +253,7 @@ Install Android SDK and NDK: - In the left pane menu select "Appearance & Behavior > System Settings > Memory Settings". - Set "IDE max heap size" to 2048Mb or more (otherwise the Studio might get stuck on "Updating indexes" when opening the project). -Configure the repo with Android SDK and NDK paths. You can do it either by setting a global environment variable pointing at your Android SDK: -``` -ANDROID_HOME= -``` - -or by running the following script, that creates `android/local.properties` file with the line `sdk.dir=` in it: +Configure the repo with Android SDK and NDK paths: _Linux:_ ```bash diff --git a/docs/STYLES.md b/docs/STYLES.md index c89a162621..b2b5abe936 100644 --- a/docs/STYLES.md +++ b/docs/STYLES.md @@ -31,8 +31,6 @@ To run the `generate_symbols.sh` script install `optipng` also, e.g. for Ubuntu sudo apt install optipng ``` -If you use WSL on Windows 10 you might need to run [X Server](INSTALL.md#windows-10-wsl) before running `generate_symbols.sh` - ## Files Map styles are defined in text files located in `data/styles/clear/include/`: diff --git a/drape/drape_tests/CMakeLists.txt b/drape/drape_tests/CMakeLists.txt index d93f200b32..5a6473af74 100644 --- a/drape/drape_tests/CMakeLists.txt +++ b/drape/drape_tests/CMakeLists.txt @@ -31,15 +31,17 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE GTEST_DONT_DEFINE_TEST WITH_GL_MOCK ) -if (NOT WITH_SYSTEM_PROVIDED_3PARTY) - add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../3party/googletest" "${CMAKE_CURRENT_BINARY_DIR}/googletest") -endif() +find_package_or_fallback_to_3party( + "GTest" + "1.12.0" + "${CMAKE_CURRENT_LIST_DIR}/../../3party/googletest" + "${CMAKE_CURRENT_BINARY_DIR}/googletest" +) target_link_libraries(${PROJECT_NAME} qt_tstfrm indexer # For StyleReader in static_texture_tests drape gmock - gtest Qt5::Core ) diff --git a/drape/gl_functions.cpp b/drape/gl_functions.cpp index 75ef2b9d8c..a7fbd74d3a 100644 --- a/drape/gl_functions.cpp +++ b/drape/gl_functions.cpp @@ -10,10 +10,10 @@ #include "std/target_os.hpp" #include -#include // strlen #include #include #include +#include #if defined(OMIM_OS_WINDOWS) #define DP_APIENTRY __stdcall diff --git a/drape_frontend/animation/interpolators.cpp b/drape_frontend/animation/interpolators.cpp index 1e2d24abc5..369bf87225 100644 --- a/drape_frontend/animation/interpolators.cpp +++ b/drape_frontend/animation/interpolators.cpp @@ -148,12 +148,11 @@ PositionInterpolator::PositionInterpolator(double delay, //static double PositionInterpolator::GetMoveDuration(double globalDistance, m2::RectD const & viewportRect, double scale) { - double constexpr kMinMoveDuration = 0.2; - double constexpr kMinSpeedScalar = 0.2; - double constexpr kMaxSpeedScalar = 7.0; - double constexpr kEps = 1e-5; + double const kMinMoveDuration = 0.2; + double const kMinSpeedScalar = 0.2; + double const kMaxSpeedScalar = 7.0; + double const kEps = 1e-5; - ASSERT_GREATER(scale, 0.0, ()); double const pixelLength = globalDistance / scale; if (pixelLength < kEps) return 0.0; @@ -264,7 +263,7 @@ AngleInterpolator::AngleInterpolator(double delay, double duration, double start // static double AngleInterpolator::GetRotateDuration(double startAngle, double endAngle) { - double constexpr kRotateDurationScalar = 0.75; + double const kRotateDurationScalar = 0.75; startAngle = ang::AngleIn2PI(startAngle); endAngle = ang::AngleIn2PI(endAngle); return kRotateDurationScalar * fabs(ang::GetShortestDistance(startAngle, endAngle)) / math::pi; diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp index bb6c54f5b2..54f3986eab 100644 --- a/drape_frontend/apply_feature_functors.cpp +++ b/drape_frontend/apply_feature_functors.cpp @@ -398,12 +398,12 @@ BaseApplyFeature::BaseApplyFeature(TileKey const & tileKey, TInsertShapeFn const void BaseApplyFeature::ExtractCaptionParams(CaptionDefProto const * primaryProto, CaptionDefProto const * secondaryProto, - float depth, TextViewParams & params) const + double depth, TextViewParams & params) const { dp::FontDecl decl; CaptionDefProtoToFontDecl(primaryProto, decl); - params.m_depth = depth; + params.m_depth = static_cast(depth); params.m_featureId = m_id; auto & titleDecl = params.m_titleDecl; @@ -464,8 +464,9 @@ void ApplyPointFeature::ProcessPointRule(Stylist::TRuleWrapper const & rule) m_symbolRule = symRule; } + bool const isNode = (rule.m_rule->GetType() & drule::node) != 0; CaptionDefProto const * capRule = rule.m_rule->GetCaption(0); - if (capRule) + if (capRule && isNode) { TextViewParams params; params.m_tileCenter = m_tileRect.Center(); @@ -509,12 +510,11 @@ void ApplyPointFeature::Finish(ref_ptr texMng) params.m_tileCenter = m_tileRect.Center(); params.m_depthTestEnabled = m_depthLayer != DepthLayer::NavigationLayer && m_depthLayer != DepthLayer::OverlayLayer; - params.m_depth = m_symbolDepth; + params.m_depth = static_cast(m_symbolDepth); params.m_depthLayer = m_depthLayer; params.m_minVisibleScale = m_minVisibleScale; params.m_rank = m_rank; params.m_symbolName = m_symbolRule->name(); - ASSERT_GREATER_OR_EQUAL(m_symbolRule->min_distance(), 0, ()); params.m_extendingSize = static_cast(mainScale * m_symbolRule->min_distance() * poiExtendScale); params.m_posZ = m_posZ; params.m_hasArea = m_hasArea; @@ -738,7 +738,7 @@ void ApplyAreaFeature::ProcessAreaRule(Stylist::TRuleWrapper const & rule) { AreaViewParams params; params.m_tileCenter = m_tileRect.Center(); - params.m_depth = rule.m_depth; + params.m_depth = static_cast(rule.m_depth); params.m_color = ToDrapeColor(areaRule->color()); params.m_minVisibleScale = m_minVisibleScale; params.m_rank = m_rank; @@ -862,7 +862,7 @@ void ApplyLineFeatureGeometry::ProcessLineRule(Stylist::TRuleWrapper const & rul PathSymProto const & symRule = pLineRule->pathsym(); PathSymbolViewParams params; params.m_tileCenter = m_tileRect.Center(); - params.m_depth = rule.m_depth; + params.m_depth = static_cast(rule.m_depth); params.m_minVisibleScale = m_minVisibleScale; params.m_rank = m_rank; params.m_symbolName = symRule.name(); @@ -879,7 +879,7 @@ void ApplyLineFeatureGeometry::ProcessLineRule(Stylist::TRuleWrapper const & rul LineViewParams params; params.m_tileCenter = m_tileRect.Center(); Extract(pLineRule, params); - params.m_depth = rule.m_depth; + params.m_depth = static_cast(rule.m_depth); params.m_minVisibleScale = m_minVisibleScale; params.m_rank = m_rank; params.m_baseGtoPScale = m_currentScaleGtoP; @@ -917,12 +917,16 @@ void ApplyLineFeatureAdditional::ProcessLineRule(Stylist::TRuleWrapper const & r if (m_clippedSplines.empty()) return; - m_depth = rule.m_depth; + m_depth = static_cast(rule.m_depth); ShieldRuleProto const * pShieldRule = rule.m_rule->GetShield(); if (pShieldRule != nullptr) m_shieldRule = pShieldRule; + bool const isWay = (rule.m_rule->GetType() & drule::way) != 0; + if (!isWay) + return; + CaptionDefProto const * pCaptionRule = rule.m_rule->GetCaption(0); if (pCaptionRule != nullptr && pCaptionRule->height() > 2 && !m_captions.GetMainText().empty()) m_captionRule = pCaptionRule; @@ -1141,13 +1145,12 @@ void ApplyLineFeatureAdditional::Finish(ref_ptr texMng, if (shieldPositions.empty()) return; - // Set default shield's icon min distance. ASSERT(m_shieldRule != nullptr, ()); - int minDistance = m_shieldRule->min_distance(); - ASSERT_GREATER_OR_EQUAL(minDistance, 0, ()); - if (minDistance <= 0) - minDistance = 50; - + int constexpr kDefaultMinDistance = 50; + int minDistance = m_shieldRule->min_distance() != 0 ? m_shieldRule->min_distance() + : kDefaultMinDistance; + if (minDistance < 0) + minDistance = kDefaultMinDistance; uint32_t const scaledMinDistance = static_cast(vs * minDistance); uint8_t shieldIndex = 0; diff --git a/drape_frontend/apply_feature_functors.hpp b/drape_frontend/apply_feature_functors.hpp index b08441c7eb..8403dbed67 100644 --- a/drape_frontend/apply_feature_functors.hpp +++ b/drape_frontend/apply_feature_functors.hpp @@ -49,7 +49,7 @@ public: protected: void ExtractCaptionParams(CaptionDefProto const * primaryProto, CaptionDefProto const * secondaryProto, - float depth, TextViewParams & params) const; + double depth, TextViewParams & params) const; std::string ExtractHotelInfo() const; TInsertShapeFn m_insertShape; @@ -85,7 +85,7 @@ private: bool m_createdByEditor; bool m_obsoleteInEditor; DepthLayer m_depthLayer; - float m_symbolDepth; + double m_symbolDepth; SymbolRuleProto const * m_symbolRule; m2::PointF m_centerPoint; std::vector m_textParams; diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp index 9f11d07532..630d735df2 100644 --- a/drape_frontend/color_constants.cpp +++ b/drape_frontend/color_constants.cpp @@ -11,7 +11,7 @@ #include "base/assert.hpp" #include "base/string_utils.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp index 440aefbbe4..0aef86be9a 100644 --- a/drape_frontend/drape_engine.cpp +++ b/drape_frontend/drape_engine.cpp @@ -92,6 +92,8 @@ DrapeEngine::DrapeEngine(Params && params) std::move(effects), params.m_onGraphicsContextInitialized); + m_frontend = make_unique_dp(std::move(frParams)); + BackendRenderer::Params brParams(params.m_apiVersion, frParams.m_commutator, frParams.m_oglContextFactory, @@ -106,8 +108,6 @@ DrapeEngine::DrapeEngine(Params && params) params.m_onGraphicsContextInitialized); m_backend = make_unique_dp(std::move(brParams)); - m_frontend = make_unique_dp(std::move(frParams)); - m_widgetsInfo = std::move(params.m_info); @@ -955,12 +955,7 @@ drape_ptr DrapeEngine::GenerateLineRenderInfo(UserLineMark auto renderInfo = make_unique_dp(); renderInfo->m_minZoom = mark->GetMinZoom(); renderInfo->m_depthLayer = mark->GetDepthLayer(); - - mark->ForEachGeometry([&renderInfo](std::vector && points) - { - renderInfo->m_splines.emplace_back(std::move(points)); - }); - + renderInfo->m_spline = m2::SharedSpline(mark->GetPoints()); renderInfo->m_layers.reserve(mark->GetLayerCount()); for (size_t layerIndex = 0, layersCount = mark->GetLayerCount(); layerIndex < layersCount; ++layerIndex) { diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index 207b959bff..c0befcadac 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -27,7 +27,7 @@ int const kPositionRoutingOffsetY = 104; double const kMinSpeedThresholdMps = 2.8; // 10 km/h double const kGpsBearingLifetimeSec = 5.0; double const kMaxPendingLocationTimeSec = 60.0; -double const kMaxTimeInBackgroundSec = 60.0 * 60 * 30; // 30 hours before starting detecting position again +double const kMaxTimeInBackgroundSec = 60.0 * 60 * 8; // 8 hours double const kMaxNotFollowRoutingTimeSec = 20.0; double const kMaxUpdateLocationInvervalSec = 30.0; double const kMaxBlockAutoZoomTimeSec = 10.0; @@ -525,9 +525,10 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool void MyPositionController::LoseLocation() { - if (m_mode == location::NotFollowNoPosition) + if (!IsModeHasPosition()) return; - else if (m_mode == location::Follow || m_mode == location::FollowAndRotate) + + if (m_mode == location::Follow || m_mode == location::FollowAndRotate) ChangeMode(location::PendingPosition); else ChangeMode(location::NotFollowNoPosition); @@ -910,6 +911,7 @@ void MyPositionController::CheckIsWaitingForLocation() if (m_pendingStarted && m_pendingTimer.ElapsedSeconds() >= kMaxPendingLocationTimeSec) { m_pendingStarted = false; + ChangeMode(location::NotFollowNoPosition); if (m_listener) m_listener->PositionPendingTimeout(); } diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index 2635527b2c..c73c66115a 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -471,12 +471,11 @@ void RuleDrawer::operator()(FeatureType & f) } #endif - /// @todo Call feature::GetMinDrawableScale() here. int minVisibleScale = 0; auto insertShape = [this, &minVisibleScale](drape_ptr && shape) { - size_t const index = shape->GetType(); - ASSERT_LESS(index, m_mapShapes.size(), ()); + int const index = static_cast(shape->GetType()); + ASSERT_LESS(index, static_cast(m_mapShapes.size()), ()); shape->SetFeatureMinZoom(minVisibleScale); m_mapShapes[index].push_back(std::move(shape)); diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index a31e4118fa..ae2850b0d8 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -45,7 +45,7 @@ inline drule::rule_type_t Convert(Type t) } } -float constexpr kMinPriority = std::numeric_limits::lowest(); +double constexpr kMinPriority = std::numeric_limits::lowest(); inline bool IsTypeOf(drule::Key const & key, int flags) { @@ -104,18 +104,18 @@ private: void ProcessKey(drule::Key const & key) { double depth = key.m_priority; - if (m_featureLayer != feature::LAYER_EMPTY) + if (m_depthLayer != feature::LAYER_EMPTY) { if (IsTypeOf(key, Line)) { - double const layerPart = m_featureLayer * drule::layer_base_priority; + double const layerPart = m_depthLayer * drule::layer_base_priority; double const depthPart = fmod(depth, drule::layer_base_priority); depth = layerPart + depthPart; } else if (IsTypeOf(key, Area)) { // Area styles have big negative priorities (like -15000), so just add layer correction. - depth += m_featureLayer * drule::layer_base_priority; + depth += m_depthLayer * drule::layer_base_priority; } else { @@ -138,13 +138,12 @@ private: if (lineRule != nullptr && (lineRule->width() < 1e-5 && !lineRule->has_pathsym())) return; - m_rules.push_back({ dRule, static_cast(depth), key.m_hatching }); + m_rules.push_back({ dRule, depth, key.m_hatching }); } void Init() { - m_featureLayer = m_f.GetLayer(); - // @todo m_priorityModifier is not used, try to apply to areas to render in size order. + m_depthLayer = m_f.GetLayer(); if (m_geomType == feature::GeomType::Point) m_priorityModifier = (double)m_f.GetPopulation() / 7E9; else @@ -158,7 +157,7 @@ private: feature::GeomType m_geomType; int const m_zoomLevel; double m_priorityModifier; - int m_featureLayer; + int m_depthLayer; }; } // namespace @@ -355,7 +354,7 @@ double GetFeaturePriority(FeatureType & f, int const zoomLevel) Aggregator aggregator(f, types.GetGeomType(), zoomLevel, keys.size()); aggregator.AggregateKeys(keys); - float maxPriority = kMinPriority; + double maxPriority = kMinPriority; for (auto const & rule : aggregator.m_rules) { if (rule.m_depth > maxPriority) diff --git a/drape_frontend/stylist.hpp b/drape_frontend/stylist.hpp index 6654935835..249a25ccd6 100644 --- a/drape_frontend/stylist.hpp +++ b/drape_frontend/stylist.hpp @@ -62,7 +62,7 @@ public: struct TRuleWrapper { drule::BaseRule const * m_rule; - float m_depth; + double m_depth; bool m_hatching; }; diff --git a/drape_frontend/user_mark_generator.cpp b/drape_frontend/user_mark_generator.cpp index 966b2f3c81..5c9528d4e5 100644 --- a/drape_frontend/user_mark_generator.cpp +++ b/drape_frontend/user_mark_generator.cpp @@ -93,7 +93,7 @@ void UserMarkGenerator::UpdateIndex(kml::MarkGroupId groupId) IDCollections & idCollection = *groupIt->second; - for (auto const & markId : idCollection.m_markIds) + for (auto markId : idCollection.m_markIds) { UserMarkRenderParams const & params = *m_marks[markId]; for (int zoomLevel = params.m_minZoom; zoomLevel <= scales::GetUpperScale(); ++zoomLevel) @@ -104,11 +104,8 @@ void UserMarkGenerator::UpdateIndex(kml::MarkGroupId groupId) } } - for (auto const & lineId : idCollection.m_lineIds) + for (auto lineId : idCollection.m_lineIds) { - // Collect unique intersected tiles. - std::set tiles; - UserLineRenderParams const & params = *m_lines[lineId]; int const startZoom = GetNearestLineIndexZoom(params.m_minZoom); @@ -116,27 +113,20 @@ void UserMarkGenerator::UpdateIndex(kml::MarkGroupId groupId) { if (zoomLevel < startZoom) continue; - // Process spline by segments that are no longer than tile size. double const maxLength = mercator::Bounds::kRangeX / (1 << (zoomLevel - 1)); - for (auto const & spline : params.m_splines) + df::ProcessSplineSegmentRects(params.m_spline, maxLength, + [&](m2::RectD const & segmentRect) { - df::ProcessSplineSegmentRects(spline, maxLength, [&](m2::RectD const & segmentRect) + CalcTilesCoverage(segmentRect, zoomLevel, [&](int tileX, int tileY) { - CalcTilesCoverage(segmentRect, zoomLevel, [&](int tileX, int tileY) - { - tiles.emplace(tileX, tileY, zoomLevel); - }); - return true; + TileKey const tileKey(tileX, tileY, zoomLevel); + auto groupIDs = GetIdCollection(tileKey, groupId); + groupIDs->m_lineIds.push_back(lineId); }); - } - } - - for (auto const & tileKey : tiles) - { - auto groupIDs = GetIdCollection(tileKey, groupId); - groupIDs->m_lineIds.push_back(lineId); + return true; + }); } } diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index c6071fda24..81d90a8bd1 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -325,13 +325,13 @@ void GenerateTextShapes(ref_ptr context, ref_ptrGetSize())); + spline.Reset(new m2::Spline(renderInfo.m_spline->GetSize())); m2::PointD lastAddedPoint; - for (auto const & point : in->GetPath()) + for (auto const & point : renderInfo.m_spline->GetPath()) { if (spline->GetSize() > 1 && point.SquaredLength(lastAddedPoint) < minSqrLength) { @@ -566,12 +566,7 @@ void CacheUserLines(ref_ptr context, TileKey const & tileKe if (simplify) minSegmentSqrLength = base::Pow2(4.0 * vs * GetScreenScale(tileKey.m_zoomLevel)); - m2::RectD const tileRect = tileKey.GetGlobalRect(); - - // Process spline by segments that are no longer than tile size. - //double const maxLength = mercator::Bounds::kRangeX / (1 << (tileKey.m_zoomLevel - 1)); - - for (auto const & id : linesId) + for (auto id : linesId) { auto const it = renderParams.find(id); if (it == renderParams.end()) @@ -579,51 +574,48 @@ void CacheUserLines(ref_ptr context, TileKey const & tileKe UserLineRenderParams const & renderInfo = *it->second; - // Spline is a shared_ptr here, can reassign later. - for (auto spline : renderInfo.m_splines) + m2::RectD const tileRect = tileKey.GetGlobalRect(); + + double const maxLength = mercator::Bounds::kRangeX / (1 << (tileKey.m_zoomLevel - 1)); + + bool intersected = false; + ProcessSplineSegmentRects(renderInfo.m_spline, maxLength, + [&tileRect, &intersected](m2::RectD const & segmentRect) { - // This check is redundant, because we already made rough check while covering tracks by tiles - // (see UserMarkGenerator::UpdateIndex). - // Also looks like ClipSplineByRect works faster than Spline iterating in ProcessSplineSegmentRects - // by |maxLength| segments on high zoom levels. - /* - bool intersected = false; - ProcessSplineSegmentRects(spline, maxLength, [&tileRect, &intersected](m2::RectD const & segmentRect) + if (segmentRect.IsIntersect(tileRect)) + intersected = true; + return !intersected; + }); + + if (!intersected) + continue; + + m2::SharedSpline spline = renderInfo.m_spline; + if (simplify) + spline = SimplifySpline(renderInfo, minSegmentSqrLength); + + if (spline->GetSize() < 2) + continue; + + auto const clippedSplines = m2::ClipSplineByRect(tileRect, spline); + for (auto const & clippedSpline : clippedSplines) + { + for (auto const & layer : renderInfo.m_layers) { - if (segmentRect.IsIntersect(tileRect)) - intersected = true; - return !intersected; - }); + LineViewParams params; + params.m_tileCenter = tileKey.GetGlobalRect().Center(); + params.m_baseGtoPScale = 1.0f; + params.m_cap = dp::RoundCap; + params.m_join = dp::RoundJoin; + params.m_color = layer.m_color; + params.m_depthTestEnabled = true; + params.m_depth = layer.m_depth; + params.m_depthLayer = renderInfo.m_depthLayer; + params.m_width = static_cast(layer.m_width * vs * kLineWidthZoomFactor[tileKey.m_zoomLevel - 1]); + params.m_minVisibleScale = 1; + params.m_rank = 0; - if (!intersected) - continue; - */ - - if (simplify) - spline = SimplifySpline(spline, minSegmentSqrLength); - - if (spline->GetSize() < 2) - continue; - - for (auto const & clippedSpline : m2::ClipSplineByRect(tileRect, spline)) - { - for (auto const & layer : renderInfo.m_layers) - { - LineViewParams params; - params.m_tileCenter = tileRect.Center(); - params.m_baseGtoPScale = 1.0f; - params.m_cap = dp::RoundCap; - params.m_join = dp::RoundJoin; - params.m_color = layer.m_color; - params.m_depthTestEnabled = true; - params.m_depth = layer.m_depth; - params.m_depthLayer = renderInfo.m_depthLayer; - params.m_width = static_cast(layer.m_width * vs * kLineWidthZoomFactor[tileKey.m_zoomLevel - 1]); - params.m_minVisibleScale = 1; - params.m_rank = 0; - - LineShape(clippedSpline, params).Draw(context, make_ref(&batcher), textures); - } + LineShape(clippedSpline, params).Draw(context, make_ref(&batcher), textures); } } } diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp index 043234d292..5101966729 100644 --- a/drape_frontend/user_mark_shapes.hpp +++ b/drape_frontend/user_mark_shapes.hpp @@ -66,7 +66,7 @@ struct UserLineRenderParams int m_minZoom = 1; DepthLayer m_depthLayer = DepthLayer::UserLineLayer; std::vector m_layers; - std::vector m_splines; + m2::SharedSpline m_spline; }; using UserMarksRenderCollection = std::unordered_map>; @@ -77,7 +77,7 @@ struct UserMarkRenderData UserMarkRenderData(dp::RenderState const & state, drape_ptr && bucket, TileKey const & tileKey) - : m_state(state), m_bucket(std::move(bucket)), m_tileKey(tileKey) + : m_state(state), m_bucket(move(bucket)), m_tileKey(tileKey) {} dp::RenderState m_state; diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp index 2a799ceea9..b6a0b60d10 100644 --- a/drape_frontend/user_marks_provider.hpp +++ b/drape_frontend/user_marks_provider.hpp @@ -110,9 +110,7 @@ public: virtual dp::Color GetColor(size_t layerIndex) const = 0; virtual float GetWidth(size_t layerIndex) const = 0; virtual float GetDepth(size_t layerIndex) const = 0; - - using GeometryFnT = std::function &&)>; - virtual void ForEachGeometry(GeometryFnT && fn) const = 0; + virtual std::vector GetPoints() const = 0; private: kml::TrackId m_id; diff --git a/editor/config_loader.cpp b/editor/config_loader.cpp index abbe4975ba..45c545e3fc 100644 --- a/editor/config_loader.cpp +++ b/editor/config_loader.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace editor { @@ -21,8 +21,8 @@ namespace { using platform::HttpClient; -constexpr char kConfigFileName[] = "editor.config"; -constexpr char kHashFileName[] = "editor.config.hash"; +auto const kConfigFileName = "editor.config"; +auto const kHashFileName = "editor.config.hash"; auto constexpr kSynchroTimeout = std::chrono::hours(4); auto constexpr kRemoteHashUrl = "https://cdn.organicmaps.app/editor.config.date"; @@ -149,10 +149,9 @@ void ConfigLoader::LoadFromLocal(pugi::xml_document & doc) if (reader) reader->ReadAsString(content); - auto const result = doc.load_buffer(content.data(), content.size()); - if (!result) + if (!doc.load_buffer(content.data(), content.size())) { - LOG(LERROR, (kConfigFileName, "can not be loaded:", result.description(), "error offset:", result.offset)); + LOG(LERROR, ("Config can not be loaded.")); doc.reset(); } } diff --git a/editor/editor_config.cpp b/editor/editor_config.cpp index e638f00148..fbc2f22221 100644 --- a/editor/editor_config.cpp +++ b/editor/editor_config.cpp @@ -83,7 +83,7 @@ bool TypeDescriptionFromXml(pugi::xml_node const & root, pugi::xml_node const & auto const node = xNode.node(); std::string const groupName = node.attribute("group").value(); - std::string const xpath = "/omaps/editor/fields/field_group[@name='" + groupName + "']"; + std::string const xpath = "/mapsme/editor/fields/field_group[@name='" + groupName + "']"; auto const group = root.select_node(xpath.data()).node(); ASSERT(group, ("No such group", groupName)); @@ -110,7 +110,7 @@ bool TypeDescriptionFromXml(pugi::xml_node const & root, pugi::xml_node const & std::vector GetPrioritizedTypes(pugi::xml_node const & node) { std::vector result; - for (auto const & xNode : node.select_nodes("/omaps/editor/types/type[@id]")) + for (auto const & xNode : node.select_nodes("/mapsme/editor/types/type[@id]")) result.push_back(xNode.node()); stable_sort(begin(result), end(result), [](pugi::xml_node const & lhs, pugi::xml_node const & rhs) { @@ -164,7 +164,7 @@ bool EditorConfig::GetTypeDescription(std::vector classificatorType std::vector EditorConfig::GetTypesThatCanBeAdded() const { auto const xpathResult = - m_document.select_nodes("/omaps/editor/types/type[not(@can_add='no' or @editable='no')]"); + m_document.select_nodes("/mapsme/editor/types/type[not(@can_add='no' or @editable='no')]"); std::vector result; for (auto const & xNode : xpathResult) diff --git a/editor/editor_config.hpp b/editor/editor_config.hpp index a1be7c2ebb..f7a0f8fba8 100644 --- a/editor/editor_config.hpp +++ b/editor/editor_config.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" class Reader; diff --git a/editor/editor_notes.cpp b/editor/editor_notes.cpp index 4018b07144..f58094e114 100644 --- a/editor/editor_notes.cpp +++ b/editor/editor_notes.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace { diff --git a/editor/editor_storage.hpp b/editor/editor_storage.hpp index d8e2373cd8..2646f8e211 100644 --- a/editor/editor_storage.hpp +++ b/editor/editor_storage.hpp @@ -2,7 +2,7 @@ #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace editor { diff --git a/editor/editor_tests/config_loader_test.cpp b/editor/editor_tests/config_loader_test.cpp index b100b57bc9..ce6d184d54 100644 --- a/editor/editor_tests/config_loader_test.cpp +++ b/editor/editor_tests/config_loader_test.cpp @@ -7,7 +7,7 @@ #include "base/atomic_shared_ptr.hpp" -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace { @@ -16,11 +16,11 @@ using platform::tests_support::ScopedFile; void CheckGeneralTags(pugi::xml_document const & doc) { - auto const types = doc.select_nodes("/omaps/editor/types"); + auto const types = doc.select_nodes("/mapsme/editor/types"); TEST(!types.empty(), ()); - auto const fields = doc.select_nodes("/omaps/editor/fields"); + auto const fields = doc.select_nodes("/mapsme/editor/fields"); TEST(!fields.empty(), ()); - auto const preferred_types = doc.select_nodes("/omaps/editor/preferred_types"); + auto const preferred_types = doc.select_nodes("/mapsme/editor/preferred_types"); TEST(!preferred_types.empty(), ()); } diff --git a/editor/editor_tests/editor_config_test.cpp b/editor/editor_tests/editor_config_test.cpp index d2932e5d81..cb5c4b9070 100644 --- a/editor/editor_tests/editor_config_test.cpp +++ b/editor/editor_tests/editor_config_test.cpp @@ -10,11 +10,10 @@ UNIT_TEST(EditorConfig_TypeDescription) using EType = feature::Metadata::EType; using Fields = editor::TypeAggregatedDescription::FeatureFields; - Fields const poiInternet = { + Fields const poi = { EType::FMD_OPEN_HOURS, EType::FMD_PHONE_NUMBER, EType::FMD_WEBSITE, - EType::FMD_INTERNET, EType::FMD_EMAIL, EType::FMD_LEVEL, EType::FMD_CONTACT_FACEBOOK, @@ -45,7 +44,10 @@ UNIT_TEST(EditorConfig_TypeDescription) TEST(config.GetTypeDescription({"shop-toys"}, desc), ()); TEST(desc.IsNameEditable(), ()); TEST(desc.IsAddressEditable(), ()); - TEST_EQUAL(desc.GetEditableFields(), poiInternet, ()); + auto fields = poi; + fields.push_back(EType::FMD_INTERNET); + base::SortUnique(fields); + TEST_EQUAL(desc.GetEditableFields(), fields, ()); } { // Test that amenity-bank is selected as it goes first in config. @@ -53,14 +55,17 @@ UNIT_TEST(EditorConfig_TypeDescription) TEST(config.GetTypeDescription({"amenity-bicycle_rental", "amenity-bank"}, desc), ()); TEST(desc.IsNameEditable(), ()); TEST(desc.IsAddressEditable(), ()); - TEST_EQUAL(desc.GetEditableFields(), poiInternet, ()); + auto fields = poi; + fields.push_back(EType::FMD_INTERNET); + base::SortUnique(fields); + TEST_EQUAL(desc.GetEditableFields(), fields, ()); } { // Testing type inheritance editor::TypeAggregatedDescription desc; TEST(config.GetTypeDescription({"amenity-place_of_worship-christian"}, desc), ()); TEST(desc.IsNameEditable(), ()); - TEST_EQUAL(desc.GetEditableFields(), poiInternet, ()); + TEST_EQUAL(desc.GetEditableFields(), poi, ()); } { // Testing long type inheritance on a fake object diff --git a/editor/editor_tests/feature_matcher_test.cpp b/editor/editor_tests/feature_matcher_test.cpp index 0b8d945c2f..c55737d58f 100644 --- a/editor/editor_tests/feature_matcher_test.cpp +++ b/editor/editor_tests/feature_matcher_test.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace { diff --git a/editor/editor_tests/match_by_geometry_test.cpp b/editor/editor_tests/match_by_geometry_test.cpp index 3ac072fd38..f40ef33c3f 100644 --- a/editor/editor_tests/match_by_geometry_test.cpp +++ b/editor/editor_tests/match_by_geometry_test.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace { diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp index a54d7848e5..e8f253250d 100644 --- a/editor/editor_tests/osm_editor_test.cpp +++ b/editor/editor_tests/osm_editor_test.cpp @@ -162,7 +162,7 @@ void GenerateUploadedFeature(MwmSet::MwmId const & mwmId, osm::EditableMapObject const & emo, pugi::xml_document & out) { - pugi::xml_node root = out.append_child("omaps"); + pugi::xml_node root = out.append_child("mapsme"); root.append_attribute("format_version") = 1; pugi::xml_node mwmNode = root.append_child("mwm"); @@ -1327,43 +1327,6 @@ bool EditorTest::RemoveMwm(MwmSet::MwmId const & mwmId) m_mwmFiles.erase(it); return true; } - -void EditorTest::LoadExistingEditsXml() -{ - char const * data = R"( - - - - - - - - - - - - - - - )"; - - ConstructTestMwm([](editor::testing::TestMwmBuilder &) - { - }); - - pugi::xml_document doc; - TEST(doc.load(data), ()); - - auto memStorage = std::make_unique(); - memStorage->Save(doc); - - auto & editor = osm::Editor::Instance(); - editor.SetStorageForTesting(std::move(memStorage)); - - editor.LoadEdits(); - TEST_EQUAL(editor.m_features.Get()->size(), 1, ()); -} - } // namespace testing } // namespace editor @@ -1464,6 +1427,4 @@ UNIT_CLASS_TEST(EditorTest, SaveEditedFeatureTest) } UNIT_CLASS_TEST(EditorTest, SaveTransactionTest) { EditorTest::SaveTransactionTest(); } - -UNIT_CLASS_TEST(EditorTest, LoadEditsXml) { LoadExistingEditsXml(); } } // namespace diff --git a/editor/editor_tests/osm_editor_test.hpp b/editor/editor_tests/osm_editor_test.hpp index d6e33a1cbb..0c4407f544 100644 --- a/editor/editor_tests/osm_editor_test.hpp +++ b/editor/editor_tests/osm_editor_test.hpp @@ -46,7 +46,6 @@ public: void LoadMapEditsTest(); void SaveEditedFeatureTest(); void SaveTransactionTest(); - void LoadExistingEditsXml(); private: template diff --git a/editor/editor_tests/xml_feature_test.cpp b/editor/editor_tests/xml_feature_test.cpp index b3b6ba2cfa..aa8c42e623 100644 --- a/editor/editor_tests/xml_feature_test.cpp +++ b/editor/editor_tests/xml_feature_test.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" using namespace editor; diff --git a/editor/osm_auth_tests/server_api_test.cpp b/editor/osm_auth_tests/server_api_test.cpp index 5615ff0e7c..bd5b1f2bf5 100644 --- a/editor/osm_auth_tests/server_api_test.cpp +++ b/editor/osm_auth_tests/server_api_test.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" using osm::ServerApi06; using osm::OsmOAuth; diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp index 4a178c957a..21fe5636d8 100644 --- a/editor/osm_editor.cpp +++ b/editor/osm_editor.cpp @@ -27,7 +27,7 @@ #include #include "3party/opening_hours/opening_hours.hpp" -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace osm { @@ -41,7 +41,7 @@ using std::move, std::make_shared, std::string; namespace { -constexpr char const * kXmlRootNode = "omaps"; +constexpr char const * kXmlRootNode = "mapsme"; constexpr char const * kXmlMwmNode = "mwm"; constexpr char const * kDeleteSection = "delete"; constexpr char const * kModifySection = "modify"; @@ -168,12 +168,7 @@ void Editor::LoadEdits() m_features.Set(make_shared()); auto loadedFeatures = make_shared(); - auto rootNode = doc.child(kXmlRootNode); - // Migrate clients with an old root node. - if (!rootNode) - rootNode = doc.child("mapsme"); - // TODO: Empty rootNode is an OK case for the current logic and unit tests. Check if there is a better way to do it. - for (auto const & mwm : rootNode.children(kXmlMwmNode)) + for (auto const & mwm : doc.child(kXmlRootNode).children(kXmlMwmNode)) { string const mapName = mwm.attribute("name").as_string(""); int64_t const mapVersion = mwm.attribute("version").as_llong(0); diff --git a/editor/server_api.cpp b/editor/server_api.cpp index fb17299ce6..655e03f0e2 100644 --- a/editor/server_api.cpp +++ b/editor/server_api.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace { diff --git a/editor/xml_feature.hpp b/editor/xml_feature.hpp index 636ed48692..ea85896631 100644 --- a/editor/xml_feature.hpp +++ b/editor/xml_feature.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include "3party/pugixml/pugixml/src/pugixml.hpp" namespace osm { diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 5a6aa4354b..881dfa2206 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -248,7 +248,7 @@ target_link_libraries(${PROJECT_NAME} storage descriptions indexer - cppjansson + jansson expat tess2 $<$:${CMAKE_DL_LIBS}> # dladdr from boost::stacktrace diff --git a/generator/brands_loader.cpp b/generator/brands_loader.cpp index 43be651e35..4ebc41fe22 100644 --- a/generator/brands_loader.cpp +++ b/generator/brands_loader.cpp @@ -8,7 +8,7 @@ #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/generator/camera_info_collector.cpp b/generator/camera_info_collector.cpp index 848f97824b..aa18987b45 100644 --- a/generator/camera_info_collector.cpp +++ b/generator/camera_info_collector.cpp @@ -103,6 +103,7 @@ bool CamerasInfoCollector::ParseIntermediateInfo( uint32_t maxSpeedKmPH = 0; uint32_t relatedWaysNumber = 0; + std::vector ways; uint32_t latInt = 0; double lat = 0; @@ -136,7 +137,6 @@ bool CamerasInfoCollector::ParseIntermediateInfo( "lat(", lat, "), lon(", lon, ")")); } - std::vector ways; uint64_t wayOsmId = 0; for (uint32_t i = 0; i < relatedWaysNumber; ++i) { diff --git a/generator/filter_elements.hpp b/generator/filter_elements.hpp index 6fefb387c8..e906af2a60 100644 --- a/generator/filter_elements.hpp +++ b/generator/filter_elements.hpp @@ -43,7 +43,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace generator { diff --git a/generator/final_processor_utils.hpp b/generator/final_processor_utils.hpp index c9b6af85f0..54a5e88019 100644 --- a/generator/final_processor_utils.hpp +++ b/generator/final_processor_utils.hpp @@ -81,7 +81,7 @@ std::vector> AppendToMwmTmp(std::vector> countryToFbsIndexes; for (size_t i = 0; i < fbs.size(); ++i) { diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 12b0d2d50b..ca0ea9b884 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -210,7 +210,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address) {"addr:housenumber", "41"}, {"addr:postcode", "8050"}, {"addr:street", "Leutschenbachstrasse"}, - {"entrance", "home"}, + {"entrance", "main"}, {"survey:date", "2020-12-17"}, {"wheelchair", "no"}, }; @@ -581,10 +581,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Surface) TestSurfaceTypes("wood", "good", "", "paved_good"); TestSurfaceTypes("wood", "", "3", "paved_good"); TestSurfaceTypes("pebblestone", "", "4", "unpaved_good"); - TestSurfaceTypes("unpaved", "", "", "unpaved_bad"); + TestSurfaceTypes("unpaved", "", "", "unpaved_good"); TestSurfaceTypes("mud", "", "", "unpaved_bad"); - /// @todo Is it better paved_bad? + /// @todo Is it ok here that default no-tags equals to smoothness=bad? TestSurfaceTypes("", "bad", "", "unpaved_good"); TestSurfaceTypes("", "horrible", "", "unpaved_bad"); diff --git a/generator/generator_tests_support/test_with_custom_mwms.hpp b/generator/generator_tests_support/test_with_custom_mwms.hpp index 29d75c1d69..0854f64e0e 100644 --- a/generator/generator_tests_support/test_with_custom_mwms.hpp +++ b/generator/generator_tests_support/test_with_custom_mwms.hpp @@ -48,7 +48,7 @@ public: auto result = m_dataSource.RegisterMap(file); CHECK_EQUAL(result.second, MwmSet::RegResult::Success, ()); - auto id = result.first; + auto const id = result.first; auto const info = id.GetInfo(); CHECK(info.get(), ()); OnMwmBuilt(*info); diff --git a/generator/hierarchy_entry.cpp b/generator/hierarchy_entry.cpp index cd150d2d2e..23cf49064d 100644 --- a/generator/hierarchy_entry.cpp +++ b/generator/hierarchy_entry.cpp @@ -14,7 +14,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace { diff --git a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp index 708e2cbe5e..9d6dc24a03 100644 --- a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp +++ b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp @@ -4,6 +4,7 @@ #include "platform/platform.hpp" +#include "coding/file_reader.hpp" #include "coding/file_writer.hpp" #include "coding/internal/file_data.hpp" @@ -11,6 +12,7 @@ #include "base/logging.hpp" #include "base/scope_guard.hpp" +#include #include namespace generator::diff_tests @@ -45,7 +47,7 @@ UNIT_TEST(IncrementalUpdates_Smoke) { // Alter the old mwm slightly. - vector oldMwmContents = base::ReadFile(oldMwmPath); + vector oldMwmContents = FileReader(oldMwmPath).ReadAsBytes(); size_t const sz = oldMwmContents.size(); for (size_t i = 3 * sz / 10; i < 4 * sz / 10; i++) oldMwmContents[i] += static_cast(i); @@ -67,7 +69,7 @@ UNIT_TEST(IncrementalUpdates_Smoke) { // Corrupt the diff file contents. - vector diffContents = base::ReadFile(diffPath); + vector diffContents = FileReader(diffPath).ReadAsBytes(); // Leave the version bits intact. for (size_t i = 4; i < diffContents.size(); i += 2) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 118933922e..d63d9c6f1d 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -347,76 +347,49 @@ void MatchTypes(OsmElement * p, FeatureBuilderParams & params, function const cities = { - {"adana", {35.216442,36.934693,35.425525,37.065481}}, {"algiers", {2.949538, 36.676777, 3.256914, 36.826518}}, {"almaty", {76.7223358154, 43.1480920701, 77.123336792, 43.4299852362}}, {"amsterdam", {4.65682983398, 52.232846171, 5.10040283203, 52.4886341706}}, {"ankara", {32.4733, 39.723, 33.0499, 40.086}}, {"athens", {23.518075, 37.849188, 23.993853, 38.129109}}, - {"baku", {49.7315,40.319728,49.978006,40.453619}}, {"bangkok", {100.159606934, 13.4363737155, 100.909423828, 14.3069694978}}, {"barcelona", {1.94458007812, 41.2489025224, 2.29614257812, 41.5414776668}}, {"beijing", {115.894775391, 39.588757277, 117.026367187, 40.2795256688}}, {"berlin", {13.0352783203, 52.3051199211, 13.7933349609, 52.6963610783}}, {"boston", {-71.2676239014, 42.2117365893, -70.8879089355, 42.521711682}}, - {"bengalore", {77.393079,12.807501,77.806439,13.17014}}, - {"bilbao", {-3.129730,43.202673,-2.859879,43.420011}}, {"brasilia", {-48.334467, -16.036627, -47.358264, -15.50321}}, - {"brescia", {10.128068,45.478792,10.312432,45.595665}}, {"brussels", {4.2448425293, 50.761653413, 4.52499389648, 50.9497757762}}, {"bucharest", {25.905198, 44.304636, 26.29032, 44.588137}}, {"budapest", {18.7509155273, 47.3034470439, 19.423828125, 47.7023684666}}, {"buenos_aires", {-58.9910888672, -35.1221551064, -57.8045654297, -34.2685661867}}, - {"bursa", {28.771425,40.151234,29.297395,40.315832}}, {"cairo", {30.3232, 29.6163, 31.9891, 30.6445}}, - {"caracas", {-67.109144,10.317298,-66.754835,10.551623}}, - {"catania", {14.94978,37.443756,15.126343,37.540221}}, - {"changchun", {124.6144,43.6274,125.9163,44.1578}}, - {"chengdu", {103.6074,30.3755,104.4863,31.0462}}, {"chicago", {-88.3163452148, 41.3541338721, -87.1270751953, 42.2691794924}}, - {"chongqing", {105.9873,29.1071,107.0255,30.0102}}, - {"dalian", {121.284679,38.752352,121.90678,39.167744}}, {"delhi", {76.8026733398, 28.3914003758, 77.5511169434, 28.9240352884}}, {"dnepro", {34.7937011719, 48.339820521, 35.2798461914, 48.6056737841}}, {"dubai", {55.01953125, 24.9337667594, 55.637512207, 25.6068559937}}, {"ekb", {60.3588867188, 56.6622647682, 61.0180664062, 57.0287738515}}, {"frankfurt", {8.36334228516, 49.937079757, 8.92364501953, 50.2296379179}}, - {"fukuoka", {130.285484,33.544873,130.51757,33.70268}}, - {"glasgow", {-4.542417,55.753178,-3.943662,55.982611}}, {"guangzhou", {112.560424805, 22.4313401564, 113.766174316, 23.5967112789}}, {"hamburg", {9.75860595703, 53.39151869, 10.2584838867, 53.6820686709}}, {"helsinki", {24.3237304688, 59.9989861206, 25.48828125, 60.44638186}}, - {"hiroshima", {132.256736,34.312824,132.621345,34.55182}}, {"hongkong", {114.039459229, 22.1848617608, 114.305877686, 22.3983322415}}, - {"isfahan", {51.472344,32.504644,51.865369,32.820396}}, {"istanbul", {28.4155, 40.7172, 29.7304, 41.4335}}, - {"izmir", {26.953591,38.262044,27.318199,38.543469}}, {"kazan", {48.8067626953, 55.6372985742, 49.39453125, 55.9153515154}}, {"kharkiv", {36.078138, 49.854027, 36.51107, 50.141277}}, {"kiev", {30.1354980469, 50.2050332649, 31.025390625, 50.6599083609}}, - {"kobe", {135.066888,34.617728,135.32232,34.776364}}, - {"kolkata", {88.240623,22.450324,88.458955,22.632536}}, {"koln", {6.7943572998, 50.8445380881, 7.12669372559, 51.0810964366}}, - {"kunming", {102.0983,24.3319,103.5969,25.7119}}, {"kyoto", {135.619598, 34.874916, 135.878442, 35.113709}}, - {"lausanne", {6.583868,46.504301,6.720813,46.602578}}, - {"lille", {2.789132,50.441626,3.329113,50.794609}}, + // https://observablehq.com/@rdmurphy/u-s-county-bounding-boxes-by-state + {"la", {-118.944112, 32.806553, -117.644787, 34.822766}}, {"lima", {-77.2750854492, -12.3279274859, -76.7999267578, -11.7988014362}}, {"lisboa", {-9.42626953125, 38.548165423, -8.876953125, 38.9166815364}}, {"london", {-0.4833984375, 51.3031452592, 0.2197265625, 51.6929902115}}, - {"la", {-118.944112, 32.806553, -117.644787, 34.822766}}, {"lyon", {4.5741, 45.5842, 5.1603, 45.9393}}, {"madrid", {-4.00451660156, 40.1536868578, -3.32885742188, 40.6222917831}}, - {"malaga", {-5.611777,36.310352,-3.765967,37.282445}}, - {"manila", {120.936229,14.550825,121.026167,14.639547}}, - {"maracaibo", {-71.812942,10.570632,-71.581199,10.758897}}, - {"mashhad", {59.302159,36.13267,59.83225,36.530945}}, {"mecca", {39.663307, 21.274985, 40.056236, 21.564195}}, - {"medellin", {-75.719423,6.162617,-75.473408,6.376421}}, {"mexico", {-99.3630981445, 19.2541083164, -98.879699707, 19.5960192403}}, {"milan", {9.02252197266, 45.341528405, 9.35760498047, 45.5813674681}}, {"minsk", {27.2845458984, 53.777934972, 27.8393554688, 54.0271334441}}, @@ -424,50 +397,39 @@ string MatchCity(OsmElement const * p) {"moscow", {36.9964599609, 55.3962717136, 38.1884765625, 56.1118730004}}, {"mumbai", {72.7514648437, 18.8803004445, 72.9862976074, 19.2878132403}}, {"munchen", {11.3433837891, 47.9981928195, 11.7965698242, 48.2530267576}}, - {"nagoya", {136.791969,35.025951,137.060899,35.260229}}, {"newyork", {-74.4104003906, 40.4134960497, -73.4600830078, 41.1869224229}}, {"nnov", {43.6431884766, 56.1608472541, 44.208984375, 56.4245355509}}, {"novosibirsk", {82.4578857422, 54.8513152597, 83.2983398438, 55.2540770671}}, {"osaka", {134.813232422, 34.1981730963, 136.076660156, 35.119908571}}, {"oslo", {10.3875732422, 59.7812868211, 10.9286499023, 60.0401604652}}, - {"palma", {2.556669,39.503227,2.841284,39.670445}}, {"panama", {-79.633827, 8.880788, -79.367367, 9.149179}}, {"paris", {2.09014892578, 48.6637569323, 2.70538330078, 49.0414689141}}, {"philadelphia", {-75.276761, 39.865446, -74.964493, 40.137768}}, {"pyongyang", {125.48888, 38.780932, 126.12748, 39.298738}}, - {"rennes", {-2.28897,47.934093,-1.283944,48.379636}}, {"rio", {-43.4873199463, -23.0348745407, -43.1405639648, -22.7134898498}}, {"roma", {12.3348999023, 41.7672146942, 12.6397705078, 42.0105298189}}, {"rotterdam", {3.940749, 51.842118, 4.601808, 52.004528}}, {"samara", {50.001145, 53.070867, 50.434992, 53.339216}}, {"santiago", {-71.015625, -33.8133843291, -70.3372192383, -33.1789392606}}, - {"santo_domingo", {-70.029669,18.390645,-69.831571,18.573966}}, {"saopaulo", {-46.9418334961, -23.8356009866, -46.2963867187, -23.3422558351}}, - {"sapporo", {141.160343,42.945651,141.577136,43.243986}}, - {"sendai", {140.469472,38.050849,141.260304,38.454699}}, {"seoul", {126.540527344, 37.3352243593, 127.23815918, 37.6838203267}}, {"sf", {-122.72277832, 37.1690715771, -121.651611328, 38.0307856938}}, {"shanghai", {119.849853516, 30.5291450367, 122.102050781, 32.1523618947}}, {"shenzhen", {113.790893555, 22.459263801, 114.348449707, 22.9280416657}}, - {"shiraz", {52.382254,29.498738,52.667513,29.840346}}, {"singapore", {103.624420166, 1.21389843409, 104.019927979, 1.45278619819}}, {"sofia", {23.195085, 42.574041, 23.503569, 42.835375}}, {"spb", {29.70703125, 59.5231755354, 31.3110351562, 60.2725145948}}, {"stockholm", {17.5726318359, 59.1336814082, 18.3966064453, 59.5565918857}}, {"stuttgart", {9.0877532959, 48.7471343254, 9.29306030273, 48.8755544436}}, {"sydney", {150.42755127, -34.3615762875, 151.424560547, -33.4543597895}}, - {"tabriz", {46.18432,38.015584,46.4126,38.15366}}, {"taipei", {121.368713379, 24.9312761454, 121.716156006, 25.1608229799}}, - {"taoyuan", {110.8471,28.4085,111.6109,29.4019}}, {"tashkent", {69.12171, 41.163421, 69.476967, 41.398638}}, {"tbilisi", {44.596922, 41.619315, 45.019694, 41.843421}}, - {"tianjin", {116.7022,38.555,118.0587,40.252}}, {"tokyo", {139.240722656, 35.2186974963, 140.498657227, 36.2575628263}}, {"valencia", {-0.432551, 39.27845, -0.272521, 39.566609}}, {"vienna", {16.0894775391, 48.0633965378, 16.6387939453, 48.3525987075}}, {"warszawa", {20.7202148438, 52.0322181041, 21.3024902344, 52.4091212523}}, {"washington", {-77.4920654297, 38.5954071994, -76.6735839844, 39.2216149801}}, - {"wuhan", {113.6925,29.972,115.0769,31.3622}}, {"yerevan", {44.359899, 40.065411, 44.645352, 40.26398}}, {"yokohama", {139.464781, 35.312501, 139.776935, 35.592738}}, }; @@ -513,7 +475,7 @@ string DetermineSurface(OsmElement * p) }; static base::StringIL badSurfaces = { - "cobblestone", "dirt", "earth", "grass", "gravel", "ground", "metal", "mud", "unpaved", + "cobblestone", "dirt", "earth", "grass", "gravel", "ground", "metal", "mud", "pebblestone", "sand", "sett", "snow", "unhewn_cobblestone", "wood", "woodchips" }; diff --git a/generator/osm_o5m_source.hpp b/generator/osm_o5m_source.hpp index b37b6ceeba..57115eb3b7 100644 --- a/generator/osm_o5m_source.hpp +++ b/generator/osm_o5m_source.hpp @@ -227,7 +227,7 @@ public: SubElements(O5MSource * reader, TSubElementGetter const & func) : m_reader(reader), m_func(func) {} - void Skip() { while (m_reader && m_func(nullptr)) { /* no-op */ } } + void Skip() { while (m_reader && m_func(nullptr)); } Iterator const begin() const { return Iterator(m_reader, m_func); } Iterator const end() const { return Iterator(); } diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index 1704aba9ef..a3d628b5bf 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -120,7 +120,6 @@ void ProcessOsmElementsFromXML(SourceReader & stream, std::function #include diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp index 6fcae33b20..8ba08addac 100644 --- a/generator/routing_index_generator.cpp +++ b/generator/routing_index_generator.cpp @@ -19,6 +19,7 @@ #include "transit/experimental/transit_data.hpp" #include "transit/transit_graph_data.hpp" +#include "transit/transit_serdes.hpp" #include "routing_common/bicycle_model.hpp" #include "routing_common/car_model.hpp" @@ -28,6 +29,7 @@ #include "indexer/feature_processor.hpp" #include "coding/files_container.hpp" +#include "coding/geometry_coding.hpp" #include "coding/point_coding.hpp" #include "coding/reader.hpp" @@ -41,6 +43,9 @@ #include "base/timer.hpp" #include +#include +#include +#include #include #include #include @@ -160,8 +165,8 @@ public: { } - /// @name For compatibility with IndexGraphStarterJoints - /// @{ + // Just for compatibility with IndexGraphStarterJoints + // @{ Segment GetStartSegment() const { return m_start; } Segment GetFinishSegment() const { return {}; } bool ConvertToReal(Segment const & /* segment */) const { return false; } @@ -193,9 +198,7 @@ public: } RouteWeight GetAStarWeightEpsilon() { return RouteWeight(0.0); } - - RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2) { return RouteWeight(0); } - /// @} + // @} ms::LatLon const & GetPoint(Segment const & s, bool forward) { diff --git a/generator/tag_admixer.hpp b/generator/tag_admixer.hpp index 5e2dd4e46c..bf0c8e94b8 100644 --- a/generator/tag_admixer.hpp +++ b/generator/tag_admixer.hpp @@ -52,16 +52,16 @@ public: { // String format: <>. // First ';'. - auto pos = oneLine.find(';'); + auto pos = oneLine.find(";"); if (pos != std::string::npos) { // Second ';'. - pos = oneLine.find(';', pos + 1); + pos = oneLine.find(";", pos + 1); if (pos != std::string::npos) { uint64_t nodeId; // Third ';'. - auto endPos = oneLine.find(';', pos + 1); + auto endPos = oneLine.find(";", pos + 1); if (endPos != std::string::npos) { if (strings::to_uint64(oneLine.substr(pos + 1, endPos - pos - 1), nodeId)) diff --git a/generator/world_roads_builder/world_roads_builder.cpp b/generator/world_roads_builder/world_roads_builder.cpp index 2bf8f9d83c..bf3b6ee577 100644 --- a/generator/world_roads_builder/world_roads_builder.cpp +++ b/generator/world_roads_builder/world_roads_builder.cpp @@ -70,10 +70,7 @@ RoadsFromOsm GetRoadsFromOsm(generator::SourceReader & reader, std::string const & highway = e.GetTag("highway"); if (!highway.empty() && base::IsExist(highways, highway)) - { - auto id = e.m_id; - roadsFromOsm.m_ways[highway].emplace(id, RoadData({}, std::move(e))); - } + roadsFromOsm.m_ways[highway].emplace(e.m_id, RoadData({}, std::move(e))); } else if (e.IsNode()) { diff --git a/geometry/angles.cpp b/geometry/angles.cpp index ab036c9d99..02cc633c25 100644 --- a/geometry/angles.cpp +++ b/geometry/angles.cpp @@ -4,7 +4,7 @@ namespace ang { double AngleIn2PI(double ang) { - double constexpr period = 2.0 * math::pi; + double const period = 2.0 * math::pi; ang = fmod(ang, period); if (ang < 0.0) ang += period; @@ -17,7 +17,7 @@ double AngleIn2PI(double ang) double GetShortestDistance(double rad1, double rad2) { - double constexpr period = 2.0 * math::pi; + double const period = 2.0 * math::pi; rad1 = fmod(rad1, period); rad2 = fmod(rad2, period); diff --git a/geometry/area_on_earth.cpp b/geometry/area_on_earth.cpp index 6ee17b0689..fd22ffae21 100644 --- a/geometry/area_on_earth.cpp +++ b/geometry/area_on_earth.cpp @@ -8,16 +8,14 @@ #include #include -namespace ms -{ namespace { -double constexpr kEarthRadiusMetersSquared = kEarthRadiusMeters * kEarthRadiusMeters; +double const kEarthRadiusMetersSquared = ms::kEarthRadiusMeters * ms::kEarthRadiusMeters; -m3::PointD GetPointOnSphere(LatLon const & ll, double sphereRadius) +m3::PointD GetPointOnSphere(ms::LatLon const & ll, double sphereRadius) { - ASSERT(LatLon::kMinLat <= ll.m_lat && ll.m_lat <= LatLon::kMaxLat, (ll)); - ASSERT(LatLon::kMinLon <= ll.m_lon && ll.m_lon <= LatLon::kMaxLon, (ll)); + ASSERT(ms::LatLon::kMinLat <= ll.m_lat && ll.m_lat <= ms::LatLon::kMaxLat, (ll)); + ASSERT(ms::LatLon::kMinLon <= ll.m_lon && ll.m_lon <= ms::LatLon::kMaxLon, (ll)); double const latRad = base::DegToRad(ll.m_lat); double const lonRad = base::DegToRad(ll.m_lon); @@ -30,6 +28,8 @@ m3::PointD GetPointOnSphere(LatLon const & ll, double sphereRadius) } } // namespace +namespace ms +{ // Look to https://en.wikipedia.org/wiki/Solid_angle for more details. // Shortly: // It's possible to calculate area of triangle on sphere with it's solid angle. @@ -68,8 +68,8 @@ double AreaOnEarth(LatLon const & ll1, LatLon const & ll2, LatLon const & ll3) // For circle: Ω = 2π(1 - cos(θ / 2)), where θ - is the cone apex angle. double CircleAreaOnEarth(double distanceOnSphereRadius) { - double const theta = 2.0 * distanceOnSphereRadius / kEarthRadiusMeters; - double constexpr kConst = 2 * math::pi * kEarthRadiusMetersSquared; + double const theta = 2.0 * distanceOnSphereRadius / ms::kEarthRadiusMeters; + static double const kConst = 2 * math::pi * kEarthRadiusMetersSquared; double const sinValue = sin(theta / 4); // 1 - cos(θ / 2) = 2sin^2(θ / 4) return kConst * 2 * sinValue * sinValue; diff --git a/geometry/area_on_earth.hpp b/geometry/area_on_earth.hpp index 4fd7c8e3df..b26301974c 100644 --- a/geometry/area_on_earth.hpp +++ b/geometry/area_on_earth.hpp @@ -1,6 +1,7 @@ #pragma once #include "geometry/latlon.hpp" +#include "geometry/point2d.hpp" namespace ms { diff --git a/geometry/calipers_box.cpp b/geometry/calipers_box.cpp index fc5e8ce3c4..0a1ccb1b43 100644 --- a/geometry/calipers_box.cpp +++ b/geometry/calipers_box.cpp @@ -16,6 +16,9 @@ namespace m2 { namespace { +static_assert(std::numeric_limits::has_infinity, ""); + +double constexpr kInf = std::numeric_limits::infinity(); // Checks whether (p1 - p) x (p2 - p) >= 0. bool IsCCWNeg(PointD const & p1, PointD const & p2, PointD const & p, double eps) @@ -50,8 +53,8 @@ void ForEachRect(ConvexHull const & hull, Fn && fn) ++l; auto const oab = Ort(ab); - std::array const lines = {Line2D(hull.PointAt(i), ab), Line2D(hull.PointAt(j), oab), - Line2D(hull.PointAt(k), ab), Line2D(hull.PointAt(l), oab)}; + std::array const lines = {{Line2D(hull.PointAt(i), ab), Line2D(hull.PointAt(j), oab), + Line2D(hull.PointAt(k), ab), Line2D(hull.PointAt(l), oab)}}; std::vector corners; for (size_t i = 0; i < lines.size(); ++i) { @@ -64,10 +67,10 @@ void ForEachRect(ConvexHull const & hull, Fn && fn) if (corners.size() != 4) continue; - auto const it = std::min_element(corners.begin(), corners.end()); - std::rotate(corners.begin(), it, corners.end()); + auto const it = min_element(corners.begin(), corners.end()); + rotate(corners.begin(), it, corners.end()); - fn(std::move(corners)); + fn(corners); } } } // namespace @@ -82,79 +85,51 @@ CalipersBox::CalipersBox(std::vector const & points) : m_points({}) return; } - double bestArea = std::numeric_limits::max(); + double bestArea = kInf; std::vector bestPoints; - ForEachRect(hull, [&](std::vector && points) - { + ForEachRect(hull, [&](std::vector const & points) { ASSERT_EQUAL(points.size(), 4, ()); double const area = GetPolygonArea(points.begin(), points.end()); if (area < bestArea) { bestArea = area; - bestPoints = std::move(points); + bestPoints = points; } }); - if (!bestPoints.empty()) + if (bestPoints.empty()) { - ASSERT_EQUAL(bestPoints.size(), 4, ()); - m_points = std::move(bestPoints); + BoundingBox bbox(points); + auto const min = bbox.Min(); + auto const max = bbox.Max(); + + auto const width = max.x - min.x; + auto const height = max.y - min.y; + + m_points.resize(4); + m_points[0] = min; + m_points[1] = m_points[0] + PointD(width, 0); + m_points[2] = m_points[1] + PointD(0, height); + m_points[3] = m_points[0] + PointD(0, height); + return; } - else - m_points = BoundingBox(points).Points(); -} -void CalipersBox::Deserialize(std::vector && points) -{ - ASSERT_EQUAL(points.size(), 4, ()); - - // 1. Stable after ser-des. - m_points = std::move(points); - ASSERT(TestValid(), ()); - - // 2. Stable with input. -//#ifdef DEBUG -// CalipersBox test(m_points); -// ASSERT(test.TestValid(), ()); -// *this = std::move(test); -//#endif -} - -void CalipersBox::Normalize() -{ - m_points.erase(std::unique(m_points.begin(), m_points.end()), m_points.end()); - if (m_points.size() == 3) - { - if (m_points.front() == m_points.back()) - m_points.pop_back(); - else - m_points.push_back(m_points.back()); - } -} - -bool CalipersBox::TestValid() const -{ - size_t const n = m_points.size(); - for (size_t i = 0; i < n; ++i) - { - if (!IsCCWNeg(m_points[i], m_points[(i + 1) % n], m_points[(i + 2) % n], kEps)) - return false; - } - return n > 0; + ASSERT_EQUAL(bestPoints.size(), 4, ()); + m_points = bestPoints; } bool CalipersBox::HasPoint(PointD const & p, double eps) const { auto const n = m_points.size(); - switch (n) - { - case 0: + + if (n == 0) return false; - case 1: + + if (n == 1) return AlmostEqualAbs(m_points[0], p, eps); - case 2: + + if (n == 2) return IsPointOnSegmentEps(p, m_points[0], m_points[1], eps); - } for (size_t i = 0; i < n; ++i) { diff --git a/geometry/calipers_box.hpp b/geometry/calipers_box.hpp index 3121e0ba0f..ed49431d88 100644 --- a/geometry/calipers_box.hpp +++ b/geometry/calipers_box.hpp @@ -25,13 +25,6 @@ public: CalipersBox() = default; explicit CalipersBox(std::vector const & points); - // Used in CitiesBoundariesDecoder. Faster than ctor. - void Deserialize(std::vector && points); - // Remove useless points in case of degenerate box. Used in unit tests. - void Normalize(); - - bool TestValid() const; - std::vector const & Points() const { return m_points; } bool HasPoint(PointD const & p) const { return HasPoint(p, kEps); } diff --git a/geometry/convex_hull.cpp b/geometry/convex_hull.cpp index 84eca849f6..184e8c94c6 100644 --- a/geometry/convex_hull.cpp +++ b/geometry/convex_hull.cpp @@ -33,15 +33,16 @@ std::vector BuildConvexHull(std::vector points, double eps) { base::SortUnique(points); - ASSERT(points.empty() || points.begin() == min_element(points.begin(), points.end()), ()); + auto const n = points.size(); - if (points.size() < 3) + if (n < 2) return points; + std::iter_swap(points.begin(), min_element(points.begin(), points.end())); + auto const pivot = points[0]; - std::sort(points.begin() + 1, points.end(), [&pivot, &eps](PointD const & lhs, PointD const & rhs) - { + std::sort(points.begin() + 1, points.end(), [&pivot, &eps](PointD const & lhs, PointD const & rhs) { if (IsCCW(lhs, rhs, pivot, eps)) return true; if (IsCCW(rhs, lhs, pivot, eps)) diff --git a/geometry/distance_on_sphere.hpp b/geometry/distance_on_sphere.hpp index 48fca49481..61b189d4d4 100644 --- a/geometry/distance_on_sphere.hpp +++ b/geometry/distance_on_sphere.hpp @@ -1,11 +1,14 @@ #pragma once #include "geometry/latlon.hpp" +#include "geometry/point3d.hpp" + +#include "base/base.hpp" // namespace ms - "math on sphere", similar to namespace m2. namespace ms { -double constexpr kEarthRadiusMeters = 6378000.0; +double const kEarthRadiusMeters = 6378000.0; // Distance on unit sphere between (lat1, lon1) and (lat2, lon2). // lat1, lat2, lon1, lon2 - in degrees. double DistanceOnSphere(double lat1Deg, double lon1Deg, double lat2Deg, double lon2Deg); diff --git a/geometry/intersection_score.hpp b/geometry/intersection_score.hpp index c26270720f..3c823a54b5 100644 --- a/geometry/intersection_score.hpp +++ b/geometry/intersection_score.hpp @@ -10,9 +10,8 @@ #ifdef __clang__ #pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#pragma clang diagnostic ignored "-Wcomma" #pragma clang diagnostic ignored "-Wshorten-64-to-32" +#pragma clang diagnostic ignored "-Wcomma" #endif #include #ifdef __clang__ diff --git a/geometry/point_with_altitude.cpp b/geometry/point_with_altitude.cpp index 4ace90c568..91e8f75fbc 100644 --- a/geometry/point_with_altitude.cpp +++ b/geometry/point_with_altitude.cpp @@ -11,11 +11,16 @@ PointWithAltitude::PointWithAltitude() { } -PointWithAltitude::PointWithAltitude(m2::PointD const & point, Altitude altitude/* = kDefaultAltitudeMeters */) +PointWithAltitude::PointWithAltitude(m2::PointD const & point, Altitude altitude) : m_point(point), m_altitude(altitude) { } +PointWithAltitude::PointWithAltitude(m2::PointD && point, Altitude altitude) + : m_point(std::move(point)), m_altitude(altitude) +{ +} + bool PointWithAltitude::operator==(PointWithAltitude const & r) const { return m_point == r.m_point && m_altitude == r.m_altitude; @@ -44,7 +49,7 @@ PointWithAltitude MakePointWithAltitudeForTesting(m2::PointD const & point) bool AlmostEqualAbs(PointWithAltitude const & lhs, PointWithAltitude const & rhs, double eps) { - return AlmostEqualAbs(lhs.GetPoint(), rhs.GetPoint(), eps) && lhs.GetAltitude() == rhs.GetAltitude(); + return lhs.GetPoint().EqualDxDy(rhs.GetPoint(), eps) && lhs.GetAltitude() == rhs.GetAltitude(); } } // namespace geometry diff --git a/geometry/point_with_altitude.hpp b/geometry/point_with_altitude.hpp index 4fa50e81c2..02ca0b42d9 100644 --- a/geometry/point_with_altitude.hpp +++ b/geometry/point_with_altitude.hpp @@ -2,8 +2,10 @@ #include "geometry/point2d.hpp" +#include #include #include +#include #include namespace geometry @@ -18,8 +20,8 @@ class PointWithAltitude { public: PointWithAltitude(); - PointWithAltitude(m2::PointD const & point, Altitude altitude = kDefaultAltitudeMeters); - operator m2::PointD() const { return m_point; } + PointWithAltitude(m2::PointD const & point, Altitude altitude); + PointWithAltitude(m2::PointD && point, Altitude altitude); bool operator==(PointWithAltitude const & r) const; bool operator!=(PointWithAltitude const & r) const { return !(*this == r); } @@ -28,7 +30,8 @@ public: m2::PointD const & GetPoint() const { return m_point; } Altitude GetAltitude() const { return m_altitude; } - void SetPoint(m2::PointD const & point) { m_point = point; } + template + void SetPoint(T && point) { m_point = std::forward(point); } void SetAltitude(Altitude altitude) { m_altitude = altitude; } private: diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp index e09a3f33ba..2934ce4963 100644 --- a/geometry/screenbase.cpp +++ b/geometry/screenbase.cpp @@ -3,6 +3,7 @@ #include "geometry/transformations.hpp" #include "base/assert.hpp" +#include "base/logging.hpp" #include @@ -44,7 +45,7 @@ ScreenBase::ScreenBase(m2::RectI const & pxRect, m2::AnyRectD const & glbRect) ScreenBase::ScreenBase(ScreenBase const & s, m2::PointD const & org, double scale, double angle) : m_Org(org), m_ViewportRect(s.m_ViewportRect), m_Scale(scale), m_Angle(angle) { - ASSERT_GREATER(m_Scale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(m_Scale, 0.0, ()); UpdateDependentParameters(); } @@ -127,15 +128,11 @@ void ScreenBase::SetAutoPerspective(bool isAutoPerspective) void ScreenBase::SetFromRects(m2::AnyRectD const & glbRect, m2::RectD const & pxRect) { - m2::RectD const & lRect = glbRect.GetLocalRect(); - ASSERT(!lRect.IsEmptyInterior(), (lRect)); - ASSERT(!pxRect.IsEmptyInterior(), (pxRect)); + double hScale = glbRect.GetLocalRect().SizeX() / pxRect.SizeX(); + double vScale = glbRect.GetLocalRect().SizeY() / pxRect.SizeY(); - double const hScale = lRect.SizeX() / pxRect.SizeX(); - double const vScale = lRect.SizeY() / pxRect.SizeY(); - - ASSERT_GREATER(hScale, 0.0, ()); - ASSERT_GREATER(vScale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(hScale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(vScale, 0.0, ()); m_Scale = std::max(hScale, vScale); m_Angle = glbRect.Angle(); m_Org = glbRect.GlobalCenter(); @@ -147,7 +144,7 @@ void ScreenBase::SetFromRect(m2::AnyRectD const & glbRect) { SetFromRects(glbRec void ScreenBase::SetFromParams(m2::PointD const & org, double angle, double scale) { - ASSERT_GREATER(scale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(scale, 0.0, ()); m_Scale = scale; m_Angle = ang::Angle(angle); m_Org = org; @@ -186,9 +183,8 @@ void ScreenBase::MoveG(m2::PointD const & p) void ScreenBase::Scale(double scale) { - ASSERT_GREATER(scale, 0, ()); m_Scale /= scale; - ASSERT_GREATER(m_Scale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(m_Scale, 0.0, ()); UpdateDependentParameters(); } @@ -208,7 +204,7 @@ void ScreenBase::OnSize(int x0, int y0, int w, int h) { OnSize(m2::RectI(x0, y0, void ScreenBase::SetScale(double scale) { - ASSERT_GREATER(scale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(scale, 0.0, ()); m_Scale = scale; UpdateDependentParameters(); } @@ -248,9 +244,8 @@ void ScreenBase::SetGtoPMatrix(MatrixT const & m) double dx, dy, a, s; ExtractGtoPParams(m, a, s, dx, dy); m_Angle = ang::AngleD(-a); - ASSERT_GREATER(s, 0.0, ()); m_Scale = 1 / s; - ASSERT_GREATER(m_Scale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(m_Scale, 0.0, ()); m_Org = PtoG(m_PixelRect.Center()); UpdateDependentParameters(); diff --git a/geometry/screenbase.hpp b/geometry/screenbase.hpp index d0418031ee..ad88f94609 100644 --- a/geometry/screenbase.hpp +++ b/geometry/screenbase.hpp @@ -35,7 +35,7 @@ public: double GetScale() const { - ASSERT_GREATER(m_Scale, 0.0, ()); + CHECK_GREATER_OR_EQUAL(m_Scale, 0.0, ()); return m_Scale; } void SetScale(double scale); diff --git a/geometry/spline.cpp b/geometry/spline.cpp index 1ecd97735d..736fef414c 100644 --- a/geometry/spline.cpp +++ b/geometry/spline.cpp @@ -1,6 +1,9 @@ #include "geometry/spline.hpp" +#include "base/logging.hpp" + #include +#include namespace m2 { @@ -11,7 +14,7 @@ Spline::Spline(std::vector const & path) Spline::Spline(std::vector && path) { - Init(std::move(path)); + Init(move(path)); } Spline::Spline(size_t reservedSize) @@ -116,7 +119,6 @@ void Spline::Init(T && path) { m_direction[i] = m_position[i + 1] - m_position[i]; m_length[i] = m_direction[i].Length(); - ASSERT_GREATER(m_length[i], 0, (i)); m_direction[i] = m_direction[i].Normalize(); } } @@ -237,7 +239,7 @@ SharedSpline::SharedSpline(std::vector const & path) } SharedSpline::SharedSpline(std::vector && path) - : m_spline(std::make_shared(std::move(path))) + : m_spline(std::make_shared(move(path))) { } diff --git a/indexer/CMakeLists.txt b/indexer/CMakeLists.txt index 75aa541976..c134c49662 100644 --- a/indexer/CMakeLists.txt +++ b/indexer/CMakeLists.txt @@ -149,6 +149,11 @@ file(COPY ${OTHER_FILES} DESTINATION ${CMAKE_BINARY_DIR}) omim_add_library(${PROJECT_NAME} ${SRC}) +set(protobuf_BUILD_TESTS OFF) +set(protobuf_BUILD_PROTOC_BINARIES OFF) + +add_subdirectory(${OMIM_ROOT}/3party/protobuf/protobuf ${CMAKE_CURRENT_BINARY_DIR}/protobuf) + target_link_libraries(${PROJECT_NAME} search # search::DummyRankTable in CachingRankTableLoader platform diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp index 111e54d489..88ac3ea98e 100644 --- a/indexer/categories_holder.hpp +++ b/indexer/categories_holder.hpp @@ -1,13 +1,18 @@ #pragma once #include "base/mem_trie.hpp" +#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" #include #include +#include +#include +#include #include #include #include +#include #include class Reader; @@ -168,7 +173,7 @@ public: void ForEachTypeByName(int8_t locale, strings::UniString const & name, ToDo && toDo) const { auto const localePrefix = strings::UniString(1, static_cast(locale)); - m_name2type.ForEachInNode(localePrefix + name, toDo); + m_name2type.ForEachInNode(localePrefix + name, std::forward(toDo)); } GroupTranslations const & GetGroupTranslations() const { return m_groupTranslations; } diff --git a/indexer/cities_boundaries_serdes.hpp b/indexer/cities_boundaries_serdes.hpp index 410fb2998c..949db52cbe 100644 --- a/indexer/cities_boundaries_serdes.hpp +++ b/indexer/cities_boundaries_serdes.hpp @@ -18,6 +18,7 @@ #include "base/assert.hpp" #include "base/macros.hpp" +#include "base/visitor.hpp" #include #include @@ -39,13 +40,11 @@ public: { } - void Save(m2::PointU const & p) + void operator()(m2::PointD const & p) { return (*this)(ToU(p)); } + + void operator()(m2::PointU const & p) { WriteVarUint(m_sink, coding::EncodePointDeltaAsUint(p, m_last)); - } - void SaveWithLast(m2::PointU const & p) - { - Save(p); m_last = p; } @@ -54,7 +53,7 @@ public: auto const min = ToU(bbox.Min()); auto const max = ToU(bbox.Max()); - SaveWithLast(min); + (*this)(min); EncodeNonNegativePointDelta(min, max); } @@ -85,9 +84,9 @@ public: auto const us = ToU(ps); - SaveWithLast(us[0]); - Save(us[1]); - Save(us[3]); + (*this)(us[0]); + coding::EncodePointDelta(m_sink, us[0], us[1]); + coding::EncodePointDelta(m_sink, us[0], us[3]); } void operator()(m2::DiamondBox const & dbox) @@ -97,17 +96,15 @@ public: auto const next = ps[1]; auto const prev = ps[3]; - SaveWithLast(base); + (*this)(base); ASSERT_GREATER_OR_EQUAL(next.x, base.x, ()); ASSERT_GREATER_OR_EQUAL(next.y, base.y, ()); - auto const nx = next.x >= base.x ? next.x - base.x : 0; + WriteVarUint(m_sink, next.x >= base.x ? next.x - base.x : 0); ASSERT_GREATER_OR_EQUAL(prev.x, base.x, ()); ASSERT_LESS_OR_EQUAL(prev.y, base.y, ()); - auto const px = prev.x >= base.x ? prev.x - base.x : 0; - - WriteVarUint(m_sink, bits::BitwiseMerge(nx, px)); + WriteVarUint(m_sink, prev.x >= base.x ? prev.x - base.x : 0); } template @@ -144,7 +141,8 @@ public: // here. In general, next.x >= curr.x and next.y >= curr.y. auto const dx = next.x >= curr.x ? next.x - curr.x : 0; auto const dy = next.y >= curr.y ? next.y - curr.y : 0; - WriteVarUint(m_sink, bits::BitwiseMerge(dx, dy)); + WriteVarUint(m_sink, dx); + WriteVarUint(m_sink, dy); } Sink & m_sink; @@ -186,40 +184,10 @@ private: }; template -class CitiesBoundariesDecoder +class CitiesBoundariesDecoderV0 { public: - struct DecoderV0 - { - static m2::PointU DecodeNonNegativeDelta(Source & src) - { - auto const dx = ReadVarUint(src); - auto const dy = ReadVarUint(src); - return {dx, dy}; - } - - static m2::PointU DecodePoint(Source & src, m2::PointU const & base) - { - return coding::DecodePointDelta(src, base); - } - }; - - struct DecoderV1 - { - static m2::PointU DecodeNonNegativeDelta(Source & src) - { - uint32_t dx, dy; - bits::BitwiseSplit(ReadVarUint(src), dx, dy); - return {dx, dy}; - } - - static m2::PointU DecodePoint(Source & src, m2::PointU const & base) - { - return coding::DecodePointDeltaFromUint(ReadVarUint(src), base); - } - }; - - template struct Visitor + struct Visitor { public: Visitor(Source & source, serial::GeometryCodingParams const & params) @@ -227,53 +195,57 @@ public: { } - m2::PointU LoadPoint() + void operator()(m2::PointD & p) { - return coding::DecodePointDeltaFromUint(ReadVarUint(m_source), m_last); + m2::PointU u; + (*this)(u); + p = FromU(u); } - m2::PointU LoadPointWithLast() + void operator()(m2::PointU & p) { - m_last = LoadPoint(); - return m_last; + p = coding::DecodePointDeltaFromUint(ReadVarUint(m_source), m_last); + m_last = p; } void operator()(m2::BoundingBox & bbox) { - auto const min = LoadPointWithLast(); - m2::PointU const delta = TDecoder::DecodeNonNegativeDelta(m_source); + m2::PointU min; + (*this)(min); + auto const max = DecodeNonNegativePointDelta(min); bbox = m2::BoundingBox(); bbox.Add(FromU(min)); - bbox.Add(FromU(min + delta)); + bbox.Add(FromU(max)); } void operator()(m2::CalipersBox & cbox) { std::vector us(4); - us[0] = LoadPointWithLast(); - us[1] = TDecoder::DecodePoint(m_source, m_last); - us[3] = TDecoder::DecodePoint(m_source, m_last); + (*this)(us[0]); + us[1] = coding::DecodePointDelta(m_source, us[0]); + us[3] = coding::DecodePointDelta(m_source, us[0]); auto ps = FromU(us); auto const dp = ps[3] - ps[0]; ps[2] = ps[1] + dp; - cbox.Deserialize(std::move(ps)); + cbox = m2::CalipersBox(ps); } void operator()(m2::DiamondBox & dbox) { - auto const base = LoadPointWithLast(); + m2::PointU base; + (*this)(base); - // {nx, px} - auto const delta = TDecoder::DecodeNonNegativeDelta(m_source); + auto const nx = ReadVarUint(m_source); + auto const px = ReadVarUint(m_source); dbox = m2::DiamondBox(); dbox.Add(FromU(base)); - dbox.Add(FromU(base + m2::PointU(delta.x, delta.x))); - dbox.Add(FromU(base + m2::PointU(delta.y, -delta.y))); - dbox.Add(FromU(base + m2::PointU(delta.x + delta.y, delta.x - delta.y))); + dbox.Add(FromU(base + m2::PointU(nx, nx))); + dbox.Add(FromU(base + m2::PointU(px, -px))); + dbox.Add(FromU(base + m2::PointU(nx + px, nx - px))); } template @@ -296,82 +268,122 @@ public: return ps; } + // Reads the encoded difference from |m_source| and returns the + // point equal to |base| + difference. It is guaranteed that + // both coordinates of difference are non-negative. + m2::PointU DecodeNonNegativePointDelta(m2::PointU const & base) + { + auto const dx = ReadVarUint(m_source); + auto const dy = ReadVarUint(m_source); + return m2::PointU(base.x + dx, base.y + dy); + } + Source & m_source; serial::GeometryCodingParams const m_params; m2::PointU m_last; }; - using BoundariesT = std::vector>; - - CitiesBoundariesDecoder(Source & source, serial::GeometryCodingParams const & params, BoundariesT & res) - : m_source(source), m_params(params), m_boundaries(res) + CitiesBoundariesDecoderV0(Source & source, serial::GeometryCodingParams const & params) + : m_source(source), m_visitor(source, params) { } - void LoadSizes() + void operator()(std::vector> & boundaries) { { auto const size = static_cast(ReadVarUint(m_source)); - m_boundaries.resize(size); + boundaries.resize(size); + } + { BitReader reader(m_source); - for (auto & bs : m_boundaries) + for (auto & bs : boundaries) { auto const size = static_cast(coding::GammaCoder::Decode(reader)); ASSERT_GREATER_OR_EQUAL(size, 1, ()); bs.resize(size - 1); } } - } - template void LoadBoundaries() - { - Visitor visitor(m_source, m_params); - for (auto & bs : m_boundaries) + for (auto & bs : boundaries) { for (auto & b : bs) - visitor(b); + m_visitor(b); } } private: Source & m_source; - serial::GeometryCodingParams const m_params; - BoundariesT & m_boundaries; + Visitor m_visitor; }; struct CitiesBoundariesSerDes { - struct Header + template + struct WriteToSinkVisitor { - // 0 - initial version - // 1 - optimized delta-points encoding - static uint8_t constexpr kLatestVersion = 1; - static uint8_t constexpr kDefaultCoordBits = 19; + WriteToSinkVisitor(Sink & sink) : m_sink(sink) {} - uint8_t m_coordBits = kDefaultCoordBits; - uint8_t m_version = kLatestVersion; - - template void Serialize(Sink & sink) const + template + std::enable_if_t::value || std::is_enum::value, void> operator()( + T const & t, char const * /* name */ = nullptr) { - WriteToSink(sink, m_version); - WriteToSink(sink, m_coordBits); + WriteToSink(m_sink, t); } - template void Deserialize(Source & src) + template + std::enable_if_t::value && !std::is_enum::value, void> operator()( + T const & t, char const * /* name */ = nullptr) { - m_version = ReadPrimitiveFromSource(src); - m_coordBits = ReadPrimitiveFromSource(src); + t.Visit(*this); } + + Sink & m_sink; }; - using BoundariesT = std::vector>; + template + struct ReadFromSourceVisitor + { + ReadFromSourceVisitor(Source & source) : m_source(source) {} + + template + std::enable_if_t::value || std::is_enum::value, void> operator()( + T & t, char const * /* name */ = nullptr) + { + t = ReadPrimitiveFromSource(m_source); + } + + template + std::enable_if_t::value && !std::is_enum::value, void> operator()( + T & t, char const * /* name */ = nullptr) + { + t.Visit(*this); + } + + Source & m_source; + }; + + static uint8_t constexpr kLatestVersion = 0; + + struct HeaderV0 + { + static uint8_t const kDefaultCoordBits = 19; + + DECLARE_VISITOR(visitor(m_coordBits, "coordBits")) + + uint8_t m_coordBits = kDefaultCoordBits; + }; template - static void Serialize(Sink & sink, BoundariesT const & boundaries) + static void Serialize(Sink & sink, std::vector> const & boundaries) { - Header header; - header.Serialize(sink); + uint8_t const version = kLatestVersion; + + WriteToSinkVisitor visitor(sink); + visitor(version); + + HeaderV0 const header; + visitor(header); using mercator::Bounds; serial::GeometryCodingParams const params(header.m_coordBits, {Bounds::kMinX, Bounds::kMinY}); @@ -380,24 +392,25 @@ struct CitiesBoundariesSerDes } template - static void Deserialize(Source & source, BoundariesT & boundaries, double & precision) + static void Deserialize(Source & source, std::vector> & boundaries, + double & precision) { - Header header; - header.Deserialize(source); + ReadFromSourceVisitor visitor(source); + + uint8_t version; + visitor(version); + + CHECK_EQUAL(version, 0, ()); + + HeaderV0 header; + visitor(header); using mercator::Bounds; precision = std::max(Bounds::kRangeX, Bounds::kRangeY) / double(1 << header.m_coordBits); serial::GeometryCodingParams const params(header.m_coordBits, {Bounds::kMinX, Bounds::kMinY}); - using DecoderT = CitiesBoundariesDecoder; - DecoderT decoder(source, params, boundaries); - - decoder.LoadSizes(); - if (header.m_version == 0) - decoder.template LoadBoundaries(); - else - decoder.template LoadBoundaries(); + CitiesBoundariesDecoderV0 decoder(source, params); + decoder(boundaries); } }; - -} // namespace indexer +} // namespace indexer diff --git a/indexer/drawing_rule_def.hpp b/indexer/drawing_rule_def.hpp index e478403e42..6f34e25a57 100644 --- a/indexer/drawing_rule_def.hpp +++ b/indexer/drawing_rule_def.hpp @@ -28,6 +28,9 @@ namespace drule /// drawing type of rule - can be one of ... enum rule_type_t { line, area, symbol, caption, circle, pathtext, waymarker, shield, count_of_rules }; + /// geo type of rule - can be one combined of ... + enum rule_geo_t { node = 1, way = 2 }; + /// text field type - can be one of ... enum text_type_t { text_type_name = 0, text_type_housename, text_type_housenumber }; diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp index 54ebfc4d13..b9fb8eb180 100644 --- a/indexer/drawing_rules.cpp +++ b/indexer/drawing_rules.cpp @@ -35,6 +35,9 @@ namespace } } // namespace +BaseRule::BaseRule() : m_type(node | way) +{} + void BaseRule::CheckCacheSize(size_t s) { m_id1.resize(s); @@ -238,7 +241,10 @@ namespace { SymbolRuleProto m_symbol; public: - explicit Symbol(SymbolRuleProto const & r) : m_symbol(r) {} + explicit Symbol(SymbolRuleProto const & r) : m_symbol(r) + { + SetType(r.apply_for_type()); + } virtual SymbolRuleProto const * GetSymbol() const { return &m_symbol; } }; diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp index 59a0f26ae8..0628c7a380 100644 --- a/indexer/drawing_rules.hpp +++ b/indexer/drawing_rules.hpp @@ -31,13 +31,14 @@ namespace drule class BaseRule { mutable buffer_vector m_id1; + char m_type; // obsolete for new styles, can be removed std::unique_ptr m_selector; public: static uint32_t const empty_id = 0xFFFFFFFF; - BaseRule() = default; + BaseRule(); virtual ~BaseRule() = default; void CheckCacheSize(size_t s); @@ -48,6 +49,9 @@ namespace drule void MakeEmptyID(size_t threadSlot); void MakeEmptyID(); + void SetType(char type) { m_type = type; } + inline char GetType() const { return m_type; } + virtual LineDefProto const * GetLine() const; virtual AreaRuleProto const * GetArea() const; virtual SymbolRuleProto const * GetSymbol() const; diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index 75a9550524..40fa606a6a 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -1,182 +1,281 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: indexer/drules_struct.proto +// source: drules_struct.proto -#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION -#include "indexer/drules_struct.pb.h" +#include "drules_struct.pb.h" #include -#include -#include -#include #include -#include +#include +#include #include // @@protoc_insertion_point(includes) -class DashDotProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _DashDotProto_default_instance_; -class PathSymProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _PathSymProto_default_instance_; -class LineRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _LineRuleProto_default_instance_; -class LineDefProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _LineDefProto_default_instance_; -class AreaRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _AreaRuleProto_default_instance_; -class SymbolRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _SymbolRuleProto_default_instance_; -class CaptionDefProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _CaptionDefProto_default_instance_; -class CaptionRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _CaptionRuleProto_default_instance_; -class CircleRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _CircleRuleProto_default_instance_; -class PathTextRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _PathTextRuleProto_default_instance_; -class ShieldRuleProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _ShieldRuleProto_default_instance_; -class DrawElementProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _DrawElementProto_default_instance_; -class ClassifElementProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _ClassifElementProto_default_instance_; -class ColorElementProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _ColorElementProto_default_instance_; -class ColorsElementProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _ColorsElementProto_default_instance_; -class ContainerProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed { -} _ContainerProto_default_instance_; +#include -namespace protobuf_indexer_2fdrules_5fstruct_2eproto { +PROTOBUF_PRAGMA_INIT_SEG -PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField - const TableStruct::entries[] = { - {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0}, +namespace _pb = ::PROTOBUF_NAMESPACE_ID; +namespace _pbi = _pb::internal; + +PROTOBUF_CONSTEXPR DashDotProto::DashDotProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.dd_)*/{} + , /*decltype(_impl_.offset_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct DashDotProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR DashDotProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~DashDotProtoDefaultTypeInternal() {} + union { + DashDotProto _instance; + }; }; - -PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField - const TableStruct::aux[] = { - ::google::protobuf::internal::AuxillaryParseTableField(), +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DashDotProtoDefaultTypeInternal _DashDotProto_default_instance_; +PROTOBUF_CONSTEXPR PathSymProto::PathSymProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.step_)*/0 + , /*decltype(_impl_.offset_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct PathSymProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR PathSymProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~PathSymProtoDefaultTypeInternal() {} + union { + PathSymProto _instance; + }; }; -PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const - TableStruct::schema[] = { - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, - { NULL, NULL, 0, -1, -1, false }, +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PathSymProtoDefaultTypeInternal _PathSymProto_default_instance_; +PROTOBUF_CONSTEXPR LineRuleProto::LineRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.dashdot_)*/nullptr + , /*decltype(_impl_.pathsym_)*/nullptr + , /*decltype(_impl_.width_)*/0 + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_.join_)*/0 + , /*decltype(_impl_.cap_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct LineRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR LineRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~LineRuleProtoDefaultTypeInternal() {} + union { + LineRuleProto _instance; + }; }; - - -void TableStruct::Shutdown() { - _DashDotProto_default_instance_.Shutdown(); - _PathSymProto_default_instance_.Shutdown(); - _LineRuleProto_default_instance_.Shutdown(); - _LineDefProto_default_instance_.Shutdown(); - _AreaRuleProto_default_instance_.Shutdown(); - _SymbolRuleProto_default_instance_.Shutdown(); - _CaptionDefProto_default_instance_.Shutdown(); - _CaptionRuleProto_default_instance_.Shutdown(); - _CircleRuleProto_default_instance_.Shutdown(); - _PathTextRuleProto_default_instance_.Shutdown(); - _ShieldRuleProto_default_instance_.Shutdown(); - _DrawElementProto_default_instance_.Shutdown(); - _ClassifElementProto_default_instance_.Shutdown(); - _ColorElementProto_default_instance_.Shutdown(); - _ColorsElementProto_default_instance_.Shutdown(); - _ContainerProto_default_instance_.Shutdown(); -} - -void TableStruct::InitDefaultsImpl() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - ::google::protobuf::internal::InitProtobufDefaults(); - _DashDotProto_default_instance_.DefaultConstruct(); - _PathSymProto_default_instance_.DefaultConstruct(); - _LineRuleProto_default_instance_.DefaultConstruct(); - _LineDefProto_default_instance_.DefaultConstruct(); - _AreaRuleProto_default_instance_.DefaultConstruct(); - _SymbolRuleProto_default_instance_.DefaultConstruct(); - _CaptionDefProto_default_instance_.DefaultConstruct(); - _CaptionRuleProto_default_instance_.DefaultConstruct(); - _CircleRuleProto_default_instance_.DefaultConstruct(); - _PathTextRuleProto_default_instance_.DefaultConstruct(); - _ShieldRuleProto_default_instance_.DefaultConstruct(); - _DrawElementProto_default_instance_.DefaultConstruct(); - _ClassifElementProto_default_instance_.DefaultConstruct(); - _ColorElementProto_default_instance_.DefaultConstruct(); - _ColorsElementProto_default_instance_.DefaultConstruct(); - _ContainerProto_default_instance_.DefaultConstruct(); - _LineRuleProto_default_instance_.get_mutable()->dashdot_ = const_cast< ::DashDotProto*>( - ::DashDotProto::internal_default_instance()); - _LineRuleProto_default_instance_.get_mutable()->pathsym_ = const_cast< ::PathSymProto*>( - ::PathSymProto::internal_default_instance()); - _LineDefProto_default_instance_.get_mutable()->dashdot_ = const_cast< ::DashDotProto*>( - ::DashDotProto::internal_default_instance()); - _LineDefProto_default_instance_.get_mutable()->pathsym_ = const_cast< ::PathSymProto*>( - ::PathSymProto::internal_default_instance()); - _AreaRuleProto_default_instance_.get_mutable()->border_ = const_cast< ::LineDefProto*>( - ::LineDefProto::internal_default_instance()); - _CaptionRuleProto_default_instance_.get_mutable()->primary_ = const_cast< ::CaptionDefProto*>( - ::CaptionDefProto::internal_default_instance()); - _CaptionRuleProto_default_instance_.get_mutable()->secondary_ = const_cast< ::CaptionDefProto*>( - ::CaptionDefProto::internal_default_instance()); - _CircleRuleProto_default_instance_.get_mutable()->border_ = const_cast< ::LineDefProto*>( - ::LineDefProto::internal_default_instance()); - _PathTextRuleProto_default_instance_.get_mutable()->primary_ = const_cast< ::CaptionDefProto*>( - ::CaptionDefProto::internal_default_instance()); - _PathTextRuleProto_default_instance_.get_mutable()->secondary_ = const_cast< ::CaptionDefProto*>( - ::CaptionDefProto::internal_default_instance()); - _DrawElementProto_default_instance_.get_mutable()->area_ = const_cast< ::AreaRuleProto*>( - ::AreaRuleProto::internal_default_instance()); - _DrawElementProto_default_instance_.get_mutable()->symbol_ = const_cast< ::SymbolRuleProto*>( - ::SymbolRuleProto::internal_default_instance()); - _DrawElementProto_default_instance_.get_mutable()->caption_ = const_cast< ::CaptionRuleProto*>( - ::CaptionRuleProto::internal_default_instance()); - _DrawElementProto_default_instance_.get_mutable()->circle_ = const_cast< ::CircleRuleProto*>( - ::CircleRuleProto::internal_default_instance()); - _DrawElementProto_default_instance_.get_mutable()->path_text_ = const_cast< ::PathTextRuleProto*>( - ::PathTextRuleProto::internal_default_instance()); - _DrawElementProto_default_instance_.get_mutable()->shield_ = const_cast< ::ShieldRuleProto*>( - ::ShieldRuleProto::internal_default_instance()); - _ContainerProto_default_instance_.get_mutable()->colors_ = const_cast< ::ColorsElementProto*>( - ::ColorsElementProto::internal_default_instance()); -} - -void InitDefaults() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl); -} -void AddDescriptorsImpl() { - InitDefaults(); - ::google::protobuf::internal::OnShutdown(&TableStruct::Shutdown); -} - -void AddDescriptors() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); -} -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -// Force AddDescriptors() to be called at static initialization time. -struct StaticDescriptorInitializer { - StaticDescriptorInitializer() { - AddDescriptors(); - } -} static_descriptor_initializer; -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - -} // namespace protobuf_indexer_2fdrules_5fstruct_2eproto - +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LineRuleProtoDefaultTypeInternal _LineRuleProto_default_instance_; +PROTOBUF_CONSTEXPR LineDefProto::LineDefProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.dashdot_)*/nullptr + , /*decltype(_impl_.pathsym_)*/nullptr + , /*decltype(_impl_.width_)*/0 + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.join_)*/0 + , /*decltype(_impl_.cap_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct LineDefProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR LineDefProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~LineDefProtoDefaultTypeInternal() {} + union { + LineDefProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LineDefProtoDefaultTypeInternal _LineDefProto_default_instance_; +PROTOBUF_CONSTEXPR AreaRuleProto::AreaRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.border_)*/nullptr + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct AreaRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR AreaRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~AreaRuleProtoDefaultTypeInternal() {} + union { + AreaRuleProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AreaRuleProtoDefaultTypeInternal _AreaRuleProto_default_instance_; +PROTOBUF_CONSTEXPR SymbolRuleProto::SymbolRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.apply_for_type_)*/0 + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_.min_distance_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct SymbolRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR SymbolRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~SymbolRuleProtoDefaultTypeInternal() {} + union { + SymbolRuleProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SymbolRuleProtoDefaultTypeInternal _SymbolRuleProto_default_instance_; +PROTOBUF_CONSTEXPR CaptionDefProto::CaptionDefProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.text_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.height_)*/0 + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.stroke_color_)*/0u + , /*decltype(_impl_.offset_x_)*/0 + , /*decltype(_impl_.offset_y_)*/0 + , /*decltype(_impl_.is_optional_)*/false + , /*decltype(_impl_._cached_size_)*/{}} {} +struct CaptionDefProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR CaptionDefProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~CaptionDefProtoDefaultTypeInternal() {} + union { + CaptionDefProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CaptionDefProtoDefaultTypeInternal _CaptionDefProto_default_instance_; +PROTOBUF_CONSTEXPR CaptionRuleProto::CaptionRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.primary_)*/nullptr + , /*decltype(_impl_.secondary_)*/nullptr + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct CaptionRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR CaptionRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~CaptionRuleProtoDefaultTypeInternal() {} + union { + CaptionRuleProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CaptionRuleProtoDefaultTypeInternal _CaptionRuleProto_default_instance_; +PROTOBUF_CONSTEXPR CircleRuleProto::CircleRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.border_)*/nullptr + , /*decltype(_impl_.radius_)*/0 + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct CircleRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR CircleRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~CircleRuleProtoDefaultTypeInternal() {} + union { + CircleRuleProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CircleRuleProtoDefaultTypeInternal _CircleRuleProto_default_instance_; +PROTOBUF_CONSTEXPR PathTextRuleProto::PathTextRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.primary_)*/nullptr + , /*decltype(_impl_.secondary_)*/nullptr + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct PathTextRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR PathTextRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~PathTextRuleProtoDefaultTypeInternal() {} + union { + PathTextRuleProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PathTextRuleProtoDefaultTypeInternal _PathTextRuleProto_default_instance_; +PROTOBUF_CONSTEXPR ShieldRuleProto::ShieldRuleProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.height_)*/0 + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.stroke_color_)*/0u + , /*decltype(_impl_.priority_)*/0 + , /*decltype(_impl_.min_distance_)*/0 + , /*decltype(_impl_.text_color_)*/0u + , /*decltype(_impl_.text_stroke_color_)*/0u + , /*decltype(_impl_._cached_size_)*/{}} {} +struct ShieldRuleProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR ShieldRuleProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~ShieldRuleProtoDefaultTypeInternal() {} + union { + ShieldRuleProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ShieldRuleProtoDefaultTypeInternal _ShieldRuleProto_default_instance_; +PROTOBUF_CONSTEXPR DrawElementProto::DrawElementProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.lines_)*/{} + , /*decltype(_impl_.apply_if_)*/{} + , /*decltype(_impl_.area_)*/nullptr + , /*decltype(_impl_.symbol_)*/nullptr + , /*decltype(_impl_.caption_)*/nullptr + , /*decltype(_impl_.circle_)*/nullptr + , /*decltype(_impl_.path_text_)*/nullptr + , /*decltype(_impl_.shield_)*/nullptr + , /*decltype(_impl_.scale_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct DrawElementProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR DrawElementProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~DrawElementProtoDefaultTypeInternal() {} + union { + DrawElementProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DrawElementProtoDefaultTypeInternal _DrawElementProto_default_instance_; +PROTOBUF_CONSTEXPR ClassifElementProto::ClassifElementProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.element_)*/{} + , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_._cached_size_)*/{}} {} +struct ClassifElementProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR ClassifElementProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~ClassifElementProtoDefaultTypeInternal() {} + union { + ClassifElementProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ClassifElementProtoDefaultTypeInternal _ClassifElementProto_default_instance_; +PROTOBUF_CONSTEXPR ColorElementProto::ColorElementProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.color_)*/0u + , /*decltype(_impl_.x_)*/0 + , /*decltype(_impl_.y_)*/0 + , /*decltype(_impl_._cached_size_)*/{}} {} +struct ColorElementProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR ColorElementProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~ColorElementProtoDefaultTypeInternal() {} + union { + ColorElementProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ColorElementProtoDefaultTypeInternal _ColorElementProto_default_instance_; +PROTOBUF_CONSTEXPR ColorsElementProto::ColorsElementProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.value_)*/{} + , /*decltype(_impl_._cached_size_)*/{}} {} +struct ColorsElementProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR ColorsElementProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~ColorsElementProtoDefaultTypeInternal() {} + union { + ColorsElementProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ColorsElementProtoDefaultTypeInternal _ColorsElementProto_default_instance_; +PROTOBUF_CONSTEXPR ContainerProto::ContainerProto( + ::_pbi::ConstantInitialized): _impl_{ + /*decltype(_impl_.cont_)*/{} + , /*decltype(_impl_.colors_)*/nullptr + , /*decltype(_impl_._cached_size_)*/{}} {} +struct ContainerProtoDefaultTypeInternal { + PROTOBUF_CONSTEXPR ContainerProtoDefaultTypeInternal() + : _instance(::_pbi::ConstantInitialized{}) {} + ~ContainerProtoDefaultTypeInternal() {} + union { + ContainerProto _instance; + }; +}; +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ContainerProtoDefaultTypeInternal _ContainerProto_default_instance_; bool LineJoin_IsValid(int value) { switch (value) { case 0: @@ -188,6 +287,50 @@ bool LineJoin_IsValid(int value) { } } +static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed LineJoin_strings[3] = {}; + +static const char LineJoin_names[] = + "BEVELJOIN" + "NOJOIN" + "ROUNDJOIN"; + +static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry LineJoin_entries[] = { + { {LineJoin_names + 0, 9}, 1 }, + { {LineJoin_names + 9, 6}, 2 }, + { {LineJoin_names + 15, 9}, 0 }, +}; + +static const int LineJoin_entries_by_number[] = { + 2, // 0 -> ROUNDJOIN + 0, // 1 -> BEVELJOIN + 1, // 2 -> NOJOIN +}; + +const std::string& LineJoin_Name( + LineJoin value) { + static const bool dummy = + ::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings( + LineJoin_entries, + LineJoin_entries_by_number, + 3, LineJoin_strings); + (void) dummy; + int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName( + LineJoin_entries, + LineJoin_entries_by_number, + 3, value); + return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() : + LineJoin_strings[idx].get(); +} +bool LineJoin_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, LineJoin* value) { + int int_value; + bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue( + LineJoin_entries, 3, name, &int_value); + if (success) { + *value = static_cast(int_value); + } + return success; +} bool LineCap_IsValid(int value) { switch (value) { case 0: @@ -199,201 +342,251 @@ bool LineCap_IsValid(int value) { } } +static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed LineCap_strings[3] = {}; + +static const char LineCap_names[] = + "BUTTCAP" + "ROUNDCAP" + "SQUARECAP"; + +static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry LineCap_entries[] = { + { {LineCap_names + 0, 7}, 1 }, + { {LineCap_names + 7, 8}, 0 }, + { {LineCap_names + 15, 9}, 2 }, +}; + +static const int LineCap_entries_by_number[] = { + 1, // 0 -> ROUNDCAP + 0, // 1 -> BUTTCAP + 2, // 2 -> SQUARECAP +}; + +const std::string& LineCap_Name( + LineCap value) { + static const bool dummy = + ::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings( + LineCap_entries, + LineCap_entries_by_number, + 3, LineCap_strings); + (void) dummy; + int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName( + LineCap_entries, + LineCap_entries_by_number, + 3, value); + return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() : + LineCap_strings[idx].get(); +} +bool LineCap_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, LineCap* value) { + int int_value; + bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue( + LineCap_entries, 3, name, &int_value); + if (success) { + *value = static_cast(int_value); + } + return success; +} // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int DashDotProto::kDdFieldNumber; -const int DashDotProto::kOffsetFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class DashDotProto::_Internal { + public: +}; -DashDotProto::DashDotProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:DashDotProto) +DashDotProto::DashDotProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:DashDotProto) } DashDotProto::DashDotProto(const DashDotProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - dd_(from.dd_), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - offset_ = from.offset_; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + DashDotProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.dd_){from._impl_.dd_} + , decltype(_impl_.offset_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + _this->_impl_.offset_ = from._impl_.offset_; // @@protoc_insertion_point(copy_constructor:DashDotProto) } -void DashDotProto::SharedCtor() { - offset_ = 0; - _cached_size_ = 0; +inline void DashDotProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.dd_){arena} + , decltype(_impl_.offset_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } DashDotProto::~DashDotProto() { // @@protoc_insertion_point(destructor:DashDotProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void DashDotProto::SharedDtor() { +inline void DashDotProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.dd_.~RepeatedField(); } void DashDotProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const DashDotProto& DashDotProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -DashDotProto* DashDotProto::New(::google::protobuf::Arena* arena) const { - DashDotProto* n = new DashDotProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void DashDotProto::Clear() { // @@protoc_insertion_point(message_clear_start:DashDotProto) - dd_.Clear(); - offset_ = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.dd_.Clear(); + _impl_.offset_ = 0; + _internal_metadata_.Clear(); } -bool DashDotProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:DashDotProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* DashDotProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // repeated double dd = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, this->mutable_dd()))); - } else if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(9u)) { - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - 1, 10u, input, this->mutable_dd()))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedDoubleParser(_internal_mutable_dd(), ptr, ctx); + CHK_(ptr); + } else if (static_cast(tag) == 9) { + _internal_add_dd(::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr)); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - + continue; // double offset = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(17u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &offset_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 17)) { + _impl_.offset_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:DashDotProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:DashDotProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void DashDotProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:DashDotProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* DashDotProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:DashDotProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // repeated double dd = 1; - if (this->dd_size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteTag(1, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); - output->WriteVarint32(_dd_cached_byte_size_); - ::google::protobuf::internal::WireFormatLite::WriteDoubleArray( - this->dd().data(), this->dd_size(), output); + if (this->_internal_dd_size() > 0) { + target = stream->WriteFixedPacked(1, _internal_dd(), target); } // double offset = 2; - if (this->offset() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->offset(), output); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_offset = this->_internal_offset(); + uint64_t raw_offset; + memcpy(&raw_offset, &tmp_offset, sizeof(tmp_offset)); + if (raw_offset != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_offset(), target); } - // @@protoc_insertion_point(serialize_end:DashDotProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:DashDotProto) + return target; } size_t DashDotProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:DashDotProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated double dd = 1; { - unsigned int count = this->dd_size(); + unsigned int count = static_cast(this->_internal_dd_size()); size_t data_size = 8UL * count; if (data_size > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + ::_pbi::WireFormatLite::Int32Size(static_cast(data_size)); } - int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _dd_cached_byte_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); total_size += data_size; } // double offset = 2; - if (this->offset() != 0) { + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_offset = this->_internal_offset(); + uint64_t raw_offset; + memcpy(&raw_offset, &tmp_offset, sizeof(tmp_offset)); + if (raw_offset != 0) { total_size += 1 + 8; } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void DashDotProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void DashDotProto::MergeFrom(const DashDotProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:DashDotProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + DashDotProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:DashDotProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - dd_.MergeFrom(from.dd_); - if (from.offset() != 0) { - set_offset(from.offset()); + _this->_impl_.dd_.MergeFrom(from._impl_.dd_); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_offset = from._internal_offset(); + uint64_t raw_offset; + memcpy(&raw_offset, &tmp_offset, sizeof(tmp_offset)); + if (raw_offset != 0) { + _this->_internal_set_offset(from._internal_offset()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void DashDotProto::CopyFrom(const DashDotProto& from) { @@ -407,295 +600,272 @@ bool DashDotProto::IsInitialized() const { return true; } -void DashDotProto::Swap(DashDotProto* other) { - if (other == this) return; - InternalSwap(other); -} void DashDotProto::InternalSwap(DashDotProto* other) { - dd_.InternalSwap(&other->dd_); - std::swap(offset_, other->offset_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + _impl_.dd_.InternalSwap(&other->_impl_.dd_); + swap(_impl_.offset_, other->_impl_.offset_); } -::std::string DashDotProto::GetTypeName() const { +std::string DashDotProto::GetTypeName() const { return "DashDotProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// DashDotProto - -// repeated double dd = 1; -int DashDotProto::dd_size() const { - return dd_.size(); -} -void DashDotProto::clear_dd() { - dd_.Clear(); -} -double DashDotProto::dd(int index) const { - // @@protoc_insertion_point(field_get:DashDotProto.dd) - return dd_.Get(index); -} -void DashDotProto::set_dd(int index, double value) { - dd_.Set(index, value); - // @@protoc_insertion_point(field_set:DashDotProto.dd) -} -void DashDotProto::add_dd(double value) { - dd_.Add(value); - // @@protoc_insertion_point(field_add:DashDotProto.dd) -} -const ::google::protobuf::RepeatedField< double >& -DashDotProto::dd() const { - // @@protoc_insertion_point(field_list:DashDotProto.dd) - return dd_; -} -::google::protobuf::RepeatedField< double >* -DashDotProto::mutable_dd() { - // @@protoc_insertion_point(field_mutable_list:DashDotProto.dd) - return &dd_; -} - -// double offset = 2; -void DashDotProto::clear_offset() { - offset_ = 0; -} -double DashDotProto::offset() const { - // @@protoc_insertion_point(field_get:DashDotProto.offset) - return offset_; -} -void DashDotProto::set_offset(double value) { - - offset_ = value; - // @@protoc_insertion_point(field_set:DashDotProto.offset) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int PathSymProto::kNameFieldNumber; -const int PathSymProto::kStepFieldNumber; -const int PathSymProto::kOffsetFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class PathSymProto::_Internal { + public: +}; -PathSymProto::PathSymProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:PathSymProto) +PathSymProto::PathSymProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:PathSymProto) } PathSymProto::PathSymProto(const PathSymProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + PathSymProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.name_){} + , decltype(_impl_.step_){} + , decltype(_impl_.offset_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (!from._internal_name().empty()) { + _this->_impl_.name_.Set(from._internal_name(), + _this->GetArenaForAllocation()); } - ::memcpy(&step_, &from.step_, - reinterpret_cast(&offset_) - - reinterpret_cast(&step_) + sizeof(offset_)); + ::memcpy(&_impl_.step_, &from._impl_.step_, + static_cast(reinterpret_cast(&_impl_.offset_) - + reinterpret_cast(&_impl_.step_)) + sizeof(_impl_.offset_)); // @@protoc_insertion_point(copy_constructor:PathSymProto) } -void PathSymProto::SharedCtor() { - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&step_, 0, reinterpret_cast(&offset_) - - reinterpret_cast(&step_) + sizeof(offset_)); - _cached_size_ = 0; +inline void PathSymProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.name_){} + , decltype(_impl_.step_){0} + , decltype(_impl_.offset_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } PathSymProto::~PathSymProto() { // @@protoc_insertion_point(destructor:PathSymProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void PathSymProto::SharedDtor() { - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline void PathSymProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.name_.Destroy(); } void PathSymProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const PathSymProto& PathSymProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -PathSymProto* PathSymProto::New(::google::protobuf::Arena* arena) const { - PathSymProto* n = new PathSymProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void PathSymProto::Clear() { // @@protoc_insertion_point(message_clear_start:PathSymProto) - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&step_, 0, reinterpret_cast(&offset_) - - reinterpret_cast(&step_) + sizeof(offset_)); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.name_.ClearToEmpty(); + ::memset(&_impl_.step_, 0, static_cast( + reinterpret_cast(&_impl_.offset_) - + reinterpret_cast(&_impl_.step_)) + sizeof(_impl_.offset_)); + _internal_metadata_.Clear(); } -bool PathSymProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:PathSymProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* PathSymProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // string name = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "PathSymProto.name")); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + auto str = _internal_mutable_name(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, nullptr)); + } else goto handle_unusual; - } - break; - } - + continue; // double step = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(17u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &step_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 17)) { + _impl_.step_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - + continue; // double offset = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(25u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &offset_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 25)) { + _impl_.offset_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:PathSymProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:PathSymProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void PathSymProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:PathSymProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* PathSymProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:PathSymProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // string name = 1; - if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (!this->_internal_name().empty()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_name().data(), static_cast(this->_internal_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "PathSymProto.name"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name(), output); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_name(), target); } // double step = 2; - if (this->step() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->step(), output); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_step = this->_internal_step(); + uint64_t raw_step; + memcpy(&raw_step, &tmp_step, sizeof(tmp_step)); + if (raw_step != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_step(), target); } // double offset = 3; - if (this->offset() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->offset(), output); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_offset = this->_internal_offset(); + uint64_t raw_offset; + memcpy(&raw_offset, &tmp_offset, sizeof(tmp_offset)); + if (raw_offset != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(3, this->_internal_offset(), target); } - // @@protoc_insertion_point(serialize_end:PathSymProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:PathSymProto) + return target; } size_t PathSymProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:PathSymProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string name = 1; - if (this->name().size() > 0) { + if (!this->_internal_name().empty()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_name()); } // double step = 2; - if (this->step() != 0) { + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_step = this->_internal_step(); + uint64_t raw_step; + memcpy(&raw_step, &tmp_step, sizeof(tmp_step)); + if (raw_step != 0) { total_size += 1 + 8; } // double offset = 3; - if (this->offset() != 0) { + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_offset = this->_internal_offset(); + uint64_t raw_offset; + memcpy(&raw_offset, &tmp_offset, sizeof(tmp_offset)); + if (raw_offset != 0) { total_size += 1 + 8; } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void PathSymProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void PathSymProto::MergeFrom(const PathSymProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:PathSymProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + PathSymProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:PathSymProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.name().size() > 0) { - - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + if (!from._internal_name().empty()) { + _this->_internal_set_name(from._internal_name()); } - if (from.step() != 0) { - set_step(from.step()); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_step = from._internal_step(); + uint64_t raw_step; + memcpy(&raw_step, &tmp_step, sizeof(tmp_step)); + if (raw_step != 0) { + _this->_internal_set_step(from._internal_step()); } - if (from.offset() != 0) { - set_offset(from.offset()); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_offset = from._internal_offset(); + uint64_t raw_offset; + memcpy(&raw_offset, &tmp_offset, sizeof(tmp_offset)); + if (raw_offset != 0) { + _this->_internal_set_offset(from._internal_offset()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void PathSymProto::CopyFrom(const PathSymProto& from) { @@ -709,464 +879,384 @@ bool PathSymProto::IsInitialized() const { return true; } -void PathSymProto::Swap(PathSymProto* other) { - if (other == this) return; - InternalSwap(other); -} void PathSymProto::InternalSwap(PathSymProto* other) { - name_.Swap(&other->name_); - std::swap(step_, other->step_); - std::swap(offset_, other->offset_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + auto* lhs_arena = GetArenaForAllocation(); + auto* rhs_arena = other->GetArenaForAllocation(); + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( + &_impl_.name_, lhs_arena, + &other->_impl_.name_, rhs_arena + ); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(PathSymProto, _impl_.offset_) + + sizeof(PathSymProto::_impl_.offset_) + - PROTOBUF_FIELD_OFFSET(PathSymProto, _impl_.step_)>( + reinterpret_cast(&_impl_.step_), + reinterpret_cast(&other->_impl_.step_)); } -::std::string PathSymProto::GetTypeName() const { +std::string PathSymProto::GetTypeName() const { return "PathSymProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// PathSymProto - -// string name = 1; -void PathSymProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -const ::std::string& PathSymProto::name() const { - // @@protoc_insertion_point(field_get:PathSymProto.name) - return name_.GetNoArena(); -} -void PathSymProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:PathSymProto.name) -} -#if LANG_CXX11 -void PathSymProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:PathSymProto.name) -} -#endif -void PathSymProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:PathSymProto.name) -} -void PathSymProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:PathSymProto.name) -} -::std::string* PathSymProto::mutable_name() { - - // @@protoc_insertion_point(field_mutable:PathSymProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -::std::string* PathSymProto::release_name() { - // @@protoc_insertion_point(field_release:PathSymProto.name) - - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void PathSymProto::set_allocated_name(::std::string* name) { - if (name != NULL) { - - } else { - - } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); - // @@protoc_insertion_point(field_set_allocated:PathSymProto.name) -} - -// double step = 2; -void PathSymProto::clear_step() { - step_ = 0; -} -double PathSymProto::step() const { - // @@protoc_insertion_point(field_get:PathSymProto.step) - return step_; -} -void PathSymProto::set_step(double value) { - - step_ = value; - // @@protoc_insertion_point(field_set:PathSymProto.step) -} - -// double offset = 3; -void PathSymProto::clear_offset() { - offset_ = 0; -} -double PathSymProto::offset() const { - // @@protoc_insertion_point(field_get:PathSymProto.offset) - return offset_; -} -void PathSymProto::set_offset(double value) { - - offset_ = value; - // @@protoc_insertion_point(field_set:PathSymProto.offset) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int LineRuleProto::kWidthFieldNumber; -const int LineRuleProto::kColorFieldNumber; -const int LineRuleProto::kDashdotFieldNumber; -const int LineRuleProto::kPriorityFieldNumber; -const int LineRuleProto::kPathsymFieldNumber; -const int LineRuleProto::kJoinFieldNumber; -const int LineRuleProto::kCapFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class LineRuleProto::_Internal { + public: + static const ::DashDotProto& dashdot(const LineRuleProto* msg); + static const ::PathSymProto& pathsym(const LineRuleProto* msg); +}; -LineRuleProto::LineRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:LineRuleProto) +const ::DashDotProto& +LineRuleProto::_Internal::dashdot(const LineRuleProto* msg) { + return *msg->_impl_.dashdot_; +} +const ::PathSymProto& +LineRuleProto::_Internal::pathsym(const LineRuleProto* msg) { + return *msg->_impl_.pathsym_; +} +LineRuleProto::LineRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:LineRuleProto) } LineRuleProto::LineRuleProto(const LineRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_dashdot()) { - dashdot_ = new ::DashDotProto(*from.dashdot_); - } else { - dashdot_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + LineRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.dashdot_){nullptr} + , decltype(_impl_.pathsym_){nullptr} + , decltype(_impl_.width_){} + , decltype(_impl_.color_){} + , decltype(_impl_.priority_){} + , decltype(_impl_.join_){} + , decltype(_impl_.cap_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_dashdot()) { + _this->_impl_.dashdot_ = new ::DashDotProto(*from._impl_.dashdot_); } - if (from.has_pathsym()) { - pathsym_ = new ::PathSymProto(*from.pathsym_); - } else { - pathsym_ = NULL; + if (from._internal_has_pathsym()) { + _this->_impl_.pathsym_ = new ::PathSymProto(*from._impl_.pathsym_); } - ::memcpy(&width_, &from.width_, - reinterpret_cast(&cap_) - - reinterpret_cast(&width_) + sizeof(cap_)); + ::memcpy(&_impl_.width_, &from._impl_.width_, + static_cast(reinterpret_cast(&_impl_.cap_) - + reinterpret_cast(&_impl_.width_)) + sizeof(_impl_.cap_)); // @@protoc_insertion_point(copy_constructor:LineRuleProto) } -void LineRuleProto::SharedCtor() { - ::memset(&dashdot_, 0, reinterpret_cast(&cap_) - - reinterpret_cast(&dashdot_) + sizeof(cap_)); - _cached_size_ = 0; +inline void LineRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.dashdot_){nullptr} + , decltype(_impl_.pathsym_){nullptr} + , decltype(_impl_.width_){0} + , decltype(_impl_.color_){0u} + , decltype(_impl_.priority_){0} + , decltype(_impl_.join_){0} + , decltype(_impl_.cap_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } LineRuleProto::~LineRuleProto() { // @@protoc_insertion_point(destructor:LineRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void LineRuleProto::SharedDtor() { - if (this != internal_default_instance()) { - delete dashdot_; - } - if (this != internal_default_instance()) { - delete pathsym_; - } +inline void LineRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + if (this != internal_default_instance()) delete _impl_.dashdot_; + if (this != internal_default_instance()) delete _impl_.pathsym_; } void LineRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const LineRuleProto& LineRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -LineRuleProto* LineRuleProto::New(::google::protobuf::Arena* arena) const { - LineRuleProto* n = new LineRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void LineRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:LineRuleProto) - if (GetArenaNoVirtual() == NULL && dashdot_ != NULL) { - delete dashdot_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaForAllocation() == nullptr && _impl_.dashdot_ != nullptr) { + delete _impl_.dashdot_; } - dashdot_ = NULL; - if (GetArenaNoVirtual() == NULL && pathsym_ != NULL) { - delete pathsym_; + _impl_.dashdot_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.pathsym_ != nullptr) { + delete _impl_.pathsym_; } - pathsym_ = NULL; - ::memset(&width_, 0, reinterpret_cast(&cap_) - - reinterpret_cast(&width_) + sizeof(cap_)); + _impl_.pathsym_ = nullptr; + ::memset(&_impl_.width_, 0, static_cast( + reinterpret_cast(&_impl_.cap_) - + reinterpret_cast(&_impl_.width_)) + sizeof(_impl_.cap_)); + _internal_metadata_.Clear(); } -bool LineRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:LineRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* LineRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // double width = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(9u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &width_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 9)) { + _impl_.width_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 color = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .DashDotProto dashdot = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_dashdot())); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + ptr = ctx->ParseMessage(_internal_mutable_dashdot(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(32u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .PathSymProto pathsym = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(42u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_pathsym())); - } else { + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + ptr = ctx->ParseMessage(_internal_mutable_pathsym(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .LineJoin join = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(48u)) { - int value; - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( - input, &value))); - set_join(static_cast< ::LineJoin >(value)); - } else { + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + _internal_set_join(static_cast<::LineJoin>(val)); + } else goto handle_unusual; - } - break; - } - + continue; // .LineCap cap = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(56u)) { - int value; - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( - input, &value))); - set_cap(static_cast< ::LineCap >(value)); - } else { + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + _internal_set_cap(static_cast<::LineCap>(val)); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:LineRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:LineRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void LineRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:LineRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* LineRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:LineRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // double width = 1; - if (this->width() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_width = this->_internal_width(); + uint64_t raw_width; + memcpy(&raw_width, &tmp_width, sizeof(tmp_width)); + if (raw_width != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(1, this->_internal_width(), target); } // uint32 color = 2; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_color(), target); } // .DashDotProto dashdot = 3; - if (this->has_dashdot()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, *this->dashdot_, output); + if (this->_internal_has_dashdot()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(3, _Internal::dashdot(this), + _Internal::dashdot(this).GetCachedSize(), target, stream); } // int32 priority = 4; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_priority(), target); } // .PathSymProto pathsym = 5; - if (this->has_pathsym()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 5, *this->pathsym_, output); + if (this->_internal_has_pathsym()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(5, _Internal::pathsym(this), + _Internal::pathsym(this).GetCachedSize(), target, stream); } // .LineJoin join = 6; - if (this->join() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteEnum( - 6, this->join(), output); + if (this->_internal_join() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteEnumToArray( + 6, this->_internal_join(), target); } // .LineCap cap = 7; - if (this->cap() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteEnum( - 7, this->cap(), output); + if (this->_internal_cap() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteEnumToArray( + 7, this->_internal_cap(), target); } - // @@protoc_insertion_point(serialize_end:LineRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:LineRuleProto) + return target; } size_t LineRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:LineRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .DashDotProto dashdot = 3; - if (this->has_dashdot()) { + if (this->_internal_has_dashdot()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->dashdot_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.dashdot_); } // .PathSymProto pathsym = 5; - if (this->has_pathsym()) { + if (this->_internal_has_pathsym()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->pathsym_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.pathsym_); } // double width = 1; - if (this->width() != 0) { + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_width = this->_internal_width(); + uint64_t raw_width; + memcpy(&raw_width, &tmp_width, sizeof(tmp_width)); + if (raw_width != 0) { total_size += 1 + 8; } // uint32 color = 2; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // int32 priority = 4; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } // .LineJoin join = 6; - if (this->join() != 0) { + if (this->_internal_join() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->join()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_join()); } // .LineCap cap = 7; - if (this->cap() != 0) { + if (this->_internal_cap() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_cap()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void LineRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void LineRuleProto::MergeFrom(const LineRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:LineRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + LineRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:LineRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.has_dashdot()) { - mutable_dashdot()->::DashDotProto::MergeFrom(from.dashdot()); + if (from._internal_has_dashdot()) { + _this->_internal_mutable_dashdot()->::DashDotProto::MergeFrom( + from._internal_dashdot()); } - if (from.has_pathsym()) { - mutable_pathsym()->::PathSymProto::MergeFrom(from.pathsym()); + if (from._internal_has_pathsym()) { + _this->_internal_mutable_pathsym()->::PathSymProto::MergeFrom( + from._internal_pathsym()); } - if (from.width() != 0) { - set_width(from.width()); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_width = from._internal_width(); + uint64_t raw_width; + memcpy(&raw_width, &tmp_width, sizeof(tmp_width)); + if (raw_width != 0) { + _this->_internal_set_width(from._internal_width()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } - if (from.join() != 0) { - set_join(from.join()); + if (from._internal_join() != 0) { + _this->_internal_set_join(from._internal_join()); } - if (from.cap() != 0) { - set_cap(from.cap()); + if (from._internal_cap() != 0) { + _this->_internal_set_cap(from._internal_cap()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void LineRuleProto::CopyFrom(const LineRuleProto& from) { @@ -1180,505 +1270,354 @@ bool LineRuleProto::IsInitialized() const { return true; } -void LineRuleProto::Swap(LineRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void LineRuleProto::InternalSwap(LineRuleProto* other) { - std::swap(dashdot_, other->dashdot_); - std::swap(pathsym_, other->pathsym_); - std::swap(width_, other->width_); - std::swap(color_, other->color_); - std::swap(priority_, other->priority_); - std::swap(join_, other->join_); - std::swap(cap_, other->cap_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(LineRuleProto, _impl_.cap_) + + sizeof(LineRuleProto::_impl_.cap_) + - PROTOBUF_FIELD_OFFSET(LineRuleProto, _impl_.dashdot_)>( + reinterpret_cast(&_impl_.dashdot_), + reinterpret_cast(&other->_impl_.dashdot_)); } -::std::string LineRuleProto::GetTypeName() const { +std::string LineRuleProto::GetTypeName() const { return "LineRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// LineRuleProto - -// double width = 1; -void LineRuleProto::clear_width() { - width_ = 0; -} -double LineRuleProto::width() const { - // @@protoc_insertion_point(field_get:LineRuleProto.width) - return width_; -} -void LineRuleProto::set_width(double value) { - - width_ = value; - // @@protoc_insertion_point(field_set:LineRuleProto.width) -} - -// uint32 color = 2; -void LineRuleProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 LineRuleProto::color() const { - // @@protoc_insertion_point(field_get:LineRuleProto.color) - return color_; -} -void LineRuleProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:LineRuleProto.color) -} - -// .DashDotProto dashdot = 3; -bool LineRuleProto::has_dashdot() const { - return this != internal_default_instance() && dashdot_ != NULL; -} -void LineRuleProto::clear_dashdot() { - if (GetArenaNoVirtual() == NULL && dashdot_ != NULL) delete dashdot_; - dashdot_ = NULL; -} -const ::DashDotProto& LineRuleProto::dashdot() const { - // @@protoc_insertion_point(field_get:LineRuleProto.dashdot) - return dashdot_ != NULL ? *dashdot_ - : *::DashDotProto::internal_default_instance(); -} -::DashDotProto* LineRuleProto::mutable_dashdot() { - - if (dashdot_ == NULL) { - dashdot_ = new ::DashDotProto; - } - // @@protoc_insertion_point(field_mutable:LineRuleProto.dashdot) - return dashdot_; -} -::DashDotProto* LineRuleProto::release_dashdot() { - // @@protoc_insertion_point(field_release:LineRuleProto.dashdot) - - ::DashDotProto* temp = dashdot_; - dashdot_ = NULL; - return temp; -} -void LineRuleProto::set_allocated_dashdot(::DashDotProto* dashdot) { - delete dashdot_; - dashdot_ = dashdot; - if (dashdot) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:LineRuleProto.dashdot) -} - -// int32 priority = 4; -void LineRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 LineRuleProto::priority() const { - // @@protoc_insertion_point(field_get:LineRuleProto.priority) - return priority_; -} -void LineRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:LineRuleProto.priority) -} - -// .PathSymProto pathsym = 5; -bool LineRuleProto::has_pathsym() const { - return this != internal_default_instance() && pathsym_ != NULL; -} -void LineRuleProto::clear_pathsym() { - if (GetArenaNoVirtual() == NULL && pathsym_ != NULL) delete pathsym_; - pathsym_ = NULL; -} -const ::PathSymProto& LineRuleProto::pathsym() const { - // @@protoc_insertion_point(field_get:LineRuleProto.pathsym) - return pathsym_ != NULL ? *pathsym_ - : *::PathSymProto::internal_default_instance(); -} -::PathSymProto* LineRuleProto::mutable_pathsym() { - - if (pathsym_ == NULL) { - pathsym_ = new ::PathSymProto; - } - // @@protoc_insertion_point(field_mutable:LineRuleProto.pathsym) - return pathsym_; -} -::PathSymProto* LineRuleProto::release_pathsym() { - // @@protoc_insertion_point(field_release:LineRuleProto.pathsym) - - ::PathSymProto* temp = pathsym_; - pathsym_ = NULL; - return temp; -} -void LineRuleProto::set_allocated_pathsym(::PathSymProto* pathsym) { - delete pathsym_; - pathsym_ = pathsym; - if (pathsym) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:LineRuleProto.pathsym) -} - -// .LineJoin join = 6; -void LineRuleProto::clear_join() { - join_ = 0; -} -::LineJoin LineRuleProto::join() const { - // @@protoc_insertion_point(field_get:LineRuleProto.join) - return static_cast< ::LineJoin >(join_); -} -void LineRuleProto::set_join(::LineJoin value) { - - join_ = value; - // @@protoc_insertion_point(field_set:LineRuleProto.join) -} - -// .LineCap cap = 7; -void LineRuleProto::clear_cap() { - cap_ = 0; -} -::LineCap LineRuleProto::cap() const { - // @@protoc_insertion_point(field_get:LineRuleProto.cap) - return static_cast< ::LineCap >(cap_); -} -void LineRuleProto::set_cap(::LineCap value) { - - cap_ = value; - // @@protoc_insertion_point(field_set:LineRuleProto.cap) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int LineDefProto::kWidthFieldNumber; -const int LineDefProto::kColorFieldNumber; -const int LineDefProto::kDashdotFieldNumber; -const int LineDefProto::kPathsymFieldNumber; -const int LineDefProto::kJoinFieldNumber; -const int LineDefProto::kCapFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class LineDefProto::_Internal { + public: + static const ::DashDotProto& dashdot(const LineDefProto* msg); + static const ::PathSymProto& pathsym(const LineDefProto* msg); +}; -LineDefProto::LineDefProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:LineDefProto) +const ::DashDotProto& +LineDefProto::_Internal::dashdot(const LineDefProto* msg) { + return *msg->_impl_.dashdot_; +} +const ::PathSymProto& +LineDefProto::_Internal::pathsym(const LineDefProto* msg) { + return *msg->_impl_.pathsym_; +} +LineDefProto::LineDefProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:LineDefProto) } LineDefProto::LineDefProto(const LineDefProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_dashdot()) { - dashdot_ = new ::DashDotProto(*from.dashdot_); - } else { - dashdot_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + LineDefProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.dashdot_){nullptr} + , decltype(_impl_.pathsym_){nullptr} + , decltype(_impl_.width_){} + , decltype(_impl_.color_){} + , decltype(_impl_.join_){} + , decltype(_impl_.cap_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_dashdot()) { + _this->_impl_.dashdot_ = new ::DashDotProto(*from._impl_.dashdot_); } - if (from.has_pathsym()) { - pathsym_ = new ::PathSymProto(*from.pathsym_); - } else { - pathsym_ = NULL; + if (from._internal_has_pathsym()) { + _this->_impl_.pathsym_ = new ::PathSymProto(*from._impl_.pathsym_); } - ::memcpy(&width_, &from.width_, - reinterpret_cast(&cap_) - - reinterpret_cast(&width_) + sizeof(cap_)); + ::memcpy(&_impl_.width_, &from._impl_.width_, + static_cast(reinterpret_cast(&_impl_.cap_) - + reinterpret_cast(&_impl_.width_)) + sizeof(_impl_.cap_)); // @@protoc_insertion_point(copy_constructor:LineDefProto) } -void LineDefProto::SharedCtor() { - ::memset(&dashdot_, 0, reinterpret_cast(&cap_) - - reinterpret_cast(&dashdot_) + sizeof(cap_)); - _cached_size_ = 0; +inline void LineDefProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.dashdot_){nullptr} + , decltype(_impl_.pathsym_){nullptr} + , decltype(_impl_.width_){0} + , decltype(_impl_.color_){0u} + , decltype(_impl_.join_){0} + , decltype(_impl_.cap_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } LineDefProto::~LineDefProto() { // @@protoc_insertion_point(destructor:LineDefProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void LineDefProto::SharedDtor() { - if (this != internal_default_instance()) { - delete dashdot_; - } - if (this != internal_default_instance()) { - delete pathsym_; - } +inline void LineDefProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + if (this != internal_default_instance()) delete _impl_.dashdot_; + if (this != internal_default_instance()) delete _impl_.pathsym_; } void LineDefProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const LineDefProto& LineDefProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -LineDefProto* LineDefProto::New(::google::protobuf::Arena* arena) const { - LineDefProto* n = new LineDefProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void LineDefProto::Clear() { // @@protoc_insertion_point(message_clear_start:LineDefProto) - if (GetArenaNoVirtual() == NULL && dashdot_ != NULL) { - delete dashdot_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaForAllocation() == nullptr && _impl_.dashdot_ != nullptr) { + delete _impl_.dashdot_; } - dashdot_ = NULL; - if (GetArenaNoVirtual() == NULL && pathsym_ != NULL) { - delete pathsym_; + _impl_.dashdot_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.pathsym_ != nullptr) { + delete _impl_.pathsym_; } - pathsym_ = NULL; - ::memset(&width_, 0, reinterpret_cast(&cap_) - - reinterpret_cast(&width_) + sizeof(cap_)); + _impl_.pathsym_ = nullptr; + ::memset(&_impl_.width_, 0, static_cast( + reinterpret_cast(&_impl_.cap_) - + reinterpret_cast(&_impl_.width_)) + sizeof(_impl_.cap_)); + _internal_metadata_.Clear(); } -bool LineDefProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:LineDefProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* LineDefProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // double width = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(9u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &width_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 9)) { + _impl_.width_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 color = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .DashDotProto dashdot = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_dashdot())); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + ptr = ctx->ParseMessage(_internal_mutable_dashdot(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .PathSymProto pathsym = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(34u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_pathsym())); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + ptr = ctx->ParseMessage(_internal_mutable_pathsym(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .LineJoin join = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(48u)) { - int value; - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( - input, &value))); - set_join(static_cast< ::LineJoin >(value)); - } else { + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + _internal_set_join(static_cast<::LineJoin>(val)); + } else goto handle_unusual; - } - break; - } - + continue; // .LineCap cap = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(56u)) { - int value; - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( - input, &value))); - set_cap(static_cast< ::LineCap >(value)); - } else { + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + _internal_set_cap(static_cast<::LineCap>(val)); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:LineDefProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:LineDefProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void LineDefProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:LineDefProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* LineDefProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:LineDefProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // double width = 1; - if (this->width() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_width = this->_internal_width(); + uint64_t raw_width; + memcpy(&raw_width, &tmp_width, sizeof(tmp_width)); + if (raw_width != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(1, this->_internal_width(), target); } // uint32 color = 2; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_color(), target); } // .DashDotProto dashdot = 3; - if (this->has_dashdot()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, *this->dashdot_, output); + if (this->_internal_has_dashdot()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(3, _Internal::dashdot(this), + _Internal::dashdot(this).GetCachedSize(), target, stream); } // .PathSymProto pathsym = 4; - if (this->has_pathsym()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 4, *this->pathsym_, output); + if (this->_internal_has_pathsym()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(4, _Internal::pathsym(this), + _Internal::pathsym(this).GetCachedSize(), target, stream); } // .LineJoin join = 6; - if (this->join() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteEnum( - 6, this->join(), output); + if (this->_internal_join() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteEnumToArray( + 6, this->_internal_join(), target); } // .LineCap cap = 7; - if (this->cap() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteEnum( - 7, this->cap(), output); + if (this->_internal_cap() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteEnumToArray( + 7, this->_internal_cap(), target); } - // @@protoc_insertion_point(serialize_end:LineDefProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:LineDefProto) + return target; } size_t LineDefProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:LineDefProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .DashDotProto dashdot = 3; - if (this->has_dashdot()) { + if (this->_internal_has_dashdot()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->dashdot_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.dashdot_); } // .PathSymProto pathsym = 4; - if (this->has_pathsym()) { + if (this->_internal_has_pathsym()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->pathsym_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.pathsym_); } // double width = 1; - if (this->width() != 0) { + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_width = this->_internal_width(); + uint64_t raw_width; + memcpy(&raw_width, &tmp_width, sizeof(tmp_width)); + if (raw_width != 0) { total_size += 1 + 8; } // uint32 color = 2; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // .LineJoin join = 6; - if (this->join() != 0) { + if (this->_internal_join() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->join()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_join()); } // .LineCap cap = 7; - if (this->cap() != 0) { + if (this->_internal_cap() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap()); + ::_pbi::WireFormatLite::EnumSize(this->_internal_cap()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void LineDefProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void LineDefProto::MergeFrom(const LineDefProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:LineDefProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + LineDefProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:LineDefProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.has_dashdot()) { - mutable_dashdot()->::DashDotProto::MergeFrom(from.dashdot()); + if (from._internal_has_dashdot()) { + _this->_internal_mutable_dashdot()->::DashDotProto::MergeFrom( + from._internal_dashdot()); } - if (from.has_pathsym()) { - mutable_pathsym()->::PathSymProto::MergeFrom(from.pathsym()); + if (from._internal_has_pathsym()) { + _this->_internal_mutable_pathsym()->::PathSymProto::MergeFrom( + from._internal_pathsym()); } - if (from.width() != 0) { - set_width(from.width()); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_width = from._internal_width(); + uint64_t raw_width; + memcpy(&raw_width, &tmp_width, sizeof(tmp_width)); + if (raw_width != 0) { + _this->_internal_set_width(from._internal_width()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.join() != 0) { - set_join(from.join()); + if (from._internal_join() != 0) { + _this->_internal_set_join(from._internal_join()); } - if (from.cap() != 0) { - set_cap(from.cap()); + if (from._internal_cap() != 0) { + _this->_internal_set_cap(from._internal_cap()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void LineDefProto::CopyFrom(const LineDefProto& from) { @@ -1692,389 +1631,247 @@ bool LineDefProto::IsInitialized() const { return true; } -void LineDefProto::Swap(LineDefProto* other) { - if (other == this) return; - InternalSwap(other); -} void LineDefProto::InternalSwap(LineDefProto* other) { - std::swap(dashdot_, other->dashdot_); - std::swap(pathsym_, other->pathsym_); - std::swap(width_, other->width_); - std::swap(color_, other->color_); - std::swap(join_, other->join_); - std::swap(cap_, other->cap_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(LineDefProto, _impl_.cap_) + + sizeof(LineDefProto::_impl_.cap_) + - PROTOBUF_FIELD_OFFSET(LineDefProto, _impl_.dashdot_)>( + reinterpret_cast(&_impl_.dashdot_), + reinterpret_cast(&other->_impl_.dashdot_)); } -::std::string LineDefProto::GetTypeName() const { +std::string LineDefProto::GetTypeName() const { return "LineDefProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// LineDefProto - -// double width = 1; -void LineDefProto::clear_width() { - width_ = 0; -} -double LineDefProto::width() const { - // @@protoc_insertion_point(field_get:LineDefProto.width) - return width_; -} -void LineDefProto::set_width(double value) { - - width_ = value; - // @@protoc_insertion_point(field_set:LineDefProto.width) -} - -// uint32 color = 2; -void LineDefProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 LineDefProto::color() const { - // @@protoc_insertion_point(field_get:LineDefProto.color) - return color_; -} -void LineDefProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:LineDefProto.color) -} - -// .DashDotProto dashdot = 3; -bool LineDefProto::has_dashdot() const { - return this != internal_default_instance() && dashdot_ != NULL; -} -void LineDefProto::clear_dashdot() { - if (GetArenaNoVirtual() == NULL && dashdot_ != NULL) delete dashdot_; - dashdot_ = NULL; -} -const ::DashDotProto& LineDefProto::dashdot() const { - // @@protoc_insertion_point(field_get:LineDefProto.dashdot) - return dashdot_ != NULL ? *dashdot_ - : *::DashDotProto::internal_default_instance(); -} -::DashDotProto* LineDefProto::mutable_dashdot() { - - if (dashdot_ == NULL) { - dashdot_ = new ::DashDotProto; - } - // @@protoc_insertion_point(field_mutable:LineDefProto.dashdot) - return dashdot_; -} -::DashDotProto* LineDefProto::release_dashdot() { - // @@protoc_insertion_point(field_release:LineDefProto.dashdot) - - ::DashDotProto* temp = dashdot_; - dashdot_ = NULL; - return temp; -} -void LineDefProto::set_allocated_dashdot(::DashDotProto* dashdot) { - delete dashdot_; - dashdot_ = dashdot; - if (dashdot) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:LineDefProto.dashdot) -} - -// .PathSymProto pathsym = 4; -bool LineDefProto::has_pathsym() const { - return this != internal_default_instance() && pathsym_ != NULL; -} -void LineDefProto::clear_pathsym() { - if (GetArenaNoVirtual() == NULL && pathsym_ != NULL) delete pathsym_; - pathsym_ = NULL; -} -const ::PathSymProto& LineDefProto::pathsym() const { - // @@protoc_insertion_point(field_get:LineDefProto.pathsym) - return pathsym_ != NULL ? *pathsym_ - : *::PathSymProto::internal_default_instance(); -} -::PathSymProto* LineDefProto::mutable_pathsym() { - - if (pathsym_ == NULL) { - pathsym_ = new ::PathSymProto; - } - // @@protoc_insertion_point(field_mutable:LineDefProto.pathsym) - return pathsym_; -} -::PathSymProto* LineDefProto::release_pathsym() { - // @@protoc_insertion_point(field_release:LineDefProto.pathsym) - - ::PathSymProto* temp = pathsym_; - pathsym_ = NULL; - return temp; -} -void LineDefProto::set_allocated_pathsym(::PathSymProto* pathsym) { - delete pathsym_; - pathsym_ = pathsym; - if (pathsym) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:LineDefProto.pathsym) -} - -// .LineJoin join = 6; -void LineDefProto::clear_join() { - join_ = 0; -} -::LineJoin LineDefProto::join() const { - // @@protoc_insertion_point(field_get:LineDefProto.join) - return static_cast< ::LineJoin >(join_); -} -void LineDefProto::set_join(::LineJoin value) { - - join_ = value; - // @@protoc_insertion_point(field_set:LineDefProto.join) -} - -// .LineCap cap = 7; -void LineDefProto::clear_cap() { - cap_ = 0; -} -::LineCap LineDefProto::cap() const { - // @@protoc_insertion_point(field_get:LineDefProto.cap) - return static_cast< ::LineCap >(cap_); -} -void LineDefProto::set_cap(::LineCap value) { - - cap_ = value; - // @@protoc_insertion_point(field_set:LineDefProto.cap) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int AreaRuleProto::kColorFieldNumber; -const int AreaRuleProto::kBorderFieldNumber; -const int AreaRuleProto::kPriorityFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class AreaRuleProto::_Internal { + public: + static const ::LineDefProto& border(const AreaRuleProto* msg); +}; -AreaRuleProto::AreaRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:AreaRuleProto) +const ::LineDefProto& +AreaRuleProto::_Internal::border(const AreaRuleProto* msg) { + return *msg->_impl_.border_; +} +AreaRuleProto::AreaRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:AreaRuleProto) } AreaRuleProto::AreaRuleProto(const AreaRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_border()) { - border_ = new ::LineDefProto(*from.border_); - } else { - border_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + AreaRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.border_){nullptr} + , decltype(_impl_.color_){} + , decltype(_impl_.priority_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_border()) { + _this->_impl_.border_ = new ::LineDefProto(*from._impl_.border_); } - ::memcpy(&color_, &from.color_, - reinterpret_cast(&priority_) - - reinterpret_cast(&color_) + sizeof(priority_)); + ::memcpy(&_impl_.color_, &from._impl_.color_, + static_cast(reinterpret_cast(&_impl_.priority_) - + reinterpret_cast(&_impl_.color_)) + sizeof(_impl_.priority_)); // @@protoc_insertion_point(copy_constructor:AreaRuleProto) } -void AreaRuleProto::SharedCtor() { - ::memset(&border_, 0, reinterpret_cast(&priority_) - - reinterpret_cast(&border_) + sizeof(priority_)); - _cached_size_ = 0; +inline void AreaRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.border_){nullptr} + , decltype(_impl_.color_){0u} + , decltype(_impl_.priority_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } AreaRuleProto::~AreaRuleProto() { // @@protoc_insertion_point(destructor:AreaRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void AreaRuleProto::SharedDtor() { - if (this != internal_default_instance()) { - delete border_; - } +inline void AreaRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + if (this != internal_default_instance()) delete _impl_.border_; } void AreaRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const AreaRuleProto& AreaRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -AreaRuleProto* AreaRuleProto::New(::google::protobuf::Arena* arena) const { - AreaRuleProto* n = new AreaRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void AreaRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:AreaRuleProto) - if (GetArenaNoVirtual() == NULL && border_ != NULL) { - delete border_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaForAllocation() == nullptr && _impl_.border_ != nullptr) { + delete _impl_.border_; } - border_ = NULL; - ::memset(&color_, 0, reinterpret_cast(&priority_) - - reinterpret_cast(&color_) + sizeof(priority_)); + _impl_.border_ = nullptr; + ::memset(&_impl_.color_, 0, static_cast( + reinterpret_cast(&_impl_.priority_) - + reinterpret_cast(&_impl_.color_)) + sizeof(_impl_.priority_)); + _internal_metadata_.Clear(); } -bool AreaRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:AreaRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* AreaRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // uint32 color = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(8u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .LineDefProto border = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_border())); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + ptr = ctx->ParseMessage(_internal_mutable_border(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:AreaRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:AreaRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void AreaRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:AreaRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* AreaRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:AreaRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // uint32 color = 1; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_color(), target); } // .LineDefProto border = 2; - if (this->has_border()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, *this->border_, output); + if (this->_internal_has_border()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(2, _Internal::border(this), + _Internal::border(this).GetCachedSize(), target, stream); } // int32 priority = 3; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_priority(), target); } - // @@protoc_insertion_point(serialize_end:AreaRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:AreaRuleProto) + return target; } size_t AreaRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:AreaRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .LineDefProto border = 2; - if (this->has_border()) { + if (this->_internal_has_border()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->border_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.border_); } // uint32 color = 1; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // int32 priority = 3; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void AreaRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void AreaRuleProto::MergeFrom(const AreaRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:AreaRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + AreaRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:AreaRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.has_border()) { - mutable_border()->::LineDefProto::MergeFrom(from.border()); + if (from._internal_has_border()) { + _this->_internal_mutable_border()->::LineDefProto::MergeFrom( + from._internal_border()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void AreaRuleProto::CopyFrom(const AreaRuleProto& from) { @@ -2088,353 +1885,276 @@ bool AreaRuleProto::IsInitialized() const { return true; } -void AreaRuleProto::Swap(AreaRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void AreaRuleProto::InternalSwap(AreaRuleProto* other) { - std::swap(border_, other->border_); - std::swap(color_, other->color_); - std::swap(priority_, other->priority_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(AreaRuleProto, _impl_.priority_) + + sizeof(AreaRuleProto::_impl_.priority_) + - PROTOBUF_FIELD_OFFSET(AreaRuleProto, _impl_.border_)>( + reinterpret_cast(&_impl_.border_), + reinterpret_cast(&other->_impl_.border_)); } -::std::string AreaRuleProto::GetTypeName() const { +std::string AreaRuleProto::GetTypeName() const { return "AreaRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// AreaRuleProto - -// uint32 color = 1; -void AreaRuleProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 AreaRuleProto::color() const { - // @@protoc_insertion_point(field_get:AreaRuleProto.color) - return color_; -} -void AreaRuleProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:AreaRuleProto.color) -} - -// .LineDefProto border = 2; -bool AreaRuleProto::has_border() const { - return this != internal_default_instance() && border_ != NULL; -} -void AreaRuleProto::clear_border() { - if (GetArenaNoVirtual() == NULL && border_ != NULL) delete border_; - border_ = NULL; -} -const ::LineDefProto& AreaRuleProto::border() const { - // @@protoc_insertion_point(field_get:AreaRuleProto.border) - return border_ != NULL ? *border_ - : *::LineDefProto::internal_default_instance(); -} -::LineDefProto* AreaRuleProto::mutable_border() { - - if (border_ == NULL) { - border_ = new ::LineDefProto; - } - // @@protoc_insertion_point(field_mutable:AreaRuleProto.border) - return border_; -} -::LineDefProto* AreaRuleProto::release_border() { - // @@protoc_insertion_point(field_release:AreaRuleProto.border) - - ::LineDefProto* temp = border_; - border_ = NULL; - return temp; -} -void AreaRuleProto::set_allocated_border(::LineDefProto* border) { - delete border_; - border_ = border; - if (border) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:AreaRuleProto.border) -} - -// int32 priority = 3; -void AreaRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 AreaRuleProto::priority() const { - // @@protoc_insertion_point(field_get:AreaRuleProto.priority) - return priority_; -} -void AreaRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:AreaRuleProto.priority) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int SymbolRuleProto::kNameFieldNumber; -const int SymbolRuleProto::kApplyForTypeFieldNumber; -const int SymbolRuleProto::kPriorityFieldNumber; -const int SymbolRuleProto::kMinDistanceFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class SymbolRuleProto::_Internal { + public: +}; -SymbolRuleProto::SymbolRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:SymbolRuleProto) +SymbolRuleProto::SymbolRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:SymbolRuleProto) } SymbolRuleProto::SymbolRuleProto(const SymbolRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + SymbolRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.name_){} + , decltype(_impl_.apply_for_type_){} + , decltype(_impl_.priority_){} + , decltype(_impl_.min_distance_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (!from._internal_name().empty()) { + _this->_impl_.name_.Set(from._internal_name(), + _this->GetArenaForAllocation()); } - ::memcpy(&apply_for_type_, &from.apply_for_type_, - reinterpret_cast(&min_distance_) - - reinterpret_cast(&apply_for_type_) + sizeof(min_distance_)); + ::memcpy(&_impl_.apply_for_type_, &from._impl_.apply_for_type_, + static_cast(reinterpret_cast(&_impl_.min_distance_) - + reinterpret_cast(&_impl_.apply_for_type_)) + sizeof(_impl_.min_distance_)); // @@protoc_insertion_point(copy_constructor:SymbolRuleProto) } -void SymbolRuleProto::SharedCtor() { - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&apply_for_type_, 0, reinterpret_cast(&min_distance_) - - reinterpret_cast(&apply_for_type_) + sizeof(min_distance_)); - _cached_size_ = 0; +inline void SymbolRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.name_){} + , decltype(_impl_.apply_for_type_){0} + , decltype(_impl_.priority_){0} + , decltype(_impl_.min_distance_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } SymbolRuleProto::~SymbolRuleProto() { // @@protoc_insertion_point(destructor:SymbolRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void SymbolRuleProto::SharedDtor() { - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline void SymbolRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.name_.Destroy(); } void SymbolRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const SymbolRuleProto& SymbolRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -SymbolRuleProto* SymbolRuleProto::New(::google::protobuf::Arena* arena) const { - SymbolRuleProto* n = new SymbolRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void SymbolRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:SymbolRuleProto) - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&apply_for_type_, 0, reinterpret_cast(&min_distance_) - - reinterpret_cast(&apply_for_type_) + sizeof(min_distance_)); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.name_.ClearToEmpty(); + ::memset(&_impl_.apply_for_type_, 0, static_cast( + reinterpret_cast(&_impl_.min_distance_) - + reinterpret_cast(&_impl_.apply_for_type_)) + sizeof(_impl_.min_distance_)); + _internal_metadata_.Clear(); } -bool SymbolRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:SymbolRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* SymbolRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // string name = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "SymbolRuleProto.name")); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + auto str = _internal_mutable_name(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, nullptr)); + } else goto handle_unusual; - } - break; - } - + continue; // int32 apply_for_type = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &apply_for_type_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.apply_for_type_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 min_distance = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(32u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &min_distance_))); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.min_distance_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:SymbolRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:SymbolRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void SymbolRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:SymbolRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* SymbolRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:SymbolRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // string name = 1; - if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (!this->_internal_name().empty()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_name().data(), static_cast(this->_internal_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "SymbolRuleProto.name"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name(), output); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_name(), target); } // int32 apply_for_type = 2; - if (this->apply_for_type() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->apply_for_type(), output); + if (this->_internal_apply_for_type() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_apply_for_type(), target); } // int32 priority = 3; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_priority(), target); } // int32 min_distance = 4; - if (this->min_distance() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->min_distance(), output); + if (this->_internal_min_distance() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_min_distance(), target); } - // @@protoc_insertion_point(serialize_end:SymbolRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:SymbolRuleProto) + return target; } size_t SymbolRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:SymbolRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string name = 1; - if (this->name().size() > 0) { + if (!this->_internal_name().empty()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_name()); } // int32 apply_for_type = 2; - if (this->apply_for_type() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->apply_for_type()); + if (this->_internal_apply_for_type() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_apply_for_type()); } // int32 priority = 3; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } // int32 min_distance = 4; - if (this->min_distance() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->min_distance()); + if (this->_internal_min_distance() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_min_distance()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void SymbolRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void SymbolRuleProto::MergeFrom(const SymbolRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:SymbolRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + SymbolRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:SymbolRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.name().size() > 0) { - - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + if (!from._internal_name().empty()) { + _this->_internal_set_name(from._internal_name()); } - if (from.apply_for_type() != 0) { - set_apply_for_type(from.apply_for_type()); + if (from._internal_apply_for_type() != 0) { + _this->_internal_set_apply_for_type(from._internal_apply_for_type()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } - if (from.min_distance() != 0) { - set_min_distance(from.min_distance()); + if (from._internal_min_distance() != 0) { + _this->_internal_set_min_distance(from._internal_min_distance()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void SymbolRuleProto::CopyFrom(const SymbolRuleProto& from) { @@ -2448,470 +2168,354 @@ bool SymbolRuleProto::IsInitialized() const { return true; } -void SymbolRuleProto::Swap(SymbolRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void SymbolRuleProto::InternalSwap(SymbolRuleProto* other) { - name_.Swap(&other->name_); - std::swap(apply_for_type_, other->apply_for_type_); - std::swap(priority_, other->priority_); - std::swap(min_distance_, other->min_distance_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + auto* lhs_arena = GetArenaForAllocation(); + auto* rhs_arena = other->GetArenaForAllocation(); + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( + &_impl_.name_, lhs_arena, + &other->_impl_.name_, rhs_arena + ); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(SymbolRuleProto, _impl_.min_distance_) + + sizeof(SymbolRuleProto::_impl_.min_distance_) + - PROTOBUF_FIELD_OFFSET(SymbolRuleProto, _impl_.apply_for_type_)>( + reinterpret_cast(&_impl_.apply_for_type_), + reinterpret_cast(&other->_impl_.apply_for_type_)); } -::std::string SymbolRuleProto::GetTypeName() const { +std::string SymbolRuleProto::GetTypeName() const { return "SymbolRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// SymbolRuleProto - -// string name = 1; -void SymbolRuleProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -const ::std::string& SymbolRuleProto::name() const { - // @@protoc_insertion_point(field_get:SymbolRuleProto.name) - return name_.GetNoArena(); -} -void SymbolRuleProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:SymbolRuleProto.name) -} -#if LANG_CXX11 -void SymbolRuleProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:SymbolRuleProto.name) -} -#endif -void SymbolRuleProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:SymbolRuleProto.name) -} -void SymbolRuleProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:SymbolRuleProto.name) -} -::std::string* SymbolRuleProto::mutable_name() { - - // @@protoc_insertion_point(field_mutable:SymbolRuleProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -::std::string* SymbolRuleProto::release_name() { - // @@protoc_insertion_point(field_release:SymbolRuleProto.name) - - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void SymbolRuleProto::set_allocated_name(::std::string* name) { - if (name != NULL) { - - } else { - - } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); - // @@protoc_insertion_point(field_set_allocated:SymbolRuleProto.name) -} - -// int32 apply_for_type = 2; -void SymbolRuleProto::clear_apply_for_type() { - apply_for_type_ = 0; -} -::google::protobuf::int32 SymbolRuleProto::apply_for_type() const { - // @@protoc_insertion_point(field_get:SymbolRuleProto.apply_for_type) - return apply_for_type_; -} -void SymbolRuleProto::set_apply_for_type(::google::protobuf::int32 value) { - - apply_for_type_ = value; - // @@protoc_insertion_point(field_set:SymbolRuleProto.apply_for_type) -} - -// int32 priority = 3; -void SymbolRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 SymbolRuleProto::priority() const { - // @@protoc_insertion_point(field_get:SymbolRuleProto.priority) - return priority_; -} -void SymbolRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:SymbolRuleProto.priority) -} - -// int32 min_distance = 4; -void SymbolRuleProto::clear_min_distance() { - min_distance_ = 0; -} -::google::protobuf::int32 SymbolRuleProto::min_distance() const { - // @@protoc_insertion_point(field_get:SymbolRuleProto.min_distance) - return min_distance_; -} -void SymbolRuleProto::set_min_distance(::google::protobuf::int32 value) { - - min_distance_ = value; - // @@protoc_insertion_point(field_set:SymbolRuleProto.min_distance) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int CaptionDefProto::kHeightFieldNumber; -const int CaptionDefProto::kColorFieldNumber; -const int CaptionDefProto::kStrokeColorFieldNumber; -const int CaptionDefProto::kOffsetXFieldNumber; -const int CaptionDefProto::kOffsetYFieldNumber; -const int CaptionDefProto::kTextFieldNumber; -const int CaptionDefProto::kIsOptionalFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class CaptionDefProto::_Internal { + public: +}; -CaptionDefProto::CaptionDefProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:CaptionDefProto) +CaptionDefProto::CaptionDefProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:CaptionDefProto) } CaptionDefProto::CaptionDefProto(const CaptionDefProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - text_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.text().size() > 0) { - text_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.text_); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + CaptionDefProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.text_){} + , decltype(_impl_.height_){} + , decltype(_impl_.color_){} + , decltype(_impl_.stroke_color_){} + , decltype(_impl_.offset_x_){} + , decltype(_impl_.offset_y_){} + , decltype(_impl_.is_optional_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + _impl_.text_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.text_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (!from._internal_text().empty()) { + _this->_impl_.text_.Set(from._internal_text(), + _this->GetArenaForAllocation()); } - ::memcpy(&height_, &from.height_, - reinterpret_cast(&is_optional_) - - reinterpret_cast(&height_) + sizeof(is_optional_)); + ::memcpy(&_impl_.height_, &from._impl_.height_, + static_cast(reinterpret_cast(&_impl_.is_optional_) - + reinterpret_cast(&_impl_.height_)) + sizeof(_impl_.is_optional_)); // @@protoc_insertion_point(copy_constructor:CaptionDefProto) } -void CaptionDefProto::SharedCtor() { - text_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&height_, 0, reinterpret_cast(&is_optional_) - - reinterpret_cast(&height_) + sizeof(is_optional_)); - _cached_size_ = 0; +inline void CaptionDefProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.text_){} + , decltype(_impl_.height_){0} + , decltype(_impl_.color_){0u} + , decltype(_impl_.stroke_color_){0u} + , decltype(_impl_.offset_x_){0} + , decltype(_impl_.offset_y_){0} + , decltype(_impl_.is_optional_){false} + , /*decltype(_impl_._cached_size_)*/{} + }; + _impl_.text_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.text_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } CaptionDefProto::~CaptionDefProto() { // @@protoc_insertion_point(destructor:CaptionDefProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void CaptionDefProto::SharedDtor() { - text_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline void CaptionDefProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.text_.Destroy(); } void CaptionDefProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const CaptionDefProto& CaptionDefProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -CaptionDefProto* CaptionDefProto::New(::google::protobuf::Arena* arena) const { - CaptionDefProto* n = new CaptionDefProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void CaptionDefProto::Clear() { // @@protoc_insertion_point(message_clear_start:CaptionDefProto) - text_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&height_, 0, reinterpret_cast(&is_optional_) - - reinterpret_cast(&height_) + sizeof(is_optional_)); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.text_.ClearToEmpty(); + ::memset(&_impl_.height_, 0, static_cast( + reinterpret_cast(&_impl_.is_optional_) - + reinterpret_cast(&_impl_.height_)) + sizeof(_impl_.is_optional_)); + _internal_metadata_.Clear(); } -bool CaptionDefProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:CaptionDefProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* CaptionDefProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // int32 height = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(8u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &height_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + _impl_.height_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 color = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 stroke_color = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &stroke_color_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + _impl_.stroke_color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 offset_x = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(32u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &offset_x_))); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.offset_x_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 offset_y = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(40u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &offset_y_))); - } else { + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + _impl_.offset_y_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // string text = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(50u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_text())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->text().data(), this->text().length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "CaptionDefProto.text")); - } else { + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + auto str = _internal_mutable_text(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, nullptr)); + } else goto handle_unusual; - } - break; - } - + continue; // bool is_optional = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(56u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &is_optional_))); - } else { + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + _impl_.is_optional_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:CaptionDefProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:CaptionDefProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void CaptionDefProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:CaptionDefProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* CaptionDefProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:CaptionDefProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // int32 height = 1; - if (this->height() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output); + if (this->_internal_height() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_height(), target); } // uint32 color = 2; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_color(), target); } // uint32 stroke_color = 3; - if (this->stroke_color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output); + if (this->_internal_stroke_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(3, this->_internal_stroke_color(), target); } // int32 offset_x = 4; - if (this->offset_x() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->offset_x(), output); + if (this->_internal_offset_x() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_offset_x(), target); } // int32 offset_y = 5; - if (this->offset_y() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->offset_y(), output); + if (this->_internal_offset_y() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(5, this->_internal_offset_y(), target); } // string text = 6; - if (this->text().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->text().data(), this->text().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (!this->_internal_text().empty()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_text().data(), static_cast(this->_internal_text().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "CaptionDefProto.text"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 6, this->text(), output); + target = stream->WriteStringMaybeAliased( + 6, this->_internal_text(), target); } // bool is_optional = 7; - if (this->is_optional() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->is_optional(), output); + if (this->_internal_is_optional() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteBoolToArray(7, this->_internal_is_optional(), target); } - // @@protoc_insertion_point(serialize_end:CaptionDefProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:CaptionDefProto) + return target; } size_t CaptionDefProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:CaptionDefProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string text = 6; - if (this->text().size() > 0) { + if (!this->_internal_text().empty()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->text()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_text()); } // int32 height = 1; - if (this->height() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->height()); + if (this->_internal_height() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_height()); } // uint32 color = 2; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // uint32 stroke_color = 3; - if (this->stroke_color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->stroke_color()); + if (this->_internal_stroke_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_stroke_color()); } // int32 offset_x = 4; - if (this->offset_x() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->offset_x()); + if (this->_internal_offset_x() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_offset_x()); } // int32 offset_y = 5; - if (this->offset_y() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->offset_y()); + if (this->_internal_offset_y() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_offset_y()); } // bool is_optional = 7; - if (this->is_optional() != 0) { + if (this->_internal_is_optional() != 0) { total_size += 1 + 1; } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void CaptionDefProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void CaptionDefProto::MergeFrom(const CaptionDefProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:CaptionDefProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + CaptionDefProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:CaptionDefProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.text().size() > 0) { - - text_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.text_); + if (!from._internal_text().empty()) { + _this->_internal_set_text(from._internal_text()); } - if (from.height() != 0) { - set_height(from.height()); + if (from._internal_height() != 0) { + _this->_internal_set_height(from._internal_height()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.stroke_color() != 0) { - set_stroke_color(from.stroke_color()); + if (from._internal_stroke_color() != 0) { + _this->_internal_set_stroke_color(from._internal_stroke_color()); } - if (from.offset_x() != 0) { - set_offset_x(from.offset_x()); + if (from._internal_offset_x() != 0) { + _this->_internal_set_offset_x(from._internal_offset_x()); } - if (from.offset_y() != 0) { - set_offset_y(from.offset_y()); + if (from._internal_offset_y() != 0) { + _this->_internal_set_offset_y(from._internal_offset_y()); } - if (from.is_optional() != 0) { - set_is_optional(from.is_optional()); + if (from._internal_is_optional() != 0) { + _this->_internal_set_is_optional(from._internal_is_optional()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void CaptionDefProto::CopyFrom(const CaptionDefProto& from) { @@ -2925,401 +2529,266 @@ bool CaptionDefProto::IsInitialized() const { return true; } -void CaptionDefProto::Swap(CaptionDefProto* other) { - if (other == this) return; - InternalSwap(other); -} void CaptionDefProto::InternalSwap(CaptionDefProto* other) { - text_.Swap(&other->text_); - std::swap(height_, other->height_); - std::swap(color_, other->color_); - std::swap(stroke_color_, other->stroke_color_); - std::swap(offset_x_, other->offset_x_); - std::swap(offset_y_, other->offset_y_); - std::swap(is_optional_, other->is_optional_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + auto* lhs_arena = GetArenaForAllocation(); + auto* rhs_arena = other->GetArenaForAllocation(); + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( + &_impl_.text_, lhs_arena, + &other->_impl_.text_, rhs_arena + ); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(CaptionDefProto, _impl_.is_optional_) + + sizeof(CaptionDefProto::_impl_.is_optional_) + - PROTOBUF_FIELD_OFFSET(CaptionDefProto, _impl_.height_)>( + reinterpret_cast(&_impl_.height_), + reinterpret_cast(&other->_impl_.height_)); } -::std::string CaptionDefProto::GetTypeName() const { +std::string CaptionDefProto::GetTypeName() const { return "CaptionDefProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// CaptionDefProto - -// int32 height = 1; -void CaptionDefProto::clear_height() { - height_ = 0; -} -::google::protobuf::int32 CaptionDefProto::height() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.height) - return height_; -} -void CaptionDefProto::set_height(::google::protobuf::int32 value) { - - height_ = value; - // @@protoc_insertion_point(field_set:CaptionDefProto.height) -} - -// uint32 color = 2; -void CaptionDefProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 CaptionDefProto::color() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.color) - return color_; -} -void CaptionDefProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:CaptionDefProto.color) -} - -// uint32 stroke_color = 3; -void CaptionDefProto::clear_stroke_color() { - stroke_color_ = 0u; -} -::google::protobuf::uint32 CaptionDefProto::stroke_color() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.stroke_color) - return stroke_color_; -} -void CaptionDefProto::set_stroke_color(::google::protobuf::uint32 value) { - - stroke_color_ = value; - // @@protoc_insertion_point(field_set:CaptionDefProto.stroke_color) -} - -// int32 offset_x = 4; -void CaptionDefProto::clear_offset_x() { - offset_x_ = 0; -} -::google::protobuf::int32 CaptionDefProto::offset_x() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.offset_x) - return offset_x_; -} -void CaptionDefProto::set_offset_x(::google::protobuf::int32 value) { - - offset_x_ = value; - // @@protoc_insertion_point(field_set:CaptionDefProto.offset_x) -} - -// int32 offset_y = 5; -void CaptionDefProto::clear_offset_y() { - offset_y_ = 0; -} -::google::protobuf::int32 CaptionDefProto::offset_y() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.offset_y) - return offset_y_; -} -void CaptionDefProto::set_offset_y(::google::protobuf::int32 value) { - - offset_y_ = value; - // @@protoc_insertion_point(field_set:CaptionDefProto.offset_y) -} - -// string text = 6; -void CaptionDefProto::clear_text() { - text_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -const ::std::string& CaptionDefProto::text() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.text) - return text_.GetNoArena(); -} -void CaptionDefProto::set_text(const ::std::string& value) { - - text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:CaptionDefProto.text) -} -#if LANG_CXX11 -void CaptionDefProto::set_text(::std::string&& value) { - - text_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:CaptionDefProto.text) -} -#endif -void CaptionDefProto::set_text(const char* value) { - GOOGLE_DCHECK(value != NULL); - - text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:CaptionDefProto.text) -} -void CaptionDefProto::set_text(const char* value, size_t size) { - - text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:CaptionDefProto.text) -} -::std::string* CaptionDefProto::mutable_text() { - - // @@protoc_insertion_point(field_mutable:CaptionDefProto.text) - return text_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -::std::string* CaptionDefProto::release_text() { - // @@protoc_insertion_point(field_release:CaptionDefProto.text) - - return text_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void CaptionDefProto::set_allocated_text(::std::string* text) { - if (text != NULL) { - - } else { - - } - text_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), text); - // @@protoc_insertion_point(field_set_allocated:CaptionDefProto.text) -} - -// bool is_optional = 7; -void CaptionDefProto::clear_is_optional() { - is_optional_ = false; -} -bool CaptionDefProto::is_optional() const { - // @@protoc_insertion_point(field_get:CaptionDefProto.is_optional) - return is_optional_; -} -void CaptionDefProto::set_is_optional(bool value) { - - is_optional_ = value; - // @@protoc_insertion_point(field_set:CaptionDefProto.is_optional) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int CaptionRuleProto::kPrimaryFieldNumber; -const int CaptionRuleProto::kSecondaryFieldNumber; -const int CaptionRuleProto::kPriorityFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class CaptionRuleProto::_Internal { + public: + static const ::CaptionDefProto& primary(const CaptionRuleProto* msg); + static const ::CaptionDefProto& secondary(const CaptionRuleProto* msg); +}; -CaptionRuleProto::CaptionRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:CaptionRuleProto) +const ::CaptionDefProto& +CaptionRuleProto::_Internal::primary(const CaptionRuleProto* msg) { + return *msg->_impl_.primary_; +} +const ::CaptionDefProto& +CaptionRuleProto::_Internal::secondary(const CaptionRuleProto* msg) { + return *msg->_impl_.secondary_; +} +CaptionRuleProto::CaptionRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:CaptionRuleProto) } CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_primary()) { - primary_ = new ::CaptionDefProto(*from.primary_); - } else { - primary_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + CaptionRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.primary_){nullptr} + , decltype(_impl_.secondary_){nullptr} + , decltype(_impl_.priority_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_primary()) { + _this->_impl_.primary_ = new ::CaptionDefProto(*from._impl_.primary_); } - if (from.has_secondary()) { - secondary_ = new ::CaptionDefProto(*from.secondary_); - } else { - secondary_ = NULL; + if (from._internal_has_secondary()) { + _this->_impl_.secondary_ = new ::CaptionDefProto(*from._impl_.secondary_); } - priority_ = from.priority_; + _this->_impl_.priority_ = from._impl_.priority_; // @@protoc_insertion_point(copy_constructor:CaptionRuleProto) } -void CaptionRuleProto::SharedCtor() { - ::memset(&primary_, 0, reinterpret_cast(&priority_) - - reinterpret_cast(&primary_) + sizeof(priority_)); - _cached_size_ = 0; +inline void CaptionRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.primary_){nullptr} + , decltype(_impl_.secondary_){nullptr} + , decltype(_impl_.priority_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } CaptionRuleProto::~CaptionRuleProto() { // @@protoc_insertion_point(destructor:CaptionRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void CaptionRuleProto::SharedDtor() { - if (this != internal_default_instance()) { - delete primary_; - } - if (this != internal_default_instance()) { - delete secondary_; - } +inline void CaptionRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + if (this != internal_default_instance()) delete _impl_.primary_; + if (this != internal_default_instance()) delete _impl_.secondary_; } void CaptionRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const CaptionRuleProto& CaptionRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -CaptionRuleProto* CaptionRuleProto::New(::google::protobuf::Arena* arena) const { - CaptionRuleProto* n = new CaptionRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void CaptionRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:CaptionRuleProto) - if (GetArenaNoVirtual() == NULL && primary_ != NULL) { - delete primary_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaForAllocation() == nullptr && _impl_.primary_ != nullptr) { + delete _impl_.primary_; } - primary_ = NULL; - if (GetArenaNoVirtual() == NULL && secondary_ != NULL) { - delete secondary_; + _impl_.primary_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.secondary_ != nullptr) { + delete _impl_.secondary_; } - secondary_ = NULL; - priority_ = 0; + _impl_.secondary_ = nullptr; + _impl_.priority_ = 0; + _internal_metadata_.Clear(); } -bool CaptionRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:CaptionRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* CaptionRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // .CaptionDefProto primary = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_primary())); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + ptr = ctx->ParseMessage(_internal_mutable_primary(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .CaptionDefProto secondary = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_secondary())); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + ptr = ctx->ParseMessage(_internal_mutable_secondary(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:CaptionRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:CaptionRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void CaptionRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:CaptionRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* CaptionRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:CaptionRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // .CaptionDefProto primary = 1; - if (this->has_primary()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 1, *this->primary_, output); + if (this->_internal_has_primary()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(1, _Internal::primary(this), + _Internal::primary(this).GetCachedSize(), target, stream); } // .CaptionDefProto secondary = 2; - if (this->has_secondary()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, *this->secondary_, output); + if (this->_internal_has_secondary()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(2, _Internal::secondary(this), + _Internal::secondary(this).GetCachedSize(), target, stream); } // int32 priority = 3; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_priority(), target); } - // @@protoc_insertion_point(serialize_end:CaptionRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:CaptionRuleProto) + return target; } size_t CaptionRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:CaptionRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .CaptionDefProto primary = 1; - if (this->has_primary()) { + if (this->_internal_has_primary()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->primary_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.primary_); } // .CaptionDefProto secondary = 2; - if (this->has_secondary()) { + if (this->_internal_has_secondary()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->secondary_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.secondary_); } // int32 priority = 3; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void CaptionRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void CaptionRuleProto::MergeFrom(const CaptionRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:CaptionRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + CaptionRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:CaptionRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.has_primary()) { - mutable_primary()->::CaptionDefProto::MergeFrom(from.primary()); + if (from._internal_has_primary()) { + _this->_internal_mutable_primary()->::CaptionDefProto::MergeFrom( + from._internal_primary()); } - if (from.has_secondary()) { - mutable_secondary()->::CaptionDefProto::MergeFrom(from.secondary()); + if (from._internal_has_secondary()) { + _this->_internal_mutable_secondary()->::CaptionDefProto::MergeFrom( + from._internal_secondary()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) { @@ -3333,372 +2802,283 @@ bool CaptionRuleProto::IsInitialized() const { return true; } -void CaptionRuleProto::Swap(CaptionRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void CaptionRuleProto::InternalSwap(CaptionRuleProto* other) { - std::swap(primary_, other->primary_); - std::swap(secondary_, other->secondary_); - std::swap(priority_, other->priority_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(CaptionRuleProto, _impl_.priority_) + + sizeof(CaptionRuleProto::_impl_.priority_) + - PROTOBUF_FIELD_OFFSET(CaptionRuleProto, _impl_.primary_)>( + reinterpret_cast(&_impl_.primary_), + reinterpret_cast(&other->_impl_.primary_)); } -::std::string CaptionRuleProto::GetTypeName() const { +std::string CaptionRuleProto::GetTypeName() const { return "CaptionRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// CaptionRuleProto - -// .CaptionDefProto primary = 1; -bool CaptionRuleProto::has_primary() const { - return this != internal_default_instance() && primary_ != NULL; -} -void CaptionRuleProto::clear_primary() { - if (GetArenaNoVirtual() == NULL && primary_ != NULL) delete primary_; - primary_ = NULL; -} -const ::CaptionDefProto& CaptionRuleProto::primary() const { - // @@protoc_insertion_point(field_get:CaptionRuleProto.primary) - return primary_ != NULL ? *primary_ - : *::CaptionDefProto::internal_default_instance(); -} -::CaptionDefProto* CaptionRuleProto::mutable_primary() { - - if (primary_ == NULL) { - primary_ = new ::CaptionDefProto; - } - // @@protoc_insertion_point(field_mutable:CaptionRuleProto.primary) - return primary_; -} -::CaptionDefProto* CaptionRuleProto::release_primary() { - // @@protoc_insertion_point(field_release:CaptionRuleProto.primary) - - ::CaptionDefProto* temp = primary_; - primary_ = NULL; - return temp; -} -void CaptionRuleProto::set_allocated_primary(::CaptionDefProto* primary) { - delete primary_; - primary_ = primary; - if (primary) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.primary) -} - -// .CaptionDefProto secondary = 2; -bool CaptionRuleProto::has_secondary() const { - return this != internal_default_instance() && secondary_ != NULL; -} -void CaptionRuleProto::clear_secondary() { - if (GetArenaNoVirtual() == NULL && secondary_ != NULL) delete secondary_; - secondary_ = NULL; -} -const ::CaptionDefProto& CaptionRuleProto::secondary() const { - // @@protoc_insertion_point(field_get:CaptionRuleProto.secondary) - return secondary_ != NULL ? *secondary_ - : *::CaptionDefProto::internal_default_instance(); -} -::CaptionDefProto* CaptionRuleProto::mutable_secondary() { - - if (secondary_ == NULL) { - secondary_ = new ::CaptionDefProto; - } - // @@protoc_insertion_point(field_mutable:CaptionRuleProto.secondary) - return secondary_; -} -::CaptionDefProto* CaptionRuleProto::release_secondary() { - // @@protoc_insertion_point(field_release:CaptionRuleProto.secondary) - - ::CaptionDefProto* temp = secondary_; - secondary_ = NULL; - return temp; -} -void CaptionRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) { - delete secondary_; - secondary_ = secondary; - if (secondary) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.secondary) -} - -// int32 priority = 3; -void CaptionRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 CaptionRuleProto::priority() const { - // @@protoc_insertion_point(field_get:CaptionRuleProto.priority) - return priority_; -} -void CaptionRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:CaptionRuleProto.priority) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int CircleRuleProto::kRadiusFieldNumber; -const int CircleRuleProto::kColorFieldNumber; -const int CircleRuleProto::kBorderFieldNumber; -const int CircleRuleProto::kPriorityFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class CircleRuleProto::_Internal { + public: + static const ::LineDefProto& border(const CircleRuleProto* msg); +}; -CircleRuleProto::CircleRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:CircleRuleProto) +const ::LineDefProto& +CircleRuleProto::_Internal::border(const CircleRuleProto* msg) { + return *msg->_impl_.border_; +} +CircleRuleProto::CircleRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:CircleRuleProto) } CircleRuleProto::CircleRuleProto(const CircleRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_border()) { - border_ = new ::LineDefProto(*from.border_); - } else { - border_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + CircleRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.border_){nullptr} + , decltype(_impl_.radius_){} + , decltype(_impl_.color_){} + , decltype(_impl_.priority_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_border()) { + _this->_impl_.border_ = new ::LineDefProto(*from._impl_.border_); } - ::memcpy(&radius_, &from.radius_, - reinterpret_cast(&priority_) - - reinterpret_cast(&radius_) + sizeof(priority_)); + ::memcpy(&_impl_.radius_, &from._impl_.radius_, + static_cast(reinterpret_cast(&_impl_.priority_) - + reinterpret_cast(&_impl_.radius_)) + sizeof(_impl_.priority_)); // @@protoc_insertion_point(copy_constructor:CircleRuleProto) } -void CircleRuleProto::SharedCtor() { - ::memset(&border_, 0, reinterpret_cast(&priority_) - - reinterpret_cast(&border_) + sizeof(priority_)); - _cached_size_ = 0; +inline void CircleRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.border_){nullptr} + , decltype(_impl_.radius_){0} + , decltype(_impl_.color_){0u} + , decltype(_impl_.priority_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } CircleRuleProto::~CircleRuleProto() { // @@protoc_insertion_point(destructor:CircleRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void CircleRuleProto::SharedDtor() { - if (this != internal_default_instance()) { - delete border_; - } +inline void CircleRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + if (this != internal_default_instance()) delete _impl_.border_; } void CircleRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const CircleRuleProto& CircleRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -CircleRuleProto* CircleRuleProto::New(::google::protobuf::Arena* arena) const { - CircleRuleProto* n = new CircleRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void CircleRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:CircleRuleProto) - if (GetArenaNoVirtual() == NULL && border_ != NULL) { - delete border_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaForAllocation() == nullptr && _impl_.border_ != nullptr) { + delete _impl_.border_; } - border_ = NULL; - ::memset(&radius_, 0, reinterpret_cast(&priority_) - - reinterpret_cast(&radius_) + sizeof(priority_)); + _impl_.border_ = nullptr; + ::memset(&_impl_.radius_, 0, static_cast( + reinterpret_cast(&_impl_.priority_) - + reinterpret_cast(&_impl_.radius_)) + sizeof(_impl_.priority_)); + _internal_metadata_.Clear(); } -bool CircleRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:CircleRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* CircleRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // double radius = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(9u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &radius_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 9)) { + _impl_.radius_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(double); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 color = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .LineDefProto border = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_border())); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + ptr = ctx->ParseMessage(_internal_mutable_border(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(32u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:CircleRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:CircleRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void CircleRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:CircleRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* CircleRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:CircleRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // double radius = 1; - if (this->radius() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->radius(), output); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_radius = this->_internal_radius(); + uint64_t raw_radius; + memcpy(&raw_radius, &tmp_radius, sizeof(tmp_radius)); + if (raw_radius != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteDoubleToArray(1, this->_internal_radius(), target); } // uint32 color = 2; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_color(), target); } // .LineDefProto border = 3; - if (this->has_border()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, *this->border_, output); + if (this->_internal_has_border()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(3, _Internal::border(this), + _Internal::border(this).GetCachedSize(), target, stream); } // int32 priority = 4; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_priority(), target); } - // @@protoc_insertion_point(serialize_end:CircleRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:CircleRuleProto) + return target; } size_t CircleRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:CircleRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .LineDefProto border = 3; - if (this->has_border()) { + if (this->_internal_has_border()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->border_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.border_); } // double radius = 1; - if (this->radius() != 0) { + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_radius = this->_internal_radius(); + uint64_t raw_radius; + memcpy(&raw_radius, &tmp_radius, sizeof(tmp_radius)); + if (raw_radius != 0) { total_size += 1 + 8; } // uint32 color = 2; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // int32 priority = 4; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void CircleRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void CircleRuleProto::MergeFrom(const CircleRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:CircleRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + CircleRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:CircleRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.has_border()) { - mutable_border()->::LineDefProto::MergeFrom(from.border()); + if (from._internal_has_border()) { + _this->_internal_mutable_border()->::LineDefProto::MergeFrom( + from._internal_border()); } - if (from.radius() != 0) { - set_radius(from.radius()); + static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size."); + double tmp_radius = from._internal_radius(); + uint64_t raw_radius; + memcpy(&raw_radius, &tmp_radius, sizeof(tmp_radius)); + if (raw_radius != 0) { + _this->_internal_set_radius(from._internal_radius()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void CircleRuleProto::CopyFrom(const CircleRuleProto& from) { @@ -3712,342 +3092,260 @@ bool CircleRuleProto::IsInitialized() const { return true; } -void CircleRuleProto::Swap(CircleRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void CircleRuleProto::InternalSwap(CircleRuleProto* other) { - std::swap(border_, other->border_); - std::swap(radius_, other->radius_); - std::swap(color_, other->color_); - std::swap(priority_, other->priority_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(CircleRuleProto, _impl_.priority_) + + sizeof(CircleRuleProto::_impl_.priority_) + - PROTOBUF_FIELD_OFFSET(CircleRuleProto, _impl_.border_)>( + reinterpret_cast(&_impl_.border_), + reinterpret_cast(&other->_impl_.border_)); } -::std::string CircleRuleProto::GetTypeName() const { +std::string CircleRuleProto::GetTypeName() const { return "CircleRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// CircleRuleProto - -// double radius = 1; -void CircleRuleProto::clear_radius() { - radius_ = 0; -} -double CircleRuleProto::radius() const { - // @@protoc_insertion_point(field_get:CircleRuleProto.radius) - return radius_; -} -void CircleRuleProto::set_radius(double value) { - - radius_ = value; - // @@protoc_insertion_point(field_set:CircleRuleProto.radius) -} - -// uint32 color = 2; -void CircleRuleProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 CircleRuleProto::color() const { - // @@protoc_insertion_point(field_get:CircleRuleProto.color) - return color_; -} -void CircleRuleProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:CircleRuleProto.color) -} - -// .LineDefProto border = 3; -bool CircleRuleProto::has_border() const { - return this != internal_default_instance() && border_ != NULL; -} -void CircleRuleProto::clear_border() { - if (GetArenaNoVirtual() == NULL && border_ != NULL) delete border_; - border_ = NULL; -} -const ::LineDefProto& CircleRuleProto::border() const { - // @@protoc_insertion_point(field_get:CircleRuleProto.border) - return border_ != NULL ? *border_ - : *::LineDefProto::internal_default_instance(); -} -::LineDefProto* CircleRuleProto::mutable_border() { - - if (border_ == NULL) { - border_ = new ::LineDefProto; - } - // @@protoc_insertion_point(field_mutable:CircleRuleProto.border) - return border_; -} -::LineDefProto* CircleRuleProto::release_border() { - // @@protoc_insertion_point(field_release:CircleRuleProto.border) - - ::LineDefProto* temp = border_; - border_ = NULL; - return temp; -} -void CircleRuleProto::set_allocated_border(::LineDefProto* border) { - delete border_; - border_ = border; - if (border) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:CircleRuleProto.border) -} - -// int32 priority = 4; -void CircleRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 CircleRuleProto::priority() const { - // @@protoc_insertion_point(field_get:CircleRuleProto.priority) - return priority_; -} -void CircleRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:CircleRuleProto.priority) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int PathTextRuleProto::kPrimaryFieldNumber; -const int PathTextRuleProto::kSecondaryFieldNumber; -const int PathTextRuleProto::kPriorityFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class PathTextRuleProto::_Internal { + public: + static const ::CaptionDefProto& primary(const PathTextRuleProto* msg); + static const ::CaptionDefProto& secondary(const PathTextRuleProto* msg); +}; -PathTextRuleProto::PathTextRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:PathTextRuleProto) +const ::CaptionDefProto& +PathTextRuleProto::_Internal::primary(const PathTextRuleProto* msg) { + return *msg->_impl_.primary_; +} +const ::CaptionDefProto& +PathTextRuleProto::_Internal::secondary(const PathTextRuleProto* msg) { + return *msg->_impl_.secondary_; +} +PathTextRuleProto::PathTextRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:PathTextRuleProto) } PathTextRuleProto::PathTextRuleProto(const PathTextRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_primary()) { - primary_ = new ::CaptionDefProto(*from.primary_); - } else { - primary_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + PathTextRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.primary_){nullptr} + , decltype(_impl_.secondary_){nullptr} + , decltype(_impl_.priority_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_primary()) { + _this->_impl_.primary_ = new ::CaptionDefProto(*from._impl_.primary_); } - if (from.has_secondary()) { - secondary_ = new ::CaptionDefProto(*from.secondary_); - } else { - secondary_ = NULL; + if (from._internal_has_secondary()) { + _this->_impl_.secondary_ = new ::CaptionDefProto(*from._impl_.secondary_); } - priority_ = from.priority_; + _this->_impl_.priority_ = from._impl_.priority_; // @@protoc_insertion_point(copy_constructor:PathTextRuleProto) } -void PathTextRuleProto::SharedCtor() { - ::memset(&primary_, 0, reinterpret_cast(&priority_) - - reinterpret_cast(&primary_) + sizeof(priority_)); - _cached_size_ = 0; +inline void PathTextRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.primary_){nullptr} + , decltype(_impl_.secondary_){nullptr} + , decltype(_impl_.priority_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } PathTextRuleProto::~PathTextRuleProto() { // @@protoc_insertion_point(destructor:PathTextRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void PathTextRuleProto::SharedDtor() { - if (this != internal_default_instance()) { - delete primary_; - } - if (this != internal_default_instance()) { - delete secondary_; - } +inline void PathTextRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + if (this != internal_default_instance()) delete _impl_.primary_; + if (this != internal_default_instance()) delete _impl_.secondary_; } void PathTextRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const PathTextRuleProto& PathTextRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -PathTextRuleProto* PathTextRuleProto::New(::google::protobuf::Arena* arena) const { - PathTextRuleProto* n = new PathTextRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void PathTextRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:PathTextRuleProto) - if (GetArenaNoVirtual() == NULL && primary_ != NULL) { - delete primary_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaForAllocation() == nullptr && _impl_.primary_ != nullptr) { + delete _impl_.primary_; } - primary_ = NULL; - if (GetArenaNoVirtual() == NULL && secondary_ != NULL) { - delete secondary_; + _impl_.primary_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.secondary_ != nullptr) { + delete _impl_.secondary_; } - secondary_ = NULL; - priority_ = 0; + _impl_.secondary_ = nullptr; + _impl_.priority_ = 0; + _internal_metadata_.Clear(); } -bool PathTextRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:PathTextRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* PathTextRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // .CaptionDefProto primary = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_primary())); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + ptr = ctx->ParseMessage(_internal_mutable_primary(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .CaptionDefProto secondary = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_secondary())); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + ptr = ctx->ParseMessage(_internal_mutable_secondary(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:PathTextRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:PathTextRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void PathTextRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:PathTextRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* PathTextRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:PathTextRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // .CaptionDefProto primary = 1; - if (this->has_primary()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 1, *this->primary_, output); + if (this->_internal_has_primary()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(1, _Internal::primary(this), + _Internal::primary(this).GetCachedSize(), target, stream); } // .CaptionDefProto secondary = 2; - if (this->has_secondary()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, *this->secondary_, output); + if (this->_internal_has_secondary()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(2, _Internal::secondary(this), + _Internal::secondary(this).GetCachedSize(), target, stream); } // int32 priority = 3; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_priority(), target); } - // @@protoc_insertion_point(serialize_end:PathTextRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:PathTextRuleProto) + return target; } size_t PathTextRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:PathTextRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .CaptionDefProto primary = 1; - if (this->has_primary()) { + if (this->_internal_has_primary()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->primary_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.primary_); } // .CaptionDefProto secondary = 2; - if (this->has_secondary()) { + if (this->_internal_has_secondary()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->secondary_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.secondary_); } // int32 priority = 3; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void PathTextRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void PathTextRuleProto::MergeFrom(const PathTextRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:PathTextRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + PathTextRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:PathTextRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.has_primary()) { - mutable_primary()->::CaptionDefProto::MergeFrom(from.primary()); + if (from._internal_has_primary()) { + _this->_internal_mutable_primary()->::CaptionDefProto::MergeFrom( + from._internal_primary()); } - if (from.has_secondary()) { - mutable_secondary()->::CaptionDefProto::MergeFrom(from.secondary()); + if (from._internal_has_secondary()) { + _this->_internal_mutable_secondary()->::CaptionDefProto::MergeFrom( + from._internal_secondary()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void PathTextRuleProto::CopyFrom(const PathTextRuleProto& from) { @@ -4061,453 +3359,326 @@ bool PathTextRuleProto::IsInitialized() const { return true; } -void PathTextRuleProto::Swap(PathTextRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void PathTextRuleProto::InternalSwap(PathTextRuleProto* other) { - std::swap(primary_, other->primary_); - std::swap(secondary_, other->secondary_); - std::swap(priority_, other->priority_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(PathTextRuleProto, _impl_.priority_) + + sizeof(PathTextRuleProto::_impl_.priority_) + - PROTOBUF_FIELD_OFFSET(PathTextRuleProto, _impl_.primary_)>( + reinterpret_cast(&_impl_.primary_), + reinterpret_cast(&other->_impl_.primary_)); } -::std::string PathTextRuleProto::GetTypeName() const { +std::string PathTextRuleProto::GetTypeName() const { return "PathTextRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// PathTextRuleProto - -// .CaptionDefProto primary = 1; -bool PathTextRuleProto::has_primary() const { - return this != internal_default_instance() && primary_ != NULL; -} -void PathTextRuleProto::clear_primary() { - if (GetArenaNoVirtual() == NULL && primary_ != NULL) delete primary_; - primary_ = NULL; -} -const ::CaptionDefProto& PathTextRuleProto::primary() const { - // @@protoc_insertion_point(field_get:PathTextRuleProto.primary) - return primary_ != NULL ? *primary_ - : *::CaptionDefProto::internal_default_instance(); -} -::CaptionDefProto* PathTextRuleProto::mutable_primary() { - - if (primary_ == NULL) { - primary_ = new ::CaptionDefProto; - } - // @@protoc_insertion_point(field_mutable:PathTextRuleProto.primary) - return primary_; -} -::CaptionDefProto* PathTextRuleProto::release_primary() { - // @@protoc_insertion_point(field_release:PathTextRuleProto.primary) - - ::CaptionDefProto* temp = primary_; - primary_ = NULL; - return temp; -} -void PathTextRuleProto::set_allocated_primary(::CaptionDefProto* primary) { - delete primary_; - primary_ = primary; - if (primary) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.primary) -} - -// .CaptionDefProto secondary = 2; -bool PathTextRuleProto::has_secondary() const { - return this != internal_default_instance() && secondary_ != NULL; -} -void PathTextRuleProto::clear_secondary() { - if (GetArenaNoVirtual() == NULL && secondary_ != NULL) delete secondary_; - secondary_ = NULL; -} -const ::CaptionDefProto& PathTextRuleProto::secondary() const { - // @@protoc_insertion_point(field_get:PathTextRuleProto.secondary) - return secondary_ != NULL ? *secondary_ - : *::CaptionDefProto::internal_default_instance(); -} -::CaptionDefProto* PathTextRuleProto::mutable_secondary() { - - if (secondary_ == NULL) { - secondary_ = new ::CaptionDefProto; - } - // @@protoc_insertion_point(field_mutable:PathTextRuleProto.secondary) - return secondary_; -} -::CaptionDefProto* PathTextRuleProto::release_secondary() { - // @@protoc_insertion_point(field_release:PathTextRuleProto.secondary) - - ::CaptionDefProto* temp = secondary_; - secondary_ = NULL; - return temp; -} -void PathTextRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) { - delete secondary_; - secondary_ = secondary; - if (secondary) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.secondary) -} - -// int32 priority = 3; -void PathTextRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 PathTextRuleProto::priority() const { - // @@protoc_insertion_point(field_get:PathTextRuleProto.priority) - return priority_; -} -void PathTextRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:PathTextRuleProto.priority) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ShieldRuleProto::kHeightFieldNumber; -const int ShieldRuleProto::kColorFieldNumber; -const int ShieldRuleProto::kStrokeColorFieldNumber; -const int ShieldRuleProto::kPriorityFieldNumber; -const int ShieldRuleProto::kMinDistanceFieldNumber; -const int ShieldRuleProto::kTextColorFieldNumber; -const int ShieldRuleProto::kTextStrokeColorFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class ShieldRuleProto::_Internal { + public: +}; -ShieldRuleProto::ShieldRuleProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:ShieldRuleProto) +ShieldRuleProto::ShieldRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:ShieldRuleProto) } ShieldRuleProto::ShieldRuleProto(const ShieldRuleProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::memcpy(&height_, &from.height_, - reinterpret_cast(&text_stroke_color_) - - reinterpret_cast(&height_) + sizeof(text_stroke_color_)); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + ShieldRuleProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.height_){} + , decltype(_impl_.color_){} + , decltype(_impl_.stroke_color_){} + , decltype(_impl_.priority_){} + , decltype(_impl_.min_distance_){} + , decltype(_impl_.text_color_){} + , decltype(_impl_.text_stroke_color_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::memcpy(&_impl_.height_, &from._impl_.height_, + static_cast(reinterpret_cast(&_impl_.text_stroke_color_) - + reinterpret_cast(&_impl_.height_)) + sizeof(_impl_.text_stroke_color_)); // @@protoc_insertion_point(copy_constructor:ShieldRuleProto) } -void ShieldRuleProto::SharedCtor() { - ::memset(&height_, 0, reinterpret_cast(&text_stroke_color_) - - reinterpret_cast(&height_) + sizeof(text_stroke_color_)); - _cached_size_ = 0; +inline void ShieldRuleProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.height_){0} + , decltype(_impl_.color_){0u} + , decltype(_impl_.stroke_color_){0u} + , decltype(_impl_.priority_){0} + , decltype(_impl_.min_distance_){0} + , decltype(_impl_.text_color_){0u} + , decltype(_impl_.text_stroke_color_){0u} + , /*decltype(_impl_._cached_size_)*/{} + }; } ShieldRuleProto::~ShieldRuleProto() { // @@protoc_insertion_point(destructor:ShieldRuleProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void ShieldRuleProto::SharedDtor() { +inline void ShieldRuleProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); } void ShieldRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ShieldRuleProto& ShieldRuleProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -ShieldRuleProto* ShieldRuleProto::New(::google::protobuf::Arena* arena) const { - ShieldRuleProto* n = new ShieldRuleProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void ShieldRuleProto::Clear() { // @@protoc_insertion_point(message_clear_start:ShieldRuleProto) - ::memset(&height_, 0, reinterpret_cast(&text_stroke_color_) - - reinterpret_cast(&height_) + sizeof(text_stroke_color_)); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + ::memset(&_impl_.height_, 0, static_cast( + reinterpret_cast(&_impl_.text_stroke_color_) - + reinterpret_cast(&_impl_.height_)) + sizeof(_impl_.text_stroke_color_)); + _internal_metadata_.Clear(); } -bool ShieldRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:ShieldRuleProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* ShieldRuleProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // int32 height = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(8u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &height_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + _impl_.height_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 color = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 stroke_color = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &stroke_color_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { + _impl_.stroke_color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 priority = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(32u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.priority_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // int32 min_distance = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(40u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &min_distance_))); - } else { + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + _impl_.min_distance_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 text_color = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(48u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &text_color_))); - } else { + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { + _impl_.text_color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 text_stroke_color = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(56u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &text_stroke_color_))); - } else { + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { + _impl_.text_stroke_color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:ShieldRuleProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:ShieldRuleProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void ShieldRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:ShieldRuleProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* ShieldRuleProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:ShieldRuleProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // int32 height = 1; - if (this->height() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output); + if (this->_internal_height() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_height(), target); } // uint32 color = 2; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_color(), target); } // uint32 stroke_color = 3; - if (this->stroke_color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output); + if (this->_internal_stroke_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(3, this->_internal_stroke_color(), target); } // int32 priority = 4; - if (this->priority() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); + if (this->_internal_priority() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_priority(), target); } // int32 min_distance = 5; - if (this->min_distance() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->min_distance(), output); + if (this->_internal_min_distance() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(5, this->_internal_min_distance(), target); } // uint32 text_color = 6; - if (this->text_color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->text_color(), output); + if (this->_internal_text_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(6, this->_internal_text_color(), target); } // uint32 text_stroke_color = 7; - if (this->text_stroke_color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->text_stroke_color(), output); + if (this->_internal_text_stroke_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(7, this->_internal_text_stroke_color(), target); } - // @@protoc_insertion_point(serialize_end:ShieldRuleProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:ShieldRuleProto) + return target; } size_t ShieldRuleProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:ShieldRuleProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // int32 height = 1; - if (this->height() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->height()); + if (this->_internal_height() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_height()); } // uint32 color = 2; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // uint32 stroke_color = 3; - if (this->stroke_color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->stroke_color()); + if (this->_internal_stroke_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_stroke_color()); } // int32 priority = 4; - if (this->priority() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); + if (this->_internal_priority() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_priority()); } // int32 min_distance = 5; - if (this->min_distance() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->min_distance()); + if (this->_internal_min_distance() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_min_distance()); } // uint32 text_color = 6; - if (this->text_color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->text_color()); + if (this->_internal_text_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_text_color()); } // uint32 text_stroke_color = 7; - if (this->text_stroke_color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->text_stroke_color()); + if (this->_internal_text_stroke_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_text_stroke_color()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void ShieldRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void ShieldRuleProto::MergeFrom(const ShieldRuleProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:ShieldRuleProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ShieldRuleProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:ShieldRuleProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.height() != 0) { - set_height(from.height()); + if (from._internal_height() != 0) { + _this->_internal_set_height(from._internal_height()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.stroke_color() != 0) { - set_stroke_color(from.stroke_color()); + if (from._internal_stroke_color() != 0) { + _this->_internal_set_stroke_color(from._internal_stroke_color()); } - if (from.priority() != 0) { - set_priority(from.priority()); + if (from._internal_priority() != 0) { + _this->_internal_set_priority(from._internal_priority()); } - if (from.min_distance() != 0) { - set_min_distance(from.min_distance()); + if (from._internal_min_distance() != 0) { + _this->_internal_set_min_distance(from._internal_min_distance()); } - if (from.text_color() != 0) { - set_text_color(from.text_color()); + if (from._internal_text_color() != 0) { + _this->_internal_set_text_color(from._internal_text_color()); } - if (from.text_stroke_color() != 0) { - set_text_stroke_color(from.text_stroke_color()); + if (from._internal_text_stroke_color() != 0) { + _this->_internal_set_text_stroke_color(from._internal_text_stroke_color()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void ShieldRuleProto::CopyFrom(const ShieldRuleProto& from) { @@ -4521,598 +3692,495 @@ bool ShieldRuleProto::IsInitialized() const { return true; } -void ShieldRuleProto::Swap(ShieldRuleProto* other) { - if (other == this) return; - InternalSwap(other); -} void ShieldRuleProto::InternalSwap(ShieldRuleProto* other) { - std::swap(height_, other->height_); - std::swap(color_, other->color_); - std::swap(stroke_color_, other->stroke_color_); - std::swap(priority_, other->priority_); - std::swap(min_distance_, other->min_distance_); - std::swap(text_color_, other->text_color_); - std::swap(text_stroke_color_, other->text_stroke_color_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(ShieldRuleProto, _impl_.text_stroke_color_) + + sizeof(ShieldRuleProto::_impl_.text_stroke_color_) + - PROTOBUF_FIELD_OFFSET(ShieldRuleProto, _impl_.height_)>( + reinterpret_cast(&_impl_.height_), + reinterpret_cast(&other->_impl_.height_)); } -::std::string ShieldRuleProto::GetTypeName() const { +std::string ShieldRuleProto::GetTypeName() const { return "ShieldRuleProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// ShieldRuleProto - -// int32 height = 1; -void ShieldRuleProto::clear_height() { - height_ = 0; -} -::google::protobuf::int32 ShieldRuleProto::height() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.height) - return height_; -} -void ShieldRuleProto::set_height(::google::protobuf::int32 value) { - - height_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.height) -} - -// uint32 color = 2; -void ShieldRuleProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 ShieldRuleProto::color() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.color) - return color_; -} -void ShieldRuleProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.color) -} - -// uint32 stroke_color = 3; -void ShieldRuleProto::clear_stroke_color() { - stroke_color_ = 0u; -} -::google::protobuf::uint32 ShieldRuleProto::stroke_color() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.stroke_color) - return stroke_color_; -} -void ShieldRuleProto::set_stroke_color(::google::protobuf::uint32 value) { - - stroke_color_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.stroke_color) -} - -// int32 priority = 4; -void ShieldRuleProto::clear_priority() { - priority_ = 0; -} -::google::protobuf::int32 ShieldRuleProto::priority() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.priority) - return priority_; -} -void ShieldRuleProto::set_priority(::google::protobuf::int32 value) { - - priority_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.priority) -} - -// int32 min_distance = 5; -void ShieldRuleProto::clear_min_distance() { - min_distance_ = 0; -} -::google::protobuf::int32 ShieldRuleProto::min_distance() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.min_distance) - return min_distance_; -} -void ShieldRuleProto::set_min_distance(::google::protobuf::int32 value) { - - min_distance_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.min_distance) -} - -// uint32 text_color = 6; -void ShieldRuleProto::clear_text_color() { - text_color_ = 0u; -} -::google::protobuf::uint32 ShieldRuleProto::text_color() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.text_color) - return text_color_; -} -void ShieldRuleProto::set_text_color(::google::protobuf::uint32 value) { - - text_color_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.text_color) -} - -// uint32 text_stroke_color = 7; -void ShieldRuleProto::clear_text_stroke_color() { - text_stroke_color_ = 0u; -} -::google::protobuf::uint32 ShieldRuleProto::text_stroke_color() const { - // @@protoc_insertion_point(field_get:ShieldRuleProto.text_stroke_color) - return text_stroke_color_; -} -void ShieldRuleProto::set_text_stroke_color(::google::protobuf::uint32 value) { - - text_stroke_color_ = value; - // @@protoc_insertion_point(field_set:ShieldRuleProto.text_stroke_color) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int DrawElementProto::kScaleFieldNumber; -const int DrawElementProto::kLinesFieldNumber; -const int DrawElementProto::kAreaFieldNumber; -const int DrawElementProto::kSymbolFieldNumber; -const int DrawElementProto::kCaptionFieldNumber; -const int DrawElementProto::kCircleFieldNumber; -const int DrawElementProto::kPathTextFieldNumber; -const int DrawElementProto::kShieldFieldNumber; -const int DrawElementProto::kApplyIfFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class DrawElementProto::_Internal { + public: + static const ::AreaRuleProto& area(const DrawElementProto* msg); + static const ::SymbolRuleProto& symbol(const DrawElementProto* msg); + static const ::CaptionRuleProto& caption(const DrawElementProto* msg); + static const ::CircleRuleProto& circle(const DrawElementProto* msg); + static const ::PathTextRuleProto& path_text(const DrawElementProto* msg); + static const ::ShieldRuleProto& shield(const DrawElementProto* msg); +}; -DrawElementProto::DrawElementProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:DrawElementProto) +const ::AreaRuleProto& +DrawElementProto::_Internal::area(const DrawElementProto* msg) { + return *msg->_impl_.area_; +} +const ::SymbolRuleProto& +DrawElementProto::_Internal::symbol(const DrawElementProto* msg) { + return *msg->_impl_.symbol_; +} +const ::CaptionRuleProto& +DrawElementProto::_Internal::caption(const DrawElementProto* msg) { + return *msg->_impl_.caption_; +} +const ::CircleRuleProto& +DrawElementProto::_Internal::circle(const DrawElementProto* msg) { + return *msg->_impl_.circle_; +} +const ::PathTextRuleProto& +DrawElementProto::_Internal::path_text(const DrawElementProto* msg) { + return *msg->_impl_.path_text_; +} +const ::ShieldRuleProto& +DrawElementProto::_Internal::shield(const DrawElementProto* msg) { + return *msg->_impl_.shield_; +} +DrawElementProto::DrawElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:DrawElementProto) } DrawElementProto::DrawElementProto(const DrawElementProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - lines_(from.lines_), - apply_if_(from.apply_if_), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_area()) { - area_ = new ::AreaRuleProto(*from.area_); - } else { - area_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + DrawElementProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.lines_){from._impl_.lines_} + , decltype(_impl_.apply_if_){from._impl_.apply_if_} + , decltype(_impl_.area_){nullptr} + , decltype(_impl_.symbol_){nullptr} + , decltype(_impl_.caption_){nullptr} + , decltype(_impl_.circle_){nullptr} + , decltype(_impl_.path_text_){nullptr} + , decltype(_impl_.shield_){nullptr} + , decltype(_impl_.scale_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_area()) { + _this->_impl_.area_ = new ::AreaRuleProto(*from._impl_.area_); } - if (from.has_symbol()) { - symbol_ = new ::SymbolRuleProto(*from.symbol_); - } else { - symbol_ = NULL; + if (from._internal_has_symbol()) { + _this->_impl_.symbol_ = new ::SymbolRuleProto(*from._impl_.symbol_); } - if (from.has_caption()) { - caption_ = new ::CaptionRuleProto(*from.caption_); - } else { - caption_ = NULL; + if (from._internal_has_caption()) { + _this->_impl_.caption_ = new ::CaptionRuleProto(*from._impl_.caption_); } - if (from.has_circle()) { - circle_ = new ::CircleRuleProto(*from.circle_); - } else { - circle_ = NULL; + if (from._internal_has_circle()) { + _this->_impl_.circle_ = new ::CircleRuleProto(*from._impl_.circle_); } - if (from.has_path_text()) { - path_text_ = new ::PathTextRuleProto(*from.path_text_); - } else { - path_text_ = NULL; + if (from._internal_has_path_text()) { + _this->_impl_.path_text_ = new ::PathTextRuleProto(*from._impl_.path_text_); } - if (from.has_shield()) { - shield_ = new ::ShieldRuleProto(*from.shield_); - } else { - shield_ = NULL; + if (from._internal_has_shield()) { + _this->_impl_.shield_ = new ::ShieldRuleProto(*from._impl_.shield_); } - scale_ = from.scale_; + _this->_impl_.scale_ = from._impl_.scale_; // @@protoc_insertion_point(copy_constructor:DrawElementProto) } -void DrawElementProto::SharedCtor() { - ::memset(&area_, 0, reinterpret_cast(&scale_) - - reinterpret_cast(&area_) + sizeof(scale_)); - _cached_size_ = 0; +inline void DrawElementProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.lines_){arena} + , decltype(_impl_.apply_if_){arena} + , decltype(_impl_.area_){nullptr} + , decltype(_impl_.symbol_){nullptr} + , decltype(_impl_.caption_){nullptr} + , decltype(_impl_.circle_){nullptr} + , decltype(_impl_.path_text_){nullptr} + , decltype(_impl_.shield_){nullptr} + , decltype(_impl_.scale_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; } DrawElementProto::~DrawElementProto() { // @@protoc_insertion_point(destructor:DrawElementProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void DrawElementProto::SharedDtor() { - if (this != internal_default_instance()) { - delete area_; - } - if (this != internal_default_instance()) { - delete symbol_; - } - if (this != internal_default_instance()) { - delete caption_; - } - if (this != internal_default_instance()) { - delete circle_; - } - if (this != internal_default_instance()) { - delete path_text_; - } - if (this != internal_default_instance()) { - delete shield_; - } +inline void DrawElementProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.lines_.~RepeatedPtrField(); + _impl_.apply_if_.~RepeatedPtrField(); + if (this != internal_default_instance()) delete _impl_.area_; + if (this != internal_default_instance()) delete _impl_.symbol_; + if (this != internal_default_instance()) delete _impl_.caption_; + if (this != internal_default_instance()) delete _impl_.circle_; + if (this != internal_default_instance()) delete _impl_.path_text_; + if (this != internal_default_instance()) delete _impl_.shield_; } void DrawElementProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const DrawElementProto& DrawElementProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -DrawElementProto* DrawElementProto::New(::google::protobuf::Arena* arena) const { - DrawElementProto* n = new DrawElementProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void DrawElementProto::Clear() { // @@protoc_insertion_point(message_clear_start:DrawElementProto) - lines_.Clear(); - apply_if_.Clear(); - if (GetArenaNoVirtual() == NULL && area_ != NULL) { - delete area_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.lines_.Clear(); + _impl_.apply_if_.Clear(); + if (GetArenaForAllocation() == nullptr && _impl_.area_ != nullptr) { + delete _impl_.area_; } - area_ = NULL; - if (GetArenaNoVirtual() == NULL && symbol_ != NULL) { - delete symbol_; + _impl_.area_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.symbol_ != nullptr) { + delete _impl_.symbol_; } - symbol_ = NULL; - if (GetArenaNoVirtual() == NULL && caption_ != NULL) { - delete caption_; + _impl_.symbol_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.caption_ != nullptr) { + delete _impl_.caption_; } - caption_ = NULL; - if (GetArenaNoVirtual() == NULL && circle_ != NULL) { - delete circle_; + _impl_.caption_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.circle_ != nullptr) { + delete _impl_.circle_; } - circle_ = NULL; - if (GetArenaNoVirtual() == NULL && path_text_ != NULL) { - delete path_text_; + _impl_.circle_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.path_text_ != nullptr) { + delete _impl_.path_text_; } - path_text_ = NULL; - if (GetArenaNoVirtual() == NULL && shield_ != NULL) { - delete shield_; + _impl_.path_text_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.shield_ != nullptr) { + delete _impl_.shield_; } - shield_ = NULL; - scale_ = 0; + _impl_.shield_ = nullptr; + _impl_.scale_ = 0; + _internal_metadata_.Clear(); } -bool DrawElementProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:DrawElementProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* DrawElementProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // int32 scale = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(8u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &scale_))); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { + _impl_.scale_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // repeated .LineRuleProto lines = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_lines())); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_lines(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr)); + } else goto handle_unusual; - } - break; - } - + continue; // .AreaRuleProto area = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_area())); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + ptr = ctx->ParseMessage(_internal_mutable_area(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .SymbolRuleProto symbol = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(34u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_symbol())); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + ptr = ctx->ParseMessage(_internal_mutable_symbol(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .CaptionRuleProto caption = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(42u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_caption())); - } else { + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + ptr = ctx->ParseMessage(_internal_mutable_caption(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .CircleRuleProto circle = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(50u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_circle())); - } else { + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + ptr = ctx->ParseMessage(_internal_mutable_circle(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .PathTextRuleProto path_text = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(58u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_path_text())); - } else { + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 58)) { + ptr = ctx->ParseMessage(_internal_mutable_path_text(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // .ShieldRuleProto shield = 8; - case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(66u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_shield())); - } else { + case 8: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { + ptr = ctx->ParseMessage(_internal_mutable_shield(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // repeated string apply_if = 9; - case 9: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(74u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->add_apply_if())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->apply_if(this->apply_if_size() - 1).data(), - this->apply_if(this->apply_if_size() - 1).length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "DrawElementProto.apply_if")); - } else { + case 9: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { + ptr -= 1; + do { + ptr += 1; + auto str = _internal_add_apply_if(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, nullptr)); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr)); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:DrawElementProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:DrawElementProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void DrawElementProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:DrawElementProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* DrawElementProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:DrawElementProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // int32 scale = 1; - if (this->scale() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->scale(), output); + if (this->_internal_scale() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_scale(), target); } // repeated .LineRuleProto lines = 2; - for (unsigned int i = 0, n = this->lines_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->lines(i), output); + for (unsigned i = 0, + n = static_cast(this->_internal_lines_size()); i < n; i++) { + const auto& repfield = this->_internal_lines(i); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } // .AreaRuleProto area = 3; - if (this->has_area()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, *this->area_, output); + if (this->_internal_has_area()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(3, _Internal::area(this), + _Internal::area(this).GetCachedSize(), target, stream); } // .SymbolRuleProto symbol = 4; - if (this->has_symbol()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 4, *this->symbol_, output); + if (this->_internal_has_symbol()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(4, _Internal::symbol(this), + _Internal::symbol(this).GetCachedSize(), target, stream); } // .CaptionRuleProto caption = 5; - if (this->has_caption()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 5, *this->caption_, output); + if (this->_internal_has_caption()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(5, _Internal::caption(this), + _Internal::caption(this).GetCachedSize(), target, stream); } // .CircleRuleProto circle = 6; - if (this->has_circle()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 6, *this->circle_, output); + if (this->_internal_has_circle()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(6, _Internal::circle(this), + _Internal::circle(this).GetCachedSize(), target, stream); } // .PathTextRuleProto path_text = 7; - if (this->has_path_text()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 7, *this->path_text_, output); + if (this->_internal_has_path_text()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(7, _Internal::path_text(this), + _Internal::path_text(this).GetCachedSize(), target, stream); } // .ShieldRuleProto shield = 8; - if (this->has_shield()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 8, *this->shield_, output); + if (this->_internal_has_shield()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(8, _Internal::shield(this), + _Internal::shield(this).GetCachedSize(), target, stream); } // repeated string apply_if = 9; - for (int i = 0, n = this->apply_if_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->apply_if(i).data(), this->apply_if(i).length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + for (int i = 0, n = this->_internal_apply_if_size(); i < n; i++) { + const auto& s = this->_internal_apply_if(i); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + s.data(), static_cast(s.length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "DrawElementProto.apply_if"); - ::google::protobuf::internal::WireFormatLite::WriteString( - 9, this->apply_if(i), output); + target = stream->WriteString(9, s, target); } - // @@protoc_insertion_point(serialize_end:DrawElementProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:DrawElementProto) + return target; } size_t DrawElementProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:DrawElementProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .LineRuleProto lines = 2; - { - unsigned int count = this->lines_size(); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->lines(i)); - } + total_size += 1UL * this->_internal_lines_size(); + for (const auto& msg : this->_impl_.lines_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } // repeated string apply_if = 9; total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->apply_if_size()); - for (int i = 0, n = this->apply_if_size(); i < n; i++) { - total_size += ::google::protobuf::internal::WireFormatLite::StringSize( - this->apply_if(i)); + ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.apply_if_.size()); + for (int i = 0, n = _impl_.apply_if_.size(); i < n; i++) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + _impl_.apply_if_.Get(i)); } // .AreaRuleProto area = 3; - if (this->has_area()) { + if (this->_internal_has_area()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->area_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.area_); } // .SymbolRuleProto symbol = 4; - if (this->has_symbol()) { + if (this->_internal_has_symbol()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->symbol_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.symbol_); } // .CaptionRuleProto caption = 5; - if (this->has_caption()) { + if (this->_internal_has_caption()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->caption_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.caption_); } // .CircleRuleProto circle = 6; - if (this->has_circle()) { + if (this->_internal_has_circle()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->circle_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.circle_); } // .PathTextRuleProto path_text = 7; - if (this->has_path_text()) { + if (this->_internal_has_path_text()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->path_text_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.path_text_); } // .ShieldRuleProto shield = 8; - if (this->has_shield()) { + if (this->_internal_has_shield()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->shield_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.shield_); } // int32 scale = 1; - if (this->scale() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->scale()); + if (this->_internal_scale() != 0) { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_scale()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void DrawElementProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void DrawElementProto::MergeFrom(const DrawElementProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:DrawElementProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + DrawElementProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:DrawElementProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - lines_.MergeFrom(from.lines_); - apply_if_.MergeFrom(from.apply_if_); - if (from.has_area()) { - mutable_area()->::AreaRuleProto::MergeFrom(from.area()); + _this->_impl_.lines_.MergeFrom(from._impl_.lines_); + _this->_impl_.apply_if_.MergeFrom(from._impl_.apply_if_); + if (from._internal_has_area()) { + _this->_internal_mutable_area()->::AreaRuleProto::MergeFrom( + from._internal_area()); } - if (from.has_symbol()) { - mutable_symbol()->::SymbolRuleProto::MergeFrom(from.symbol()); + if (from._internal_has_symbol()) { + _this->_internal_mutable_symbol()->::SymbolRuleProto::MergeFrom( + from._internal_symbol()); } - if (from.has_caption()) { - mutable_caption()->::CaptionRuleProto::MergeFrom(from.caption()); + if (from._internal_has_caption()) { + _this->_internal_mutable_caption()->::CaptionRuleProto::MergeFrom( + from._internal_caption()); } - if (from.has_circle()) { - mutable_circle()->::CircleRuleProto::MergeFrom(from.circle()); + if (from._internal_has_circle()) { + _this->_internal_mutable_circle()->::CircleRuleProto::MergeFrom( + from._internal_circle()); } - if (from.has_path_text()) { - mutable_path_text()->::PathTextRuleProto::MergeFrom(from.path_text()); + if (from._internal_has_path_text()) { + _this->_internal_mutable_path_text()->::PathTextRuleProto::MergeFrom( + from._internal_path_text()); } - if (from.has_shield()) { - mutable_shield()->::ShieldRuleProto::MergeFrom(from.shield()); + if (from._internal_has_shield()) { + _this->_internal_mutable_shield()->::ShieldRuleProto::MergeFrom( + from._internal_shield()); } - if (from.scale() != 0) { - set_scale(from.scale()); + if (from._internal_scale() != 0) { + _this->_internal_set_scale(from._internal_scale()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void DrawElementProto::CopyFrom(const DrawElementProto& from) { @@ -5126,575 +4194,233 @@ bool DrawElementProto::IsInitialized() const { return true; } -void DrawElementProto::Swap(DrawElementProto* other) { - if (other == this) return; - InternalSwap(other); -} void DrawElementProto::InternalSwap(DrawElementProto* other) { - lines_.InternalSwap(&other->lines_); - apply_if_.InternalSwap(&other->apply_if_); - std::swap(area_, other->area_); - std::swap(symbol_, other->symbol_); - std::swap(caption_, other->caption_); - std::swap(circle_, other->circle_); - std::swap(path_text_, other->path_text_); - std::swap(shield_, other->shield_); - std::swap(scale_, other->scale_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + _impl_.lines_.InternalSwap(&other->_impl_.lines_); + _impl_.apply_if_.InternalSwap(&other->_impl_.apply_if_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(DrawElementProto, _impl_.scale_) + + sizeof(DrawElementProto::_impl_.scale_) + - PROTOBUF_FIELD_OFFSET(DrawElementProto, _impl_.area_)>( + reinterpret_cast(&_impl_.area_), + reinterpret_cast(&other->_impl_.area_)); } -::std::string DrawElementProto::GetTypeName() const { +std::string DrawElementProto::GetTypeName() const { return "DrawElementProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// DrawElementProto - -// int32 scale = 1; -void DrawElementProto::clear_scale() { - scale_ = 0; -} -::google::protobuf::int32 DrawElementProto::scale() const { - // @@protoc_insertion_point(field_get:DrawElementProto.scale) - return scale_; -} -void DrawElementProto::set_scale(::google::protobuf::int32 value) { - - scale_ = value; - // @@protoc_insertion_point(field_set:DrawElementProto.scale) -} - -// repeated .LineRuleProto lines = 2; -int DrawElementProto::lines_size() const { - return lines_.size(); -} -void DrawElementProto::clear_lines() { - lines_.Clear(); -} -const ::LineRuleProto& DrawElementProto::lines(int index) const { - // @@protoc_insertion_point(field_get:DrawElementProto.lines) - return lines_.Get(index); -} -::LineRuleProto* DrawElementProto::mutable_lines(int index) { - // @@protoc_insertion_point(field_mutable:DrawElementProto.lines) - return lines_.Mutable(index); -} -::LineRuleProto* DrawElementProto::add_lines() { - // @@protoc_insertion_point(field_add:DrawElementProto.lines) - return lines_.Add(); -} -::google::protobuf::RepeatedPtrField< ::LineRuleProto >* -DrawElementProto::mutable_lines() { - // @@protoc_insertion_point(field_mutable_list:DrawElementProto.lines) - return &lines_; -} -const ::google::protobuf::RepeatedPtrField< ::LineRuleProto >& -DrawElementProto::lines() const { - // @@protoc_insertion_point(field_list:DrawElementProto.lines) - return lines_; -} - -// .AreaRuleProto area = 3; -bool DrawElementProto::has_area() const { - return this != internal_default_instance() && area_ != NULL; -} -void DrawElementProto::clear_area() { - if (GetArenaNoVirtual() == NULL && area_ != NULL) delete area_; - area_ = NULL; -} -const ::AreaRuleProto& DrawElementProto::area() const { - // @@protoc_insertion_point(field_get:DrawElementProto.area) - return area_ != NULL ? *area_ - : *::AreaRuleProto::internal_default_instance(); -} -::AreaRuleProto* DrawElementProto::mutable_area() { - - if (area_ == NULL) { - area_ = new ::AreaRuleProto; - } - // @@protoc_insertion_point(field_mutable:DrawElementProto.area) - return area_; -} -::AreaRuleProto* DrawElementProto::release_area() { - // @@protoc_insertion_point(field_release:DrawElementProto.area) - - ::AreaRuleProto* temp = area_; - area_ = NULL; - return temp; -} -void DrawElementProto::set_allocated_area(::AreaRuleProto* area) { - delete area_; - area_ = area; - if (area) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:DrawElementProto.area) -} - -// .SymbolRuleProto symbol = 4; -bool DrawElementProto::has_symbol() const { - return this != internal_default_instance() && symbol_ != NULL; -} -void DrawElementProto::clear_symbol() { - if (GetArenaNoVirtual() == NULL && symbol_ != NULL) delete symbol_; - symbol_ = NULL; -} -const ::SymbolRuleProto& DrawElementProto::symbol() const { - // @@protoc_insertion_point(field_get:DrawElementProto.symbol) - return symbol_ != NULL ? *symbol_ - : *::SymbolRuleProto::internal_default_instance(); -} -::SymbolRuleProto* DrawElementProto::mutable_symbol() { - - if (symbol_ == NULL) { - symbol_ = new ::SymbolRuleProto; - } - // @@protoc_insertion_point(field_mutable:DrawElementProto.symbol) - return symbol_; -} -::SymbolRuleProto* DrawElementProto::release_symbol() { - // @@protoc_insertion_point(field_release:DrawElementProto.symbol) - - ::SymbolRuleProto* temp = symbol_; - symbol_ = NULL; - return temp; -} -void DrawElementProto::set_allocated_symbol(::SymbolRuleProto* symbol) { - delete symbol_; - symbol_ = symbol; - if (symbol) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:DrawElementProto.symbol) -} - -// .CaptionRuleProto caption = 5; -bool DrawElementProto::has_caption() const { - return this != internal_default_instance() && caption_ != NULL; -} -void DrawElementProto::clear_caption() { - if (GetArenaNoVirtual() == NULL && caption_ != NULL) delete caption_; - caption_ = NULL; -} -const ::CaptionRuleProto& DrawElementProto::caption() const { - // @@protoc_insertion_point(field_get:DrawElementProto.caption) - return caption_ != NULL ? *caption_ - : *::CaptionRuleProto::internal_default_instance(); -} -::CaptionRuleProto* DrawElementProto::mutable_caption() { - - if (caption_ == NULL) { - caption_ = new ::CaptionRuleProto; - } - // @@protoc_insertion_point(field_mutable:DrawElementProto.caption) - return caption_; -} -::CaptionRuleProto* DrawElementProto::release_caption() { - // @@protoc_insertion_point(field_release:DrawElementProto.caption) - - ::CaptionRuleProto* temp = caption_; - caption_ = NULL; - return temp; -} -void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption) { - delete caption_; - caption_ = caption; - if (caption) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:DrawElementProto.caption) -} - -// .CircleRuleProto circle = 6; -bool DrawElementProto::has_circle() const { - return this != internal_default_instance() && circle_ != NULL; -} -void DrawElementProto::clear_circle() { - if (GetArenaNoVirtual() == NULL && circle_ != NULL) delete circle_; - circle_ = NULL; -} -const ::CircleRuleProto& DrawElementProto::circle() const { - // @@protoc_insertion_point(field_get:DrawElementProto.circle) - return circle_ != NULL ? *circle_ - : *::CircleRuleProto::internal_default_instance(); -} -::CircleRuleProto* DrawElementProto::mutable_circle() { - - if (circle_ == NULL) { - circle_ = new ::CircleRuleProto; - } - // @@protoc_insertion_point(field_mutable:DrawElementProto.circle) - return circle_; -} -::CircleRuleProto* DrawElementProto::release_circle() { - // @@protoc_insertion_point(field_release:DrawElementProto.circle) - - ::CircleRuleProto* temp = circle_; - circle_ = NULL; - return temp; -} -void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) { - delete circle_; - circle_ = circle; - if (circle) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:DrawElementProto.circle) -} - -// .PathTextRuleProto path_text = 7; -bool DrawElementProto::has_path_text() const { - return this != internal_default_instance() && path_text_ != NULL; -} -void DrawElementProto::clear_path_text() { - if (GetArenaNoVirtual() == NULL && path_text_ != NULL) delete path_text_; - path_text_ = NULL; -} -const ::PathTextRuleProto& DrawElementProto::path_text() const { - // @@protoc_insertion_point(field_get:DrawElementProto.path_text) - return path_text_ != NULL ? *path_text_ - : *::PathTextRuleProto::internal_default_instance(); -} -::PathTextRuleProto* DrawElementProto::mutable_path_text() { - - if (path_text_ == NULL) { - path_text_ = new ::PathTextRuleProto; - } - // @@protoc_insertion_point(field_mutable:DrawElementProto.path_text) - return path_text_; -} -::PathTextRuleProto* DrawElementProto::release_path_text() { - // @@protoc_insertion_point(field_release:DrawElementProto.path_text) - - ::PathTextRuleProto* temp = path_text_; - path_text_ = NULL; - return temp; -} -void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_text) { - delete path_text_; - path_text_ = path_text; - if (path_text) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:DrawElementProto.path_text) -} - -// .ShieldRuleProto shield = 8; -bool DrawElementProto::has_shield() const { - return this != internal_default_instance() && shield_ != NULL; -} -void DrawElementProto::clear_shield() { - if (GetArenaNoVirtual() == NULL && shield_ != NULL) delete shield_; - shield_ = NULL; -} -const ::ShieldRuleProto& DrawElementProto::shield() const { - // @@protoc_insertion_point(field_get:DrawElementProto.shield) - return shield_ != NULL ? *shield_ - : *::ShieldRuleProto::internal_default_instance(); -} -::ShieldRuleProto* DrawElementProto::mutable_shield() { - - if (shield_ == NULL) { - shield_ = new ::ShieldRuleProto; - } - // @@protoc_insertion_point(field_mutable:DrawElementProto.shield) - return shield_; -} -::ShieldRuleProto* DrawElementProto::release_shield() { - // @@protoc_insertion_point(field_release:DrawElementProto.shield) - - ::ShieldRuleProto* temp = shield_; - shield_ = NULL; - return temp; -} -void DrawElementProto::set_allocated_shield(::ShieldRuleProto* shield) { - delete shield_; - shield_ = shield; - if (shield) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:DrawElementProto.shield) -} - -// repeated string apply_if = 9; -int DrawElementProto::apply_if_size() const { - return apply_if_.size(); -} -void DrawElementProto::clear_apply_if() { - apply_if_.Clear(); -} -const ::std::string& DrawElementProto::apply_if(int index) const { - // @@protoc_insertion_point(field_get:DrawElementProto.apply_if) - return apply_if_.Get(index); -} -::std::string* DrawElementProto::mutable_apply_if(int index) { - // @@protoc_insertion_point(field_mutable:DrawElementProto.apply_if) - return apply_if_.Mutable(index); -} -void DrawElementProto::set_apply_if(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:DrawElementProto.apply_if) - apply_if_.Mutable(index)->assign(value); -} -#if LANG_CXX11 -void DrawElementProto::set_apply_if(int index, ::std::string&& value) { - // @@protoc_insertion_point(field_set:DrawElementProto.apply_if) - apply_if_.Mutable(index)->assign(std::move(value)); -} -#endif -void DrawElementProto::set_apply_if(int index, const char* value) { - GOOGLE_DCHECK(value != NULL); - apply_if_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:DrawElementProto.apply_if) -} -void DrawElementProto::set_apply_if(int index, const char* value, size_t size) { - apply_if_.Mutable(index)->assign( - reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:DrawElementProto.apply_if) -} -::std::string* DrawElementProto::add_apply_if() { - // @@protoc_insertion_point(field_add_mutable:DrawElementProto.apply_if) - return apply_if_.Add(); -} -void DrawElementProto::add_apply_if(const ::std::string& value) { - apply_if_.Add()->assign(value); - // @@protoc_insertion_point(field_add:DrawElementProto.apply_if) -} -#if LANG_CXX11 -void DrawElementProto::add_apply_if(::std::string&& value) { - apply_if_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:DrawElementProto.apply_if) -} -#endif -void DrawElementProto::add_apply_if(const char* value) { - GOOGLE_DCHECK(value != NULL); - apply_if_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:DrawElementProto.apply_if) -} -void DrawElementProto::add_apply_if(const char* value, size_t size) { - apply_if_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:DrawElementProto.apply_if) -} -const ::google::protobuf::RepeatedPtrField< ::std::string>& -DrawElementProto::apply_if() const { - // @@protoc_insertion_point(field_list:DrawElementProto.apply_if) - return apply_if_; -} -::google::protobuf::RepeatedPtrField< ::std::string>* -DrawElementProto::mutable_apply_if() { - // @@protoc_insertion_point(field_mutable_list:DrawElementProto.apply_if) - return &apply_if_; -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ClassifElementProto::kNameFieldNumber; -const int ClassifElementProto::kElementFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class ClassifElementProto::_Internal { + public: +}; -ClassifElementProto::ClassifElementProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:ClassifElementProto) +ClassifElementProto::ClassifElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:ClassifElementProto) } ClassifElementProto::ClassifElementProto(const ClassifElementProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - element_(from.element_), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + ClassifElementProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.element_){from._impl_.element_} + , decltype(_impl_.name_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (!from._internal_name().empty()) { + _this->_impl_.name_.Set(from._internal_name(), + _this->GetArenaForAllocation()); } // @@protoc_insertion_point(copy_constructor:ClassifElementProto) } -void ClassifElementProto::SharedCtor() { - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - _cached_size_ = 0; +inline void ClassifElementProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.element_){arena} + , decltype(_impl_.name_){} + , /*decltype(_impl_._cached_size_)*/{} + }; + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } ClassifElementProto::~ClassifElementProto() { // @@protoc_insertion_point(destructor:ClassifElementProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void ClassifElementProto::SharedDtor() { - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline void ClassifElementProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.element_.~RepeatedPtrField(); + _impl_.name_.Destroy(); } void ClassifElementProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ClassifElementProto& ClassifElementProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -ClassifElementProto* ClassifElementProto::New(::google::protobuf::Arena* arena) const { - ClassifElementProto* n = new ClassifElementProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void ClassifElementProto::Clear() { // @@protoc_insertion_point(message_clear_start:ClassifElementProto) - element_.Clear(); - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.element_.Clear(); + _impl_.name_.ClearToEmpty(); + _internal_metadata_.Clear(); } -bool ClassifElementProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:ClassifElementProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* ClassifElementProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // string name = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "ClassifElementProto.name")); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + auto str = _internal_mutable_name(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, nullptr)); + } else goto handle_unusual; - } - break; - } - + continue; // repeated .DrawElementProto element = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_element())); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_element(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr)); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:ClassifElementProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:ClassifElementProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void ClassifElementProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:ClassifElementProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* ClassifElementProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:ClassifElementProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // string name = 1; - if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (!this->_internal_name().empty()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_name().data(), static_cast(this->_internal_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "ClassifElementProto.name"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name(), output); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_name(), target); } // repeated .DrawElementProto element = 2; - for (unsigned int i = 0, n = this->element_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->element(i), output); + for (unsigned i = 0, + n = static_cast(this->_internal_element_size()); i < n; i++) { + const auto& repfield = this->_internal_element(i); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } - // @@protoc_insertion_point(serialize_end:ClassifElementProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:ClassifElementProto) + return target; } size_t ClassifElementProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:ClassifElementProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .DrawElementProto element = 2; - { - unsigned int count = this->element_size(); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->element(i)); - } + total_size += 1UL * this->_internal_element_size(); + for (const auto& msg : this->_impl_.element_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } // string name = 1; - if (this->name().size() > 0) { + if (!this->_internal_name().empty()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_name()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void ClassifElementProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void ClassifElementProto::MergeFrom(const ClassifElementProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:ClassifElementProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ClassifElementProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:ClassifElementProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - element_.MergeFrom(from.element_); - if (from.name().size() > 0) { - - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + _this->_impl_.element_.MergeFrom(from._impl_.element_); + if (!from._internal_name().empty()) { + _this->_internal_set_name(from._internal_name()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void ClassifElementProto::CopyFrom(const ClassifElementProto& from) { @@ -5708,364 +4434,301 @@ bool ClassifElementProto::IsInitialized() const { return true; } -void ClassifElementProto::Swap(ClassifElementProto* other) { - if (other == this) return; - InternalSwap(other); -} void ClassifElementProto::InternalSwap(ClassifElementProto* other) { - element_.InternalSwap(&other->element_); - name_.Swap(&other->name_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + auto* lhs_arena = GetArenaForAllocation(); + auto* rhs_arena = other->GetArenaForAllocation(); + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + _impl_.element_.InternalSwap(&other->_impl_.element_); + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( + &_impl_.name_, lhs_arena, + &other->_impl_.name_, rhs_arena + ); } -::std::string ClassifElementProto::GetTypeName() const { +std::string ClassifElementProto::GetTypeName() const { return "ClassifElementProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// ClassifElementProto - -// string name = 1; -void ClassifElementProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -const ::std::string& ClassifElementProto::name() const { - // @@protoc_insertion_point(field_get:ClassifElementProto.name) - return name_.GetNoArena(); -} -void ClassifElementProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:ClassifElementProto.name) -} -#if LANG_CXX11 -void ClassifElementProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:ClassifElementProto.name) -} -#endif -void ClassifElementProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:ClassifElementProto.name) -} -void ClassifElementProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:ClassifElementProto.name) -} -::std::string* ClassifElementProto::mutable_name() { - - // @@protoc_insertion_point(field_mutable:ClassifElementProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -::std::string* ClassifElementProto::release_name() { - // @@protoc_insertion_point(field_release:ClassifElementProto.name) - - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void ClassifElementProto::set_allocated_name(::std::string* name) { - if (name != NULL) { - - } else { - - } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); - // @@protoc_insertion_point(field_set_allocated:ClassifElementProto.name) -} - -// repeated .DrawElementProto element = 2; -int ClassifElementProto::element_size() const { - return element_.size(); -} -void ClassifElementProto::clear_element() { - element_.Clear(); -} -const ::DrawElementProto& ClassifElementProto::element(int index) const { - // @@protoc_insertion_point(field_get:ClassifElementProto.element) - return element_.Get(index); -} -::DrawElementProto* ClassifElementProto::mutable_element(int index) { - // @@protoc_insertion_point(field_mutable:ClassifElementProto.element) - return element_.Mutable(index); -} -::DrawElementProto* ClassifElementProto::add_element() { - // @@protoc_insertion_point(field_add:ClassifElementProto.element) - return element_.Add(); -} -::google::protobuf::RepeatedPtrField< ::DrawElementProto >* -ClassifElementProto::mutable_element() { - // @@protoc_insertion_point(field_mutable_list:ClassifElementProto.element) - return &element_; -} -const ::google::protobuf::RepeatedPtrField< ::DrawElementProto >& -ClassifElementProto::element() const { - // @@protoc_insertion_point(field_list:ClassifElementProto.element) - return element_; -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ColorElementProto::kNameFieldNumber; -const int ColorElementProto::kColorFieldNumber; -const int ColorElementProto::kXFieldNumber; -const int ColorElementProto::kYFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class ColorElementProto::_Internal { + public: +}; -ColorElementProto::ColorElementProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:ColorElementProto) +ColorElementProto::ColorElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:ColorElementProto) } ColorElementProto::ColorElementProto(const ColorElementProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + ColorElementProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.name_){} + , decltype(_impl_.color_){} + , decltype(_impl_.x_){} + , decltype(_impl_.y_){} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (!from._internal_name().empty()) { + _this->_impl_.name_.Set(from._internal_name(), + _this->GetArenaForAllocation()); } - ::memcpy(&color_, &from.color_, - reinterpret_cast(&y_) - - reinterpret_cast(&color_) + sizeof(y_)); + ::memcpy(&_impl_.color_, &from._impl_.color_, + static_cast(reinterpret_cast(&_impl_.y_) - + reinterpret_cast(&_impl_.color_)) + sizeof(_impl_.y_)); // @@protoc_insertion_point(copy_constructor:ColorElementProto) } -void ColorElementProto::SharedCtor() { - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&color_, 0, reinterpret_cast(&y_) - - reinterpret_cast(&color_) + sizeof(y_)); - _cached_size_ = 0; +inline void ColorElementProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.name_){} + , decltype(_impl_.color_){0u} + , decltype(_impl_.x_){0} + , decltype(_impl_.y_){0} + , /*decltype(_impl_._cached_size_)*/{} + }; + _impl_.name_.InitDefault(); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + _impl_.name_.Set("", GetArenaForAllocation()); + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } ColorElementProto::~ColorElementProto() { // @@protoc_insertion_point(destructor:ColorElementProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void ColorElementProto::SharedDtor() { - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline void ColorElementProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.name_.Destroy(); } void ColorElementProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ColorElementProto& ColorElementProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -ColorElementProto* ColorElementProto::New(::google::protobuf::Arena* arena) const { - ColorElementProto* n = new ColorElementProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void ColorElementProto::Clear() { // @@protoc_insertion_point(message_clear_start:ColorElementProto) - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&color_, 0, reinterpret_cast(&y_) - - reinterpret_cast(&color_) + sizeof(y_)); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.name_.ClearToEmpty(); + ::memset(&_impl_.color_, 0, static_cast( + reinterpret_cast(&_impl_.y_) - + reinterpret_cast(&_impl_.color_)) + sizeof(_impl_.y_)); + _internal_metadata_.Clear(); } -bool ColorElementProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:ColorElementProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* ColorElementProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // string name = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "ColorElementProto.name")); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + auto str = _internal_mutable_name(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + CHK_(::_pbi::VerifyUTF8(str, nullptr)); + } else goto handle_unusual; - } - break; - } - + continue; // uint32 color = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + _impl_.color_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - + continue; // float x = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(29u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>( - input, &x_))); - } else { + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 29)) { + _impl_.x_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(float); + } else goto handle_unusual; - } - break; - } - + continue; // float y = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(37u)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>( - input, &y_))); - } else { + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 37)) { + _impl_.y_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr); + ptr += sizeof(float); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:ColorElementProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:ColorElementProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void ColorElementProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:ColorElementProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* ColorElementProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:ColorElementProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // string name = 1; - if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (!this->_internal_name().empty()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_name().data(), static_cast(this->_internal_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "ColorElementProto.name"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name(), output); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_name(), target); } // uint32 color = 2; - if (this->color() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + if (this->_internal_color() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_color(), target); } // float x = 3; - if (this->x() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteFloat(3, this->x(), output); + static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size."); + float tmp_x = this->_internal_x(); + uint32_t raw_x; + memcpy(&raw_x, &tmp_x, sizeof(tmp_x)); + if (raw_x != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteFloatToArray(3, this->_internal_x(), target); } // float y = 4; - if (this->y() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteFloat(4, this->y(), output); + static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size."); + float tmp_y = this->_internal_y(); + uint32_t raw_y; + memcpy(&raw_y, &tmp_y, sizeof(tmp_y)); + if (raw_y != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteFloatToArray(4, this->_internal_y(), target); } - // @@protoc_insertion_point(serialize_end:ColorElementProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:ColorElementProto) + return target; } size_t ColorElementProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:ColorElementProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string name = 1; - if (this->name().size() > 0) { + if (!this->_internal_name().empty()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_name()); } // uint32 color = 2; - if (this->color() != 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); + if (this->_internal_color() != 0) { + total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_color()); } // float x = 3; - if (this->x() != 0) { + static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size."); + float tmp_x = this->_internal_x(); + uint32_t raw_x; + memcpy(&raw_x, &tmp_x, sizeof(tmp_x)); + if (raw_x != 0) { total_size += 1 + 4; } // float y = 4; - if (this->y() != 0) { + static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size."); + float tmp_y = this->_internal_y(); + uint32_t raw_y; + memcpy(&raw_y, &tmp_y, sizeof(tmp_y)); + if (raw_y != 0) { total_size += 1 + 4; } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void ColorElementProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void ColorElementProto::MergeFrom(const ColorElementProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:ColorElementProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ColorElementProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:ColorElementProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from.name().size() > 0) { - - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + if (!from._internal_name().empty()) { + _this->_internal_set_name(from._internal_name()); } - if (from.color() != 0) { - set_color(from.color()); + if (from._internal_color() != 0) { + _this->_internal_set_color(from._internal_color()); } - if (from.x() != 0) { - set_x(from.x()); + static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size."); + float tmp_x = from._internal_x(); + uint32_t raw_x; + memcpy(&raw_x, &tmp_x, sizeof(tmp_x)); + if (raw_x != 0) { + _this->_internal_set_x(from._internal_x()); } - if (from.y() != 0) { - set_y(from.y()); + static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size."); + float tmp_y = from._internal_y(); + uint32_t raw_y; + memcpy(&raw_y, &tmp_y, sizeof(tmp_y)); + if (raw_y != 0) { + _this->_internal_set_y(from._internal_y()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void ColorElementProto::CopyFrom(const ColorElementProto& from) { @@ -6079,273 +4742,191 @@ bool ColorElementProto::IsInitialized() const { return true; } -void ColorElementProto::Swap(ColorElementProto* other) { - if (other == this) return; - InternalSwap(other); -} void ColorElementProto::InternalSwap(ColorElementProto* other) { - name_.Swap(&other->name_); - std::swap(color_, other->color_); - std::swap(x_, other->x_); - std::swap(y_, other->y_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + auto* lhs_arena = GetArenaForAllocation(); + auto* rhs_arena = other->GetArenaForAllocation(); + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( + &_impl_.name_, lhs_arena, + &other->_impl_.name_, rhs_arena + ); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(ColorElementProto, _impl_.y_) + + sizeof(ColorElementProto::_impl_.y_) + - PROTOBUF_FIELD_OFFSET(ColorElementProto, _impl_.color_)>( + reinterpret_cast(&_impl_.color_), + reinterpret_cast(&other->_impl_.color_)); } -::std::string ColorElementProto::GetTypeName() const { +std::string ColorElementProto::GetTypeName() const { return "ColorElementProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// ColorElementProto - -// string name = 1; -void ColorElementProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -const ::std::string& ColorElementProto::name() const { - // @@protoc_insertion_point(field_get:ColorElementProto.name) - return name_.GetNoArena(); -} -void ColorElementProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:ColorElementProto.name) -} -#if LANG_CXX11 -void ColorElementProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:ColorElementProto.name) -} -#endif -void ColorElementProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:ColorElementProto.name) -} -void ColorElementProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:ColorElementProto.name) -} -::std::string* ColorElementProto::mutable_name() { - - // @@protoc_insertion_point(field_mutable:ColorElementProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -::std::string* ColorElementProto::release_name() { - // @@protoc_insertion_point(field_release:ColorElementProto.name) - - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void ColorElementProto::set_allocated_name(::std::string* name) { - if (name != NULL) { - - } else { - - } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); - // @@protoc_insertion_point(field_set_allocated:ColorElementProto.name) -} - -// uint32 color = 2; -void ColorElementProto::clear_color() { - color_ = 0u; -} -::google::protobuf::uint32 ColorElementProto::color() const { - // @@protoc_insertion_point(field_get:ColorElementProto.color) - return color_; -} -void ColorElementProto::set_color(::google::protobuf::uint32 value) { - - color_ = value; - // @@protoc_insertion_point(field_set:ColorElementProto.color) -} - -// float x = 3; -void ColorElementProto::clear_x() { - x_ = 0; -} -float ColorElementProto::x() const { - // @@protoc_insertion_point(field_get:ColorElementProto.x) - return x_; -} -void ColorElementProto::set_x(float value) { - - x_ = value; - // @@protoc_insertion_point(field_set:ColorElementProto.x) -} - -// float y = 4; -void ColorElementProto::clear_y() { - y_ = 0; -} -float ColorElementProto::y() const { - // @@protoc_insertion_point(field_get:ColorElementProto.y) - return y_; -} -void ColorElementProto::set_y(float value) { - - y_ = value; - // @@protoc_insertion_point(field_set:ColorElementProto.y) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ColorsElementProto::kValueFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class ColorsElementProto::_Internal { + public: +}; -ColorsElementProto::ColorsElementProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:ColorsElementProto) +ColorsElementProto::ColorsElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:ColorsElementProto) } ColorsElementProto::ColorsElementProto(const ColorsElementProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - value_(from.value_), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + ColorsElementProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.value_){from._impl_.value_} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:ColorsElementProto) } -void ColorsElementProto::SharedCtor() { - _cached_size_ = 0; +inline void ColorsElementProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.value_){arena} + , /*decltype(_impl_._cached_size_)*/{} + }; } ColorsElementProto::~ColorsElementProto() { // @@protoc_insertion_point(destructor:ColorsElementProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void ColorsElementProto::SharedDtor() { +inline void ColorsElementProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.value_.~RepeatedPtrField(); } void ColorsElementProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ColorsElementProto& ColorsElementProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -ColorsElementProto* ColorsElementProto::New(::google::protobuf::Arena* arena) const { - ColorsElementProto* n = new ColorsElementProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void ColorsElementProto::Clear() { // @@protoc_insertion_point(message_clear_start:ColorsElementProto) - value_.Clear(); + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.value_.Clear(); + _internal_metadata_.Clear(); } -bool ColorsElementProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:ColorsElementProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* ColorsElementProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // repeated .ColorElementProto value = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_value())); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_value(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:ColorsElementProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:ColorsElementProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void ColorsElementProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:ColorsElementProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* ColorsElementProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:ColorsElementProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // repeated .ColorElementProto value = 1; - for (unsigned int i = 0, n = this->value_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 1, this->value(i), output); + for (unsigned i = 0, + n = static_cast(this->_internal_value_size()); i < n; i++) { + const auto& repfield = this->_internal_value(i); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream); } - // @@protoc_insertion_point(serialize_end:ColorsElementProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:ColorsElementProto) + return target; } size_t ColorsElementProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:ColorsElementProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .ColorElementProto value = 1; - { - unsigned int count = this->value_size(); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->value(i)); - } + total_size += 1UL * this->_internal_value_size(); + for (const auto& msg : this->_impl_.value_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void ColorsElementProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void ColorsElementProto::MergeFrom(const ColorsElementProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:ColorsElementProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ColorsElementProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:ColorsElementProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - value_.MergeFrom(from.value_); + _this->_impl_.value_.MergeFrom(from._impl_.value_); + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void ColorsElementProto::CopyFrom(const ColorsElementProto& from) { @@ -6359,247 +4940,221 @@ bool ColorsElementProto::IsInitialized() const { return true; } -void ColorsElementProto::Swap(ColorsElementProto* other) { - if (other == this) return; - InternalSwap(other); -} void ColorsElementProto::InternalSwap(ColorsElementProto* other) { - value_.InternalSwap(&other->value_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + _impl_.value_.InternalSwap(&other->_impl_.value_); } -::std::string ColorsElementProto::GetTypeName() const { +std::string ColorsElementProto::GetTypeName() const { return "ColorsElementProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// ColorsElementProto - -// repeated .ColorElementProto value = 1; -int ColorsElementProto::value_size() const { - return value_.size(); -} -void ColorsElementProto::clear_value() { - value_.Clear(); -} -const ::ColorElementProto& ColorsElementProto::value(int index) const { - // @@protoc_insertion_point(field_get:ColorsElementProto.value) - return value_.Get(index); -} -::ColorElementProto* ColorsElementProto::mutable_value(int index) { - // @@protoc_insertion_point(field_mutable:ColorsElementProto.value) - return value_.Mutable(index); -} -::ColorElementProto* ColorsElementProto::add_value() { - // @@protoc_insertion_point(field_add:ColorsElementProto.value) - return value_.Add(); -} -::google::protobuf::RepeatedPtrField< ::ColorElementProto >* -ColorsElementProto::mutable_value() { - // @@protoc_insertion_point(field_mutable_list:ColorsElementProto.value) - return &value_; -} -const ::google::protobuf::RepeatedPtrField< ::ColorElementProto >& -ColorsElementProto::value() const { - // @@protoc_insertion_point(field_list:ColorsElementProto.value) - return value_; -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ContainerProto::kContFieldNumber; -const int ContainerProto::kColorsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +class ContainerProto::_Internal { + public: + static const ::ColorsElementProto& colors(const ContainerProto* msg); +}; -ContainerProto::ContainerProto() - : ::google::protobuf::MessageLite(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - } - SharedCtor(); - // @@protoc_insertion_point(constructor:ContainerProto) +const ::ColorsElementProto& +ContainerProto::_Internal::colors(const ContainerProto* msg) { + return *msg->_impl_.colors_; +} +ContainerProto::ContainerProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned) + : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + SharedCtor(arena, is_message_owned); + // @@protoc_insertion_point(arena_constructor:ContainerProto) } ContainerProto::ContainerProto(const ContainerProto& from) - : ::google::protobuf::MessageLite(), - _internal_metadata_(NULL), - cont_(from.cont_), - _cached_size_(0) { - _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_colors()) { - colors_ = new ::ColorsElementProto(*from.colors_); - } else { - colors_ = NULL; + : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + ContainerProto* const _this = this; (void)_this; + new (&_impl_) Impl_{ + decltype(_impl_.cont_){from._impl_.cont_} + , decltype(_impl_.colors_){nullptr} + , /*decltype(_impl_._cached_size_)*/{}}; + + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._internal_has_colors()) { + _this->_impl_.colors_ = new ::ColorsElementProto(*from._impl_.colors_); } // @@protoc_insertion_point(copy_constructor:ContainerProto) } -void ContainerProto::SharedCtor() { - colors_ = NULL; - _cached_size_ = 0; +inline void ContainerProto::SharedCtor( + ::_pb::Arena* arena, bool is_message_owned) { + (void)arena; + (void)is_message_owned; + new (&_impl_) Impl_{ + decltype(_impl_.cont_){arena} + , decltype(_impl_.colors_){nullptr} + , /*decltype(_impl_._cached_size_)*/{} + }; } ContainerProto::~ContainerProto() { // @@protoc_insertion_point(destructor:ContainerProto) + if (auto *arena = _internal_metadata_.DeleteReturnArena()) { + (void)arena; + return; + } SharedDtor(); } -void ContainerProto::SharedDtor() { - if (this != internal_default_instance()) { - delete colors_; - } +inline void ContainerProto::SharedDtor() { + GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); + _impl_.cont_.~RepeatedPtrField(); + if (this != internal_default_instance()) delete _impl_.colors_; } void ContainerProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ContainerProto& ContainerProto::default_instance() { - protobuf_indexer_2fdrules_5fstruct_2eproto::InitDefaults(); - return *internal_default_instance(); -} - -ContainerProto* ContainerProto::New(::google::protobuf::Arena* arena) const { - ContainerProto* n = new ContainerProto; - if (arena != NULL) { - arena->Own(n); - } - return n; + _impl_._cached_size_.Set(size); } void ContainerProto::Clear() { // @@protoc_insertion_point(message_clear_start:ContainerProto) - cont_.Clear(); - if (GetArenaNoVirtual() == NULL && colors_ != NULL) { - delete colors_; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.cont_.Clear(); + if (GetArenaForAllocation() == nullptr && _impl_.colors_ != nullptr) { + delete _impl_.colors_; } - colors_ = NULL; + _impl_.colors_ = nullptr; + _internal_metadata_.Clear(); } -bool ContainerProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:ContainerProto) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { +const char* ContainerProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + uint32_t tag; + ptr = ::_pbi::ReadTag(ptr, &tag); + switch (tag >> 3) { // repeated .ClassifElementProto cont = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_cont())); - } else { + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_cont(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); + } else goto handle_unusual; - } - break; - } - + continue; // .ColorsElementProto colors = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_colors())); - } else { + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { + ptr = ctx->ParseMessage(_internal_mutable_colors(), ptr); + CHK_(ptr); + } else goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } + continue; + default: + goto handle_unusual; + } // switch + handle_unusual: + if ((tag == 0) || ((tag & 7) == 4)) { + CHK_(ptr); + ctx->SetLastTag(tag); + goto message_done; } - } -success: - // @@protoc_insertion_point(parse_success:ContainerProto) - return true; + ptr = UnknownFieldParse( + tag, + _internal_metadata_.mutable_unknown_fields(), + ptr, ctx); + CHK_(ptr != nullptr); + } // while +message_done: + return ptr; failure: - // @@protoc_insertion_point(parse_failure:ContainerProto) - return false; -#undef DO_ + ptr = nullptr; + goto message_done; +#undef CHK_ } -void ContainerProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:ContainerProto) - ::google::protobuf::uint32 cached_has_bits = 0; +uint8_t* ContainerProto::_InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:ContainerProto) + uint32_t cached_has_bits = 0; (void) cached_has_bits; // repeated .ClassifElementProto cont = 1; - for (unsigned int i = 0, n = this->cont_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 1, this->cont(i), output); + for (unsigned i = 0, + n = static_cast(this->_internal_cont_size()); i < n; i++) { + const auto& repfield = this->_internal_cont(i); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream); } // .ColorsElementProto colors = 2; - if (this->has_colors()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, *this->colors_, output); + if (this->_internal_has_colors()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(2, _Internal::colors(this), + _Internal::colors(this).GetCachedSize(), target, stream); } - // @@protoc_insertion_point(serialize_end:ContainerProto) + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = stream->WriteRaw(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), + static_cast(_internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + } + // @@protoc_insertion_point(serialize_to_array_end:ContainerProto) + return target; } size_t ContainerProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:ContainerProto) size_t total_size = 0; + uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .ClassifElementProto cont = 1; - { - unsigned int count = this->cont_size(); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->cont(i)); - } + total_size += 1UL * this->_internal_cont_size(); + for (const auto& msg : this->_impl_.cont_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } // .ColorsElementProto colors = 2; - if (this->has_colors()) { + if (this->_internal_has_colors()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->colors_); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.colors_); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + total_size += _internal_metadata_.unknown_fields(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); + } + int cached_size = ::_pbi::ToCachedSize(total_size); + SetCachedSize(cached_size); return total_size; } void ContainerProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { + MergeFrom(*::_pbi::DownCast( + &from)); } void ContainerProto::MergeFrom(const ContainerProto& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:ContainerProto) - GOOGLE_DCHECK_NE(&from, this); - _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ContainerProto* const _this = this; + // @@protoc_insertion_point(class_specific_merge_from_start:ContainerProto) + GOOGLE_DCHECK_NE(&from, _this); + uint32_t cached_has_bits = 0; (void) cached_has_bits; - cont_.MergeFrom(from.cont_); - if (from.has_colors()) { - mutable_colors()->::ColorsElementProto::MergeFrom(from.colors()); + _this->_impl_.cont_.MergeFrom(from._impl_.cont_); + if (from._internal_has_colors()) { + _this->_internal_mutable_colors()->::ColorsElementProto::MergeFrom( + from._internal_colors()); } + _this->_internal_metadata_.MergeFrom(from._internal_metadata_); } void ContainerProto::CopyFrom(const ContainerProto& from) { @@ -6613,94 +5168,85 @@ bool ContainerProto::IsInitialized() const { return true; } -void ContainerProto::Swap(ContainerProto* other) { - if (other == this) return; - InternalSwap(other); -} void ContainerProto::InternalSwap(ContainerProto* other) { - cont_.InternalSwap(&other->cont_); - std::swap(colors_, other->colors_); - std::swap(_cached_size_, other->_cached_size_); + using std::swap; + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + _impl_.cont_.InternalSwap(&other->_impl_.cont_); + swap(_impl_.colors_, other->_impl_.colors_); } -::std::string ContainerProto::GetTypeName() const { +std::string ContainerProto::GetTypeName() const { return "ContainerProto"; } -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// ContainerProto - -// repeated .ClassifElementProto cont = 1; -int ContainerProto::cont_size() const { - return cont_.size(); -} -void ContainerProto::clear_cont() { - cont_.Clear(); -} -const ::ClassifElementProto& ContainerProto::cont(int index) const { - // @@protoc_insertion_point(field_get:ContainerProto.cont) - return cont_.Get(index); -} -::ClassifElementProto* ContainerProto::mutable_cont(int index) { - // @@protoc_insertion_point(field_mutable:ContainerProto.cont) - return cont_.Mutable(index); -} -::ClassifElementProto* ContainerProto::add_cont() { - // @@protoc_insertion_point(field_add:ContainerProto.cont) - return cont_.Add(); -} -::google::protobuf::RepeatedPtrField< ::ClassifElementProto >* -ContainerProto::mutable_cont() { - // @@protoc_insertion_point(field_mutable_list:ContainerProto.cont) - return &cont_; -} -const ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >& -ContainerProto::cont() const { - // @@protoc_insertion_point(field_list:ContainerProto.cont) - return cont_; -} - -// .ColorsElementProto colors = 2; -bool ContainerProto::has_colors() const { - return this != internal_default_instance() && colors_ != NULL; -} -void ContainerProto::clear_colors() { - if (GetArenaNoVirtual() == NULL && colors_ != NULL) delete colors_; - colors_ = NULL; -} -const ::ColorsElementProto& ContainerProto::colors() const { - // @@protoc_insertion_point(field_get:ContainerProto.colors) - return colors_ != NULL ? *colors_ - : *::ColorsElementProto::internal_default_instance(); -} -::ColorsElementProto* ContainerProto::mutable_colors() { - - if (colors_ == NULL) { - colors_ = new ::ColorsElementProto; - } - // @@protoc_insertion_point(field_mutable:ContainerProto.colors) - return colors_; -} -::ColorsElementProto* ContainerProto::release_colors() { - // @@protoc_insertion_point(field_release:ContainerProto.colors) - - ::ColorsElementProto* temp = colors_; - colors_ = NULL; - return temp; -} -void ContainerProto::set_allocated_colors(::ColorsElementProto* colors) { - delete colors_; - colors_ = colors; - if (colors) { - - } else { - - } - // @@protoc_insertion_point(field_set_allocated:ContainerProto.colors) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS // @@protoc_insertion_point(namespace_scope) +PROTOBUF_NAMESPACE_OPEN +template<> PROTOBUF_NOINLINE ::DashDotProto* +Arena::CreateMaybeMessage< ::DashDotProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::DashDotProto >(arena); +} +template<> PROTOBUF_NOINLINE ::PathSymProto* +Arena::CreateMaybeMessage< ::PathSymProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::PathSymProto >(arena); +} +template<> PROTOBUF_NOINLINE ::LineRuleProto* +Arena::CreateMaybeMessage< ::LineRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::LineRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::LineDefProto* +Arena::CreateMaybeMessage< ::LineDefProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::LineDefProto >(arena); +} +template<> PROTOBUF_NOINLINE ::AreaRuleProto* +Arena::CreateMaybeMessage< ::AreaRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::AreaRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::SymbolRuleProto* +Arena::CreateMaybeMessage< ::SymbolRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::SymbolRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::CaptionDefProto* +Arena::CreateMaybeMessage< ::CaptionDefProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::CaptionDefProto >(arena); +} +template<> PROTOBUF_NOINLINE ::CaptionRuleProto* +Arena::CreateMaybeMessage< ::CaptionRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::CaptionRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::CircleRuleProto* +Arena::CreateMaybeMessage< ::CircleRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::CircleRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::PathTextRuleProto* +Arena::CreateMaybeMessage< ::PathTextRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::PathTextRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::ShieldRuleProto* +Arena::CreateMaybeMessage< ::ShieldRuleProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::ShieldRuleProto >(arena); +} +template<> PROTOBUF_NOINLINE ::DrawElementProto* +Arena::CreateMaybeMessage< ::DrawElementProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::DrawElementProto >(arena); +} +template<> PROTOBUF_NOINLINE ::ClassifElementProto* +Arena::CreateMaybeMessage< ::ClassifElementProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::ClassifElementProto >(arena); +} +template<> PROTOBUF_NOINLINE ::ColorElementProto* +Arena::CreateMaybeMessage< ::ColorElementProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::ColorElementProto >(arena); +} +template<> PROTOBUF_NOINLINE ::ColorsElementProto* +Arena::CreateMaybeMessage< ::ColorsElementProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::ColorsElementProto >(arena); +} +template<> PROTOBUF_NOINLINE ::ContainerProto* +Arena::CreateMaybeMessage< ::ContainerProto >(Arena* arena) { + return Arena::CreateMessageInternal< ::ContainerProto >(arena); +} +PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) +#include diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h index 16d333a3bb..9e0bf39994 100644 --- a/indexer/drules_struct.pb.h +++ b/indexer/drules_struct.pb.h @@ -1,28 +1,28 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: indexer/drules_struct.proto +// source: drules_struct.proto -#ifndef PROTOBUF_indexer_2fdrules_5fstruct_2eproto__INCLUDED -#define PROTOBUF_indexer_2fdrules_5fstruct_2eproto__INCLUDED +#ifndef GOOGLE_PROTOBUF_INCLUDED_drules_5fstruct_2eproto +#define GOOGLE_PROTOBUF_INCLUDED_drules_5fstruct_2eproto +#include #include -#include - -#if GOOGLE_PROTOBUF_VERSION < 3003000 +#include +#if PROTOBUF_VERSION < 3021000 #error This file was generated by a newer version of protoc which is -#error incompatible with your Protocol Buffer headers. Please update +#error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3003000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is -#error incompatible with your Protocol Buffer headers. Please +#error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. #endif +#include #include #include #include -#include #include #include #include @@ -30,1885 +30,3087 @@ #include // IWYU pragma: export #include // @@protoc_insertion_point(includes) +#include +#define PROTOBUF_INTERNAL_EXPORT_drules_5fstruct_2eproto +PROTOBUF_NAMESPACE_OPEN +namespace internal { +class AnyMetadata; +} // namespace internal +PROTOBUF_NAMESPACE_CLOSE + +// Internal implementation detail -- do not use these members. +struct TableStruct_drules_5fstruct_2eproto { + static const uint32_t offsets[]; +}; class AreaRuleProto; -class AreaRuleProtoDefaultTypeInternal; +struct AreaRuleProtoDefaultTypeInternal; extern AreaRuleProtoDefaultTypeInternal _AreaRuleProto_default_instance_; class CaptionDefProto; -class CaptionDefProtoDefaultTypeInternal; +struct CaptionDefProtoDefaultTypeInternal; extern CaptionDefProtoDefaultTypeInternal _CaptionDefProto_default_instance_; class CaptionRuleProto; -class CaptionRuleProtoDefaultTypeInternal; +struct CaptionRuleProtoDefaultTypeInternal; extern CaptionRuleProtoDefaultTypeInternal _CaptionRuleProto_default_instance_; class CircleRuleProto; -class CircleRuleProtoDefaultTypeInternal; +struct CircleRuleProtoDefaultTypeInternal; extern CircleRuleProtoDefaultTypeInternal _CircleRuleProto_default_instance_; class ClassifElementProto; -class ClassifElementProtoDefaultTypeInternal; +struct ClassifElementProtoDefaultTypeInternal; extern ClassifElementProtoDefaultTypeInternal _ClassifElementProto_default_instance_; class ColorElementProto; -class ColorElementProtoDefaultTypeInternal; +struct ColorElementProtoDefaultTypeInternal; extern ColorElementProtoDefaultTypeInternal _ColorElementProto_default_instance_; class ColorsElementProto; -class ColorsElementProtoDefaultTypeInternal; +struct ColorsElementProtoDefaultTypeInternal; extern ColorsElementProtoDefaultTypeInternal _ColorsElementProto_default_instance_; class ContainerProto; -class ContainerProtoDefaultTypeInternal; +struct ContainerProtoDefaultTypeInternal; extern ContainerProtoDefaultTypeInternal _ContainerProto_default_instance_; class DashDotProto; -class DashDotProtoDefaultTypeInternal; +struct DashDotProtoDefaultTypeInternal; extern DashDotProtoDefaultTypeInternal _DashDotProto_default_instance_; class DrawElementProto; -class DrawElementProtoDefaultTypeInternal; +struct DrawElementProtoDefaultTypeInternal; extern DrawElementProtoDefaultTypeInternal _DrawElementProto_default_instance_; class LineDefProto; -class LineDefProtoDefaultTypeInternal; +struct LineDefProtoDefaultTypeInternal; extern LineDefProtoDefaultTypeInternal _LineDefProto_default_instance_; class LineRuleProto; -class LineRuleProtoDefaultTypeInternal; +struct LineRuleProtoDefaultTypeInternal; extern LineRuleProtoDefaultTypeInternal _LineRuleProto_default_instance_; class PathSymProto; -class PathSymProtoDefaultTypeInternal; +struct PathSymProtoDefaultTypeInternal; extern PathSymProtoDefaultTypeInternal _PathSymProto_default_instance_; class PathTextRuleProto; -class PathTextRuleProtoDefaultTypeInternal; +struct PathTextRuleProtoDefaultTypeInternal; extern PathTextRuleProtoDefaultTypeInternal _PathTextRuleProto_default_instance_; class ShieldRuleProto; -class ShieldRuleProtoDefaultTypeInternal; +struct ShieldRuleProtoDefaultTypeInternal; extern ShieldRuleProtoDefaultTypeInternal _ShieldRuleProto_default_instance_; class SymbolRuleProto; -class SymbolRuleProtoDefaultTypeInternal; +struct SymbolRuleProtoDefaultTypeInternal; extern SymbolRuleProtoDefaultTypeInternal _SymbolRuleProto_default_instance_; +PROTOBUF_NAMESPACE_OPEN +template<> ::AreaRuleProto* Arena::CreateMaybeMessage<::AreaRuleProto>(Arena*); +template<> ::CaptionDefProto* Arena::CreateMaybeMessage<::CaptionDefProto>(Arena*); +template<> ::CaptionRuleProto* Arena::CreateMaybeMessage<::CaptionRuleProto>(Arena*); +template<> ::CircleRuleProto* Arena::CreateMaybeMessage<::CircleRuleProto>(Arena*); +template<> ::ClassifElementProto* Arena::CreateMaybeMessage<::ClassifElementProto>(Arena*); +template<> ::ColorElementProto* Arena::CreateMaybeMessage<::ColorElementProto>(Arena*); +template<> ::ColorsElementProto* Arena::CreateMaybeMessage<::ColorsElementProto>(Arena*); +template<> ::ContainerProto* Arena::CreateMaybeMessage<::ContainerProto>(Arena*); +template<> ::DashDotProto* Arena::CreateMaybeMessage<::DashDotProto>(Arena*); +template<> ::DrawElementProto* Arena::CreateMaybeMessage<::DrawElementProto>(Arena*); +template<> ::LineDefProto* Arena::CreateMaybeMessage<::LineDefProto>(Arena*); +template<> ::LineRuleProto* Arena::CreateMaybeMessage<::LineRuleProto>(Arena*); +template<> ::PathSymProto* Arena::CreateMaybeMessage<::PathSymProto>(Arena*); +template<> ::PathTextRuleProto* Arena::CreateMaybeMessage<::PathTextRuleProto>(Arena*); +template<> ::ShieldRuleProto* Arena::CreateMaybeMessage<::ShieldRuleProto>(Arena*); +template<> ::SymbolRuleProto* Arena::CreateMaybeMessage<::SymbolRuleProto>(Arena*); +PROTOBUF_NAMESPACE_CLOSE -namespace protobuf_indexer_2fdrules_5fstruct_2eproto { -// Internal implementation detail -- do not call these. -struct TableStruct { - static const ::google::protobuf::internal::ParseTableField entries[]; - static const ::google::protobuf::internal::AuxillaryParseTableField aux[]; - static const ::google::protobuf::internal::ParseTable schema[]; - static const ::google::protobuf::uint32 offsets[]; - static void InitDefaultsImpl(); - static void Shutdown(); -}; -void AddDescriptors(); -void InitDefaults(); -} // namespace protobuf_indexer_2fdrules_5fstruct_2eproto - -enum LineJoin { +enum LineJoin : int { ROUNDJOIN = 0, BEVELJOIN = 1, NOJOIN = 2, - LineJoin_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min, - LineJoin_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max + LineJoin_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), + LineJoin_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool LineJoin_IsValid(int value); -const LineJoin LineJoin_MIN = ROUNDJOIN; -const LineJoin LineJoin_MAX = NOJOIN; -const int LineJoin_ARRAYSIZE = LineJoin_MAX + 1; +constexpr LineJoin LineJoin_MIN = ROUNDJOIN; +constexpr LineJoin LineJoin_MAX = NOJOIN; +constexpr int LineJoin_ARRAYSIZE = LineJoin_MAX + 1; -enum LineCap { +const std::string& LineJoin_Name(LineJoin value); +template +inline const std::string& LineJoin_Name(T enum_t_value) { + static_assert(::std::is_same::value || + ::std::is_integral::value, + "Incorrect type passed to function LineJoin_Name."); + return LineJoin_Name(static_cast(enum_t_value)); +} +bool LineJoin_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, LineJoin* value); +enum LineCap : int { ROUNDCAP = 0, BUTTCAP = 1, SQUARECAP = 2, - LineCap_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min, - LineCap_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max + LineCap_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), + LineCap_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool LineCap_IsValid(int value); -const LineCap LineCap_MIN = ROUNDCAP; -const LineCap LineCap_MAX = SQUARECAP; -const int LineCap_ARRAYSIZE = LineCap_MAX + 1; +constexpr LineCap LineCap_MIN = ROUNDCAP; +constexpr LineCap LineCap_MAX = SQUARECAP; +constexpr int LineCap_ARRAYSIZE = LineCap_MAX + 1; +const std::string& LineCap_Name(LineCap value); +template +inline const std::string& LineCap_Name(T enum_t_value) { + static_assert(::std::is_same::value || + ::std::is_integral::value, + "Incorrect type passed to function LineCap_Name."); + return LineCap_Name(static_cast(enum_t_value)); +} +bool LineCap_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, LineCap* value); // =================================================================== -class DashDotProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:DashDotProto) */ { +class DashDotProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:DashDotProto) */ { public: - DashDotProto(); - virtual ~DashDotProto(); + inline DashDotProto() : DashDotProto(nullptr) {} + ~DashDotProto() override; + explicit PROTOBUF_CONSTEXPR DashDotProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); DashDotProto(const DashDotProto& from); + DashDotProto(DashDotProto&& from) noexcept + : DashDotProto() { + *this = ::std::move(from); + } inline DashDotProto& operator=(const DashDotProto& from) { CopyFrom(from); return *this; } + inline DashDotProto& operator=(DashDotProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const DashDotProto& default_instance(); - + static const DashDotProto& default_instance() { + return *internal_default_instance(); + } static inline const DashDotProto* internal_default_instance() { return reinterpret_cast( &_DashDotProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 0; - void Swap(DashDotProto* other); + friend void swap(DashDotProto& a, DashDotProto& b) { + a.Swap(&b); + } + inline void Swap(DashDotProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(DashDotProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline DashDotProto* New() const PROTOBUF_FINAL { return New(NULL); } - - DashDotProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + DashDotProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const DashDotProto& from); void MergeFrom(const DashDotProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(DashDotProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "DashDotProto"; } + protected: + explicit DashDotProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kDdFieldNumber = 1, + kOffsetFieldNumber = 2, + }; // repeated double dd = 1; int dd_size() const; + private: + int _internal_dd_size() const; + public: void clear_dd(); - static const int kDdFieldNumber = 1; + private: + double _internal_dd(int index) const; + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >& + _internal_dd() const; + void _internal_add_dd(double value); + ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >* + _internal_mutable_dd(); + public: double dd(int index) const; void set_dd(int index, double value); void add_dd(double value); - const ::google::protobuf::RepeatedField< double >& + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >& dd() const; - ::google::protobuf::RepeatedField< double >* + ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >* mutable_dd(); // double offset = 2; void clear_offset(); - static const int kOffsetFieldNumber = 2; double offset() const; void set_offset(double value); + private: + double _internal_offset() const; + void _internal_set_offset(double value); + public: // @@protoc_insertion_point(class_scope:DashDotProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::RepeatedField< double > dd_; - mutable int _dd_cached_byte_size_; - double offset_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::RepeatedField< double > dd_; + double offset_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class PathSymProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:PathSymProto) */ { +class PathSymProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:PathSymProto) */ { public: - PathSymProto(); - virtual ~PathSymProto(); + inline PathSymProto() : PathSymProto(nullptr) {} + ~PathSymProto() override; + explicit PROTOBUF_CONSTEXPR PathSymProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); PathSymProto(const PathSymProto& from); + PathSymProto(PathSymProto&& from) noexcept + : PathSymProto() { + *this = ::std::move(from); + } inline PathSymProto& operator=(const PathSymProto& from) { CopyFrom(from); return *this; } + inline PathSymProto& operator=(PathSymProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const PathSymProto& default_instance(); - + static const PathSymProto& default_instance() { + return *internal_default_instance(); + } static inline const PathSymProto* internal_default_instance() { return reinterpret_cast( &_PathSymProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 1; - void Swap(PathSymProto* other); + friend void swap(PathSymProto& a, PathSymProto& b) { + a.Swap(&b); + } + inline void Swap(PathSymProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(PathSymProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline PathSymProto* New() const PROTOBUF_FINAL { return New(NULL); } - - PathSymProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + PathSymProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const PathSymProto& from); void MergeFrom(const PathSymProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(PathSymProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "PathSymProto"; } + protected: + explicit PathSymProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kNameFieldNumber = 1, + kStepFieldNumber = 2, + kOffsetFieldNumber = 3, + }; // string name = 1; void clear_name(); - static const int kNameFieldNumber = 1; - const ::std::string& name() const; - void set_name(const ::std::string& value); - #if LANG_CXX11 - void set_name(::std::string&& value); - #endif - void set_name(const char* value); - void set_name(const char* value, size_t size); - ::std::string* mutable_name(); - ::std::string* release_name(); - void set_allocated_name(::std::string* name); + const std::string& name() const; + template + void set_name(ArgT0&& arg0, ArgT... args); + std::string* mutable_name(); + PROTOBUF_NODISCARD std::string* release_name(); + void set_allocated_name(std::string* name); + private: + const std::string& _internal_name() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); + std::string* _internal_mutable_name(); + public: // double step = 2; void clear_step(); - static const int kStepFieldNumber = 2; double step() const; void set_step(double value); + private: + double _internal_step() const; + void _internal_set_step(double value); + public: // double offset = 3; void clear_offset(); - static const int kOffsetFieldNumber = 3; double offset() const; void set_offset(double value); + private: + double _internal_offset() const; + void _internal_set_offset(double value); + public: // @@protoc_insertion_point(class_scope:PathSymProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr name_; - double step_; - double offset_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; + double step_; + double offset_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class LineRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:LineRuleProto) */ { +class LineRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:LineRuleProto) */ { public: - LineRuleProto(); - virtual ~LineRuleProto(); + inline LineRuleProto() : LineRuleProto(nullptr) {} + ~LineRuleProto() override; + explicit PROTOBUF_CONSTEXPR LineRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); LineRuleProto(const LineRuleProto& from); + LineRuleProto(LineRuleProto&& from) noexcept + : LineRuleProto() { + *this = ::std::move(from); + } inline LineRuleProto& operator=(const LineRuleProto& from) { CopyFrom(from); return *this; } + inline LineRuleProto& operator=(LineRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const LineRuleProto& default_instance(); - + static const LineRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const LineRuleProto* internal_default_instance() { return reinterpret_cast( &_LineRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 2; - void Swap(LineRuleProto* other); + friend void swap(LineRuleProto& a, LineRuleProto& b) { + a.Swap(&b); + } + inline void Swap(LineRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(LineRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline LineRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - LineRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + LineRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const LineRuleProto& from); void MergeFrom(const LineRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(LineRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "LineRuleProto"; } + protected: + explicit LineRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kDashdotFieldNumber = 3, + kPathsymFieldNumber = 5, + kWidthFieldNumber = 1, + kColorFieldNumber = 2, + kPriorityFieldNumber = 4, + kJoinFieldNumber = 6, + kCapFieldNumber = 7, + }; // .DashDotProto dashdot = 3; bool has_dashdot() const; + private: + bool _internal_has_dashdot() const; + public: void clear_dashdot(); - static const int kDashdotFieldNumber = 3; const ::DashDotProto& dashdot() const; + PROTOBUF_NODISCARD ::DashDotProto* release_dashdot(); ::DashDotProto* mutable_dashdot(); - ::DashDotProto* release_dashdot(); void set_allocated_dashdot(::DashDotProto* dashdot); + private: + const ::DashDotProto& _internal_dashdot() const; + ::DashDotProto* _internal_mutable_dashdot(); + public: + void unsafe_arena_set_allocated_dashdot( + ::DashDotProto* dashdot); + ::DashDotProto* unsafe_arena_release_dashdot(); // .PathSymProto pathsym = 5; bool has_pathsym() const; + private: + bool _internal_has_pathsym() const; + public: void clear_pathsym(); - static const int kPathsymFieldNumber = 5; const ::PathSymProto& pathsym() const; + PROTOBUF_NODISCARD ::PathSymProto* release_pathsym(); ::PathSymProto* mutable_pathsym(); - ::PathSymProto* release_pathsym(); void set_allocated_pathsym(::PathSymProto* pathsym); + private: + const ::PathSymProto& _internal_pathsym() const; + ::PathSymProto* _internal_mutable_pathsym(); + public: + void unsafe_arena_set_allocated_pathsym( + ::PathSymProto* pathsym); + ::PathSymProto* unsafe_arena_release_pathsym(); // double width = 1; void clear_width(); - static const int kWidthFieldNumber = 1; double width() const; void set_width(double value); + private: + double _internal_width() const; + void _internal_set_width(double value); + public: // uint32 color = 2; void clear_color(); - static const int kColorFieldNumber = 2; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // int32 priority = 4; void clear_priority(); - static const int kPriorityFieldNumber = 4; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // .LineJoin join = 6; void clear_join(); - static const int kJoinFieldNumber = 6; ::LineJoin join() const; void set_join(::LineJoin value); + private: + ::LineJoin _internal_join() const; + void _internal_set_join(::LineJoin value); + public: // .LineCap cap = 7; void clear_cap(); - static const int kCapFieldNumber = 7; ::LineCap cap() const; void set_cap(::LineCap value); + private: + ::LineCap _internal_cap() const; + void _internal_set_cap(::LineCap value); + public: // @@protoc_insertion_point(class_scope:LineRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::DashDotProto* dashdot_; - ::PathSymProto* pathsym_; - double width_; - ::google::protobuf::uint32 color_; - ::google::protobuf::int32 priority_; - int join_; - int cap_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::DashDotProto* dashdot_; + ::PathSymProto* pathsym_; + double width_; + uint32_t color_; + int32_t priority_; + int join_; + int cap_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class LineDefProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:LineDefProto) */ { +class LineDefProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:LineDefProto) */ { public: - LineDefProto(); - virtual ~LineDefProto(); + inline LineDefProto() : LineDefProto(nullptr) {} + ~LineDefProto() override; + explicit PROTOBUF_CONSTEXPR LineDefProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); LineDefProto(const LineDefProto& from); + LineDefProto(LineDefProto&& from) noexcept + : LineDefProto() { + *this = ::std::move(from); + } inline LineDefProto& operator=(const LineDefProto& from) { CopyFrom(from); return *this; } + inline LineDefProto& operator=(LineDefProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const LineDefProto& default_instance(); - + static const LineDefProto& default_instance() { + return *internal_default_instance(); + } static inline const LineDefProto* internal_default_instance() { return reinterpret_cast( &_LineDefProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 3; - void Swap(LineDefProto* other); + friend void swap(LineDefProto& a, LineDefProto& b) { + a.Swap(&b); + } + inline void Swap(LineDefProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(LineDefProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline LineDefProto* New() const PROTOBUF_FINAL { return New(NULL); } - - LineDefProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + LineDefProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const LineDefProto& from); void MergeFrom(const LineDefProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(LineDefProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "LineDefProto"; } + protected: + explicit LineDefProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kDashdotFieldNumber = 3, + kPathsymFieldNumber = 4, + kWidthFieldNumber = 1, + kColorFieldNumber = 2, + kJoinFieldNumber = 6, + kCapFieldNumber = 7, + }; // .DashDotProto dashdot = 3; bool has_dashdot() const; + private: + bool _internal_has_dashdot() const; + public: void clear_dashdot(); - static const int kDashdotFieldNumber = 3; const ::DashDotProto& dashdot() const; + PROTOBUF_NODISCARD ::DashDotProto* release_dashdot(); ::DashDotProto* mutable_dashdot(); - ::DashDotProto* release_dashdot(); void set_allocated_dashdot(::DashDotProto* dashdot); + private: + const ::DashDotProto& _internal_dashdot() const; + ::DashDotProto* _internal_mutable_dashdot(); + public: + void unsafe_arena_set_allocated_dashdot( + ::DashDotProto* dashdot); + ::DashDotProto* unsafe_arena_release_dashdot(); // .PathSymProto pathsym = 4; bool has_pathsym() const; + private: + bool _internal_has_pathsym() const; + public: void clear_pathsym(); - static const int kPathsymFieldNumber = 4; const ::PathSymProto& pathsym() const; + PROTOBUF_NODISCARD ::PathSymProto* release_pathsym(); ::PathSymProto* mutable_pathsym(); - ::PathSymProto* release_pathsym(); void set_allocated_pathsym(::PathSymProto* pathsym); + private: + const ::PathSymProto& _internal_pathsym() const; + ::PathSymProto* _internal_mutable_pathsym(); + public: + void unsafe_arena_set_allocated_pathsym( + ::PathSymProto* pathsym); + ::PathSymProto* unsafe_arena_release_pathsym(); // double width = 1; void clear_width(); - static const int kWidthFieldNumber = 1; double width() const; void set_width(double value); + private: + double _internal_width() const; + void _internal_set_width(double value); + public: // uint32 color = 2; void clear_color(); - static const int kColorFieldNumber = 2; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // .LineJoin join = 6; void clear_join(); - static const int kJoinFieldNumber = 6; ::LineJoin join() const; void set_join(::LineJoin value); + private: + ::LineJoin _internal_join() const; + void _internal_set_join(::LineJoin value); + public: // .LineCap cap = 7; void clear_cap(); - static const int kCapFieldNumber = 7; ::LineCap cap() const; void set_cap(::LineCap value); + private: + ::LineCap _internal_cap() const; + void _internal_set_cap(::LineCap value); + public: // @@protoc_insertion_point(class_scope:LineDefProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::DashDotProto* dashdot_; - ::PathSymProto* pathsym_; - double width_; - ::google::protobuf::uint32 color_; - int join_; - int cap_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::DashDotProto* dashdot_; + ::PathSymProto* pathsym_; + double width_; + uint32_t color_; + int join_; + int cap_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class AreaRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:AreaRuleProto) */ { +class AreaRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:AreaRuleProto) */ { public: - AreaRuleProto(); - virtual ~AreaRuleProto(); + inline AreaRuleProto() : AreaRuleProto(nullptr) {} + ~AreaRuleProto() override; + explicit PROTOBUF_CONSTEXPR AreaRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); AreaRuleProto(const AreaRuleProto& from); + AreaRuleProto(AreaRuleProto&& from) noexcept + : AreaRuleProto() { + *this = ::std::move(from); + } inline AreaRuleProto& operator=(const AreaRuleProto& from) { CopyFrom(from); return *this; } + inline AreaRuleProto& operator=(AreaRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const AreaRuleProto& default_instance(); - + static const AreaRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const AreaRuleProto* internal_default_instance() { return reinterpret_cast( &_AreaRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 4; - void Swap(AreaRuleProto* other); + friend void swap(AreaRuleProto& a, AreaRuleProto& b) { + a.Swap(&b); + } + inline void Swap(AreaRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(AreaRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline AreaRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - AreaRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + AreaRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const AreaRuleProto& from); void MergeFrom(const AreaRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(AreaRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "AreaRuleProto"; } + protected: + explicit AreaRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kBorderFieldNumber = 2, + kColorFieldNumber = 1, + kPriorityFieldNumber = 3, + }; // .LineDefProto border = 2; bool has_border() const; + private: + bool _internal_has_border() const; + public: void clear_border(); - static const int kBorderFieldNumber = 2; const ::LineDefProto& border() const; + PROTOBUF_NODISCARD ::LineDefProto* release_border(); ::LineDefProto* mutable_border(); - ::LineDefProto* release_border(); void set_allocated_border(::LineDefProto* border); + private: + const ::LineDefProto& _internal_border() const; + ::LineDefProto* _internal_mutable_border(); + public: + void unsafe_arena_set_allocated_border( + ::LineDefProto* border); + ::LineDefProto* unsafe_arena_release_border(); // uint32 color = 1; void clear_color(); - static const int kColorFieldNumber = 1; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // int32 priority = 3; void clear_priority(); - static const int kPriorityFieldNumber = 3; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // @@protoc_insertion_point(class_scope:AreaRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::LineDefProto* border_; - ::google::protobuf::uint32 color_; - ::google::protobuf::int32 priority_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::LineDefProto* border_; + uint32_t color_; + int32_t priority_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class SymbolRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:SymbolRuleProto) */ { +class SymbolRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:SymbolRuleProto) */ { public: - SymbolRuleProto(); - virtual ~SymbolRuleProto(); + inline SymbolRuleProto() : SymbolRuleProto(nullptr) {} + ~SymbolRuleProto() override; + explicit PROTOBUF_CONSTEXPR SymbolRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); SymbolRuleProto(const SymbolRuleProto& from); + SymbolRuleProto(SymbolRuleProto&& from) noexcept + : SymbolRuleProto() { + *this = ::std::move(from); + } inline SymbolRuleProto& operator=(const SymbolRuleProto& from) { CopyFrom(from); return *this; } + inline SymbolRuleProto& operator=(SymbolRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const SymbolRuleProto& default_instance(); - + static const SymbolRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const SymbolRuleProto* internal_default_instance() { return reinterpret_cast( &_SymbolRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 5; - void Swap(SymbolRuleProto* other); + friend void swap(SymbolRuleProto& a, SymbolRuleProto& b) { + a.Swap(&b); + } + inline void Swap(SymbolRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(SymbolRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline SymbolRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - SymbolRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + SymbolRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const SymbolRuleProto& from); void MergeFrom(const SymbolRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(SymbolRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "SymbolRuleProto"; } + protected: + explicit SymbolRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kNameFieldNumber = 1, + kApplyForTypeFieldNumber = 2, + kPriorityFieldNumber = 3, + kMinDistanceFieldNumber = 4, + }; // string name = 1; void clear_name(); - static const int kNameFieldNumber = 1; - const ::std::string& name() const; - void set_name(const ::std::string& value); - #if LANG_CXX11 - void set_name(::std::string&& value); - #endif - void set_name(const char* value); - void set_name(const char* value, size_t size); - ::std::string* mutable_name(); - ::std::string* release_name(); - void set_allocated_name(::std::string* name); + const std::string& name() const; + template + void set_name(ArgT0&& arg0, ArgT... args); + std::string* mutable_name(); + PROTOBUF_NODISCARD std::string* release_name(); + void set_allocated_name(std::string* name); + private: + const std::string& _internal_name() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); + std::string* _internal_mutable_name(); + public: // int32 apply_for_type = 2; void clear_apply_for_type(); - static const int kApplyForTypeFieldNumber = 2; - ::google::protobuf::int32 apply_for_type() const; - void set_apply_for_type(::google::protobuf::int32 value); + int32_t apply_for_type() const; + void set_apply_for_type(int32_t value); + private: + int32_t _internal_apply_for_type() const; + void _internal_set_apply_for_type(int32_t value); + public: // int32 priority = 3; void clear_priority(); - static const int kPriorityFieldNumber = 3; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // int32 min_distance = 4; void clear_min_distance(); - static const int kMinDistanceFieldNumber = 4; - ::google::protobuf::int32 min_distance() const; - void set_min_distance(::google::protobuf::int32 value); + int32_t min_distance() const; + void set_min_distance(int32_t value); + private: + int32_t _internal_min_distance() const; + void _internal_set_min_distance(int32_t value); + public: // @@protoc_insertion_point(class_scope:SymbolRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::int32 apply_for_type_; - ::google::protobuf::int32 priority_; - ::google::protobuf::int32 min_distance_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; + int32_t apply_for_type_; + int32_t priority_; + int32_t min_distance_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class CaptionDefProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:CaptionDefProto) */ { +class CaptionDefProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:CaptionDefProto) */ { public: - CaptionDefProto(); - virtual ~CaptionDefProto(); + inline CaptionDefProto() : CaptionDefProto(nullptr) {} + ~CaptionDefProto() override; + explicit PROTOBUF_CONSTEXPR CaptionDefProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); CaptionDefProto(const CaptionDefProto& from); + CaptionDefProto(CaptionDefProto&& from) noexcept + : CaptionDefProto() { + *this = ::std::move(from); + } inline CaptionDefProto& operator=(const CaptionDefProto& from) { CopyFrom(from); return *this; } + inline CaptionDefProto& operator=(CaptionDefProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const CaptionDefProto& default_instance(); - + static const CaptionDefProto& default_instance() { + return *internal_default_instance(); + } static inline const CaptionDefProto* internal_default_instance() { return reinterpret_cast( &_CaptionDefProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 6; - void Swap(CaptionDefProto* other); + friend void swap(CaptionDefProto& a, CaptionDefProto& b) { + a.Swap(&b); + } + inline void Swap(CaptionDefProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(CaptionDefProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline CaptionDefProto* New() const PROTOBUF_FINAL { return New(NULL); } - - CaptionDefProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + CaptionDefProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const CaptionDefProto& from); void MergeFrom(const CaptionDefProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(CaptionDefProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "CaptionDefProto"; } + protected: + explicit CaptionDefProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kTextFieldNumber = 6, + kHeightFieldNumber = 1, + kColorFieldNumber = 2, + kStrokeColorFieldNumber = 3, + kOffsetXFieldNumber = 4, + kOffsetYFieldNumber = 5, + kIsOptionalFieldNumber = 7, + }; // string text = 6; void clear_text(); - static const int kTextFieldNumber = 6; - const ::std::string& text() const; - void set_text(const ::std::string& value); - #if LANG_CXX11 - void set_text(::std::string&& value); - #endif - void set_text(const char* value); - void set_text(const char* value, size_t size); - ::std::string* mutable_text(); - ::std::string* release_text(); - void set_allocated_text(::std::string* text); + const std::string& text() const; + template + void set_text(ArgT0&& arg0, ArgT... args); + std::string* mutable_text(); + PROTOBUF_NODISCARD std::string* release_text(); + void set_allocated_text(std::string* text); + private: + const std::string& _internal_text() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_text(const std::string& value); + std::string* _internal_mutable_text(); + public: // int32 height = 1; void clear_height(); - static const int kHeightFieldNumber = 1; - ::google::protobuf::int32 height() const; - void set_height(::google::protobuf::int32 value); + int32_t height() const; + void set_height(int32_t value); + private: + int32_t _internal_height() const; + void _internal_set_height(int32_t value); + public: // uint32 color = 2; void clear_color(); - static const int kColorFieldNumber = 2; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // uint32 stroke_color = 3; void clear_stroke_color(); - static const int kStrokeColorFieldNumber = 3; - ::google::protobuf::uint32 stroke_color() const; - void set_stroke_color(::google::protobuf::uint32 value); + uint32_t stroke_color() const; + void set_stroke_color(uint32_t value); + private: + uint32_t _internal_stroke_color() const; + void _internal_set_stroke_color(uint32_t value); + public: // int32 offset_x = 4; void clear_offset_x(); - static const int kOffsetXFieldNumber = 4; - ::google::protobuf::int32 offset_x() const; - void set_offset_x(::google::protobuf::int32 value); + int32_t offset_x() const; + void set_offset_x(int32_t value); + private: + int32_t _internal_offset_x() const; + void _internal_set_offset_x(int32_t value); + public: // int32 offset_y = 5; void clear_offset_y(); - static const int kOffsetYFieldNumber = 5; - ::google::protobuf::int32 offset_y() const; - void set_offset_y(::google::protobuf::int32 value); + int32_t offset_y() const; + void set_offset_y(int32_t value); + private: + int32_t _internal_offset_y() const; + void _internal_set_offset_y(int32_t value); + public: // bool is_optional = 7; void clear_is_optional(); - static const int kIsOptionalFieldNumber = 7; bool is_optional() const; void set_is_optional(bool value); + private: + bool _internal_is_optional() const; + void _internal_set_is_optional(bool value); + public: // @@protoc_insertion_point(class_scope:CaptionDefProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr text_; - ::google::protobuf::int32 height_; - ::google::protobuf::uint32 color_; - ::google::protobuf::uint32 stroke_color_; - ::google::protobuf::int32 offset_x_; - ::google::protobuf::int32 offset_y_; - bool is_optional_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr text_; + int32_t height_; + uint32_t color_; + uint32_t stroke_color_; + int32_t offset_x_; + int32_t offset_y_; + bool is_optional_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class CaptionRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:CaptionRuleProto) */ { +class CaptionRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:CaptionRuleProto) */ { public: - CaptionRuleProto(); - virtual ~CaptionRuleProto(); + inline CaptionRuleProto() : CaptionRuleProto(nullptr) {} + ~CaptionRuleProto() override; + explicit PROTOBUF_CONSTEXPR CaptionRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); CaptionRuleProto(const CaptionRuleProto& from); + CaptionRuleProto(CaptionRuleProto&& from) noexcept + : CaptionRuleProto() { + *this = ::std::move(from); + } inline CaptionRuleProto& operator=(const CaptionRuleProto& from) { CopyFrom(from); return *this; } + inline CaptionRuleProto& operator=(CaptionRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const CaptionRuleProto& default_instance(); - + static const CaptionRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const CaptionRuleProto* internal_default_instance() { return reinterpret_cast( &_CaptionRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 7; - void Swap(CaptionRuleProto* other); + friend void swap(CaptionRuleProto& a, CaptionRuleProto& b) { + a.Swap(&b); + } + inline void Swap(CaptionRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(CaptionRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline CaptionRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - CaptionRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + CaptionRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const CaptionRuleProto& from); void MergeFrom(const CaptionRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(CaptionRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "CaptionRuleProto"; } + protected: + explicit CaptionRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kPrimaryFieldNumber = 1, + kSecondaryFieldNumber = 2, + kPriorityFieldNumber = 3, + }; // .CaptionDefProto primary = 1; bool has_primary() const; + private: + bool _internal_has_primary() const; + public: void clear_primary(); - static const int kPrimaryFieldNumber = 1; const ::CaptionDefProto& primary() const; + PROTOBUF_NODISCARD ::CaptionDefProto* release_primary(); ::CaptionDefProto* mutable_primary(); - ::CaptionDefProto* release_primary(); void set_allocated_primary(::CaptionDefProto* primary); + private: + const ::CaptionDefProto& _internal_primary() const; + ::CaptionDefProto* _internal_mutable_primary(); + public: + void unsafe_arena_set_allocated_primary( + ::CaptionDefProto* primary); + ::CaptionDefProto* unsafe_arena_release_primary(); // .CaptionDefProto secondary = 2; bool has_secondary() const; + private: + bool _internal_has_secondary() const; + public: void clear_secondary(); - static const int kSecondaryFieldNumber = 2; const ::CaptionDefProto& secondary() const; + PROTOBUF_NODISCARD ::CaptionDefProto* release_secondary(); ::CaptionDefProto* mutable_secondary(); - ::CaptionDefProto* release_secondary(); void set_allocated_secondary(::CaptionDefProto* secondary); + private: + const ::CaptionDefProto& _internal_secondary() const; + ::CaptionDefProto* _internal_mutable_secondary(); + public: + void unsafe_arena_set_allocated_secondary( + ::CaptionDefProto* secondary); + ::CaptionDefProto* unsafe_arena_release_secondary(); // int32 priority = 3; void clear_priority(); - static const int kPriorityFieldNumber = 3; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // @@protoc_insertion_point(class_scope:CaptionRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::CaptionDefProto* primary_; - ::CaptionDefProto* secondary_; - ::google::protobuf::int32 priority_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::CaptionDefProto* primary_; + ::CaptionDefProto* secondary_; + int32_t priority_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class CircleRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:CircleRuleProto) */ { +class CircleRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:CircleRuleProto) */ { public: - CircleRuleProto(); - virtual ~CircleRuleProto(); + inline CircleRuleProto() : CircleRuleProto(nullptr) {} + ~CircleRuleProto() override; + explicit PROTOBUF_CONSTEXPR CircleRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); CircleRuleProto(const CircleRuleProto& from); + CircleRuleProto(CircleRuleProto&& from) noexcept + : CircleRuleProto() { + *this = ::std::move(from); + } inline CircleRuleProto& operator=(const CircleRuleProto& from) { CopyFrom(from); return *this; } + inline CircleRuleProto& operator=(CircleRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const CircleRuleProto& default_instance(); - + static const CircleRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const CircleRuleProto* internal_default_instance() { return reinterpret_cast( &_CircleRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 8; - void Swap(CircleRuleProto* other); + friend void swap(CircleRuleProto& a, CircleRuleProto& b) { + a.Swap(&b); + } + inline void Swap(CircleRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(CircleRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline CircleRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - CircleRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + CircleRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const CircleRuleProto& from); void MergeFrom(const CircleRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(CircleRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "CircleRuleProto"; } + protected: + explicit CircleRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kBorderFieldNumber = 3, + kRadiusFieldNumber = 1, + kColorFieldNumber = 2, + kPriorityFieldNumber = 4, + }; // .LineDefProto border = 3; bool has_border() const; + private: + bool _internal_has_border() const; + public: void clear_border(); - static const int kBorderFieldNumber = 3; const ::LineDefProto& border() const; + PROTOBUF_NODISCARD ::LineDefProto* release_border(); ::LineDefProto* mutable_border(); - ::LineDefProto* release_border(); void set_allocated_border(::LineDefProto* border); + private: + const ::LineDefProto& _internal_border() const; + ::LineDefProto* _internal_mutable_border(); + public: + void unsafe_arena_set_allocated_border( + ::LineDefProto* border); + ::LineDefProto* unsafe_arena_release_border(); // double radius = 1; void clear_radius(); - static const int kRadiusFieldNumber = 1; double radius() const; void set_radius(double value); + private: + double _internal_radius() const; + void _internal_set_radius(double value); + public: // uint32 color = 2; void clear_color(); - static const int kColorFieldNumber = 2; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // int32 priority = 4; void clear_priority(); - static const int kPriorityFieldNumber = 4; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // @@protoc_insertion_point(class_scope:CircleRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::LineDefProto* border_; - double radius_; - ::google::protobuf::uint32 color_; - ::google::protobuf::int32 priority_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::LineDefProto* border_; + double radius_; + uint32_t color_; + int32_t priority_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class PathTextRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:PathTextRuleProto) */ { +class PathTextRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:PathTextRuleProto) */ { public: - PathTextRuleProto(); - virtual ~PathTextRuleProto(); + inline PathTextRuleProto() : PathTextRuleProto(nullptr) {} + ~PathTextRuleProto() override; + explicit PROTOBUF_CONSTEXPR PathTextRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); PathTextRuleProto(const PathTextRuleProto& from); + PathTextRuleProto(PathTextRuleProto&& from) noexcept + : PathTextRuleProto() { + *this = ::std::move(from); + } inline PathTextRuleProto& operator=(const PathTextRuleProto& from) { CopyFrom(from); return *this; } + inline PathTextRuleProto& operator=(PathTextRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const PathTextRuleProto& default_instance(); - + static const PathTextRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const PathTextRuleProto* internal_default_instance() { return reinterpret_cast( &_PathTextRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 9; - void Swap(PathTextRuleProto* other); + friend void swap(PathTextRuleProto& a, PathTextRuleProto& b) { + a.Swap(&b); + } + inline void Swap(PathTextRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(PathTextRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline PathTextRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - PathTextRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + PathTextRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const PathTextRuleProto& from); void MergeFrom(const PathTextRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(PathTextRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "PathTextRuleProto"; } + protected: + explicit PathTextRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kPrimaryFieldNumber = 1, + kSecondaryFieldNumber = 2, + kPriorityFieldNumber = 3, + }; // .CaptionDefProto primary = 1; bool has_primary() const; + private: + bool _internal_has_primary() const; + public: void clear_primary(); - static const int kPrimaryFieldNumber = 1; const ::CaptionDefProto& primary() const; + PROTOBUF_NODISCARD ::CaptionDefProto* release_primary(); ::CaptionDefProto* mutable_primary(); - ::CaptionDefProto* release_primary(); void set_allocated_primary(::CaptionDefProto* primary); + private: + const ::CaptionDefProto& _internal_primary() const; + ::CaptionDefProto* _internal_mutable_primary(); + public: + void unsafe_arena_set_allocated_primary( + ::CaptionDefProto* primary); + ::CaptionDefProto* unsafe_arena_release_primary(); // .CaptionDefProto secondary = 2; bool has_secondary() const; + private: + bool _internal_has_secondary() const; + public: void clear_secondary(); - static const int kSecondaryFieldNumber = 2; const ::CaptionDefProto& secondary() const; + PROTOBUF_NODISCARD ::CaptionDefProto* release_secondary(); ::CaptionDefProto* mutable_secondary(); - ::CaptionDefProto* release_secondary(); void set_allocated_secondary(::CaptionDefProto* secondary); + private: + const ::CaptionDefProto& _internal_secondary() const; + ::CaptionDefProto* _internal_mutable_secondary(); + public: + void unsafe_arena_set_allocated_secondary( + ::CaptionDefProto* secondary); + ::CaptionDefProto* unsafe_arena_release_secondary(); // int32 priority = 3; void clear_priority(); - static const int kPriorityFieldNumber = 3; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // @@protoc_insertion_point(class_scope:PathTextRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::CaptionDefProto* primary_; - ::CaptionDefProto* secondary_; - ::google::protobuf::int32 priority_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::CaptionDefProto* primary_; + ::CaptionDefProto* secondary_; + int32_t priority_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class ShieldRuleProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:ShieldRuleProto) */ { +class ShieldRuleProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:ShieldRuleProto) */ { public: - ShieldRuleProto(); - virtual ~ShieldRuleProto(); + inline ShieldRuleProto() : ShieldRuleProto(nullptr) {} + ~ShieldRuleProto() override; + explicit PROTOBUF_CONSTEXPR ShieldRuleProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); ShieldRuleProto(const ShieldRuleProto& from); + ShieldRuleProto(ShieldRuleProto&& from) noexcept + : ShieldRuleProto() { + *this = ::std::move(from); + } inline ShieldRuleProto& operator=(const ShieldRuleProto& from) { CopyFrom(from); return *this; } + inline ShieldRuleProto& operator=(ShieldRuleProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const ShieldRuleProto& default_instance(); - + static const ShieldRuleProto& default_instance() { + return *internal_default_instance(); + } static inline const ShieldRuleProto* internal_default_instance() { return reinterpret_cast( &_ShieldRuleProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 10; - void Swap(ShieldRuleProto* other); + friend void swap(ShieldRuleProto& a, ShieldRuleProto& b) { + a.Swap(&b); + } + inline void Swap(ShieldRuleProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(ShieldRuleProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline ShieldRuleProto* New() const PROTOBUF_FINAL { return New(NULL); } - - ShieldRuleProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + ShieldRuleProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const ShieldRuleProto& from); void MergeFrom(const ShieldRuleProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(ShieldRuleProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "ShieldRuleProto"; } + protected: + explicit ShieldRuleProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kHeightFieldNumber = 1, + kColorFieldNumber = 2, + kStrokeColorFieldNumber = 3, + kPriorityFieldNumber = 4, + kMinDistanceFieldNumber = 5, + kTextColorFieldNumber = 6, + kTextStrokeColorFieldNumber = 7, + }; // int32 height = 1; void clear_height(); - static const int kHeightFieldNumber = 1; - ::google::protobuf::int32 height() const; - void set_height(::google::protobuf::int32 value); + int32_t height() const; + void set_height(int32_t value); + private: + int32_t _internal_height() const; + void _internal_set_height(int32_t value); + public: // uint32 color = 2; void clear_color(); - static const int kColorFieldNumber = 2; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // uint32 stroke_color = 3; void clear_stroke_color(); - static const int kStrokeColorFieldNumber = 3; - ::google::protobuf::uint32 stroke_color() const; - void set_stroke_color(::google::protobuf::uint32 value); + uint32_t stroke_color() const; + void set_stroke_color(uint32_t value); + private: + uint32_t _internal_stroke_color() const; + void _internal_set_stroke_color(uint32_t value); + public: // int32 priority = 4; void clear_priority(); - static const int kPriorityFieldNumber = 4; - ::google::protobuf::int32 priority() const; - void set_priority(::google::protobuf::int32 value); + int32_t priority() const; + void set_priority(int32_t value); + private: + int32_t _internal_priority() const; + void _internal_set_priority(int32_t value); + public: // int32 min_distance = 5; void clear_min_distance(); - static const int kMinDistanceFieldNumber = 5; - ::google::protobuf::int32 min_distance() const; - void set_min_distance(::google::protobuf::int32 value); + int32_t min_distance() const; + void set_min_distance(int32_t value); + private: + int32_t _internal_min_distance() const; + void _internal_set_min_distance(int32_t value); + public: // uint32 text_color = 6; void clear_text_color(); - static const int kTextColorFieldNumber = 6; - ::google::protobuf::uint32 text_color() const; - void set_text_color(::google::protobuf::uint32 value); + uint32_t text_color() const; + void set_text_color(uint32_t value); + private: + uint32_t _internal_text_color() const; + void _internal_set_text_color(uint32_t value); + public: // uint32 text_stroke_color = 7; void clear_text_stroke_color(); - static const int kTextStrokeColorFieldNumber = 7; - ::google::protobuf::uint32 text_stroke_color() const; - void set_text_stroke_color(::google::protobuf::uint32 value); + uint32_t text_stroke_color() const; + void set_text_stroke_color(uint32_t value); + private: + uint32_t _internal_text_stroke_color() const; + void _internal_set_text_stroke_color(uint32_t value); + public: // @@protoc_insertion_point(class_scope:ShieldRuleProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::int32 height_; - ::google::protobuf::uint32 color_; - ::google::protobuf::uint32 stroke_color_; - ::google::protobuf::int32 priority_; - ::google::protobuf::int32 min_distance_; - ::google::protobuf::uint32 text_color_; - ::google::protobuf::uint32 text_stroke_color_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + int32_t height_; + uint32_t color_; + uint32_t stroke_color_; + int32_t priority_; + int32_t min_distance_; + uint32_t text_color_; + uint32_t text_stroke_color_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class DrawElementProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:DrawElementProto) */ { +class DrawElementProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:DrawElementProto) */ { public: - DrawElementProto(); - virtual ~DrawElementProto(); + inline DrawElementProto() : DrawElementProto(nullptr) {} + ~DrawElementProto() override; + explicit PROTOBUF_CONSTEXPR DrawElementProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); DrawElementProto(const DrawElementProto& from); + DrawElementProto(DrawElementProto&& from) noexcept + : DrawElementProto() { + *this = ::std::move(from); + } inline DrawElementProto& operator=(const DrawElementProto& from) { CopyFrom(from); return *this; } + inline DrawElementProto& operator=(DrawElementProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const DrawElementProto& default_instance(); - + static const DrawElementProto& default_instance() { + return *internal_default_instance(); + } static inline const DrawElementProto* internal_default_instance() { return reinterpret_cast( &_DrawElementProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 11; - void Swap(DrawElementProto* other); + friend void swap(DrawElementProto& a, DrawElementProto& b) { + a.Swap(&b); + } + inline void Swap(DrawElementProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(DrawElementProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline DrawElementProto* New() const PROTOBUF_FINAL { return New(NULL); } - - DrawElementProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + DrawElementProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const DrawElementProto& from); void MergeFrom(const DrawElementProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(DrawElementProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "DrawElementProto"; } + protected: + explicit DrawElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kLinesFieldNumber = 2, + kApplyIfFieldNumber = 9, + kAreaFieldNumber = 3, + kSymbolFieldNumber = 4, + kCaptionFieldNumber = 5, + kCircleFieldNumber = 6, + kPathTextFieldNumber = 7, + kShieldFieldNumber = 8, + kScaleFieldNumber = 1, + }; // repeated .LineRuleProto lines = 2; int lines_size() const; + private: + int _internal_lines_size() const; + public: void clear_lines(); - static const int kLinesFieldNumber = 2; - const ::LineRuleProto& lines(int index) const; ::LineRuleProto* mutable_lines(int index); - ::LineRuleProto* add_lines(); - ::google::protobuf::RepeatedPtrField< ::LineRuleProto >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::LineRuleProto >* mutable_lines(); - const ::google::protobuf::RepeatedPtrField< ::LineRuleProto >& + private: + const ::LineRuleProto& _internal_lines(int index) const; + ::LineRuleProto* _internal_add_lines(); + public: + const ::LineRuleProto& lines(int index) const; + ::LineRuleProto* add_lines(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::LineRuleProto >& lines() const; // repeated string apply_if = 9; int apply_if_size() const; + private: + int _internal_apply_if_size() const; + public: void clear_apply_if(); - static const int kApplyIfFieldNumber = 9; - const ::std::string& apply_if(int index) const; - ::std::string* mutable_apply_if(int index); - void set_apply_if(int index, const ::std::string& value); - #if LANG_CXX11 - void set_apply_if(int index, ::std::string&& value); - #endif + const std::string& apply_if(int index) const; + std::string* mutable_apply_if(int index); + void set_apply_if(int index, const std::string& value); + void set_apply_if(int index, std::string&& value); void set_apply_if(int index, const char* value); void set_apply_if(int index, const char* value, size_t size); - ::std::string* add_apply_if(); - void add_apply_if(const ::std::string& value); - #if LANG_CXX11 - void add_apply_if(::std::string&& value); - #endif + std::string* add_apply_if(); + void add_apply_if(const std::string& value); + void add_apply_if(std::string&& value); void add_apply_if(const char* value); void add_apply_if(const char* value, size_t size); - const ::google::protobuf::RepeatedPtrField< ::std::string>& apply_if() const; - ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_apply_if(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& apply_if() const; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* mutable_apply_if(); + private: + const std::string& _internal_apply_if(int index) const; + std::string* _internal_add_apply_if(); + public: // .AreaRuleProto area = 3; bool has_area() const; + private: + bool _internal_has_area() const; + public: void clear_area(); - static const int kAreaFieldNumber = 3; const ::AreaRuleProto& area() const; + PROTOBUF_NODISCARD ::AreaRuleProto* release_area(); ::AreaRuleProto* mutable_area(); - ::AreaRuleProto* release_area(); void set_allocated_area(::AreaRuleProto* area); + private: + const ::AreaRuleProto& _internal_area() const; + ::AreaRuleProto* _internal_mutable_area(); + public: + void unsafe_arena_set_allocated_area( + ::AreaRuleProto* area); + ::AreaRuleProto* unsafe_arena_release_area(); // .SymbolRuleProto symbol = 4; bool has_symbol() const; + private: + bool _internal_has_symbol() const; + public: void clear_symbol(); - static const int kSymbolFieldNumber = 4; const ::SymbolRuleProto& symbol() const; + PROTOBUF_NODISCARD ::SymbolRuleProto* release_symbol(); ::SymbolRuleProto* mutable_symbol(); - ::SymbolRuleProto* release_symbol(); void set_allocated_symbol(::SymbolRuleProto* symbol); + private: + const ::SymbolRuleProto& _internal_symbol() const; + ::SymbolRuleProto* _internal_mutable_symbol(); + public: + void unsafe_arena_set_allocated_symbol( + ::SymbolRuleProto* symbol); + ::SymbolRuleProto* unsafe_arena_release_symbol(); // .CaptionRuleProto caption = 5; bool has_caption() const; + private: + bool _internal_has_caption() const; + public: void clear_caption(); - static const int kCaptionFieldNumber = 5; const ::CaptionRuleProto& caption() const; + PROTOBUF_NODISCARD ::CaptionRuleProto* release_caption(); ::CaptionRuleProto* mutable_caption(); - ::CaptionRuleProto* release_caption(); void set_allocated_caption(::CaptionRuleProto* caption); + private: + const ::CaptionRuleProto& _internal_caption() const; + ::CaptionRuleProto* _internal_mutable_caption(); + public: + void unsafe_arena_set_allocated_caption( + ::CaptionRuleProto* caption); + ::CaptionRuleProto* unsafe_arena_release_caption(); // .CircleRuleProto circle = 6; bool has_circle() const; + private: + bool _internal_has_circle() const; + public: void clear_circle(); - static const int kCircleFieldNumber = 6; const ::CircleRuleProto& circle() const; + PROTOBUF_NODISCARD ::CircleRuleProto* release_circle(); ::CircleRuleProto* mutable_circle(); - ::CircleRuleProto* release_circle(); void set_allocated_circle(::CircleRuleProto* circle); + private: + const ::CircleRuleProto& _internal_circle() const; + ::CircleRuleProto* _internal_mutable_circle(); + public: + void unsafe_arena_set_allocated_circle( + ::CircleRuleProto* circle); + ::CircleRuleProto* unsafe_arena_release_circle(); // .PathTextRuleProto path_text = 7; bool has_path_text() const; + private: + bool _internal_has_path_text() const; + public: void clear_path_text(); - static const int kPathTextFieldNumber = 7; const ::PathTextRuleProto& path_text() const; + PROTOBUF_NODISCARD ::PathTextRuleProto* release_path_text(); ::PathTextRuleProto* mutable_path_text(); - ::PathTextRuleProto* release_path_text(); void set_allocated_path_text(::PathTextRuleProto* path_text); + private: + const ::PathTextRuleProto& _internal_path_text() const; + ::PathTextRuleProto* _internal_mutable_path_text(); + public: + void unsafe_arena_set_allocated_path_text( + ::PathTextRuleProto* path_text); + ::PathTextRuleProto* unsafe_arena_release_path_text(); // .ShieldRuleProto shield = 8; bool has_shield() const; + private: + bool _internal_has_shield() const; + public: void clear_shield(); - static const int kShieldFieldNumber = 8; const ::ShieldRuleProto& shield() const; + PROTOBUF_NODISCARD ::ShieldRuleProto* release_shield(); ::ShieldRuleProto* mutable_shield(); - ::ShieldRuleProto* release_shield(); void set_allocated_shield(::ShieldRuleProto* shield); + private: + const ::ShieldRuleProto& _internal_shield() const; + ::ShieldRuleProto* _internal_mutable_shield(); + public: + void unsafe_arena_set_allocated_shield( + ::ShieldRuleProto* shield); + ::ShieldRuleProto* unsafe_arena_release_shield(); // int32 scale = 1; void clear_scale(); - static const int kScaleFieldNumber = 1; - ::google::protobuf::int32 scale() const; - void set_scale(::google::protobuf::int32 value); + int32_t scale() const; + void set_scale(int32_t value); + private: + int32_t _internal_scale() const; + void _internal_set_scale(int32_t value); + public: // @@protoc_insertion_point(class_scope:DrawElementProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::RepeatedPtrField< ::LineRuleProto > lines_; - ::google::protobuf::RepeatedPtrField< ::std::string> apply_if_; - ::AreaRuleProto* area_; - ::SymbolRuleProto* symbol_; - ::CaptionRuleProto* caption_; - ::CircleRuleProto* circle_; - ::PathTextRuleProto* path_text_; - ::ShieldRuleProto* shield_; - ::google::protobuf::int32 scale_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::LineRuleProto > lines_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField apply_if_; + ::AreaRuleProto* area_; + ::SymbolRuleProto* symbol_; + ::CaptionRuleProto* caption_; + ::CircleRuleProto* circle_; + ::PathTextRuleProto* path_text_; + ::ShieldRuleProto* shield_; + int32_t scale_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class ClassifElementProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:ClassifElementProto) */ { +class ClassifElementProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:ClassifElementProto) */ { public: - ClassifElementProto(); - virtual ~ClassifElementProto(); + inline ClassifElementProto() : ClassifElementProto(nullptr) {} + ~ClassifElementProto() override; + explicit PROTOBUF_CONSTEXPR ClassifElementProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); ClassifElementProto(const ClassifElementProto& from); + ClassifElementProto(ClassifElementProto&& from) noexcept + : ClassifElementProto() { + *this = ::std::move(from); + } inline ClassifElementProto& operator=(const ClassifElementProto& from) { CopyFrom(from); return *this; } + inline ClassifElementProto& operator=(ClassifElementProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const ClassifElementProto& default_instance(); - + static const ClassifElementProto& default_instance() { + return *internal_default_instance(); + } static inline const ClassifElementProto* internal_default_instance() { return reinterpret_cast( &_ClassifElementProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 12; - void Swap(ClassifElementProto* other); + friend void swap(ClassifElementProto& a, ClassifElementProto& b) { + a.Swap(&b); + } + inline void Swap(ClassifElementProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(ClassifElementProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline ClassifElementProto* New() const PROTOBUF_FINAL { return New(NULL); } - - ClassifElementProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + ClassifElementProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const ClassifElementProto& from); void MergeFrom(const ClassifElementProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(ClassifElementProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "ClassifElementProto"; } + protected: + explicit ClassifElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kElementFieldNumber = 2, + kNameFieldNumber = 1, + }; // repeated .DrawElementProto element = 2; int element_size() const; + private: + int _internal_element_size() const; + public: void clear_element(); - static const int kElementFieldNumber = 2; - const ::DrawElementProto& element(int index) const; ::DrawElementProto* mutable_element(int index); - ::DrawElementProto* add_element(); - ::google::protobuf::RepeatedPtrField< ::DrawElementProto >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::DrawElementProto >* mutable_element(); - const ::google::protobuf::RepeatedPtrField< ::DrawElementProto >& + private: + const ::DrawElementProto& _internal_element(int index) const; + ::DrawElementProto* _internal_add_element(); + public: + const ::DrawElementProto& element(int index) const; + ::DrawElementProto* add_element(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::DrawElementProto >& element() const; // string name = 1; void clear_name(); - static const int kNameFieldNumber = 1; - const ::std::string& name() const; - void set_name(const ::std::string& value); - #if LANG_CXX11 - void set_name(::std::string&& value); - #endif - void set_name(const char* value); - void set_name(const char* value, size_t size); - ::std::string* mutable_name(); - ::std::string* release_name(); - void set_allocated_name(::std::string* name); + const std::string& name() const; + template + void set_name(ArgT0&& arg0, ArgT... args); + std::string* mutable_name(); + PROTOBUF_NODISCARD std::string* release_name(); + void set_allocated_name(std::string* name); + private: + const std::string& _internal_name() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); + std::string* _internal_mutable_name(); + public: // @@protoc_insertion_point(class_scope:ClassifElementProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_; - ::google::protobuf::internal::ArenaStringPtr name_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::DrawElementProto > element_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class ColorElementProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:ColorElementProto) */ { +class ColorElementProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:ColorElementProto) */ { public: - ColorElementProto(); - virtual ~ColorElementProto(); + inline ColorElementProto() : ColorElementProto(nullptr) {} + ~ColorElementProto() override; + explicit PROTOBUF_CONSTEXPR ColorElementProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); ColorElementProto(const ColorElementProto& from); + ColorElementProto(ColorElementProto&& from) noexcept + : ColorElementProto() { + *this = ::std::move(from); + } inline ColorElementProto& operator=(const ColorElementProto& from) { CopyFrom(from); return *this; } + inline ColorElementProto& operator=(ColorElementProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const ColorElementProto& default_instance(); - + static const ColorElementProto& default_instance() { + return *internal_default_instance(); + } static inline const ColorElementProto* internal_default_instance() { return reinterpret_cast( &_ColorElementProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 13; - void Swap(ColorElementProto* other); + friend void swap(ColorElementProto& a, ColorElementProto& b) { + a.Swap(&b); + } + inline void Swap(ColorElementProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(ColorElementProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline ColorElementProto* New() const PROTOBUF_FINAL { return New(NULL); } - - ColorElementProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + ColorElementProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const ColorElementProto& from); void MergeFrom(const ColorElementProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(ColorElementProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "ColorElementProto"; } + protected: + explicit ColorElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kNameFieldNumber = 1, + kColorFieldNumber = 2, + kXFieldNumber = 3, + kYFieldNumber = 4, + }; // string name = 1; void clear_name(); - static const int kNameFieldNumber = 1; - const ::std::string& name() const; - void set_name(const ::std::string& value); - #if LANG_CXX11 - void set_name(::std::string&& value); - #endif - void set_name(const char* value); - void set_name(const char* value, size_t size); - ::std::string* mutable_name(); - ::std::string* release_name(); - void set_allocated_name(::std::string* name); + const std::string& name() const; + template + void set_name(ArgT0&& arg0, ArgT... args); + std::string* mutable_name(); + PROTOBUF_NODISCARD std::string* release_name(); + void set_allocated_name(std::string* name); + private: + const std::string& _internal_name() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); + std::string* _internal_mutable_name(); + public: // uint32 color = 2; void clear_color(); - static const int kColorFieldNumber = 2; - ::google::protobuf::uint32 color() const; - void set_color(::google::protobuf::uint32 value); + uint32_t color() const; + void set_color(uint32_t value); + private: + uint32_t _internal_color() const; + void _internal_set_color(uint32_t value); + public: // float x = 3; void clear_x(); - static const int kXFieldNumber = 3; float x() const; void set_x(float value); + private: + float _internal_x() const; + void _internal_set_x(float value); + public: // float y = 4; void clear_y(); - static const int kYFieldNumber = 4; float y() const; void set_y(float value); + private: + float _internal_y() const; + void _internal_set_y(float value); + public: // @@protoc_insertion_point(class_scope:ColorElementProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::uint32 color_; - float x_; - float y_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; + uint32_t color_; + float x_; + float y_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class ColorsElementProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:ColorsElementProto) */ { +class ColorsElementProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:ColorsElementProto) */ { public: - ColorsElementProto(); - virtual ~ColorsElementProto(); + inline ColorsElementProto() : ColorsElementProto(nullptr) {} + ~ColorsElementProto() override; + explicit PROTOBUF_CONSTEXPR ColorsElementProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); ColorsElementProto(const ColorsElementProto& from); + ColorsElementProto(ColorsElementProto&& from) noexcept + : ColorsElementProto() { + *this = ::std::move(from); + } inline ColorsElementProto& operator=(const ColorsElementProto& from) { CopyFrom(from); return *this; } + inline ColorsElementProto& operator=(ColorsElementProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const ColorsElementProto& default_instance(); - + static const ColorsElementProto& default_instance() { + return *internal_default_instance(); + } static inline const ColorsElementProto* internal_default_instance() { return reinterpret_cast( &_ColorsElementProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 14; - void Swap(ColorsElementProto* other); + friend void swap(ColorsElementProto& a, ColorsElementProto& b) { + a.Swap(&b); + } + inline void Swap(ColorsElementProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(ColorsElementProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline ColorsElementProto* New() const PROTOBUF_FINAL { return New(NULL); } - - ColorsElementProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + ColorsElementProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const ColorsElementProto& from); void MergeFrom(const ColorsElementProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(ColorsElementProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "ColorsElementProto"; } + protected: + explicit ColorsElementProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kValueFieldNumber = 1, + }; // repeated .ColorElementProto value = 1; int value_size() const; + private: + int _internal_value_size() const; + public: void clear_value(); - static const int kValueFieldNumber = 1; - const ::ColorElementProto& value(int index) const; ::ColorElementProto* mutable_value(int index); - ::ColorElementProto* add_value(); - ::google::protobuf::RepeatedPtrField< ::ColorElementProto >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ColorElementProto >* mutable_value(); - const ::google::protobuf::RepeatedPtrField< ::ColorElementProto >& + private: + const ::ColorElementProto& _internal_value(int index) const; + ::ColorElementProto* _internal_add_value(); + public: + const ::ColorElementProto& value(int index) const; + ::ColorElementProto* add_value(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ColorElementProto >& value() const; // @@protoc_insertion_point(class_scope:ColorsElementProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::RepeatedPtrField< ::ColorElementProto > value_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ColorElementProto > value_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // ------------------------------------------------------------------- -class ContainerProto : public ::google::protobuf::MessageLite /* @@protoc_insertion_point(class_definition:ContainerProto) */ { +class ContainerProto final : + public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:ContainerProto) */ { public: - ContainerProto(); - virtual ~ContainerProto(); + inline ContainerProto() : ContainerProto(nullptr) {} + ~ContainerProto() override; + explicit PROTOBUF_CONSTEXPR ContainerProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); ContainerProto(const ContainerProto& from); + ContainerProto(ContainerProto&& from) noexcept + : ContainerProto() { + *this = ::std::move(from); + } inline ContainerProto& operator=(const ContainerProto& from) { CopyFrom(from); return *this; } + inline ContainerProto& operator=(ContainerProto&& from) noexcept { + if (this == &from) return *this; + if (GetOwningArena() == from.GetOwningArena() + #ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetOwningArena() != nullptr + #endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } - static const ContainerProto& default_instance(); - + static const ContainerProto& default_instance() { + return *internal_default_instance(); + } static inline const ContainerProto* internal_default_instance() { return reinterpret_cast( &_ContainerProto_default_instance_); } - static PROTOBUF_CONSTEXPR int const kIndexInFileMessages = + static constexpr int kIndexInFileMessages = 15; - void Swap(ContainerProto* other); + friend void swap(ContainerProto& a, ContainerProto& b) { + a.Swap(&b); + } + inline void Swap(ContainerProto* other) { + if (other == this) return; + #ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() != nullptr && + GetOwningArena() == other->GetOwningArena()) { + #else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetOwningArena() == other->GetOwningArena()) { + #endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(ContainerProto* other) { + if (other == this) return; + GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); + InternalSwap(other); + } // implements Message ---------------------------------------------- - inline ContainerProto* New() const PROTOBUF_FINAL { return New(NULL); } - - ContainerProto* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from) - PROTOBUF_FINAL; + ContainerProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + return CreateMaybeMessage(arena); + } + void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; void CopyFrom(const ContainerProto& from); void MergeFrom(const ContainerProto& from); - void Clear() PROTOBUF_FINAL; - bool IsInitialized() const PROTOBUF_FINAL; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + uint8_t* _InternalSerialize( + uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - size_t ByteSizeLong() const PROTOBUF_FINAL; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; - void DiscardUnknownFields(); - int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } private: - void SharedCtor(); + void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); void SetCachedSize(int size) const; void InternalSwap(ContainerProto* other); + private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; - } - inline void* MaybeArenaPtr() const { - return NULL; + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "ContainerProto"; } + protected: + explicit ContainerProto(::PROTOBUF_NAMESPACE_ID::Arena* arena, + bool is_message_owned = false); public: - ::std::string GetTypeName() const PROTOBUF_FINAL; + std::string GetTypeName() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kContFieldNumber = 1, + kColorsFieldNumber = 2, + }; // repeated .ClassifElementProto cont = 1; int cont_size() const; + private: + int _internal_cont_size() const; + public: void clear_cont(); - static const int kContFieldNumber = 1; - const ::ClassifElementProto& cont(int index) const; ::ClassifElementProto* mutable_cont(int index); - ::ClassifElementProto* add_cont(); - ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ClassifElementProto >* mutable_cont(); - const ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >& + private: + const ::ClassifElementProto& _internal_cont(int index) const; + ::ClassifElementProto* _internal_add_cont(); + public: + const ::ClassifElementProto& cont(int index) const; + ::ClassifElementProto* add_cont(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ClassifElementProto >& cont() const; // .ColorsElementProto colors = 2; bool has_colors() const; + private: + bool _internal_has_colors() const; + public: void clear_colors(); - static const int kColorsFieldNumber = 2; const ::ColorsElementProto& colors() const; + PROTOBUF_NODISCARD ::ColorsElementProto* release_colors(); ::ColorsElementProto* mutable_colors(); - ::ColorsElementProto* release_colors(); void set_allocated_colors(::ColorsElementProto* colors); + private: + const ::ColorsElementProto& _internal_colors() const; + ::ColorsElementProto* _internal_mutable_colors(); + public: + void unsafe_arena_set_allocated_colors( + ::ColorsElementProto* colors); + ::ColorsElementProto* unsafe_arena_release_colors(); // @@protoc_insertion_point(class_scope:ContainerProto) private: + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_; - ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_; - ::ColorsElementProto* colors_; - mutable int _cached_size_; - friend struct protobuf_indexer_2fdrules_5fstruct_2eproto::TableStruct; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + struct Impl_ { + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ClassifElementProto > cont_; + ::ColorsElementProto* colors_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_drules_5fstruct_2eproto; }; // =================================================================== // =================================================================== -#if !PROTOBUF_INLINE_NOT_IN_HEADERS +#ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif // __GNUC__ // DashDotProto // repeated double dd = 1; +inline int DashDotProto::_internal_dd_size() const { + return _impl_.dd_.size(); +} inline int DashDotProto::dd_size() const { - return dd_.size(); + return _internal_dd_size(); } inline void DashDotProto::clear_dd() { - dd_.Clear(); + _impl_.dd_.Clear(); +} +inline double DashDotProto::_internal_dd(int index) const { + return _impl_.dd_.Get(index); } inline double DashDotProto::dd(int index) const { // @@protoc_insertion_point(field_get:DashDotProto.dd) - return dd_.Get(index); + return _internal_dd(index); } inline void DashDotProto::set_dd(int index, double value) { - dd_.Set(index, value); + _impl_.dd_.Set(index, value); // @@protoc_insertion_point(field_set:DashDotProto.dd) } +inline void DashDotProto::_internal_add_dd(double value) { + _impl_.dd_.Add(value); +} inline void DashDotProto::add_dd(double value) { - dd_.Add(value); + _internal_add_dd(value); // @@protoc_insertion_point(field_add:DashDotProto.dd) } -inline const ::google::protobuf::RepeatedField< double >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >& +DashDotProto::_internal_dd() const { + return _impl_.dd_; +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >& DashDotProto::dd() const { // @@protoc_insertion_point(field_list:DashDotProto.dd) - return dd_; + return _internal_dd(); } -inline ::google::protobuf::RepeatedField< double >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >* +DashDotProto::_internal_mutable_dd() { + return &_impl_.dd_; +} +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< double >* DashDotProto::mutable_dd() { // @@protoc_insertion_point(field_mutable_list:DashDotProto.dd) - return &dd_; + return _internal_mutable_dd(); } // double offset = 2; inline void DashDotProto::clear_offset() { - offset_ = 0; + _impl_.offset_ = 0; +} +inline double DashDotProto::_internal_offset() const { + return _impl_.offset_; } inline double DashDotProto::offset() const { // @@protoc_insertion_point(field_get:DashDotProto.offset) - return offset_; + return _internal_offset(); +} +inline void DashDotProto::_internal_set_offset(double value) { + + _impl_.offset_ = value; } inline void DashDotProto::set_offset(double value) { - - offset_ = value; + _internal_set_offset(value); // @@protoc_insertion_point(field_set:DashDotProto.offset) } @@ -1918,82 +3120,91 @@ inline void DashDotProto::set_offset(double value) { // string name = 1; inline void PathSymProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.ClearToEmpty(); } -inline const ::std::string& PathSymProto::name() const { +inline const std::string& PathSymProto::name() const { // @@protoc_insertion_point(field_get:PathSymProto.name) - return name_.GetNoArena(); + return _internal_name(); } -inline void PathSymProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); +template +inline PROTOBUF_ALWAYS_INLINE +void PathSymProto::set_name(ArgT0&& arg0, ArgT... args) { + + _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:PathSymProto.name) } -#if LANG_CXX11 -inline void PathSymProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:PathSymProto.name) -} -#endif -inline void PathSymProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:PathSymProto.name) -} -inline void PathSymProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:PathSymProto.name) -} -inline ::std::string* PathSymProto::mutable_name() { - +inline std::string* PathSymProto::mutable_name() { + std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:PathSymProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return _s; } -inline ::std::string* PathSymProto::release_name() { - // @@protoc_insertion_point(field_release:PathSymProto.name) +inline const std::string& PathSymProto::_internal_name() const { + return _impl_.name_.Get(); +} +inline void PathSymProto::_internal_set_name(const std::string& value) { - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.Set(value, GetArenaForAllocation()); } -inline void PathSymProto::set_allocated_name(::std::string* name) { - if (name != NULL) { +inline std::string* PathSymProto::_internal_mutable_name() { + + return _impl_.name_.Mutable(GetArenaForAllocation()); +} +inline std::string* PathSymProto::release_name() { + // @@protoc_insertion_point(field_release:PathSymProto.name) + return _impl_.name_.Release(); +} +inline void PathSymProto::set_allocated_name(std::string* name) { + if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + _impl_.name_.SetAllocated(name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:PathSymProto.name) } // double step = 2; inline void PathSymProto::clear_step() { - step_ = 0; + _impl_.step_ = 0; +} +inline double PathSymProto::_internal_step() const { + return _impl_.step_; } inline double PathSymProto::step() const { // @@protoc_insertion_point(field_get:PathSymProto.step) - return step_; + return _internal_step(); +} +inline void PathSymProto::_internal_set_step(double value) { + + _impl_.step_ = value; } inline void PathSymProto::set_step(double value) { - - step_ = value; + _internal_set_step(value); // @@protoc_insertion_point(field_set:PathSymProto.step) } // double offset = 3; inline void PathSymProto::clear_offset() { - offset_ = 0; + _impl_.offset_ = 0; +} +inline double PathSymProto::_internal_offset() const { + return _impl_.offset_; } inline double PathSymProto::offset() const { // @@protoc_insertion_point(field_get:PathSymProto.offset) - return offset_; + return _internal_offset(); +} +inline void PathSymProto::_internal_set_offset(double value) { + + _impl_.offset_ = value; } inline void PathSymProto::set_offset(double value) { - - offset_ = value; + _internal_set_offset(value); // @@protoc_insertion_point(field_set:PathSymProto.offset) } @@ -2003,149 +3214,281 @@ inline void PathSymProto::set_offset(double value) { // double width = 1; inline void LineRuleProto::clear_width() { - width_ = 0; + _impl_.width_ = 0; +} +inline double LineRuleProto::_internal_width() const { + return _impl_.width_; } inline double LineRuleProto::width() const { // @@protoc_insertion_point(field_get:LineRuleProto.width) - return width_; + return _internal_width(); +} +inline void LineRuleProto::_internal_set_width(double value) { + + _impl_.width_ = value; } inline void LineRuleProto::set_width(double value) { - - width_ = value; + _internal_set_width(value); // @@protoc_insertion_point(field_set:LineRuleProto.width) } // uint32 color = 2; inline void LineRuleProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 LineRuleProto::color() const { +inline uint32_t LineRuleProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t LineRuleProto::color() const { // @@protoc_insertion_point(field_get:LineRuleProto.color) - return color_; + return _internal_color(); } -inline void LineRuleProto::set_color(::google::protobuf::uint32 value) { +inline void LineRuleProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void LineRuleProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:LineRuleProto.color) } // .DashDotProto dashdot = 3; +inline bool LineRuleProto::_internal_has_dashdot() const { + return this != internal_default_instance() && _impl_.dashdot_ != nullptr; +} inline bool LineRuleProto::has_dashdot() const { - return this != internal_default_instance() && dashdot_ != NULL; + return _internal_has_dashdot(); } inline void LineRuleProto::clear_dashdot() { - if (GetArenaNoVirtual() == NULL && dashdot_ != NULL) delete dashdot_; - dashdot_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.dashdot_ != nullptr) { + delete _impl_.dashdot_; + } + _impl_.dashdot_ = nullptr; +} +inline const ::DashDotProto& LineRuleProto::_internal_dashdot() const { + const ::DashDotProto* p = _impl_.dashdot_; + return p != nullptr ? *p : reinterpret_cast( + ::_DashDotProto_default_instance_); } inline const ::DashDotProto& LineRuleProto::dashdot() const { // @@protoc_insertion_point(field_get:LineRuleProto.dashdot) - return dashdot_ != NULL ? *dashdot_ - : *::DashDotProto::internal_default_instance(); + return _internal_dashdot(); } -inline ::DashDotProto* LineRuleProto::mutable_dashdot() { - - if (dashdot_ == NULL) { - dashdot_ = new ::DashDotProto; +inline void LineRuleProto::unsafe_arena_set_allocated_dashdot( + ::DashDotProto* dashdot) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.dashdot_); } - // @@protoc_insertion_point(field_mutable:LineRuleProto.dashdot) - return dashdot_; -} -inline ::DashDotProto* LineRuleProto::release_dashdot() { - // @@protoc_insertion_point(field_release:LineRuleProto.dashdot) - - ::DashDotProto* temp = dashdot_; - dashdot_ = NULL; - return temp; -} -inline void LineRuleProto::set_allocated_dashdot(::DashDotProto* dashdot) { - delete dashdot_; - dashdot_ = dashdot; + _impl_.dashdot_ = dashdot; if (dashdot) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:LineRuleProto.dashdot) +} +inline ::DashDotProto* LineRuleProto::release_dashdot() { + + ::DashDotProto* temp = _impl_.dashdot_; + _impl_.dashdot_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::DashDotProto* LineRuleProto::unsafe_arena_release_dashdot() { + // @@protoc_insertion_point(field_release:LineRuleProto.dashdot) + + ::DashDotProto* temp = _impl_.dashdot_; + _impl_.dashdot_ = nullptr; + return temp; +} +inline ::DashDotProto* LineRuleProto::_internal_mutable_dashdot() { + + if (_impl_.dashdot_ == nullptr) { + auto* p = CreateMaybeMessage<::DashDotProto>(GetArenaForAllocation()); + _impl_.dashdot_ = p; + } + return _impl_.dashdot_; +} +inline ::DashDotProto* LineRuleProto::mutable_dashdot() { + ::DashDotProto* _msg = _internal_mutable_dashdot(); + // @@protoc_insertion_point(field_mutable:LineRuleProto.dashdot) + return _msg; +} +inline void LineRuleProto::set_allocated_dashdot(::DashDotProto* dashdot) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.dashdot_; + } + if (dashdot) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(dashdot); + if (message_arena != submessage_arena) { + dashdot = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, dashdot, submessage_arena); + } + + } else { + + } + _impl_.dashdot_ = dashdot; // @@protoc_insertion_point(field_set_allocated:LineRuleProto.dashdot) } // int32 priority = 4; inline void LineRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 LineRuleProto::priority() const { +inline int32_t LineRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t LineRuleProto::priority() const { // @@protoc_insertion_point(field_get:LineRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void LineRuleProto::set_priority(::google::protobuf::int32 value) { +inline void LineRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void LineRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:LineRuleProto.priority) } // .PathSymProto pathsym = 5; +inline bool LineRuleProto::_internal_has_pathsym() const { + return this != internal_default_instance() && _impl_.pathsym_ != nullptr; +} inline bool LineRuleProto::has_pathsym() const { - return this != internal_default_instance() && pathsym_ != NULL; + return _internal_has_pathsym(); } inline void LineRuleProto::clear_pathsym() { - if (GetArenaNoVirtual() == NULL && pathsym_ != NULL) delete pathsym_; - pathsym_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.pathsym_ != nullptr) { + delete _impl_.pathsym_; + } + _impl_.pathsym_ = nullptr; +} +inline const ::PathSymProto& LineRuleProto::_internal_pathsym() const { + const ::PathSymProto* p = _impl_.pathsym_; + return p != nullptr ? *p : reinterpret_cast( + ::_PathSymProto_default_instance_); } inline const ::PathSymProto& LineRuleProto::pathsym() const { // @@protoc_insertion_point(field_get:LineRuleProto.pathsym) - return pathsym_ != NULL ? *pathsym_ - : *::PathSymProto::internal_default_instance(); + return _internal_pathsym(); } -inline ::PathSymProto* LineRuleProto::mutable_pathsym() { - - if (pathsym_ == NULL) { - pathsym_ = new ::PathSymProto; +inline void LineRuleProto::unsafe_arena_set_allocated_pathsym( + ::PathSymProto* pathsym) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.pathsym_); } - // @@protoc_insertion_point(field_mutable:LineRuleProto.pathsym) - return pathsym_; -} -inline ::PathSymProto* LineRuleProto::release_pathsym() { - // @@protoc_insertion_point(field_release:LineRuleProto.pathsym) - - ::PathSymProto* temp = pathsym_; - pathsym_ = NULL; - return temp; -} -inline void LineRuleProto::set_allocated_pathsym(::PathSymProto* pathsym) { - delete pathsym_; - pathsym_ = pathsym; + _impl_.pathsym_ = pathsym; if (pathsym) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:LineRuleProto.pathsym) +} +inline ::PathSymProto* LineRuleProto::release_pathsym() { + + ::PathSymProto* temp = _impl_.pathsym_; + _impl_.pathsym_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::PathSymProto* LineRuleProto::unsafe_arena_release_pathsym() { + // @@protoc_insertion_point(field_release:LineRuleProto.pathsym) + + ::PathSymProto* temp = _impl_.pathsym_; + _impl_.pathsym_ = nullptr; + return temp; +} +inline ::PathSymProto* LineRuleProto::_internal_mutable_pathsym() { + + if (_impl_.pathsym_ == nullptr) { + auto* p = CreateMaybeMessage<::PathSymProto>(GetArenaForAllocation()); + _impl_.pathsym_ = p; + } + return _impl_.pathsym_; +} +inline ::PathSymProto* LineRuleProto::mutable_pathsym() { + ::PathSymProto* _msg = _internal_mutable_pathsym(); + // @@protoc_insertion_point(field_mutable:LineRuleProto.pathsym) + return _msg; +} +inline void LineRuleProto::set_allocated_pathsym(::PathSymProto* pathsym) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.pathsym_; + } + if (pathsym) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(pathsym); + if (message_arena != submessage_arena) { + pathsym = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, pathsym, submessage_arena); + } + + } else { + + } + _impl_.pathsym_ = pathsym; // @@protoc_insertion_point(field_set_allocated:LineRuleProto.pathsym) } // .LineJoin join = 6; inline void LineRuleProto::clear_join() { - join_ = 0; + _impl_.join_ = 0; +} +inline ::LineJoin LineRuleProto::_internal_join() const { + return static_cast< ::LineJoin >(_impl_.join_); } inline ::LineJoin LineRuleProto::join() const { // @@protoc_insertion_point(field_get:LineRuleProto.join) - return static_cast< ::LineJoin >(join_); + return _internal_join(); +} +inline void LineRuleProto::_internal_set_join(::LineJoin value) { + + _impl_.join_ = value; } inline void LineRuleProto::set_join(::LineJoin value) { - - join_ = value; + _internal_set_join(value); // @@protoc_insertion_point(field_set:LineRuleProto.join) } // .LineCap cap = 7; inline void LineRuleProto::clear_cap() { - cap_ = 0; + _impl_.cap_ = 0; +} +inline ::LineCap LineRuleProto::_internal_cap() const { + return static_cast< ::LineCap >(_impl_.cap_); } inline ::LineCap LineRuleProto::cap() const { // @@protoc_insertion_point(field_get:LineRuleProto.cap) - return static_cast< ::LineCap >(cap_); + return _internal_cap(); +} +inline void LineRuleProto::_internal_set_cap(::LineCap value) { + + _impl_.cap_ = value; } inline void LineRuleProto::set_cap(::LineCap value) { - - cap_ = value; + _internal_set_cap(value); // @@protoc_insertion_point(field_set:LineRuleProto.cap) } @@ -2155,135 +3498,261 @@ inline void LineRuleProto::set_cap(::LineCap value) { // double width = 1; inline void LineDefProto::clear_width() { - width_ = 0; + _impl_.width_ = 0; +} +inline double LineDefProto::_internal_width() const { + return _impl_.width_; } inline double LineDefProto::width() const { // @@protoc_insertion_point(field_get:LineDefProto.width) - return width_; + return _internal_width(); +} +inline void LineDefProto::_internal_set_width(double value) { + + _impl_.width_ = value; } inline void LineDefProto::set_width(double value) { - - width_ = value; + _internal_set_width(value); // @@protoc_insertion_point(field_set:LineDefProto.width) } // uint32 color = 2; inline void LineDefProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 LineDefProto::color() const { +inline uint32_t LineDefProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t LineDefProto::color() const { // @@protoc_insertion_point(field_get:LineDefProto.color) - return color_; + return _internal_color(); } -inline void LineDefProto::set_color(::google::protobuf::uint32 value) { +inline void LineDefProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void LineDefProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:LineDefProto.color) } // .DashDotProto dashdot = 3; +inline bool LineDefProto::_internal_has_dashdot() const { + return this != internal_default_instance() && _impl_.dashdot_ != nullptr; +} inline bool LineDefProto::has_dashdot() const { - return this != internal_default_instance() && dashdot_ != NULL; + return _internal_has_dashdot(); } inline void LineDefProto::clear_dashdot() { - if (GetArenaNoVirtual() == NULL && dashdot_ != NULL) delete dashdot_; - dashdot_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.dashdot_ != nullptr) { + delete _impl_.dashdot_; + } + _impl_.dashdot_ = nullptr; +} +inline const ::DashDotProto& LineDefProto::_internal_dashdot() const { + const ::DashDotProto* p = _impl_.dashdot_; + return p != nullptr ? *p : reinterpret_cast( + ::_DashDotProto_default_instance_); } inline const ::DashDotProto& LineDefProto::dashdot() const { // @@protoc_insertion_point(field_get:LineDefProto.dashdot) - return dashdot_ != NULL ? *dashdot_ - : *::DashDotProto::internal_default_instance(); + return _internal_dashdot(); } -inline ::DashDotProto* LineDefProto::mutable_dashdot() { - - if (dashdot_ == NULL) { - dashdot_ = new ::DashDotProto; +inline void LineDefProto::unsafe_arena_set_allocated_dashdot( + ::DashDotProto* dashdot) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.dashdot_); } - // @@protoc_insertion_point(field_mutable:LineDefProto.dashdot) - return dashdot_; -} -inline ::DashDotProto* LineDefProto::release_dashdot() { - // @@protoc_insertion_point(field_release:LineDefProto.dashdot) - - ::DashDotProto* temp = dashdot_; - dashdot_ = NULL; - return temp; -} -inline void LineDefProto::set_allocated_dashdot(::DashDotProto* dashdot) { - delete dashdot_; - dashdot_ = dashdot; + _impl_.dashdot_ = dashdot; if (dashdot) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:LineDefProto.dashdot) +} +inline ::DashDotProto* LineDefProto::release_dashdot() { + + ::DashDotProto* temp = _impl_.dashdot_; + _impl_.dashdot_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::DashDotProto* LineDefProto::unsafe_arena_release_dashdot() { + // @@protoc_insertion_point(field_release:LineDefProto.dashdot) + + ::DashDotProto* temp = _impl_.dashdot_; + _impl_.dashdot_ = nullptr; + return temp; +} +inline ::DashDotProto* LineDefProto::_internal_mutable_dashdot() { + + if (_impl_.dashdot_ == nullptr) { + auto* p = CreateMaybeMessage<::DashDotProto>(GetArenaForAllocation()); + _impl_.dashdot_ = p; + } + return _impl_.dashdot_; +} +inline ::DashDotProto* LineDefProto::mutable_dashdot() { + ::DashDotProto* _msg = _internal_mutable_dashdot(); + // @@protoc_insertion_point(field_mutable:LineDefProto.dashdot) + return _msg; +} +inline void LineDefProto::set_allocated_dashdot(::DashDotProto* dashdot) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.dashdot_; + } + if (dashdot) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(dashdot); + if (message_arena != submessage_arena) { + dashdot = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, dashdot, submessage_arena); + } + + } else { + + } + _impl_.dashdot_ = dashdot; // @@protoc_insertion_point(field_set_allocated:LineDefProto.dashdot) } // .PathSymProto pathsym = 4; +inline bool LineDefProto::_internal_has_pathsym() const { + return this != internal_default_instance() && _impl_.pathsym_ != nullptr; +} inline bool LineDefProto::has_pathsym() const { - return this != internal_default_instance() && pathsym_ != NULL; + return _internal_has_pathsym(); } inline void LineDefProto::clear_pathsym() { - if (GetArenaNoVirtual() == NULL && pathsym_ != NULL) delete pathsym_; - pathsym_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.pathsym_ != nullptr) { + delete _impl_.pathsym_; + } + _impl_.pathsym_ = nullptr; +} +inline const ::PathSymProto& LineDefProto::_internal_pathsym() const { + const ::PathSymProto* p = _impl_.pathsym_; + return p != nullptr ? *p : reinterpret_cast( + ::_PathSymProto_default_instance_); } inline const ::PathSymProto& LineDefProto::pathsym() const { // @@protoc_insertion_point(field_get:LineDefProto.pathsym) - return pathsym_ != NULL ? *pathsym_ - : *::PathSymProto::internal_default_instance(); + return _internal_pathsym(); } -inline ::PathSymProto* LineDefProto::mutable_pathsym() { - - if (pathsym_ == NULL) { - pathsym_ = new ::PathSymProto; +inline void LineDefProto::unsafe_arena_set_allocated_pathsym( + ::PathSymProto* pathsym) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.pathsym_); } - // @@protoc_insertion_point(field_mutable:LineDefProto.pathsym) - return pathsym_; -} -inline ::PathSymProto* LineDefProto::release_pathsym() { - // @@protoc_insertion_point(field_release:LineDefProto.pathsym) - - ::PathSymProto* temp = pathsym_; - pathsym_ = NULL; - return temp; -} -inline void LineDefProto::set_allocated_pathsym(::PathSymProto* pathsym) { - delete pathsym_; - pathsym_ = pathsym; + _impl_.pathsym_ = pathsym; if (pathsym) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:LineDefProto.pathsym) +} +inline ::PathSymProto* LineDefProto::release_pathsym() { + + ::PathSymProto* temp = _impl_.pathsym_; + _impl_.pathsym_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::PathSymProto* LineDefProto::unsafe_arena_release_pathsym() { + // @@protoc_insertion_point(field_release:LineDefProto.pathsym) + + ::PathSymProto* temp = _impl_.pathsym_; + _impl_.pathsym_ = nullptr; + return temp; +} +inline ::PathSymProto* LineDefProto::_internal_mutable_pathsym() { + + if (_impl_.pathsym_ == nullptr) { + auto* p = CreateMaybeMessage<::PathSymProto>(GetArenaForAllocation()); + _impl_.pathsym_ = p; + } + return _impl_.pathsym_; +} +inline ::PathSymProto* LineDefProto::mutable_pathsym() { + ::PathSymProto* _msg = _internal_mutable_pathsym(); + // @@protoc_insertion_point(field_mutable:LineDefProto.pathsym) + return _msg; +} +inline void LineDefProto::set_allocated_pathsym(::PathSymProto* pathsym) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.pathsym_; + } + if (pathsym) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(pathsym); + if (message_arena != submessage_arena) { + pathsym = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, pathsym, submessage_arena); + } + + } else { + + } + _impl_.pathsym_ = pathsym; // @@protoc_insertion_point(field_set_allocated:LineDefProto.pathsym) } // .LineJoin join = 6; inline void LineDefProto::clear_join() { - join_ = 0; + _impl_.join_ = 0; +} +inline ::LineJoin LineDefProto::_internal_join() const { + return static_cast< ::LineJoin >(_impl_.join_); } inline ::LineJoin LineDefProto::join() const { // @@protoc_insertion_point(field_get:LineDefProto.join) - return static_cast< ::LineJoin >(join_); + return _internal_join(); +} +inline void LineDefProto::_internal_set_join(::LineJoin value) { + + _impl_.join_ = value; } inline void LineDefProto::set_join(::LineJoin value) { - - join_ = value; + _internal_set_join(value); // @@protoc_insertion_point(field_set:LineDefProto.join) } // .LineCap cap = 7; inline void LineDefProto::clear_cap() { - cap_ = 0; + _impl_.cap_ = 0; +} +inline ::LineCap LineDefProto::_internal_cap() const { + return static_cast< ::LineCap >(_impl_.cap_); } inline ::LineCap LineDefProto::cap() const { // @@protoc_insertion_point(field_get:LineDefProto.cap) - return static_cast< ::LineCap >(cap_); + return _internal_cap(); +} +inline void LineDefProto::_internal_set_cap(::LineCap value) { + + _impl_.cap_ = value; } inline void LineDefProto::set_cap(::LineCap value) { - - cap_ = value; + _internal_set_cap(value); // @@protoc_insertion_point(field_set:LineDefProto.cap) } @@ -2293,68 +3762,131 @@ inline void LineDefProto::set_cap(::LineCap value) { // uint32 color = 1; inline void AreaRuleProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 AreaRuleProto::color() const { +inline uint32_t AreaRuleProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t AreaRuleProto::color() const { // @@protoc_insertion_point(field_get:AreaRuleProto.color) - return color_; + return _internal_color(); } -inline void AreaRuleProto::set_color(::google::protobuf::uint32 value) { +inline void AreaRuleProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void AreaRuleProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:AreaRuleProto.color) } // .LineDefProto border = 2; +inline bool AreaRuleProto::_internal_has_border() const { + return this != internal_default_instance() && _impl_.border_ != nullptr; +} inline bool AreaRuleProto::has_border() const { - return this != internal_default_instance() && border_ != NULL; + return _internal_has_border(); } inline void AreaRuleProto::clear_border() { - if (GetArenaNoVirtual() == NULL && border_ != NULL) delete border_; - border_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.border_ != nullptr) { + delete _impl_.border_; + } + _impl_.border_ = nullptr; +} +inline const ::LineDefProto& AreaRuleProto::_internal_border() const { + const ::LineDefProto* p = _impl_.border_; + return p != nullptr ? *p : reinterpret_cast( + ::_LineDefProto_default_instance_); } inline const ::LineDefProto& AreaRuleProto::border() const { // @@protoc_insertion_point(field_get:AreaRuleProto.border) - return border_ != NULL ? *border_ - : *::LineDefProto::internal_default_instance(); + return _internal_border(); } -inline ::LineDefProto* AreaRuleProto::mutable_border() { - - if (border_ == NULL) { - border_ = new ::LineDefProto; +inline void AreaRuleProto::unsafe_arena_set_allocated_border( + ::LineDefProto* border) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.border_); } - // @@protoc_insertion_point(field_mutable:AreaRuleProto.border) - return border_; -} -inline ::LineDefProto* AreaRuleProto::release_border() { - // @@protoc_insertion_point(field_release:AreaRuleProto.border) - - ::LineDefProto* temp = border_; - border_ = NULL; - return temp; -} -inline void AreaRuleProto::set_allocated_border(::LineDefProto* border) { - delete border_; - border_ = border; + _impl_.border_ = border; if (border) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:AreaRuleProto.border) +} +inline ::LineDefProto* AreaRuleProto::release_border() { + + ::LineDefProto* temp = _impl_.border_; + _impl_.border_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::LineDefProto* AreaRuleProto::unsafe_arena_release_border() { + // @@protoc_insertion_point(field_release:AreaRuleProto.border) + + ::LineDefProto* temp = _impl_.border_; + _impl_.border_ = nullptr; + return temp; +} +inline ::LineDefProto* AreaRuleProto::_internal_mutable_border() { + + if (_impl_.border_ == nullptr) { + auto* p = CreateMaybeMessage<::LineDefProto>(GetArenaForAllocation()); + _impl_.border_ = p; + } + return _impl_.border_; +} +inline ::LineDefProto* AreaRuleProto::mutable_border() { + ::LineDefProto* _msg = _internal_mutable_border(); + // @@protoc_insertion_point(field_mutable:AreaRuleProto.border) + return _msg; +} +inline void AreaRuleProto::set_allocated_border(::LineDefProto* border) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.border_; + } + if (border) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(border); + if (message_arena != submessage_arena) { + border = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, border, submessage_arena); + } + + } else { + + } + _impl_.border_ = border; // @@protoc_insertion_point(field_set_allocated:AreaRuleProto.border) } // int32 priority = 3; inline void AreaRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 AreaRuleProto::priority() const { +inline int32_t AreaRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t AreaRuleProto::priority() const { // @@protoc_insertion_point(field_get:AreaRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void AreaRuleProto::set_priority(::google::protobuf::int32 value) { +inline void AreaRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void AreaRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:AreaRuleProto.priority) } @@ -2364,96 +3896,111 @@ inline void AreaRuleProto::set_priority(::google::protobuf::int32 value) { // string name = 1; inline void SymbolRuleProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.ClearToEmpty(); } -inline const ::std::string& SymbolRuleProto::name() const { +inline const std::string& SymbolRuleProto::name() const { // @@protoc_insertion_point(field_get:SymbolRuleProto.name) - return name_.GetNoArena(); + return _internal_name(); } -inline void SymbolRuleProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); +template +inline PROTOBUF_ALWAYS_INLINE +void SymbolRuleProto::set_name(ArgT0&& arg0, ArgT... args) { + + _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:SymbolRuleProto.name) } -#if LANG_CXX11 -inline void SymbolRuleProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:SymbolRuleProto.name) -} -#endif -inline void SymbolRuleProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:SymbolRuleProto.name) -} -inline void SymbolRuleProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:SymbolRuleProto.name) -} -inline ::std::string* SymbolRuleProto::mutable_name() { - +inline std::string* SymbolRuleProto::mutable_name() { + std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:SymbolRuleProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return _s; } -inline ::std::string* SymbolRuleProto::release_name() { - // @@protoc_insertion_point(field_release:SymbolRuleProto.name) +inline const std::string& SymbolRuleProto::_internal_name() const { + return _impl_.name_.Get(); +} +inline void SymbolRuleProto::_internal_set_name(const std::string& value) { - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.Set(value, GetArenaForAllocation()); } -inline void SymbolRuleProto::set_allocated_name(::std::string* name) { - if (name != NULL) { +inline std::string* SymbolRuleProto::_internal_mutable_name() { + + return _impl_.name_.Mutable(GetArenaForAllocation()); +} +inline std::string* SymbolRuleProto::release_name() { + // @@protoc_insertion_point(field_release:SymbolRuleProto.name) + return _impl_.name_.Release(); +} +inline void SymbolRuleProto::set_allocated_name(std::string* name) { + if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + _impl_.name_.SetAllocated(name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:SymbolRuleProto.name) } // int32 apply_for_type = 2; inline void SymbolRuleProto::clear_apply_for_type() { - apply_for_type_ = 0; + _impl_.apply_for_type_ = 0; } -inline ::google::protobuf::int32 SymbolRuleProto::apply_for_type() const { +inline int32_t SymbolRuleProto::_internal_apply_for_type() const { + return _impl_.apply_for_type_; +} +inline int32_t SymbolRuleProto::apply_for_type() const { // @@protoc_insertion_point(field_get:SymbolRuleProto.apply_for_type) - return apply_for_type_; + return _internal_apply_for_type(); } -inline void SymbolRuleProto::set_apply_for_type(::google::protobuf::int32 value) { +inline void SymbolRuleProto::_internal_set_apply_for_type(int32_t value) { - apply_for_type_ = value; + _impl_.apply_for_type_ = value; +} +inline void SymbolRuleProto::set_apply_for_type(int32_t value) { + _internal_set_apply_for_type(value); // @@protoc_insertion_point(field_set:SymbolRuleProto.apply_for_type) } // int32 priority = 3; inline void SymbolRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 SymbolRuleProto::priority() const { +inline int32_t SymbolRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t SymbolRuleProto::priority() const { // @@protoc_insertion_point(field_get:SymbolRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void SymbolRuleProto::set_priority(::google::protobuf::int32 value) { +inline void SymbolRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void SymbolRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:SymbolRuleProto.priority) } // int32 min_distance = 4; inline void SymbolRuleProto::clear_min_distance() { - min_distance_ = 0; + _impl_.min_distance_ = 0; } -inline ::google::protobuf::int32 SymbolRuleProto::min_distance() const { +inline int32_t SymbolRuleProto::_internal_min_distance() const { + return _impl_.min_distance_; +} +inline int32_t SymbolRuleProto::min_distance() const { // @@protoc_insertion_point(field_get:SymbolRuleProto.min_distance) - return min_distance_; + return _internal_min_distance(); } -inline void SymbolRuleProto::set_min_distance(::google::protobuf::int32 value) { +inline void SymbolRuleProto::_internal_set_min_distance(int32_t value) { - min_distance_ = value; + _impl_.min_distance_ = value; +} +inline void SymbolRuleProto::set_min_distance(int32_t value) { + _internal_set_min_distance(value); // @@protoc_insertion_point(field_set:SymbolRuleProto.min_distance) } @@ -2463,138 +4010,171 @@ inline void SymbolRuleProto::set_min_distance(::google::protobuf::int32 value) { // int32 height = 1; inline void CaptionDefProto::clear_height() { - height_ = 0; + _impl_.height_ = 0; } -inline ::google::protobuf::int32 CaptionDefProto::height() const { +inline int32_t CaptionDefProto::_internal_height() const { + return _impl_.height_; +} +inline int32_t CaptionDefProto::height() const { // @@protoc_insertion_point(field_get:CaptionDefProto.height) - return height_; + return _internal_height(); } -inline void CaptionDefProto::set_height(::google::protobuf::int32 value) { +inline void CaptionDefProto::_internal_set_height(int32_t value) { - height_ = value; + _impl_.height_ = value; +} +inline void CaptionDefProto::set_height(int32_t value) { + _internal_set_height(value); // @@protoc_insertion_point(field_set:CaptionDefProto.height) } // uint32 color = 2; inline void CaptionDefProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 CaptionDefProto::color() const { +inline uint32_t CaptionDefProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t CaptionDefProto::color() const { // @@protoc_insertion_point(field_get:CaptionDefProto.color) - return color_; + return _internal_color(); } -inline void CaptionDefProto::set_color(::google::protobuf::uint32 value) { +inline void CaptionDefProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void CaptionDefProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:CaptionDefProto.color) } // uint32 stroke_color = 3; inline void CaptionDefProto::clear_stroke_color() { - stroke_color_ = 0u; + _impl_.stroke_color_ = 0u; } -inline ::google::protobuf::uint32 CaptionDefProto::stroke_color() const { +inline uint32_t CaptionDefProto::_internal_stroke_color() const { + return _impl_.stroke_color_; +} +inline uint32_t CaptionDefProto::stroke_color() const { // @@protoc_insertion_point(field_get:CaptionDefProto.stroke_color) - return stroke_color_; + return _internal_stroke_color(); } -inline void CaptionDefProto::set_stroke_color(::google::protobuf::uint32 value) { +inline void CaptionDefProto::_internal_set_stroke_color(uint32_t value) { - stroke_color_ = value; + _impl_.stroke_color_ = value; +} +inline void CaptionDefProto::set_stroke_color(uint32_t value) { + _internal_set_stroke_color(value); // @@protoc_insertion_point(field_set:CaptionDefProto.stroke_color) } // int32 offset_x = 4; inline void CaptionDefProto::clear_offset_x() { - offset_x_ = 0; + _impl_.offset_x_ = 0; } -inline ::google::protobuf::int32 CaptionDefProto::offset_x() const { +inline int32_t CaptionDefProto::_internal_offset_x() const { + return _impl_.offset_x_; +} +inline int32_t CaptionDefProto::offset_x() const { // @@protoc_insertion_point(field_get:CaptionDefProto.offset_x) - return offset_x_; + return _internal_offset_x(); } -inline void CaptionDefProto::set_offset_x(::google::protobuf::int32 value) { +inline void CaptionDefProto::_internal_set_offset_x(int32_t value) { - offset_x_ = value; + _impl_.offset_x_ = value; +} +inline void CaptionDefProto::set_offset_x(int32_t value) { + _internal_set_offset_x(value); // @@protoc_insertion_point(field_set:CaptionDefProto.offset_x) } // int32 offset_y = 5; inline void CaptionDefProto::clear_offset_y() { - offset_y_ = 0; + _impl_.offset_y_ = 0; } -inline ::google::protobuf::int32 CaptionDefProto::offset_y() const { +inline int32_t CaptionDefProto::_internal_offset_y() const { + return _impl_.offset_y_; +} +inline int32_t CaptionDefProto::offset_y() const { // @@protoc_insertion_point(field_get:CaptionDefProto.offset_y) - return offset_y_; + return _internal_offset_y(); } -inline void CaptionDefProto::set_offset_y(::google::protobuf::int32 value) { +inline void CaptionDefProto::_internal_set_offset_y(int32_t value) { - offset_y_ = value; + _impl_.offset_y_ = value; +} +inline void CaptionDefProto::set_offset_y(int32_t value) { + _internal_set_offset_y(value); // @@protoc_insertion_point(field_set:CaptionDefProto.offset_y) } // string text = 6; inline void CaptionDefProto::clear_text() { - text_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.text_.ClearToEmpty(); } -inline const ::std::string& CaptionDefProto::text() const { +inline const std::string& CaptionDefProto::text() const { // @@protoc_insertion_point(field_get:CaptionDefProto.text) - return text_.GetNoArena(); + return _internal_text(); } -inline void CaptionDefProto::set_text(const ::std::string& value) { - - text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); +template +inline PROTOBUF_ALWAYS_INLINE +void CaptionDefProto::set_text(ArgT0&& arg0, ArgT... args) { + + _impl_.text_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:CaptionDefProto.text) } -#if LANG_CXX11 -inline void CaptionDefProto::set_text(::std::string&& value) { - - text_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:CaptionDefProto.text) -} -#endif -inline void CaptionDefProto::set_text(const char* value) { - GOOGLE_DCHECK(value != NULL); - - text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:CaptionDefProto.text) -} -inline void CaptionDefProto::set_text(const char* value, size_t size) { - - text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:CaptionDefProto.text) -} -inline ::std::string* CaptionDefProto::mutable_text() { - +inline std::string* CaptionDefProto::mutable_text() { + std::string* _s = _internal_mutable_text(); // @@protoc_insertion_point(field_mutable:CaptionDefProto.text) - return text_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return _s; } -inline ::std::string* CaptionDefProto::release_text() { - // @@protoc_insertion_point(field_release:CaptionDefProto.text) +inline const std::string& CaptionDefProto::_internal_text() const { + return _impl_.text_.Get(); +} +inline void CaptionDefProto::_internal_set_text(const std::string& value) { - return text_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.text_.Set(value, GetArenaForAllocation()); } -inline void CaptionDefProto::set_allocated_text(::std::string* text) { - if (text != NULL) { +inline std::string* CaptionDefProto::_internal_mutable_text() { + + return _impl_.text_.Mutable(GetArenaForAllocation()); +} +inline std::string* CaptionDefProto::release_text() { + // @@protoc_insertion_point(field_release:CaptionDefProto.text) + return _impl_.text_.Release(); +} +inline void CaptionDefProto::set_allocated_text(std::string* text) { + if (text != nullptr) { } else { } - text_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), text); + _impl_.text_.SetAllocated(text, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.text_.IsDefault()) { + _impl_.text_.Set("", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:CaptionDefProto.text) } // bool is_optional = 7; inline void CaptionDefProto::clear_is_optional() { - is_optional_ = false; + _impl_.is_optional_ = false; +} +inline bool CaptionDefProto::_internal_is_optional() const { + return _impl_.is_optional_; } inline bool CaptionDefProto::is_optional() const { // @@protoc_insertion_point(field_get:CaptionDefProto.is_optional) - return is_optional_; + return _internal_is_optional(); +} +inline void CaptionDefProto::_internal_set_is_optional(bool value) { + + _impl_.is_optional_ = value; } inline void CaptionDefProto::set_is_optional(bool value) { - - is_optional_ = value; + _internal_set_is_optional(value); // @@protoc_insertion_point(field_set:CaptionDefProto.is_optional) } @@ -2603,94 +4183,202 @@ inline void CaptionDefProto::set_is_optional(bool value) { // CaptionRuleProto // .CaptionDefProto primary = 1; +inline bool CaptionRuleProto::_internal_has_primary() const { + return this != internal_default_instance() && _impl_.primary_ != nullptr; +} inline bool CaptionRuleProto::has_primary() const { - return this != internal_default_instance() && primary_ != NULL; + return _internal_has_primary(); } inline void CaptionRuleProto::clear_primary() { - if (GetArenaNoVirtual() == NULL && primary_ != NULL) delete primary_; - primary_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.primary_ != nullptr) { + delete _impl_.primary_; + } + _impl_.primary_ = nullptr; +} +inline const ::CaptionDefProto& CaptionRuleProto::_internal_primary() const { + const ::CaptionDefProto* p = _impl_.primary_; + return p != nullptr ? *p : reinterpret_cast( + ::_CaptionDefProto_default_instance_); } inline const ::CaptionDefProto& CaptionRuleProto::primary() const { // @@protoc_insertion_point(field_get:CaptionRuleProto.primary) - return primary_ != NULL ? *primary_ - : *::CaptionDefProto::internal_default_instance(); + return _internal_primary(); } -inline ::CaptionDefProto* CaptionRuleProto::mutable_primary() { - - if (primary_ == NULL) { - primary_ = new ::CaptionDefProto; +inline void CaptionRuleProto::unsafe_arena_set_allocated_primary( + ::CaptionDefProto* primary) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.primary_); } - // @@protoc_insertion_point(field_mutable:CaptionRuleProto.primary) - return primary_; -} -inline ::CaptionDefProto* CaptionRuleProto::release_primary() { - // @@protoc_insertion_point(field_release:CaptionRuleProto.primary) - - ::CaptionDefProto* temp = primary_; - primary_ = NULL; - return temp; -} -inline void CaptionRuleProto::set_allocated_primary(::CaptionDefProto* primary) { - delete primary_; - primary_ = primary; + _impl_.primary_ = primary; if (primary) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CaptionRuleProto.primary) +} +inline ::CaptionDefProto* CaptionRuleProto::release_primary() { + + ::CaptionDefProto* temp = _impl_.primary_; + _impl_.primary_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::CaptionDefProto* CaptionRuleProto::unsafe_arena_release_primary() { + // @@protoc_insertion_point(field_release:CaptionRuleProto.primary) + + ::CaptionDefProto* temp = _impl_.primary_; + _impl_.primary_ = nullptr; + return temp; +} +inline ::CaptionDefProto* CaptionRuleProto::_internal_mutable_primary() { + + if (_impl_.primary_ == nullptr) { + auto* p = CreateMaybeMessage<::CaptionDefProto>(GetArenaForAllocation()); + _impl_.primary_ = p; + } + return _impl_.primary_; +} +inline ::CaptionDefProto* CaptionRuleProto::mutable_primary() { + ::CaptionDefProto* _msg = _internal_mutable_primary(); + // @@protoc_insertion_point(field_mutable:CaptionRuleProto.primary) + return _msg; +} +inline void CaptionRuleProto::set_allocated_primary(::CaptionDefProto* primary) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.primary_; + } + if (primary) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(primary); + if (message_arena != submessage_arena) { + primary = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, primary, submessage_arena); + } + + } else { + + } + _impl_.primary_ = primary; // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.primary) } // .CaptionDefProto secondary = 2; +inline bool CaptionRuleProto::_internal_has_secondary() const { + return this != internal_default_instance() && _impl_.secondary_ != nullptr; +} inline bool CaptionRuleProto::has_secondary() const { - return this != internal_default_instance() && secondary_ != NULL; + return _internal_has_secondary(); } inline void CaptionRuleProto::clear_secondary() { - if (GetArenaNoVirtual() == NULL && secondary_ != NULL) delete secondary_; - secondary_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.secondary_ != nullptr) { + delete _impl_.secondary_; + } + _impl_.secondary_ = nullptr; +} +inline const ::CaptionDefProto& CaptionRuleProto::_internal_secondary() const { + const ::CaptionDefProto* p = _impl_.secondary_; + return p != nullptr ? *p : reinterpret_cast( + ::_CaptionDefProto_default_instance_); } inline const ::CaptionDefProto& CaptionRuleProto::secondary() const { // @@protoc_insertion_point(field_get:CaptionRuleProto.secondary) - return secondary_ != NULL ? *secondary_ - : *::CaptionDefProto::internal_default_instance(); + return _internal_secondary(); } -inline ::CaptionDefProto* CaptionRuleProto::mutable_secondary() { - - if (secondary_ == NULL) { - secondary_ = new ::CaptionDefProto; +inline void CaptionRuleProto::unsafe_arena_set_allocated_secondary( + ::CaptionDefProto* secondary) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.secondary_); } - // @@protoc_insertion_point(field_mutable:CaptionRuleProto.secondary) - return secondary_; -} -inline ::CaptionDefProto* CaptionRuleProto::release_secondary() { - // @@protoc_insertion_point(field_release:CaptionRuleProto.secondary) - - ::CaptionDefProto* temp = secondary_; - secondary_ = NULL; - return temp; -} -inline void CaptionRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) { - delete secondary_; - secondary_ = secondary; + _impl_.secondary_ = secondary; if (secondary) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CaptionRuleProto.secondary) +} +inline ::CaptionDefProto* CaptionRuleProto::release_secondary() { + + ::CaptionDefProto* temp = _impl_.secondary_; + _impl_.secondary_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::CaptionDefProto* CaptionRuleProto::unsafe_arena_release_secondary() { + // @@protoc_insertion_point(field_release:CaptionRuleProto.secondary) + + ::CaptionDefProto* temp = _impl_.secondary_; + _impl_.secondary_ = nullptr; + return temp; +} +inline ::CaptionDefProto* CaptionRuleProto::_internal_mutable_secondary() { + + if (_impl_.secondary_ == nullptr) { + auto* p = CreateMaybeMessage<::CaptionDefProto>(GetArenaForAllocation()); + _impl_.secondary_ = p; + } + return _impl_.secondary_; +} +inline ::CaptionDefProto* CaptionRuleProto::mutable_secondary() { + ::CaptionDefProto* _msg = _internal_mutable_secondary(); + // @@protoc_insertion_point(field_mutable:CaptionRuleProto.secondary) + return _msg; +} +inline void CaptionRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.secondary_; + } + if (secondary) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(secondary); + if (message_arena != submessage_arena) { + secondary = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, secondary, submessage_arena); + } + + } else { + + } + _impl_.secondary_ = secondary; // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.secondary) } // int32 priority = 3; inline void CaptionRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 CaptionRuleProto::priority() const { +inline int32_t CaptionRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t CaptionRuleProto::priority() const { // @@protoc_insertion_point(field_get:CaptionRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void CaptionRuleProto::set_priority(::google::protobuf::int32 value) { +inline void CaptionRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void CaptionRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:CaptionRuleProto.priority) } @@ -2700,82 +4388,151 @@ inline void CaptionRuleProto::set_priority(::google::protobuf::int32 value) { // double radius = 1; inline void CircleRuleProto::clear_radius() { - radius_ = 0; + _impl_.radius_ = 0; +} +inline double CircleRuleProto::_internal_radius() const { + return _impl_.radius_; } inline double CircleRuleProto::radius() const { // @@protoc_insertion_point(field_get:CircleRuleProto.radius) - return radius_; + return _internal_radius(); +} +inline void CircleRuleProto::_internal_set_radius(double value) { + + _impl_.radius_ = value; } inline void CircleRuleProto::set_radius(double value) { - - radius_ = value; + _internal_set_radius(value); // @@protoc_insertion_point(field_set:CircleRuleProto.radius) } // uint32 color = 2; inline void CircleRuleProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 CircleRuleProto::color() const { +inline uint32_t CircleRuleProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t CircleRuleProto::color() const { // @@protoc_insertion_point(field_get:CircleRuleProto.color) - return color_; + return _internal_color(); } -inline void CircleRuleProto::set_color(::google::protobuf::uint32 value) { +inline void CircleRuleProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void CircleRuleProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:CircleRuleProto.color) } // .LineDefProto border = 3; +inline bool CircleRuleProto::_internal_has_border() const { + return this != internal_default_instance() && _impl_.border_ != nullptr; +} inline bool CircleRuleProto::has_border() const { - return this != internal_default_instance() && border_ != NULL; + return _internal_has_border(); } inline void CircleRuleProto::clear_border() { - if (GetArenaNoVirtual() == NULL && border_ != NULL) delete border_; - border_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.border_ != nullptr) { + delete _impl_.border_; + } + _impl_.border_ = nullptr; +} +inline const ::LineDefProto& CircleRuleProto::_internal_border() const { + const ::LineDefProto* p = _impl_.border_; + return p != nullptr ? *p : reinterpret_cast( + ::_LineDefProto_default_instance_); } inline const ::LineDefProto& CircleRuleProto::border() const { // @@protoc_insertion_point(field_get:CircleRuleProto.border) - return border_ != NULL ? *border_ - : *::LineDefProto::internal_default_instance(); + return _internal_border(); } -inline ::LineDefProto* CircleRuleProto::mutable_border() { - - if (border_ == NULL) { - border_ = new ::LineDefProto; +inline void CircleRuleProto::unsafe_arena_set_allocated_border( + ::LineDefProto* border) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.border_); } - // @@protoc_insertion_point(field_mutable:CircleRuleProto.border) - return border_; -} -inline ::LineDefProto* CircleRuleProto::release_border() { - // @@protoc_insertion_point(field_release:CircleRuleProto.border) - - ::LineDefProto* temp = border_; - border_ = NULL; - return temp; -} -inline void CircleRuleProto::set_allocated_border(::LineDefProto* border) { - delete border_; - border_ = border; + _impl_.border_ = border; if (border) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:CircleRuleProto.border) +} +inline ::LineDefProto* CircleRuleProto::release_border() { + + ::LineDefProto* temp = _impl_.border_; + _impl_.border_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::LineDefProto* CircleRuleProto::unsafe_arena_release_border() { + // @@protoc_insertion_point(field_release:CircleRuleProto.border) + + ::LineDefProto* temp = _impl_.border_; + _impl_.border_ = nullptr; + return temp; +} +inline ::LineDefProto* CircleRuleProto::_internal_mutable_border() { + + if (_impl_.border_ == nullptr) { + auto* p = CreateMaybeMessage<::LineDefProto>(GetArenaForAllocation()); + _impl_.border_ = p; + } + return _impl_.border_; +} +inline ::LineDefProto* CircleRuleProto::mutable_border() { + ::LineDefProto* _msg = _internal_mutable_border(); + // @@protoc_insertion_point(field_mutable:CircleRuleProto.border) + return _msg; +} +inline void CircleRuleProto::set_allocated_border(::LineDefProto* border) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.border_; + } + if (border) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(border); + if (message_arena != submessage_arena) { + border = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, border, submessage_arena); + } + + } else { + + } + _impl_.border_ = border; // @@protoc_insertion_point(field_set_allocated:CircleRuleProto.border) } // int32 priority = 4; inline void CircleRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 CircleRuleProto::priority() const { +inline int32_t CircleRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t CircleRuleProto::priority() const { // @@protoc_insertion_point(field_get:CircleRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void CircleRuleProto::set_priority(::google::protobuf::int32 value) { +inline void CircleRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void CircleRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:CircleRuleProto.priority) } @@ -2784,94 +4541,202 @@ inline void CircleRuleProto::set_priority(::google::protobuf::int32 value) { // PathTextRuleProto // .CaptionDefProto primary = 1; +inline bool PathTextRuleProto::_internal_has_primary() const { + return this != internal_default_instance() && _impl_.primary_ != nullptr; +} inline bool PathTextRuleProto::has_primary() const { - return this != internal_default_instance() && primary_ != NULL; + return _internal_has_primary(); } inline void PathTextRuleProto::clear_primary() { - if (GetArenaNoVirtual() == NULL && primary_ != NULL) delete primary_; - primary_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.primary_ != nullptr) { + delete _impl_.primary_; + } + _impl_.primary_ = nullptr; +} +inline const ::CaptionDefProto& PathTextRuleProto::_internal_primary() const { + const ::CaptionDefProto* p = _impl_.primary_; + return p != nullptr ? *p : reinterpret_cast( + ::_CaptionDefProto_default_instance_); } inline const ::CaptionDefProto& PathTextRuleProto::primary() const { // @@protoc_insertion_point(field_get:PathTextRuleProto.primary) - return primary_ != NULL ? *primary_ - : *::CaptionDefProto::internal_default_instance(); + return _internal_primary(); } -inline ::CaptionDefProto* PathTextRuleProto::mutable_primary() { - - if (primary_ == NULL) { - primary_ = new ::CaptionDefProto; +inline void PathTextRuleProto::unsafe_arena_set_allocated_primary( + ::CaptionDefProto* primary) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.primary_); } - // @@protoc_insertion_point(field_mutable:PathTextRuleProto.primary) - return primary_; -} -inline ::CaptionDefProto* PathTextRuleProto::release_primary() { - // @@protoc_insertion_point(field_release:PathTextRuleProto.primary) - - ::CaptionDefProto* temp = primary_; - primary_ = NULL; - return temp; -} -inline void PathTextRuleProto::set_allocated_primary(::CaptionDefProto* primary) { - delete primary_; - primary_ = primary; + _impl_.primary_ = primary; if (primary) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:PathTextRuleProto.primary) +} +inline ::CaptionDefProto* PathTextRuleProto::release_primary() { + + ::CaptionDefProto* temp = _impl_.primary_; + _impl_.primary_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::CaptionDefProto* PathTextRuleProto::unsafe_arena_release_primary() { + // @@protoc_insertion_point(field_release:PathTextRuleProto.primary) + + ::CaptionDefProto* temp = _impl_.primary_; + _impl_.primary_ = nullptr; + return temp; +} +inline ::CaptionDefProto* PathTextRuleProto::_internal_mutable_primary() { + + if (_impl_.primary_ == nullptr) { + auto* p = CreateMaybeMessage<::CaptionDefProto>(GetArenaForAllocation()); + _impl_.primary_ = p; + } + return _impl_.primary_; +} +inline ::CaptionDefProto* PathTextRuleProto::mutable_primary() { + ::CaptionDefProto* _msg = _internal_mutable_primary(); + // @@protoc_insertion_point(field_mutable:PathTextRuleProto.primary) + return _msg; +} +inline void PathTextRuleProto::set_allocated_primary(::CaptionDefProto* primary) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.primary_; + } + if (primary) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(primary); + if (message_arena != submessage_arena) { + primary = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, primary, submessage_arena); + } + + } else { + + } + _impl_.primary_ = primary; // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.primary) } // .CaptionDefProto secondary = 2; +inline bool PathTextRuleProto::_internal_has_secondary() const { + return this != internal_default_instance() && _impl_.secondary_ != nullptr; +} inline bool PathTextRuleProto::has_secondary() const { - return this != internal_default_instance() && secondary_ != NULL; + return _internal_has_secondary(); } inline void PathTextRuleProto::clear_secondary() { - if (GetArenaNoVirtual() == NULL && secondary_ != NULL) delete secondary_; - secondary_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.secondary_ != nullptr) { + delete _impl_.secondary_; + } + _impl_.secondary_ = nullptr; +} +inline const ::CaptionDefProto& PathTextRuleProto::_internal_secondary() const { + const ::CaptionDefProto* p = _impl_.secondary_; + return p != nullptr ? *p : reinterpret_cast( + ::_CaptionDefProto_default_instance_); } inline const ::CaptionDefProto& PathTextRuleProto::secondary() const { // @@protoc_insertion_point(field_get:PathTextRuleProto.secondary) - return secondary_ != NULL ? *secondary_ - : *::CaptionDefProto::internal_default_instance(); + return _internal_secondary(); } -inline ::CaptionDefProto* PathTextRuleProto::mutable_secondary() { - - if (secondary_ == NULL) { - secondary_ = new ::CaptionDefProto; +inline void PathTextRuleProto::unsafe_arena_set_allocated_secondary( + ::CaptionDefProto* secondary) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.secondary_); } - // @@protoc_insertion_point(field_mutable:PathTextRuleProto.secondary) - return secondary_; -} -inline ::CaptionDefProto* PathTextRuleProto::release_secondary() { - // @@protoc_insertion_point(field_release:PathTextRuleProto.secondary) - - ::CaptionDefProto* temp = secondary_; - secondary_ = NULL; - return temp; -} -inline void PathTextRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) { - delete secondary_; - secondary_ = secondary; + _impl_.secondary_ = secondary; if (secondary) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:PathTextRuleProto.secondary) +} +inline ::CaptionDefProto* PathTextRuleProto::release_secondary() { + + ::CaptionDefProto* temp = _impl_.secondary_; + _impl_.secondary_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::CaptionDefProto* PathTextRuleProto::unsafe_arena_release_secondary() { + // @@protoc_insertion_point(field_release:PathTextRuleProto.secondary) + + ::CaptionDefProto* temp = _impl_.secondary_; + _impl_.secondary_ = nullptr; + return temp; +} +inline ::CaptionDefProto* PathTextRuleProto::_internal_mutable_secondary() { + + if (_impl_.secondary_ == nullptr) { + auto* p = CreateMaybeMessage<::CaptionDefProto>(GetArenaForAllocation()); + _impl_.secondary_ = p; + } + return _impl_.secondary_; +} +inline ::CaptionDefProto* PathTextRuleProto::mutable_secondary() { + ::CaptionDefProto* _msg = _internal_mutable_secondary(); + // @@protoc_insertion_point(field_mutable:PathTextRuleProto.secondary) + return _msg; +} +inline void PathTextRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.secondary_; + } + if (secondary) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(secondary); + if (message_arena != submessage_arena) { + secondary = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, secondary, submessage_arena); + } + + } else { + + } + _impl_.secondary_ = secondary; // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.secondary) } // int32 priority = 3; inline void PathTextRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 PathTextRuleProto::priority() const { +inline int32_t PathTextRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t PathTextRuleProto::priority() const { // @@protoc_insertion_point(field_get:PathTextRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void PathTextRuleProto::set_priority(::google::protobuf::int32 value) { +inline void PathTextRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void PathTextRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:PathTextRuleProto.priority) } @@ -2881,99 +4746,141 @@ inline void PathTextRuleProto::set_priority(::google::protobuf::int32 value) { // int32 height = 1; inline void ShieldRuleProto::clear_height() { - height_ = 0; + _impl_.height_ = 0; } -inline ::google::protobuf::int32 ShieldRuleProto::height() const { +inline int32_t ShieldRuleProto::_internal_height() const { + return _impl_.height_; +} +inline int32_t ShieldRuleProto::height() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.height) - return height_; + return _internal_height(); } -inline void ShieldRuleProto::set_height(::google::protobuf::int32 value) { +inline void ShieldRuleProto::_internal_set_height(int32_t value) { - height_ = value; + _impl_.height_ = value; +} +inline void ShieldRuleProto::set_height(int32_t value) { + _internal_set_height(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.height) } // uint32 color = 2; inline void ShieldRuleProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 ShieldRuleProto::color() const { +inline uint32_t ShieldRuleProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t ShieldRuleProto::color() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.color) - return color_; + return _internal_color(); } -inline void ShieldRuleProto::set_color(::google::protobuf::uint32 value) { +inline void ShieldRuleProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void ShieldRuleProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.color) } // uint32 stroke_color = 3; inline void ShieldRuleProto::clear_stroke_color() { - stroke_color_ = 0u; + _impl_.stroke_color_ = 0u; } -inline ::google::protobuf::uint32 ShieldRuleProto::stroke_color() const { +inline uint32_t ShieldRuleProto::_internal_stroke_color() const { + return _impl_.stroke_color_; +} +inline uint32_t ShieldRuleProto::stroke_color() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.stroke_color) - return stroke_color_; + return _internal_stroke_color(); } -inline void ShieldRuleProto::set_stroke_color(::google::protobuf::uint32 value) { +inline void ShieldRuleProto::_internal_set_stroke_color(uint32_t value) { - stroke_color_ = value; + _impl_.stroke_color_ = value; +} +inline void ShieldRuleProto::set_stroke_color(uint32_t value) { + _internal_set_stroke_color(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.stroke_color) } // int32 priority = 4; inline void ShieldRuleProto::clear_priority() { - priority_ = 0; + _impl_.priority_ = 0; } -inline ::google::protobuf::int32 ShieldRuleProto::priority() const { +inline int32_t ShieldRuleProto::_internal_priority() const { + return _impl_.priority_; +} +inline int32_t ShieldRuleProto::priority() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.priority) - return priority_; + return _internal_priority(); } -inline void ShieldRuleProto::set_priority(::google::protobuf::int32 value) { +inline void ShieldRuleProto::_internal_set_priority(int32_t value) { - priority_ = value; + _impl_.priority_ = value; +} +inline void ShieldRuleProto::set_priority(int32_t value) { + _internal_set_priority(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.priority) } // int32 min_distance = 5; inline void ShieldRuleProto::clear_min_distance() { - min_distance_ = 0; + _impl_.min_distance_ = 0; } -inline ::google::protobuf::int32 ShieldRuleProto::min_distance() const { +inline int32_t ShieldRuleProto::_internal_min_distance() const { + return _impl_.min_distance_; +} +inline int32_t ShieldRuleProto::min_distance() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.min_distance) - return min_distance_; + return _internal_min_distance(); } -inline void ShieldRuleProto::set_min_distance(::google::protobuf::int32 value) { +inline void ShieldRuleProto::_internal_set_min_distance(int32_t value) { - min_distance_ = value; + _impl_.min_distance_ = value; +} +inline void ShieldRuleProto::set_min_distance(int32_t value) { + _internal_set_min_distance(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.min_distance) } // uint32 text_color = 6; inline void ShieldRuleProto::clear_text_color() { - text_color_ = 0u; + _impl_.text_color_ = 0u; } -inline ::google::protobuf::uint32 ShieldRuleProto::text_color() const { +inline uint32_t ShieldRuleProto::_internal_text_color() const { + return _impl_.text_color_; +} +inline uint32_t ShieldRuleProto::text_color() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.text_color) - return text_color_; + return _internal_text_color(); } -inline void ShieldRuleProto::set_text_color(::google::protobuf::uint32 value) { +inline void ShieldRuleProto::_internal_set_text_color(uint32_t value) { - text_color_ = value; + _impl_.text_color_ = value; +} +inline void ShieldRuleProto::set_text_color(uint32_t value) { + _internal_set_text_color(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.text_color) } // uint32 text_stroke_color = 7; inline void ShieldRuleProto::clear_text_stroke_color() { - text_stroke_color_ = 0u; + _impl_.text_stroke_color_ = 0u; } -inline ::google::protobuf::uint32 ShieldRuleProto::text_stroke_color() const { +inline uint32_t ShieldRuleProto::_internal_text_stroke_color() const { + return _impl_.text_stroke_color_; +} +inline uint32_t ShieldRuleProto::text_stroke_color() const { // @@protoc_insertion_point(field_get:ShieldRuleProto.text_stroke_color) - return text_stroke_color_; + return _internal_text_stroke_color(); } -inline void ShieldRuleProto::set_text_stroke_color(::google::protobuf::uint32 value) { +inline void ShieldRuleProto::_internal_set_text_stroke_color(uint32_t value) { - text_stroke_color_ = value; + _impl_.text_stroke_color_ = value; +} +inline void ShieldRuleProto::set_text_stroke_color(uint32_t value) { + _internal_set_text_stroke_color(value); // @@protoc_insertion_point(field_set:ShieldRuleProto.text_stroke_color) } @@ -2983,349 +4890,677 @@ inline void ShieldRuleProto::set_text_stroke_color(::google::protobuf::uint32 va // int32 scale = 1; inline void DrawElementProto::clear_scale() { - scale_ = 0; + _impl_.scale_ = 0; } -inline ::google::protobuf::int32 DrawElementProto::scale() const { +inline int32_t DrawElementProto::_internal_scale() const { + return _impl_.scale_; +} +inline int32_t DrawElementProto::scale() const { // @@protoc_insertion_point(field_get:DrawElementProto.scale) - return scale_; + return _internal_scale(); } -inline void DrawElementProto::set_scale(::google::protobuf::int32 value) { +inline void DrawElementProto::_internal_set_scale(int32_t value) { - scale_ = value; + _impl_.scale_ = value; +} +inline void DrawElementProto::set_scale(int32_t value) { + _internal_set_scale(value); // @@protoc_insertion_point(field_set:DrawElementProto.scale) } // repeated .LineRuleProto lines = 2; +inline int DrawElementProto::_internal_lines_size() const { + return _impl_.lines_.size(); +} inline int DrawElementProto::lines_size() const { - return lines_.size(); + return _internal_lines_size(); } inline void DrawElementProto::clear_lines() { - lines_.Clear(); -} -inline const ::LineRuleProto& DrawElementProto::lines(int index) const { - // @@protoc_insertion_point(field_get:DrawElementProto.lines) - return lines_.Get(index); + _impl_.lines_.Clear(); } inline ::LineRuleProto* DrawElementProto::mutable_lines(int index) { // @@protoc_insertion_point(field_mutable:DrawElementProto.lines) - return lines_.Mutable(index); + return _impl_.lines_.Mutable(index); } -inline ::LineRuleProto* DrawElementProto::add_lines() { - // @@protoc_insertion_point(field_add:DrawElementProto.lines) - return lines_.Add(); -} -inline ::google::protobuf::RepeatedPtrField< ::LineRuleProto >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::LineRuleProto >* DrawElementProto::mutable_lines() { // @@protoc_insertion_point(field_mutable_list:DrawElementProto.lines) - return &lines_; + return &_impl_.lines_; } -inline const ::google::protobuf::RepeatedPtrField< ::LineRuleProto >& +inline const ::LineRuleProto& DrawElementProto::_internal_lines(int index) const { + return _impl_.lines_.Get(index); +} +inline const ::LineRuleProto& DrawElementProto::lines(int index) const { + // @@protoc_insertion_point(field_get:DrawElementProto.lines) + return _internal_lines(index); +} +inline ::LineRuleProto* DrawElementProto::_internal_add_lines() { + return _impl_.lines_.Add(); +} +inline ::LineRuleProto* DrawElementProto::add_lines() { + ::LineRuleProto* _add = _internal_add_lines(); + // @@protoc_insertion_point(field_add:DrawElementProto.lines) + return _add; +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::LineRuleProto >& DrawElementProto::lines() const { // @@protoc_insertion_point(field_list:DrawElementProto.lines) - return lines_; + return _impl_.lines_; } // .AreaRuleProto area = 3; +inline bool DrawElementProto::_internal_has_area() const { + return this != internal_default_instance() && _impl_.area_ != nullptr; +} inline bool DrawElementProto::has_area() const { - return this != internal_default_instance() && area_ != NULL; + return _internal_has_area(); } inline void DrawElementProto::clear_area() { - if (GetArenaNoVirtual() == NULL && area_ != NULL) delete area_; - area_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.area_ != nullptr) { + delete _impl_.area_; + } + _impl_.area_ = nullptr; +} +inline const ::AreaRuleProto& DrawElementProto::_internal_area() const { + const ::AreaRuleProto* p = _impl_.area_; + return p != nullptr ? *p : reinterpret_cast( + ::_AreaRuleProto_default_instance_); } inline const ::AreaRuleProto& DrawElementProto::area() const { // @@protoc_insertion_point(field_get:DrawElementProto.area) - return area_ != NULL ? *area_ - : *::AreaRuleProto::internal_default_instance(); + return _internal_area(); } -inline ::AreaRuleProto* DrawElementProto::mutable_area() { - - if (area_ == NULL) { - area_ = new ::AreaRuleProto; +inline void DrawElementProto::unsafe_arena_set_allocated_area( + ::AreaRuleProto* area) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.area_); } - // @@protoc_insertion_point(field_mutable:DrawElementProto.area) - return area_; -} -inline ::AreaRuleProto* DrawElementProto::release_area() { - // @@protoc_insertion_point(field_release:DrawElementProto.area) - - ::AreaRuleProto* temp = area_; - area_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_area(::AreaRuleProto* area) { - delete area_; - area_ = area; + _impl_.area_ = area; if (area) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DrawElementProto.area) +} +inline ::AreaRuleProto* DrawElementProto::release_area() { + + ::AreaRuleProto* temp = _impl_.area_; + _impl_.area_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::AreaRuleProto* DrawElementProto::unsafe_arena_release_area() { + // @@protoc_insertion_point(field_release:DrawElementProto.area) + + ::AreaRuleProto* temp = _impl_.area_; + _impl_.area_ = nullptr; + return temp; +} +inline ::AreaRuleProto* DrawElementProto::_internal_mutable_area() { + + if (_impl_.area_ == nullptr) { + auto* p = CreateMaybeMessage<::AreaRuleProto>(GetArenaForAllocation()); + _impl_.area_ = p; + } + return _impl_.area_; +} +inline ::AreaRuleProto* DrawElementProto::mutable_area() { + ::AreaRuleProto* _msg = _internal_mutable_area(); + // @@protoc_insertion_point(field_mutable:DrawElementProto.area) + return _msg; +} +inline void DrawElementProto::set_allocated_area(::AreaRuleProto* area) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.area_; + } + if (area) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(area); + if (message_arena != submessage_arena) { + area = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, area, submessage_arena); + } + + } else { + + } + _impl_.area_ = area; // @@protoc_insertion_point(field_set_allocated:DrawElementProto.area) } // .SymbolRuleProto symbol = 4; +inline bool DrawElementProto::_internal_has_symbol() const { + return this != internal_default_instance() && _impl_.symbol_ != nullptr; +} inline bool DrawElementProto::has_symbol() const { - return this != internal_default_instance() && symbol_ != NULL; + return _internal_has_symbol(); } inline void DrawElementProto::clear_symbol() { - if (GetArenaNoVirtual() == NULL && symbol_ != NULL) delete symbol_; - symbol_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.symbol_ != nullptr) { + delete _impl_.symbol_; + } + _impl_.symbol_ = nullptr; +} +inline const ::SymbolRuleProto& DrawElementProto::_internal_symbol() const { + const ::SymbolRuleProto* p = _impl_.symbol_; + return p != nullptr ? *p : reinterpret_cast( + ::_SymbolRuleProto_default_instance_); } inline const ::SymbolRuleProto& DrawElementProto::symbol() const { // @@protoc_insertion_point(field_get:DrawElementProto.symbol) - return symbol_ != NULL ? *symbol_ - : *::SymbolRuleProto::internal_default_instance(); + return _internal_symbol(); } -inline ::SymbolRuleProto* DrawElementProto::mutable_symbol() { - - if (symbol_ == NULL) { - symbol_ = new ::SymbolRuleProto; +inline void DrawElementProto::unsafe_arena_set_allocated_symbol( + ::SymbolRuleProto* symbol) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.symbol_); } - // @@protoc_insertion_point(field_mutable:DrawElementProto.symbol) - return symbol_; -} -inline ::SymbolRuleProto* DrawElementProto::release_symbol() { - // @@protoc_insertion_point(field_release:DrawElementProto.symbol) - - ::SymbolRuleProto* temp = symbol_; - symbol_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_symbol(::SymbolRuleProto* symbol) { - delete symbol_; - symbol_ = symbol; + _impl_.symbol_ = symbol; if (symbol) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DrawElementProto.symbol) +} +inline ::SymbolRuleProto* DrawElementProto::release_symbol() { + + ::SymbolRuleProto* temp = _impl_.symbol_; + _impl_.symbol_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::SymbolRuleProto* DrawElementProto::unsafe_arena_release_symbol() { + // @@protoc_insertion_point(field_release:DrawElementProto.symbol) + + ::SymbolRuleProto* temp = _impl_.symbol_; + _impl_.symbol_ = nullptr; + return temp; +} +inline ::SymbolRuleProto* DrawElementProto::_internal_mutable_symbol() { + + if (_impl_.symbol_ == nullptr) { + auto* p = CreateMaybeMessage<::SymbolRuleProto>(GetArenaForAllocation()); + _impl_.symbol_ = p; + } + return _impl_.symbol_; +} +inline ::SymbolRuleProto* DrawElementProto::mutable_symbol() { + ::SymbolRuleProto* _msg = _internal_mutable_symbol(); + // @@protoc_insertion_point(field_mutable:DrawElementProto.symbol) + return _msg; +} +inline void DrawElementProto::set_allocated_symbol(::SymbolRuleProto* symbol) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.symbol_; + } + if (symbol) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(symbol); + if (message_arena != submessage_arena) { + symbol = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, symbol, submessage_arena); + } + + } else { + + } + _impl_.symbol_ = symbol; // @@protoc_insertion_point(field_set_allocated:DrawElementProto.symbol) } // .CaptionRuleProto caption = 5; +inline bool DrawElementProto::_internal_has_caption() const { + return this != internal_default_instance() && _impl_.caption_ != nullptr; +} inline bool DrawElementProto::has_caption() const { - return this != internal_default_instance() && caption_ != NULL; + return _internal_has_caption(); } inline void DrawElementProto::clear_caption() { - if (GetArenaNoVirtual() == NULL && caption_ != NULL) delete caption_; - caption_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.caption_ != nullptr) { + delete _impl_.caption_; + } + _impl_.caption_ = nullptr; +} +inline const ::CaptionRuleProto& DrawElementProto::_internal_caption() const { + const ::CaptionRuleProto* p = _impl_.caption_; + return p != nullptr ? *p : reinterpret_cast( + ::_CaptionRuleProto_default_instance_); } inline const ::CaptionRuleProto& DrawElementProto::caption() const { // @@protoc_insertion_point(field_get:DrawElementProto.caption) - return caption_ != NULL ? *caption_ - : *::CaptionRuleProto::internal_default_instance(); + return _internal_caption(); } -inline ::CaptionRuleProto* DrawElementProto::mutable_caption() { - - if (caption_ == NULL) { - caption_ = new ::CaptionRuleProto; +inline void DrawElementProto::unsafe_arena_set_allocated_caption( + ::CaptionRuleProto* caption) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.caption_); } - // @@protoc_insertion_point(field_mutable:DrawElementProto.caption) - return caption_; -} -inline ::CaptionRuleProto* DrawElementProto::release_caption() { - // @@protoc_insertion_point(field_release:DrawElementProto.caption) - - ::CaptionRuleProto* temp = caption_; - caption_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption) { - delete caption_; - caption_ = caption; + _impl_.caption_ = caption; if (caption) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DrawElementProto.caption) +} +inline ::CaptionRuleProto* DrawElementProto::release_caption() { + + ::CaptionRuleProto* temp = _impl_.caption_; + _impl_.caption_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::CaptionRuleProto* DrawElementProto::unsafe_arena_release_caption() { + // @@protoc_insertion_point(field_release:DrawElementProto.caption) + + ::CaptionRuleProto* temp = _impl_.caption_; + _impl_.caption_ = nullptr; + return temp; +} +inline ::CaptionRuleProto* DrawElementProto::_internal_mutable_caption() { + + if (_impl_.caption_ == nullptr) { + auto* p = CreateMaybeMessage<::CaptionRuleProto>(GetArenaForAllocation()); + _impl_.caption_ = p; + } + return _impl_.caption_; +} +inline ::CaptionRuleProto* DrawElementProto::mutable_caption() { + ::CaptionRuleProto* _msg = _internal_mutable_caption(); + // @@protoc_insertion_point(field_mutable:DrawElementProto.caption) + return _msg; +} +inline void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.caption_; + } + if (caption) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(caption); + if (message_arena != submessage_arena) { + caption = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, caption, submessage_arena); + } + + } else { + + } + _impl_.caption_ = caption; // @@protoc_insertion_point(field_set_allocated:DrawElementProto.caption) } // .CircleRuleProto circle = 6; +inline bool DrawElementProto::_internal_has_circle() const { + return this != internal_default_instance() && _impl_.circle_ != nullptr; +} inline bool DrawElementProto::has_circle() const { - return this != internal_default_instance() && circle_ != NULL; + return _internal_has_circle(); } inline void DrawElementProto::clear_circle() { - if (GetArenaNoVirtual() == NULL && circle_ != NULL) delete circle_; - circle_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.circle_ != nullptr) { + delete _impl_.circle_; + } + _impl_.circle_ = nullptr; +} +inline const ::CircleRuleProto& DrawElementProto::_internal_circle() const { + const ::CircleRuleProto* p = _impl_.circle_; + return p != nullptr ? *p : reinterpret_cast( + ::_CircleRuleProto_default_instance_); } inline const ::CircleRuleProto& DrawElementProto::circle() const { // @@protoc_insertion_point(field_get:DrawElementProto.circle) - return circle_ != NULL ? *circle_ - : *::CircleRuleProto::internal_default_instance(); + return _internal_circle(); } -inline ::CircleRuleProto* DrawElementProto::mutable_circle() { - - if (circle_ == NULL) { - circle_ = new ::CircleRuleProto; +inline void DrawElementProto::unsafe_arena_set_allocated_circle( + ::CircleRuleProto* circle) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.circle_); } - // @@protoc_insertion_point(field_mutable:DrawElementProto.circle) - return circle_; -} -inline ::CircleRuleProto* DrawElementProto::release_circle() { - // @@protoc_insertion_point(field_release:DrawElementProto.circle) - - ::CircleRuleProto* temp = circle_; - circle_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) { - delete circle_; - circle_ = circle; + _impl_.circle_ = circle; if (circle) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DrawElementProto.circle) +} +inline ::CircleRuleProto* DrawElementProto::release_circle() { + + ::CircleRuleProto* temp = _impl_.circle_; + _impl_.circle_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::CircleRuleProto* DrawElementProto::unsafe_arena_release_circle() { + // @@protoc_insertion_point(field_release:DrawElementProto.circle) + + ::CircleRuleProto* temp = _impl_.circle_; + _impl_.circle_ = nullptr; + return temp; +} +inline ::CircleRuleProto* DrawElementProto::_internal_mutable_circle() { + + if (_impl_.circle_ == nullptr) { + auto* p = CreateMaybeMessage<::CircleRuleProto>(GetArenaForAllocation()); + _impl_.circle_ = p; + } + return _impl_.circle_; +} +inline ::CircleRuleProto* DrawElementProto::mutable_circle() { + ::CircleRuleProto* _msg = _internal_mutable_circle(); + // @@protoc_insertion_point(field_mutable:DrawElementProto.circle) + return _msg; +} +inline void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.circle_; + } + if (circle) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(circle); + if (message_arena != submessage_arena) { + circle = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, circle, submessage_arena); + } + + } else { + + } + _impl_.circle_ = circle; // @@protoc_insertion_point(field_set_allocated:DrawElementProto.circle) } // .PathTextRuleProto path_text = 7; +inline bool DrawElementProto::_internal_has_path_text() const { + return this != internal_default_instance() && _impl_.path_text_ != nullptr; +} inline bool DrawElementProto::has_path_text() const { - return this != internal_default_instance() && path_text_ != NULL; + return _internal_has_path_text(); } inline void DrawElementProto::clear_path_text() { - if (GetArenaNoVirtual() == NULL && path_text_ != NULL) delete path_text_; - path_text_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.path_text_ != nullptr) { + delete _impl_.path_text_; + } + _impl_.path_text_ = nullptr; +} +inline const ::PathTextRuleProto& DrawElementProto::_internal_path_text() const { + const ::PathTextRuleProto* p = _impl_.path_text_; + return p != nullptr ? *p : reinterpret_cast( + ::_PathTextRuleProto_default_instance_); } inline const ::PathTextRuleProto& DrawElementProto::path_text() const { // @@protoc_insertion_point(field_get:DrawElementProto.path_text) - return path_text_ != NULL ? *path_text_ - : *::PathTextRuleProto::internal_default_instance(); + return _internal_path_text(); } -inline ::PathTextRuleProto* DrawElementProto::mutable_path_text() { - - if (path_text_ == NULL) { - path_text_ = new ::PathTextRuleProto; +inline void DrawElementProto::unsafe_arena_set_allocated_path_text( + ::PathTextRuleProto* path_text) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.path_text_); } - // @@protoc_insertion_point(field_mutable:DrawElementProto.path_text) - return path_text_; -} -inline ::PathTextRuleProto* DrawElementProto::release_path_text() { - // @@protoc_insertion_point(field_release:DrawElementProto.path_text) - - ::PathTextRuleProto* temp = path_text_; - path_text_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_text) { - delete path_text_; - path_text_ = path_text; + _impl_.path_text_ = path_text; if (path_text) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DrawElementProto.path_text) +} +inline ::PathTextRuleProto* DrawElementProto::release_path_text() { + + ::PathTextRuleProto* temp = _impl_.path_text_; + _impl_.path_text_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::PathTextRuleProto* DrawElementProto::unsafe_arena_release_path_text() { + // @@protoc_insertion_point(field_release:DrawElementProto.path_text) + + ::PathTextRuleProto* temp = _impl_.path_text_; + _impl_.path_text_ = nullptr; + return temp; +} +inline ::PathTextRuleProto* DrawElementProto::_internal_mutable_path_text() { + + if (_impl_.path_text_ == nullptr) { + auto* p = CreateMaybeMessage<::PathTextRuleProto>(GetArenaForAllocation()); + _impl_.path_text_ = p; + } + return _impl_.path_text_; +} +inline ::PathTextRuleProto* DrawElementProto::mutable_path_text() { + ::PathTextRuleProto* _msg = _internal_mutable_path_text(); + // @@protoc_insertion_point(field_mutable:DrawElementProto.path_text) + return _msg; +} +inline void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_text) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.path_text_; + } + if (path_text) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(path_text); + if (message_arena != submessage_arena) { + path_text = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, path_text, submessage_arena); + } + + } else { + + } + _impl_.path_text_ = path_text; // @@protoc_insertion_point(field_set_allocated:DrawElementProto.path_text) } // .ShieldRuleProto shield = 8; +inline bool DrawElementProto::_internal_has_shield() const { + return this != internal_default_instance() && _impl_.shield_ != nullptr; +} inline bool DrawElementProto::has_shield() const { - return this != internal_default_instance() && shield_ != NULL; + return _internal_has_shield(); } inline void DrawElementProto::clear_shield() { - if (GetArenaNoVirtual() == NULL && shield_ != NULL) delete shield_; - shield_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.shield_ != nullptr) { + delete _impl_.shield_; + } + _impl_.shield_ = nullptr; +} +inline const ::ShieldRuleProto& DrawElementProto::_internal_shield() const { + const ::ShieldRuleProto* p = _impl_.shield_; + return p != nullptr ? *p : reinterpret_cast( + ::_ShieldRuleProto_default_instance_); } inline const ::ShieldRuleProto& DrawElementProto::shield() const { // @@protoc_insertion_point(field_get:DrawElementProto.shield) - return shield_ != NULL ? *shield_ - : *::ShieldRuleProto::internal_default_instance(); + return _internal_shield(); } -inline ::ShieldRuleProto* DrawElementProto::mutable_shield() { - - if (shield_ == NULL) { - shield_ = new ::ShieldRuleProto; +inline void DrawElementProto::unsafe_arena_set_allocated_shield( + ::ShieldRuleProto* shield) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.shield_); } - // @@protoc_insertion_point(field_mutable:DrawElementProto.shield) - return shield_; -} -inline ::ShieldRuleProto* DrawElementProto::release_shield() { - // @@protoc_insertion_point(field_release:DrawElementProto.shield) - - ::ShieldRuleProto* temp = shield_; - shield_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_shield(::ShieldRuleProto* shield) { - delete shield_; - shield_ = shield; + _impl_.shield_ = shield; if (shield) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DrawElementProto.shield) +} +inline ::ShieldRuleProto* DrawElementProto::release_shield() { + + ::ShieldRuleProto* temp = _impl_.shield_; + _impl_.shield_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::ShieldRuleProto* DrawElementProto::unsafe_arena_release_shield() { + // @@protoc_insertion_point(field_release:DrawElementProto.shield) + + ::ShieldRuleProto* temp = _impl_.shield_; + _impl_.shield_ = nullptr; + return temp; +} +inline ::ShieldRuleProto* DrawElementProto::_internal_mutable_shield() { + + if (_impl_.shield_ == nullptr) { + auto* p = CreateMaybeMessage<::ShieldRuleProto>(GetArenaForAllocation()); + _impl_.shield_ = p; + } + return _impl_.shield_; +} +inline ::ShieldRuleProto* DrawElementProto::mutable_shield() { + ::ShieldRuleProto* _msg = _internal_mutable_shield(); + // @@protoc_insertion_point(field_mutable:DrawElementProto.shield) + return _msg; +} +inline void DrawElementProto::set_allocated_shield(::ShieldRuleProto* shield) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.shield_; + } + if (shield) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(shield); + if (message_arena != submessage_arena) { + shield = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, shield, submessage_arena); + } + + } else { + + } + _impl_.shield_ = shield; // @@protoc_insertion_point(field_set_allocated:DrawElementProto.shield) } // repeated string apply_if = 9; +inline int DrawElementProto::_internal_apply_if_size() const { + return _impl_.apply_if_.size(); +} inline int DrawElementProto::apply_if_size() const { - return apply_if_.size(); + return _internal_apply_if_size(); } inline void DrawElementProto::clear_apply_if() { - apply_if_.Clear(); + _impl_.apply_if_.Clear(); } -inline const ::std::string& DrawElementProto::apply_if(int index) const { +inline std::string* DrawElementProto::add_apply_if() { + std::string* _s = _internal_add_apply_if(); + // @@protoc_insertion_point(field_add_mutable:DrawElementProto.apply_if) + return _s; +} +inline const std::string& DrawElementProto::_internal_apply_if(int index) const { + return _impl_.apply_if_.Get(index); +} +inline const std::string& DrawElementProto::apply_if(int index) const { // @@protoc_insertion_point(field_get:DrawElementProto.apply_if) - return apply_if_.Get(index); + return _internal_apply_if(index); } -inline ::std::string* DrawElementProto::mutable_apply_if(int index) { +inline std::string* DrawElementProto::mutable_apply_if(int index) { // @@protoc_insertion_point(field_mutable:DrawElementProto.apply_if) - return apply_if_.Mutable(index); + return _impl_.apply_if_.Mutable(index); } -inline void DrawElementProto::set_apply_if(int index, const ::std::string& value) { +inline void DrawElementProto::set_apply_if(int index, const std::string& value) { + _impl_.apply_if_.Mutable(index)->assign(value); // @@protoc_insertion_point(field_set:DrawElementProto.apply_if) - apply_if_.Mutable(index)->assign(value); } -#if LANG_CXX11 -inline void DrawElementProto::set_apply_if(int index, ::std::string&& value) { +inline void DrawElementProto::set_apply_if(int index, std::string&& value) { + _impl_.apply_if_.Mutable(index)->assign(std::move(value)); // @@protoc_insertion_point(field_set:DrawElementProto.apply_if) - apply_if_.Mutable(index)->assign(std::move(value)); } -#endif inline void DrawElementProto::set_apply_if(int index, const char* value) { - GOOGLE_DCHECK(value != NULL); - apply_if_.Mutable(index)->assign(value); + GOOGLE_DCHECK(value != nullptr); + _impl_.apply_if_.Mutable(index)->assign(value); // @@protoc_insertion_point(field_set_char:DrawElementProto.apply_if) } inline void DrawElementProto::set_apply_if(int index, const char* value, size_t size) { - apply_if_.Mutable(index)->assign( + _impl_.apply_if_.Mutable(index)->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_set_pointer:DrawElementProto.apply_if) } -inline ::std::string* DrawElementProto::add_apply_if() { - // @@protoc_insertion_point(field_add_mutable:DrawElementProto.apply_if) - return apply_if_.Add(); +inline std::string* DrawElementProto::_internal_add_apply_if() { + return _impl_.apply_if_.Add(); } -inline void DrawElementProto::add_apply_if(const ::std::string& value) { - apply_if_.Add()->assign(value); +inline void DrawElementProto::add_apply_if(const std::string& value) { + _impl_.apply_if_.Add()->assign(value); // @@protoc_insertion_point(field_add:DrawElementProto.apply_if) } -#if LANG_CXX11 -inline void DrawElementProto::add_apply_if(::std::string&& value) { - apply_if_.Add(std::move(value)); +inline void DrawElementProto::add_apply_if(std::string&& value) { + _impl_.apply_if_.Add(std::move(value)); // @@protoc_insertion_point(field_add:DrawElementProto.apply_if) } -#endif inline void DrawElementProto::add_apply_if(const char* value) { - GOOGLE_DCHECK(value != NULL); - apply_if_.Add()->assign(value); + GOOGLE_DCHECK(value != nullptr); + _impl_.apply_if_.Add()->assign(value); // @@protoc_insertion_point(field_add_char:DrawElementProto.apply_if) } inline void DrawElementProto::add_apply_if(const char* value, size_t size) { - apply_if_.Add()->assign(reinterpret_cast(value), size); + _impl_.apply_if_.Add()->assign(reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:DrawElementProto.apply_if) } -inline const ::google::protobuf::RepeatedPtrField< ::std::string>& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& DrawElementProto::apply_if() const { // @@protoc_insertion_point(field_list:DrawElementProto.apply_if) - return apply_if_; + return _impl_.apply_if_; } -inline ::google::protobuf::RepeatedPtrField< ::std::string>* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* DrawElementProto::mutable_apply_if() { // @@protoc_insertion_point(field_mutable_list:DrawElementProto.apply_if) - return &apply_if_; + return &_impl_.apply_if_; } // ------------------------------------------------------------------- @@ -3334,85 +5569,92 @@ DrawElementProto::mutable_apply_if() { // string name = 1; inline void ClassifElementProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.ClearToEmpty(); } -inline const ::std::string& ClassifElementProto::name() const { +inline const std::string& ClassifElementProto::name() const { // @@protoc_insertion_point(field_get:ClassifElementProto.name) - return name_.GetNoArena(); + return _internal_name(); } -inline void ClassifElementProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); +template +inline PROTOBUF_ALWAYS_INLINE +void ClassifElementProto::set_name(ArgT0&& arg0, ArgT... args) { + + _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:ClassifElementProto.name) } -#if LANG_CXX11 -inline void ClassifElementProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:ClassifElementProto.name) -} -#endif -inline void ClassifElementProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:ClassifElementProto.name) -} -inline void ClassifElementProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:ClassifElementProto.name) -} -inline ::std::string* ClassifElementProto::mutable_name() { - +inline std::string* ClassifElementProto::mutable_name() { + std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:ClassifElementProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return _s; } -inline ::std::string* ClassifElementProto::release_name() { - // @@protoc_insertion_point(field_release:ClassifElementProto.name) +inline const std::string& ClassifElementProto::_internal_name() const { + return _impl_.name_.Get(); +} +inline void ClassifElementProto::_internal_set_name(const std::string& value) { - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.Set(value, GetArenaForAllocation()); } -inline void ClassifElementProto::set_allocated_name(::std::string* name) { - if (name != NULL) { +inline std::string* ClassifElementProto::_internal_mutable_name() { + + return _impl_.name_.Mutable(GetArenaForAllocation()); +} +inline std::string* ClassifElementProto::release_name() { + // @@protoc_insertion_point(field_release:ClassifElementProto.name) + return _impl_.name_.Release(); +} +inline void ClassifElementProto::set_allocated_name(std::string* name) { + if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + _impl_.name_.SetAllocated(name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:ClassifElementProto.name) } // repeated .DrawElementProto element = 2; +inline int ClassifElementProto::_internal_element_size() const { + return _impl_.element_.size(); +} inline int ClassifElementProto::element_size() const { - return element_.size(); + return _internal_element_size(); } inline void ClassifElementProto::clear_element() { - element_.Clear(); -} -inline const ::DrawElementProto& ClassifElementProto::element(int index) const { - // @@protoc_insertion_point(field_get:ClassifElementProto.element) - return element_.Get(index); + _impl_.element_.Clear(); } inline ::DrawElementProto* ClassifElementProto::mutable_element(int index) { // @@protoc_insertion_point(field_mutable:ClassifElementProto.element) - return element_.Mutable(index); + return _impl_.element_.Mutable(index); } -inline ::DrawElementProto* ClassifElementProto::add_element() { - // @@protoc_insertion_point(field_add:ClassifElementProto.element) - return element_.Add(); -} -inline ::google::protobuf::RepeatedPtrField< ::DrawElementProto >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::DrawElementProto >* ClassifElementProto::mutable_element() { // @@protoc_insertion_point(field_mutable_list:ClassifElementProto.element) - return &element_; + return &_impl_.element_; } -inline const ::google::protobuf::RepeatedPtrField< ::DrawElementProto >& +inline const ::DrawElementProto& ClassifElementProto::_internal_element(int index) const { + return _impl_.element_.Get(index); +} +inline const ::DrawElementProto& ClassifElementProto::element(int index) const { + // @@protoc_insertion_point(field_get:ClassifElementProto.element) + return _internal_element(index); +} +inline ::DrawElementProto* ClassifElementProto::_internal_add_element() { + return _impl_.element_.Add(); +} +inline ::DrawElementProto* ClassifElementProto::add_element() { + ::DrawElementProto* _add = _internal_add_element(); + // @@protoc_insertion_point(field_add:ClassifElementProto.element) + return _add; +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::DrawElementProto >& ClassifElementProto::element() const { // @@protoc_insertion_point(field_list:ClassifElementProto.element) - return element_; + return _impl_.element_; } // ------------------------------------------------------------------- @@ -3421,96 +5663,111 @@ ClassifElementProto::element() const { // string name = 1; inline void ColorElementProto::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.ClearToEmpty(); } -inline const ::std::string& ColorElementProto::name() const { +inline const std::string& ColorElementProto::name() const { // @@protoc_insertion_point(field_get:ColorElementProto.name) - return name_.GetNoArena(); + return _internal_name(); } -inline void ColorElementProto::set_name(const ::std::string& value) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); +template +inline PROTOBUF_ALWAYS_INLINE +void ColorElementProto::set_name(ArgT0&& arg0, ArgT... args) { + + _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:ColorElementProto.name) } -#if LANG_CXX11 -inline void ColorElementProto::set_name(::std::string&& value) { - - name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:ColorElementProto.name) -} -#endif -inline void ColorElementProto::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:ColorElementProto.name) -} -inline void ColorElementProto::set_name(const char* value, size_t size) { - - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:ColorElementProto.name) -} -inline ::std::string* ColorElementProto::mutable_name() { - +inline std::string* ColorElementProto::mutable_name() { + std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:ColorElementProto.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return _s; } -inline ::std::string* ColorElementProto::release_name() { - // @@protoc_insertion_point(field_release:ColorElementProto.name) +inline const std::string& ColorElementProto::_internal_name() const { + return _impl_.name_.Get(); +} +inline void ColorElementProto::_internal_set_name(const std::string& value) { - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _impl_.name_.Set(value, GetArenaForAllocation()); } -inline void ColorElementProto::set_allocated_name(::std::string* name) { - if (name != NULL) { +inline std::string* ColorElementProto::_internal_mutable_name() { + + return _impl_.name_.Mutable(GetArenaForAllocation()); +} +inline std::string* ColorElementProto::release_name() { + // @@protoc_insertion_point(field_release:ColorElementProto.name) + return _impl_.name_.Release(); +} +inline void ColorElementProto::set_allocated_name(std::string* name) { + if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + _impl_.name_.SetAllocated(name, GetArenaForAllocation()); +#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.name_.IsDefault()) { + _impl_.name_.Set("", GetArenaForAllocation()); + } +#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:ColorElementProto.name) } // uint32 color = 2; inline void ColorElementProto::clear_color() { - color_ = 0u; + _impl_.color_ = 0u; } -inline ::google::protobuf::uint32 ColorElementProto::color() const { +inline uint32_t ColorElementProto::_internal_color() const { + return _impl_.color_; +} +inline uint32_t ColorElementProto::color() const { // @@protoc_insertion_point(field_get:ColorElementProto.color) - return color_; + return _internal_color(); } -inline void ColorElementProto::set_color(::google::protobuf::uint32 value) { +inline void ColorElementProto::_internal_set_color(uint32_t value) { - color_ = value; + _impl_.color_ = value; +} +inline void ColorElementProto::set_color(uint32_t value) { + _internal_set_color(value); // @@protoc_insertion_point(field_set:ColorElementProto.color) } // float x = 3; inline void ColorElementProto::clear_x() { - x_ = 0; + _impl_.x_ = 0; +} +inline float ColorElementProto::_internal_x() const { + return _impl_.x_; } inline float ColorElementProto::x() const { // @@protoc_insertion_point(field_get:ColorElementProto.x) - return x_; + return _internal_x(); +} +inline void ColorElementProto::_internal_set_x(float value) { + + _impl_.x_ = value; } inline void ColorElementProto::set_x(float value) { - - x_ = value; + _internal_set_x(value); // @@protoc_insertion_point(field_set:ColorElementProto.x) } // float y = 4; inline void ColorElementProto::clear_y() { - y_ = 0; + _impl_.y_ = 0; +} +inline float ColorElementProto::_internal_y() const { + return _impl_.y_; } inline float ColorElementProto::y() const { // @@protoc_insertion_point(field_get:ColorElementProto.y) - return y_; + return _internal_y(); +} +inline void ColorElementProto::_internal_set_y(float value) { + + _impl_.y_ = value; } inline void ColorElementProto::set_y(float value) { - - y_ = value; + _internal_set_y(value); // @@protoc_insertion_point(field_set:ColorElementProto.y) } @@ -3519,33 +5776,43 @@ inline void ColorElementProto::set_y(float value) { // ColorsElementProto // repeated .ColorElementProto value = 1; +inline int ColorsElementProto::_internal_value_size() const { + return _impl_.value_.size(); +} inline int ColorsElementProto::value_size() const { - return value_.size(); + return _internal_value_size(); } inline void ColorsElementProto::clear_value() { - value_.Clear(); -} -inline const ::ColorElementProto& ColorsElementProto::value(int index) const { - // @@protoc_insertion_point(field_get:ColorsElementProto.value) - return value_.Get(index); + _impl_.value_.Clear(); } inline ::ColorElementProto* ColorsElementProto::mutable_value(int index) { // @@protoc_insertion_point(field_mutable:ColorsElementProto.value) - return value_.Mutable(index); + return _impl_.value_.Mutable(index); } -inline ::ColorElementProto* ColorsElementProto::add_value() { - // @@protoc_insertion_point(field_add:ColorsElementProto.value) - return value_.Add(); -} -inline ::google::protobuf::RepeatedPtrField< ::ColorElementProto >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ColorElementProto >* ColorsElementProto::mutable_value() { // @@protoc_insertion_point(field_mutable_list:ColorsElementProto.value) - return &value_; + return &_impl_.value_; } -inline const ::google::protobuf::RepeatedPtrField< ::ColorElementProto >& +inline const ::ColorElementProto& ColorsElementProto::_internal_value(int index) const { + return _impl_.value_.Get(index); +} +inline const ::ColorElementProto& ColorsElementProto::value(int index) const { + // @@protoc_insertion_point(field_get:ColorsElementProto.value) + return _internal_value(index); +} +inline ::ColorElementProto* ColorsElementProto::_internal_add_value() { + return _impl_.value_.Add(); +} +inline ::ColorElementProto* ColorsElementProto::add_value() { + ::ColorElementProto* _add = _internal_add_value(); + // @@protoc_insertion_point(field_add:ColorsElementProto.value) + return _add; +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ColorElementProto >& ColorsElementProto::value() const { // @@protoc_insertion_point(field_list:ColorsElementProto.value) - return value_; + return _impl_.value_; } // ------------------------------------------------------------------- @@ -3553,75 +5820,138 @@ ColorsElementProto::value() const { // ContainerProto // repeated .ClassifElementProto cont = 1; +inline int ContainerProto::_internal_cont_size() const { + return _impl_.cont_.size(); +} inline int ContainerProto::cont_size() const { - return cont_.size(); + return _internal_cont_size(); } inline void ContainerProto::clear_cont() { - cont_.Clear(); -} -inline const ::ClassifElementProto& ContainerProto::cont(int index) const { - // @@protoc_insertion_point(field_get:ContainerProto.cont) - return cont_.Get(index); + _impl_.cont_.Clear(); } inline ::ClassifElementProto* ContainerProto::mutable_cont(int index) { // @@protoc_insertion_point(field_mutable:ContainerProto.cont) - return cont_.Mutable(index); + return _impl_.cont_.Mutable(index); } -inline ::ClassifElementProto* ContainerProto::add_cont() { - // @@protoc_insertion_point(field_add:ContainerProto.cont) - return cont_.Add(); -} -inline ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ClassifElementProto >* ContainerProto::mutable_cont() { // @@protoc_insertion_point(field_mutable_list:ContainerProto.cont) - return &cont_; + return &_impl_.cont_; } -inline const ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >& +inline const ::ClassifElementProto& ContainerProto::_internal_cont(int index) const { + return _impl_.cont_.Get(index); +} +inline const ::ClassifElementProto& ContainerProto::cont(int index) const { + // @@protoc_insertion_point(field_get:ContainerProto.cont) + return _internal_cont(index); +} +inline ::ClassifElementProto* ContainerProto::_internal_add_cont() { + return _impl_.cont_.Add(); +} +inline ::ClassifElementProto* ContainerProto::add_cont() { + ::ClassifElementProto* _add = _internal_add_cont(); + // @@protoc_insertion_point(field_add:ContainerProto.cont) + return _add; +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ClassifElementProto >& ContainerProto::cont() const { // @@protoc_insertion_point(field_list:ContainerProto.cont) - return cont_; + return _impl_.cont_; } // .ColorsElementProto colors = 2; +inline bool ContainerProto::_internal_has_colors() const { + return this != internal_default_instance() && _impl_.colors_ != nullptr; +} inline bool ContainerProto::has_colors() const { - return this != internal_default_instance() && colors_ != NULL; + return _internal_has_colors(); } inline void ContainerProto::clear_colors() { - if (GetArenaNoVirtual() == NULL && colors_ != NULL) delete colors_; - colors_ = NULL; + if (GetArenaForAllocation() == nullptr && _impl_.colors_ != nullptr) { + delete _impl_.colors_; + } + _impl_.colors_ = nullptr; +} +inline const ::ColorsElementProto& ContainerProto::_internal_colors() const { + const ::ColorsElementProto* p = _impl_.colors_; + return p != nullptr ? *p : reinterpret_cast( + ::_ColorsElementProto_default_instance_); } inline const ::ColorsElementProto& ContainerProto::colors() const { // @@protoc_insertion_point(field_get:ContainerProto.colors) - return colors_ != NULL ? *colors_ - : *::ColorsElementProto::internal_default_instance(); + return _internal_colors(); } -inline ::ColorsElementProto* ContainerProto::mutable_colors() { - - if (colors_ == NULL) { - colors_ = new ::ColorsElementProto; +inline void ContainerProto::unsafe_arena_set_allocated_colors( + ::ColorsElementProto* colors) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.colors_); } - // @@protoc_insertion_point(field_mutable:ContainerProto.colors) - return colors_; -} -inline ::ColorsElementProto* ContainerProto::release_colors() { - // @@protoc_insertion_point(field_release:ContainerProto.colors) - - ::ColorsElementProto* temp = colors_; - colors_ = NULL; - return temp; -} -inline void ContainerProto::set_allocated_colors(::ColorsElementProto* colors) { - delete colors_; - colors_ = colors; + _impl_.colors_ = colors; if (colors) { } else { } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ContainerProto.colors) +} +inline ::ColorsElementProto* ContainerProto::release_colors() { + + ::ColorsElementProto* temp = _impl_.colors_; + _impl_.colors_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::ColorsElementProto* ContainerProto::unsafe_arena_release_colors() { + // @@protoc_insertion_point(field_release:ContainerProto.colors) + + ::ColorsElementProto* temp = _impl_.colors_; + _impl_.colors_ = nullptr; + return temp; +} +inline ::ColorsElementProto* ContainerProto::_internal_mutable_colors() { + + if (_impl_.colors_ == nullptr) { + auto* p = CreateMaybeMessage<::ColorsElementProto>(GetArenaForAllocation()); + _impl_.colors_ = p; + } + return _impl_.colors_; +} +inline ::ColorsElementProto* ContainerProto::mutable_colors() { + ::ColorsElementProto* _msg = _internal_mutable_colors(); + // @@protoc_insertion_point(field_mutable:ContainerProto.colors) + return _msg; +} +inline void ContainerProto::set_allocated_colors(::ColorsElementProto* colors) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete _impl_.colors_; + } + if (colors) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(colors); + if (message_arena != submessage_arena) { + colors = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, colors, submessage_arena); + } + + } else { + + } + _impl_.colors_ = colors; // @@protoc_insertion_point(field_set_allocated:ContainerProto.colors) } -#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS +#ifdef __GNUC__ + #pragma GCC diagnostic pop +#endif // __GNUC__ // ------------------------------------------------------------------- // ------------------------------------------------------------------- @@ -3656,17 +5986,14 @@ inline void ContainerProto::set_allocated_colors(::ColorsElementProto* colors) { // @@protoc_insertion_point(namespace_scope) -#ifndef SWIG -namespace google { -namespace protobuf { +PROTOBUF_NAMESPACE_OPEN -template <> struct is_proto_enum< ::LineJoin> : ::google::protobuf::internal::true_type {}; -template <> struct is_proto_enum< ::LineCap> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::LineJoin> : ::std::true_type {}; +template <> struct is_proto_enum< ::LineCap> : ::std::true_type {}; -} // namespace protobuf -} // namespace google -#endif // SWIG +PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_indexer_2fdrules_5fstruct_2eproto__INCLUDED +#include +#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_drules_5fstruct_2eproto diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp index 9f61d8afe5..af78c34b2f 100644 --- a/indexer/editable_map_object.cpp +++ b/indexer/editable_map_object.cpp @@ -745,7 +745,7 @@ bool EditableMapObject::ValidateName(string const & name) if (strings::IsASCIIString(name)) { - static auto const s_nameRegex = regex(R"(^[ A-Za-z0-9.,?!@°#$%&()\-\+\/\\\[\]:;"'`]+$)"); + static auto const s_nameRegex = regex(R"(^[ A-Za-z0-9.,?!@#$%&()\-\+:;"'`]+$)"); return regex_match(name, s_nameRegex); } @@ -762,7 +762,7 @@ bool EditableMapObject::ValidateName(string const & name) return false; } - std::u32string const excludedSymbols = U"^~§><{}*=_±\n\t\r\v\f|√•÷׶"; + std::u32string const excludedSymbols = U"^~§><{}[]*=_±\n\t\r\v\f|√•÷׶°"; for (auto const ch : u32name) { diff --git a/indexer/editable_map_object.hpp b/indexer/editable_map_object.hpp index 323db6d00a..2d45c9d108 100644 --- a/indexer/editable_map_object.hpp +++ b/indexer/editable_map_object.hpp @@ -91,7 +91,7 @@ struct LocalizedStreet class EditableMapObject : public MapObject { public: - static uint8_t constexpr kMaximumLevelsEditableByUsers = 50; + static uint8_t constexpr kMaximumLevelsEditableByUsers = 25; bool IsNameEditable() const; bool IsAddressEditable() const; diff --git a/indexer/feature.cpp b/indexer/feature.cpp index 5dcb5a4875..d6d775d6d1 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -691,8 +691,6 @@ m2::RectD FeatureType::GetLimitRect(int scale) if (m_triangles.empty() && m_points.empty() && (GetGeomType() != GeomType::Point)) { - ASSERT(false, ()); - // This function is called during indexing, when we need // to check visibility according to feature sizes. // So, if no geometry for this scale, assume that rect has zero dimensions. @@ -702,14 +700,6 @@ m2::RectD FeatureType::GetLimitRect(int scale) return m_limitRect; } -m2::RectD const & FeatureType::GetLimitRectChecked() const -{ - /// @todo Replace with ASSERTs later. - CHECK(m_parsed.m_points && m_parsed.m_triangles, (m_id)); - CHECK(m_limitRect.IsValid(), (m_id)); - return m_limitRect; -} - bool FeatureType::IsEmptyGeometry(int scale) { ParseGeometryAndTriangles(scale); diff --git a/indexer/feature.hpp b/indexer/feature.hpp index a3d379fce2..11b16984db 100644 --- a/indexer/feature.hpp +++ b/indexer/feature.hpp @@ -86,7 +86,6 @@ public: enum { BEST_GEOMETRY = -1, WORST_GEOMETRY = -2 }; m2::RectD GetLimitRect(int scale); - m2::RectD const & GetLimitRectChecked() const; bool IsEmptyGeometry(int scale); diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp index c76dad7c50..64dba72b0b 100644 --- a/indexer/feature_data.cpp +++ b/indexer/feature_data.cpp @@ -149,10 +149,7 @@ private: {"amenity", "shelter"}, {"amenity", "toilets"}, {"amenity", "drinking_water"}, - {"shop", "copyshop"}, // often used as secondary tag for amenity=post_office {"leisure", "pitch"}, // Give priority to tag "sport"=*. - {"sport", "9pin"}, - {"sport", "10pin"}, {"public_transport", "platform"}, }; diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp index b86dc48598..28aabc0042 100644 --- a/indexer/feature_visibility.cpp +++ b/indexer/feature_visibility.cpp @@ -191,7 +191,7 @@ namespace return base::IsExist(arrTypes, type); } /// @} -} // namespace +} // namespace bool IsCategoryNondrawableType(uint32_t type) { @@ -215,9 +215,24 @@ bool CanGenerateLike(vector const & types, GeomType geomType) return false; } -namespace +bool IsDrawableForIndex(FeatureType & ft, int level) { -bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD const & limitRect, int level) + return IsDrawableForIndexGeometryOnly(ft, level) && + IsDrawableForIndexClassifOnly(TypesHolder(ft), level); +} + +bool IsDrawableForIndex(TypesHolder const & types, m2::RectD limitRect, int level) +{ + return IsDrawableForIndexGeometryOnly(types, limitRect, level) && + IsDrawableForIndexClassifOnly(types, level); +} + +bool IsDrawableForIndexGeometryOnly(FeatureType & ft, int level) +{ + return IsDrawableForIndexGeometryOnly(TypesHolder(ft), + ft.GetLimitRect(FeatureType::BEST_GEOMETRY), level); +} +bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD limitRect, int level) { Classificator const & c = classif(); @@ -244,24 +259,6 @@ bool IsDrawableForIndexClassifOnly(TypesHolder const & types, int level) return false; } -} // namespace - -bool IsDrawableForIndex(FeatureType & ft, int level) -{ - return IsDrawableForIndexGeometryOnly(ft, level) && - IsDrawableForIndexClassifOnly(TypesHolder(ft), level); -} - -bool IsDrawableForIndex(TypesHolder const & types, m2::RectD const & limitRect, int level) -{ - return IsDrawableForIndexGeometryOnly(types, limitRect, level) && - IsDrawableForIndexClassifOnly(types, level); -} - -bool IsDrawableForIndexGeometryOnly(FeatureType & ft, int level) -{ - return IsDrawableForIndexGeometryOnly(TypesHolder(ft), ft.GetLimitRectChecked(), level); -} bool IsUsefulType(uint32_t t, GeomType geomType, bool emptyName) { @@ -296,10 +293,10 @@ bool RemoveUselessTypes(vector & types, GeomType geomType, bool emptyN int GetMinDrawableScale(FeatureType & ft) { - return GetMinDrawableScale(TypesHolder(ft), ft.GetLimitRectChecked()); + return GetMinDrawableScale(TypesHolder(ft), ft.GetLimitRect(FeatureType::BEST_GEOMETRY)); } -int GetMinDrawableScale(TypesHolder const & types, m2::RectD const & limitRect) +int GetMinDrawableScale(TypesHolder const & types, m2::RectD limitRect) { int const upBound = scales::GetUpperStyleScale(); @@ -312,8 +309,7 @@ int GetMinDrawableScale(TypesHolder const & types, m2::RectD const & limitRect) return -1; } -/* -int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD const & limitRect) +int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect) { int const upBound = scales::GetUpperStyleScale(); @@ -325,7 +321,6 @@ int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD const & return -1; } -*/ int GetMinDrawableScaleClassifOnly(TypesHolder const & types) { @@ -450,4 +445,4 @@ bool TypeSetChecker::IsEqual(uint32_t type) const ftype::TruncValue(type, m_level); return (m_type == type); } -} // namespace feature +} // namespace feature diff --git a/indexer/feature_visibility.hpp b/indexer/feature_visibility.hpp index 48b8c6c986..cab998262b 100644 --- a/indexer/feature_visibility.hpp +++ b/indexer/feature_visibility.hpp @@ -1,9 +1,14 @@ #pragma once #include "indexer/drawing_rule_def.hpp" +#include "indexer/feature.hpp" #include "indexer/feature_decl.hpp" +#include "base/base.hpp" + +#include #include +#include #include #include @@ -16,15 +21,15 @@ namespace feature bool IsCategoryNondrawableType(uint32_t type); bool IsUsefulType(uint32_t type); bool IsDrawableForIndex(FeatureType & ft, int level); - bool IsDrawableForIndex(TypesHolder const & types, m2::RectD const & limitRect, int level); + bool IsDrawableForIndex(TypesHolder const & types, m2::RectD limitRect, int level); // The separation into ClassifOnly and GeometryOnly versions is needed to speed up // the geometrical index (see indexer/scale_index_builder.hpp). // Technically, the GeometryOnly version uses the classificator, but it only does // so when checking against coastlines. - //bool IsDrawableForIndexClassifOnly(TypesHolder const & types, int level); + bool IsDrawableForIndexClassifOnly(TypesHolder const & types, int level); bool IsDrawableForIndexGeometryOnly(FeatureType & ft, int level); - //bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD const & limitRect, int level); + bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD limitRect, int level); /// @name Generator check functions. /// @{ @@ -38,8 +43,8 @@ namespace feature /// @} int GetMinDrawableScale(FeatureType & ft); - int GetMinDrawableScale(TypesHolder const & types, m2::RectD const & limitRect); - //int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect); + int GetMinDrawableScale(TypesHolder const & types, m2::RectD limitRect); + int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect); int GetMinDrawableScaleClassifOnly(TypesHolder const & types); /// @return [-1, -1] if range is not drawable @@ -61,6 +66,7 @@ namespace feature std::pair GetDrawableScaleRangeForRules(TypesHolder const & types, int rules); //@} + /// @return (geometry type, is coastline) void GetDrawRule(TypesHolder const & types, int level, drule::KeysT & keys); void GetDrawRule(std::vector const & types, int level, GeomType geomType, drule::KeysT & keys); void FilterRulesByRuntimeSelector(FeatureType & f, int zoomLevel, drule::KeysT & keys); @@ -89,4 +95,4 @@ namespace feature return IsEqualR(v.begin(), v.end()); } }; -} // namespace feature +} diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 4878a414cf..916a86d38e 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -54,7 +54,6 @@ public: m_map[c.GetTypeByPath({"highway", "service"})] = ftypes::HighwayClass::Service; m_map[c.GetTypeByPath({"highway", "track"})] = ftypes::HighwayClass::Service; - m_map[c.GetTypeByPath({"highway", "busway"})] = ftypes::HighwayClass::Service; m_map[c.GetTypeByPath({"man_made", "pier"})] = ftypes::HighwayClass::Service; m_map[c.GetTypeByPath({"highway", "pedestrian"})] = ftypes::HighwayClass::Pedestrian; @@ -145,10 +144,9 @@ bool BaseChecker::IsMatched(uint32_t type) const return (find(m_types.begin(), m_types.end(), PrepareToMatch(type, m_level)) != m_types.end()); } -void BaseChecker::ForEachType(function const & fn) const +void BaseChecker::ForEachType(function && fn) const { - for (auto const & t : m_types) - fn(t); + for_each(m_types.cbegin(), m_types.cend(), move(fn)); } bool BaseChecker::operator()(feature::TypesHolder const & types) const diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index 6a47e28e15..30b3e1ec9f 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -9,8 +9,10 @@ #include #include #include +#include #include #include +#include #include #define DECLARE_CHECKER_INSTANCE(CheckerType) static CheckerType const & Instance() { \ @@ -24,12 +26,12 @@ protected: uint8_t const m_level; std::vector m_types; - explicit BaseChecker(uint8_t level = 2) : m_level(level) {} + BaseChecker(uint8_t level = 2) : m_level(level) {} virtual ~BaseChecker() = default; public: virtual bool IsMatched(uint32_t type) const; - virtual void ForEachType(std::function const & fn) const; + virtual void ForEachType(std::function && fn) const; std::vector const & GetTypes() const { return m_types; } diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp index a1bdff0c4c..58e9195c55 100644 --- a/indexer/indexer_tests/categories_test.cpp +++ b/indexer/indexer_tests/categories_test.cpp @@ -315,7 +315,7 @@ UNIT_TEST(CategoriesIndex_AllCategories) index.AddAllCategoriesInAllLangs(); // Consider deprecating this method if this bound rises as high as a million. LOG(LINFO, ("Number of nodes in the CategoriesIndex trie:", index.GetNumTrieNodes())); - TEST_LESS(index.GetNumTrieNodes(), 650000, ()); + TEST_LESS(index.GetNumTrieNodes(), 600000, ()); } // A check that this data structure is not too heavy. diff --git a/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp b/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp index fcd227ced2..743126f49d 100644 --- a/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp +++ b/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp @@ -3,27 +3,30 @@ #include "indexer/cities_boundaries_serdes.hpp" #include "indexer/city_boundary.hpp" -#include "platform/platform.hpp" - -#include "coding/files_container.hpp" +#include "coding/geometry_coding.hpp" #include "coding/reader.hpp" #include "coding/writer.hpp" +#include "geometry/mercator.hpp" #include "geometry/point2d.hpp" -#include "base/file_name_utils.hpp" - +#include +#include #include -namespace cities_boundaries_serdes_tests -{ using namespace indexer; using namespace m2; +using namespace serial; using namespace std; +namespace +{ using Boundary = vector; using Boundaries = vector; +static_assert(CitiesBoundariesSerDes::kLatestVersion == 0, ""); +static_assert(CitiesBoundariesSerDes::HeaderV0::kDefaultCoordBits == 19, ""); + struct Result { Result(Boundaries const & boundaries, double eps) : m_boundaries(boundaries), m_eps(eps) {} @@ -47,11 +50,7 @@ void TestEqual(BoundingBox const & lhs, BoundingBox const & rhs, double eps) void TestEqual(CalipersBox const & lhs, CalipersBox const & rhs, double eps) { - // SerDes for CaliperBox works without normalization. - CalipersBox norm(rhs); - norm.Normalize(); - - TestEqual(lhs.Points(), norm.Points(), eps); + TestEqual(lhs.Points(), rhs.Points(), eps); } void TestEqual(DiamondBox const & lhs, DiamondBox const & rhs, double eps) @@ -77,7 +76,6 @@ void TestEqual(Boundary const & lhs, Boundary const & rhs, double eps) TestEqual(lhs[i], rhs[i], eps); } -// Eps equal function to compare initial (expected) value (lhs) with encoded-decoded (rhs). void TestEqual(Boundaries const & lhs, Boundaries const & rhs, double eps) { TEST_EQUAL(lhs.size(), rhs.size(), (lhs, rhs)); @@ -132,11 +130,12 @@ UNIT_TEST(CitiesBoundariesSerDes_Smoke) UNIT_TEST(CitiesBoundaries_Moscow) { - vector const points = { - {37.04001, 67.55964}, {37.55650, 66.96428}, {38.02513, 67.37082}, {37.50865, 67.96618} - }; + vector const points = {{37.04001, 67.55964}, + {37.55650, 66.96428}, + {38.02513, 67.37082}, + {37.50865, 67.96618}}; - PointD const target(37.44765, 67.65243); + m2::PointD const target(37.44765, 67.65243); vector buffer; { @@ -160,40 +159,4 @@ UNIT_TEST(CitiesBoundaries_Moscow) TEST(boundaries[0][0].HasPoint(target, precision), ()); } } - -UNIT_TEST(CitiesBoundaries_Compression) -{ - FilesContainerR cont(base::JoinPath(GetPlatform().WritableDir(), WORLD_FILE_NAME) + DATA_FILE_EXTENSION); - - vector> all1; - double precision; - - ReaderSource source1(cont.GetReader(CITIES_BOUNDARIES_FILE_TAG)); - LOG(LINFO, ("Size before:", source1.Size())); - - CitiesBoundariesSerDes::Deserialize(source1, all1, precision); - - vector buffer; - MemWriter writer(buffer); - CitiesBoundariesSerDes::Serialize(writer, all1); - LOG(LINFO, ("Size after:", buffer.size())); - - // Equal test. - vector> all2; - MemReader reader(buffer.data(), buffer.size()); - ReaderSource source2(reader); - CitiesBoundariesSerDes::Deserialize(source2, all2, precision); - - TEST_EQUAL(all1.size(), all2.size(), ()); - for (size_t i = 0; i < all1.size(); ++i) - { - TEST_EQUAL(all1[i].size(), all2[i].size(), ()); - for (size_t j = 0; j < all1[i].size(); ++j) - { - if (!(all1[i][j] == all2[i][j])) - LOG(LINFO, (i, all1[i][j], all2[i][j])); - } - } -} - -} // namespace cities_boundaries_serdes_tests +} // namespace diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp index e655caf861..1fd405080e 100644 --- a/indexer/indexer_tests/editable_map_object_test.cpp +++ b/indexer/indexer_tests/editable_map_object_test.cpp @@ -77,7 +77,7 @@ UNIT_TEST(EditableMapObject_ValidateBuildingLevels) TEST(EditableMapObject::ValidateBuildingLevels("25"), ()); TEST(!EditableMapObject::ValidateBuildingLevels("0"), ()); TEST(!EditableMapObject::ValidateBuildingLevels("005"), ()); - TEST(!EditableMapObject::ValidateBuildingLevels(std::to_string(EditableMapObject::kMaximumLevelsEditableByUsers + 1)), ()); + TEST(!EditableMapObject::ValidateBuildingLevels("26"), ()); TEST(!EditableMapObject::ValidateBuildingLevels("22a"), ()); TEST(!EditableMapObject::ValidateBuildingLevels("a22"), ()); TEST(!EditableMapObject::ValidateBuildingLevels("2a22"), ()); @@ -199,8 +199,8 @@ UNIT_TEST(EditableMapObject_ValidateEmail) UNIT_TEST(EditableMapObject_ValidateName) { vector correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c", "a,b.c", - "a$bc", "a%bc", "a#bc", "a№bc", "c&a", "a[bc"}; - vector incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a #include +#include #include namespace search_string_utils_test @@ -109,7 +111,7 @@ UNIT_TEST(NormalizeAndSimplifyString_Contains) TEST(!ContainsNormalized(kTestStr, "z"), ()); } -UNIT_TEST(Street_Synonym) +UNIT_TEST(StreetSynonym) { TEST(TestStreetSynonym("street"), ()); TEST(TestStreetSynonym("улица"), ()); @@ -119,10 +121,10 @@ UNIT_TEST(Street_Synonym) TEST(!TestStreetSynonym("strase"), ()); TEST(TestStreetSynonymWithMisprints("strase"), ()); -// TEST(TestStreetSynonym("boulevard"), ()); -// TEST(TestStreetSynonymWithMisprints("boulevard"), ()); -// TEST(!TestStreetSynonym("boulevrd"), ()); -// TEST(TestStreetSynonymWithMisprints("boulevrd"), ()); + TEST(TestStreetSynonym("boulevard"), ()); + TEST(TestStreetSynonymWithMisprints("boulevard"), ()); + TEST(!TestStreetSynonym("boulevrd"), ()); + TEST(TestStreetSynonymWithMisprints("boulevrd"), ()); TEST(TestStreetSynonym("avenue"), ()); TEST(TestStreetSynonymWithMisprints("avenue"), ()); @@ -130,57 +132,34 @@ UNIT_TEST(Street_Synonym) TEST(TestStreetSynonymWithMisprints("aveneu"), ()); TEST(!TestStreetSynonymWithMisprints("abcdefg"), ()); - - TEST(TestStreetSynonym("g."), ()); - TEST(TestStreetSynonymWithMisprints("g."), ()); - - TEST(!TestStreetSynonymWithMisprints("ву"), ()); - TEST(TestStreetSynonymWithMisprints("вул"), ()); - - TEST(!TestStreetSynonymWithMisprints("gat"), ()); - TEST(!TestStreetSynonymWithMisprints("sok"), ()); - TEST(!TestStreetSynonymWithMisprints("ca"), ()); - - // soka -> sokak - TEST(TestStreetSynonymWithMisprints("soka"), ()); - TEST(!TestStreetSynonym("soka"), ()); } -UNIT_TEST(Street_PrefixMatch) +UNIT_TEST(StreetPrefixMatch) { - TEST(TestStreetPrefixMatch("у"), ()); - TEST(TestStreetPrefixMatch("ул"), ()); - TEST(TestStreetPrefixMatch("ули"), ()); + TEST(TestStreetPrefixMatch("п"), ()); + TEST(TestStreetPrefixMatch("пр"), ()); + TEST(TestStreetPrefixMatch("про"), ()); + TEST(TestStreetPrefixMatch("прое"), ()); + TEST(TestStreetPrefixMatch("проез"), ()); + TEST(TestStreetPrefixMatch("проезд"), ()); + TEST(!TestStreetPrefixMatch("проездд"), ()); - TEST(TestStreetPrefixMatch("gat"), ()); - TEST(TestStreetPrefixMatch("sok"), ()); - TEST(TestStreetPrefixMatch("ca"), ()); - TEST(TestStreetPrefixMatch("ву"), ()); - -// TEST(TestStreetPrefixMatch("п"), ()); -// TEST(TestStreetPrefixMatch("пр"), ()); -// TEST(TestStreetPrefixMatch("про"), ()); -// TEST(TestStreetPrefixMatch("прое"), ()); -// TEST(TestStreetPrefixMatch("проез"), ()); -// TEST(TestStreetPrefixMatch("проезд"), ()); -// TEST(!TestStreetPrefixMatch("проездд"), ()); - -// TEST(TestStreetPrefixMatchWithMisprints("пр"), ()); -// TEST(!TestStreetPrefixMatch("пре"), ()); -// TEST(!TestStreetPrefixMatchWithMisprints("пре"), ()); -// TEST(!TestStreetPrefixMatch("преу"), ()); -// TEST(TestStreetPrefixMatchWithMisprints("преу"), ()); -// TEST(!TestStreetPrefixMatch("преул"), ()); -// TEST(TestStreetPrefixMatchWithMisprints("преул"), ()); -// TEST(!TestStreetPrefixMatch("преуло"), ()); -// TEST(TestStreetPrefixMatchWithMisprints("преуло"), ()); -// TEST(!TestStreetPrefixMatch("преулок"), ()); -// TEST(TestStreetPrefixMatchWithMisprints("преулок"), ()); -// TEST(!TestStreetPrefixMatch("преулак"), ()); -// TEST(!TestStreetPrefixMatchWithMisprints("преулак"), ()); + TEST(TestStreetPrefixMatchWithMisprints("пр"), ()); + TEST(!TestStreetPrefixMatch("пре"), ()); + TEST(!TestStreetPrefixMatchWithMisprints("пре"), ()); + TEST(!TestStreetPrefixMatch("преу"), ()); + TEST(TestStreetPrefixMatchWithMisprints("преу"), ()); + TEST(!TestStreetPrefixMatch("преул"), ()); + TEST(TestStreetPrefixMatchWithMisprints("преул"), ()); + TEST(!TestStreetPrefixMatch("преуло"), ()); + TEST(TestStreetPrefixMatchWithMisprints("преуло"), ()); + TEST(!TestStreetPrefixMatch("преулок"), ()); + TEST(TestStreetPrefixMatchWithMisprints("преулок"), ()); + TEST(!TestStreetPrefixMatch("преулак"), ()); + TEST(!TestStreetPrefixMatchWithMisprints("преулак"), ()); } -UNIT_TEST(Street_TokensFilter) +UNIT_TEST(StreetTokensFilter) { using List = vector>; @@ -217,7 +196,7 @@ UNIT_TEST(Street_TokensFilter) } { - List expected = {{"набережная", 50}}; + List expected = {{"улица", 100}, {"набережная", 50}}; List actual; Utf8StreetTokensFilter filter(actual); @@ -228,7 +207,7 @@ UNIT_TEST(Street_TokensFilter) } { - List expected = {{"набережная", 1}, {"проспект", 2}}; + List expected = {{"улица", 0}, {"набережная", 1}, {"проспект", 2}}; List actual; Utf8StreetTokensFilter filter(actual); @@ -240,7 +219,8 @@ UNIT_TEST(Street_TokensFilter) } { - List expected = {{"ленинский", 0}, {"пропект", 1}}; + List expectedWithMisprints = {{"ленинский", 0}}; + List expectedWithoutMisprints = {{"ленинский", 0}, {"пропект", 1}}; List actualWithMisprints; List actualWithoutMisprints; @@ -252,12 +232,13 @@ UNIT_TEST(Street_TokensFilter) filterWithMisprints.Put("пропект", false /* isPrefix */, 1 /* tag */); filterWithoutMisprints.Put("пропект", false /* isPrefix */, 1 /* tag */); - TEST_EQUAL(expected, actualWithMisprints, ()); - TEST_EQUAL(expected, actualWithoutMisprints, ()); + TEST_EQUAL(expectedWithMisprints, actualWithMisprints, ()); + TEST_EQUAL(expectedWithoutMisprints, actualWithoutMisprints, ()); } { - List expected = {{"набрежная", 1}}; + List expectedWithMisprints = {{"улица", 0}, {"набрежная", 1}}; + List expectedWithoutMisprints = {{"набрежная", 1}}; List actualWithMisprints; List actualWithoutMisprints; @@ -269,8 +250,8 @@ UNIT_TEST(Street_TokensFilter) filterWithMisprints.Put("набрежная", false /* isPrefix */, 1 /* tag */); filterWithoutMisprints.Put("набрежная", false /* isPrefix */, 1 /* tag */); - TEST_EQUAL(expected, actualWithMisprints, ()); - TEST_EQUAL(expected, actualWithoutMisprints, ()); + TEST_EQUAL(expectedWithMisprints, actualWithMisprints, ()); + TEST_EQUAL(expectedWithoutMisprints, actualWithoutMisprints, ()); } } diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp index 622827070c..736542a189 100644 --- a/indexer/search_string_utils.cpp +++ b/indexer/search_string_utils.cpp @@ -16,29 +16,22 @@ namespace search { -using std::string; +using namespace std; using namespace strings; namespace { -std::vector const kAllowedMisprints = { - MakeUniString("ckq"), - MakeUniString("eyjiu"), - MakeUniString("gh"), - MakeUniString("pf"), - MakeUniString("vw"), - MakeUniString("ао"), - MakeUniString("еиэ"), - MakeUniString("шщ"), +vector const kAllowedMisprints = { + strings::MakeUniString("ckq"), + strings::MakeUniString("eyjiu"), + strings::MakeUniString("gh"), + strings::MakeUniString("pf"), + strings::MakeUniString("vw"), + strings::MakeUniString("ао"), + strings::MakeUniString("еиэ"), + strings::MakeUniString("шщ"), }; -std::pair const kPreprocessReplacements[] = { - {MakeUniString("пр-т"), MakeUniString("проспект")}, - {MakeUniString("пр-д"), MakeUniString("проезд")}, - {MakeUniString("наб-я"), MakeUniString("набережная")} -}; - - void TransliterateHiraganaToKatakana(UniString & s) { // Transliteration is heavy. Check we have any hiragana symbol before transliteration. @@ -47,43 +40,28 @@ void TransliterateHiraganaToKatakana(UniString & s) InitTransliterationInstanceWithDefaultDirs(); string out; - if (Transliteration::Instance().TransliterateForce(ToUtf8(s), "Hiragana-Katakana", out)) + if (Transliteration::Instance().TransliterateForce(strings::ToUtf8(s), "Hiragana-Katakana", out)) s = MakeUniString(out); } } // namespace -size_t GetMaxErrorsForToken(UniString const & token) +size_t GetMaxErrorsForToken(strings::UniString const & token) { - bool const digitsOnly = std::all_of(token.begin(), token.end(), ::isdigit); + bool const digitsOnly = all_of(token.begin(), token.end(), ::isdigit); if (digitsOnly) return 0; return GetMaxErrorsForTokenLength(token.size()); } -LevenshteinDFA BuildLevenshteinDFA(UniString const & s) +strings::LevenshteinDFA BuildLevenshteinDFA(strings::UniString const & s) { - ASSERT(!s.empty(), ()); // In search we use LevenshteinDFAs for fuzzy matching. But due to // performance reasons, we limit prefix misprints to fixed set of substitutions defined in // kAllowedMisprints and skipped letters. - return LevenshteinDFA(s, 1 /* prefixSize */, kAllowedMisprints, GetMaxErrorsForToken(s)); + return strings::LevenshteinDFA(s, 1 /* prefixSize */, kAllowedMisprints, GetMaxErrorsForToken(s)); } -LevenshteinDFA BuildLevenshteinDFA_Category(UniString const & s) -{ - // https://github.com/organicmaps/organicmaps/issues/3655 - // Separate DFA for categories (_Category) to avoid fancy matchings like: - // cafe <-> care - // ecco -> eco - // shop <-> shoe - // warte -> waste - /// @todo "hote" doesn't match "hotel" now. Allow prefix search for categories? - - ASSERT(!s.empty(), ()); - return LevenshteinDFA(s, 1 /* prefixSize */, kAllowedMisprints, GetMaxErrorsForToken_Category(s.size())); -} - -UniString NormalizeAndSimplifyString(std::string_view s) +UniString NormalizeAndSimplifyString(string_view s) { UniString uniString = MakeUniString(s); for (size_t i = 0; i < uniString.size(); ++i) @@ -143,7 +121,7 @@ UniString NormalizeAndSimplifyString(std::string_view s) }); // Replace sequence of spaces with single one. - uniString.erase(std::unique(uniString.begin(), uniString.end(), [](UniChar l, UniChar r) + uniString.erase(unique(uniString.begin(), uniString.end(), [](UniChar l, UniChar r) { return (l == r && l == ' '); }), uniString.end()); @@ -175,11 +153,15 @@ UniString NormalizeAndSimplifyString(std::string_view s) */ } -void PreprocessBeforeTokenization(UniString & query) +void PreprocessBeforeTokenization(strings::UniString & query) { search::Delimiters const delims; + vector> const replacements = { + {MakeUniString("пр-т"), MakeUniString("проспект")}, + {MakeUniString("пр-д"), MakeUniString("проезд")}, + {MakeUniString("наб-я"), MakeUniString("набережная")}}; - for (auto const & replacement : kPreprocessReplacements) + for (auto const & replacement : replacements) { auto start = query.begin(); while ((start = std::search(start, query.end(), replacement.first.begin(), @@ -188,7 +170,7 @@ void PreprocessBeforeTokenization(UniString & query) auto end = start + replacement.first.size(); if ((start == query.begin() || delims(*(start - 1))) && (end == query.end() || delims(*end))) { - auto const dist = std::distance(query.begin(), start); + auto const dist = distance(query.begin(), start); query.Replace(start, end, replacement.second.begin(), replacement.second.end()); start = query.begin() + dist; } @@ -203,14 +185,14 @@ UniString FeatureTypeToString(uint32_t type) return UniString(s.begin(), s.end()); } -std::vector NormalizeAndTokenizeString(std::string_view s) +std::vector NormalizeAndTokenizeString(std::string_view s) { - std::vector tokens; + std::vector tokens; ForEachNormalizedToken(s, base::MakeBackInsertFunctor(tokens)); return tokens; } -bool TokenizeStringAndCheckIfLastTokenIsPrefix(std::string_view s, std::vector & tokens) +bool TokenizeStringAndCheckIfLastTokenIsPrefix(std::string_view s, std::vector & tokens) { auto const uniString = NormalizeAndSimplifyString(s); @@ -256,8 +238,8 @@ public: void Swap(BooleanSum & rhs) { - std::swap(m_value, rhs.m_value); - std::swap(m_empty, rhs.m_empty); + swap(m_value, rhs.m_value); + swap(m_empty, rhs.m_empty); } bool m_value; @@ -279,11 +261,11 @@ public: bool MatchWithMisprints(DFA const & dfa) const { using TrieIt = Trie::Iterator; - using State = std::pair; + using State = pair; auto const trieRoot = m_strings.GetRootIterator(); - std::queue q; + queue q; q.emplace(trieRoot, dfa.Begin()); while (!q.empty()) @@ -294,14 +276,13 @@ public: auto const & currTrieIt = p.first; auto const & currDfaIt = p.second; - if (currDfaIt.Accepts() && !currTrieIt.GetValues().Empty()) + if (currDfaIt.Accepts()) return true; - currTrieIt.ForEachMove([&q, &currDfaIt](UniChar const & c, TrieIt const & nextTrieIt) - { + currTrieIt.ForEachMove([&q, &currDfaIt](UniChar const & c, TrieIt const & nextTrieIt) { auto nextDfaIt = currDfaIt; nextDfaIt.Move(c); - DFAMove(nextDfaIt, nextTrieIt.GetLabel()); + strings::DFAMove(nextDfaIt, nextTrieIt.GetLabel()); if (!nextDfaIt.Rejects()) q.emplace(nextTrieIt, nextDfaIt); }); @@ -311,80 +292,114 @@ public: } private: - // Keep only *very-common-used* synonyms here (can increase search index, otherwise). - // Too many synonyms increases entropy only and produces messy results .. + /// @todo Print most common street tokens for each country on generator stage + /// (OSM ground truth) and compare with these synonyms. StreetsSynonymsHolder() { char const * affics[] = { // Russian - Русский - "улица", "ул", + "аллея", "бульвар", "набережная", "переулок", "площадь", "проезд", "проспект", "шоссе", "тупик", "улица", "тракт", "ал", "бул", "наб", "пер", "пл", "пр", "просп", "ш", "туп", "ул", "тр", // English - English - "street", "st", "road", "rd", "drive", "dr", "lane", "ln", "avenue", "av", + "street", "st", "avenue", "av", "ave", "square", "sq", "road", "rd", "boulevard", "blvd", "drive", "dr", "highway", "hwy", "lane", "ln", "way", "circle", "place", "pl", // Belarusian - Беларуская мова - "вуліца", "вул", + "вуліца", "вул", "завулак", "набярэжная", "плошча", "пл", "праезд", "праспект", "пр", "тракт", "тр", "тупік", - // Arabic - "شارع", + // Bulgarian - Български + "булевард", "бул", "площад", "пл", "улица", "ул", "квартал", "кв", - // Armenian - "փողոց", + /// @todo Do not use popular POI (carrefour) or Street name (rambla) tokens as generic street synonyms. + /// This POIs (Carrefour supermarket) and Streets (La Rambla - most popular street in Barcelona) + /// will be lost in search results, otherwise. + /// Should reconsider candidates fetching and sorting logic from scratch to make correct processing. + + // Canada + "allee", "alley", "autoroute", "aut", "bypass", "byway", /*"carrefour", "carref",*/ "côte", "expressway", "freeway", "fwy", "pky", "pkwy", + /// @todo Do not use next _common search_ (e.g. 'park' is a prefix of 'parkway') tokens as generic street synonyms. + /// Should reconsider streets matching logic to get this synonyms back. + //"line", "link", "loop", "parkway", "parkvej", "path", "pathway", "route", "trail", "walk" // Catalan language (Barcelona, Valencia, ...) - "carrer", + "avinguda", "carrer", /*"rambla", "ronda",*/ "passeig", "passatge", "travessera", // Croatian - Hrvatski - "ulica", // Also common used transcription from RU + "šetalište", "trg", "ulica", "ul", "poljana", + + // Czech - Čeština + "ulice", "ul", "náměstí", "nám", "nábřeží", "nábr", + + // Danish - Dansk + "plads", "alle", "gade", "vej", + + // Dutch - Nederlands + "laan", "ln.", "straat", "steenweg", "stwg", "st", + + // Estonian - Eesti + "maantee", "mnt", "puiestee", "tee", "pst", + + // Finnish - Suomi + "kaari", "kri", "katu", "kuja", "kj", "kylä", "polku", "tie", "t", "tori", "väylä", "vlä", // French - Français - "rue", - - // Georgia - "ქუჩა", + "rue", "avenue", "carré", "cercle", "route", "boulevard", "drive", "autoroute", "lane", "chemin", // German - Deutsch - "straße", "str", + "allee", "al", "brücke", "br", "chaussee", "gasse", "gr", "pfad", "straße", "str", "weg", "platz", // Hungarian - Magyar - "utca", "út", + "utca", "út", "u.", "tér", "körút", "krt.", "rakpart", "rkp.", - // Indonesia - "jalan", + // Italian - Italiano + "corso", "piazza", "piazzale", "strada", "via", "viale", "calle", "fondamenta", - // Italian - Italiano - "via", - - /// @todo Also expect that this synonyms should be in categories.txt list, but we dont support lt, lv langs now. - /// @{ // Latvian - Latviešu - "iela", + "iela", "laukums", + // Lithuanian - Lietuvių - "gatvė", "g.", - ///@} + "gatvė", "g.", "aikštė", "a", "prospektas", "pr.", "pl", "kel", + + // Nepalese - नेपाली + "मार्ग", "marg", + + // Norwegian - Norsk + // Details here: https://github.com/organicmaps/organicmaps/issues/3616 + "vei", "veien", "veg", "vegen", "vn", "gata", "gate", "gaten", "gt", "plass", "plassen", "sving", "sv", "allé", + + // Polish - Polski + "aleja", "aleje", "aleji", "alejach", "aleją", "plac", "placu", "placem", "ulica", "ulicy", // Portuguese - Português - "rua", + "rua", "r.", "travessa", "tr.", "praça", "pç.", "avenida", "quadrado", "estrada", "boulevard", "carro", "auto-estrada", "lane", "caminho", - // Romanian - Română (Moldova) - "strada", + // Romanian - Română + "bul", "bdul", "blv", "bulevard", "bulevardu", "calea", "cal", "piața", "pţa", "pța", "strada", "stra", "stradela", "sdla", "stradă", "unitate", "autostradă", "lane", + + // Slovenian - Slovenščina + "cesta", "ulica", "trg", "nabrežje", // Spanish - Español - "calle", "avenida", + "avenida", "avd", "avda", "bulevar", "bulev", "calle", "calleja", "cllja", "callejón", "callej", "cjon", "callejuela", "cjla", "callizo", "cllzo", "calzada", "czada", "costera", "coste", "plza", "pza", "plazoleta", "pzta", "plazuela", "plzla", "tránsito", "trans", "transversal", "trval", "trasera", "tras", "travesía", "trva", "paseo", "plaça", + + // Swedish - Svenska + "väg", "vägen", "gata", "gatan", "gränd", "gränden", "stig", "stigen", "plats", "platsen", "allé", // Turkish - Türkçe - "sokağı", "sokak", "sk", + "sokak", "sk.", "sok", "sokağı", "cadde", "cad", "cd", "caddesi", "bulvar", "bulvarı", "blv.", // Ukrainian - Українська - "вулиця", "вул", + "дорога", "провулок", "площа", "шосе", "вулиця", "дор", "пров", "вул", // Vietnamese - Tiếng Việt - "đường", + "quốc lộ", "ql", "tỉnh lộ", "tl", "Đại lộ", "Đl", "Đường", "Đ", "Đường sắt", "Đs", "Đường phố", "Đp", "vuông", "con Đường", "Đại lộ", "Đường cao tốc", }; for (auto const * s : affics) - m_strings.Add(NormalizeAndSimplifyString(s), true /* end of string */); + { + UniString const us = NormalizeAndSimplifyString(s); + m_strings.Add(us, true /* end of string */); + } } Trie m_strings; @@ -413,13 +428,13 @@ string DropLastToken(string const & str) return string(str.begin(), iter.base()); } -UniString GetStreetNameAsKey(std::string_view name, bool ignoreStreetSynonyms) +UniString GetStreetNameAsKey(string_view name, bool ignoreStreetSynonyms) { if (name.empty()) return UniString(); UniString res; - Tokenize(name, kStreetTokensSeparator, [&](std::string_view v) + Tokenize(name, kStreetTokensSeparator, [&](string_view v) { UniString const s = NormalizeAndSimplifyString(v); if (!ignoreStreetSynonyms || !IsStreetSynonym(s)) @@ -444,7 +459,7 @@ bool IsStreetSynonymWithMisprints(UniString const & s) bool IsStreetSynonymPrefixWithMisprints(UniString const & s) { - auto const dfa = PrefixDFAModifier(BuildLevenshteinDFA(s)); + auto const dfa = strings::PrefixDFAModifier(BuildLevenshteinDFA(s)); return StreetsSynonymsHolder::Instance().MatchWithMisprints(dfa); } @@ -456,35 +471,29 @@ bool ContainsNormalized(string const & str, string const & substr) } // StreetTokensFilter ------------------------------------------------------------------------------ -void StreetTokensFilter::Put(UniString const & token, bool isPrefix, size_t tag) +void StreetTokensFilter::Put(strings::UniString const & token, bool isPrefix, size_t tag) { - if (isPrefix) - { - if (m_withMisprints) - { - if (IsStreetSynonymPrefixWithMisprints(token)) - return; - } - else - { - if (IsStreetSynonymPrefix(token)) - return; - } - } - else - { - if (m_withMisprints) - { - if (IsStreetSynonymWithMisprints(token)) - return; - } - else - { - if (IsStreetSynonym(token)) - return; - } - } + using IsStreetChecker = std::function; - m_callback(token, tag); + IsStreetChecker isStreet = m_withMisprints ? IsStreetSynonymWithMisprints : IsStreetSynonym; + IsStreetChecker isStreetPrefix = + m_withMisprints ? IsStreetSynonymPrefixWithMisprints : IsStreetSynonymPrefix; + + auto const isStreetSynonym = isStreet(token); + if ((isPrefix && isStreetPrefix(token)) || (!isPrefix && isStreetSynonym)) + { + ++m_numSynonyms; + if (m_numSynonyms == 1) + { + m_delayedToken = token; + m_delayedTag = tag; + return; + } + + // Do not emit delayed token for incomplete street synonym. + if ((!isPrefix || isStreetSynonym) && m_numSynonyms == 2) + EmitToken(m_delayedToken, m_delayedTag); + } + EmitToken(token, tag); } } // namespace search diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp index 7e306ab72b..36ec0f0850 100644 --- a/indexer/search_string_utils.hpp +++ b/indexer/search_string_utils.hpp @@ -19,20 +19,9 @@ inline constexpr size_t GetMaxErrorsForTokenLength(size_t length) return 1; return 2; } - -inline constexpr size_t GetMaxErrorsForToken_Category(size_t length) -{ - if (length < 7) - return 0; - if (length < 10) - return 1; - return 2; -} - size_t GetMaxErrorsForToken(strings::UniString const & token); strings::LevenshteinDFA BuildLevenshteinDFA(strings::UniString const & s); -strings::LevenshteinDFA BuildLevenshteinDFA_Category(strings::UniString const & s); // This function should be used for all search strings normalization. // It does some magic text transformation which greatly helps us to improve our search. @@ -125,6 +114,14 @@ public: void Put(strings::UniString const & token, bool isPrefix, size_t tag); private: + using Cell = std::pair; + + inline void EmitToken(strings::UniString const & token, size_t tag) { m_callback(token, tag); } + + strings::UniString m_delayedToken; + size_t m_delayedTag = 0; + size_t m_numSynonyms = 0; + Callback m_callback; bool m_withMisprints = false; }; diff --git a/indexer/validate_and_format_contacts.cpp b/indexer/validate_and_format_contacts.cpp index 00c4ee462d..5bc74f50ed 100644 --- a/indexer/validate_and_format_contacts.cpp +++ b/indexer/validate_and_format_contacts.cpp @@ -4,9 +4,6 @@ #include "base/string_utils.hpp" -#include // strlen -#include - namespace osm { using namespace std; @@ -293,7 +290,7 @@ bool ValidateWebsite(string const & site) if ('.' == site[startPos] || '.' == site.back()) return false; - if (string::npos == site.find('.')) + if (string::npos == site.find(".")) return false; if (string::npos != site.find("..")) diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index a5d8b03f3d..526069a59a 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -181,7 +181,7 @@ 9974CA2823DF1968003FE824 /* ElevationProfileData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ElevationProfileData.mm; sourceTree = ""; }; 9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ElevationProfileData+Core.h"; sourceTree = ""; }; AC6A585628057CC1003EABAF /* StringUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringUtils.h; sourceTree = ""; }; - FAA6D8CF29205D2D00E8D50D /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FAA6D8CF29205D2D00E8D50D /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -246,7 +246,7 @@ 4700161123425CFC00EBF03D /* Frameworks */ = { isa = PBXGroup; children = ( - FAA6D8CF29205D2D00E8D50D /* libcppjansson.a */, + FAA6D8CF29205D2D00E8D50D /* libjansson.a */, 4700161223425CFD00EBF03D /* UIKit.framework */, ); name = Frameworks; @@ -606,7 +606,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -630,7 +629,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index 5afef3cc85..e987ebc671 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -35,6 +35,7 @@ NS_SWIFT_NAME(BookmarksManager) - (void)loadBookmarks; - (BOOL)isCategoryNotEmpty:(MWMMarkGroupID)groupId; +- (BOOL)isSearchAllowed:(MWMMarkGroupID)groupId; - (void)prepareForSearch:(MWMMarkGroupID)groupId; - (NSString *)getCategoryName:(MWMMarkGroupID)groupId; - (uint64_t)getCategoryMarksCount:(MWMMarkGroupID)groupId; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index f784405dc8..e20d6a114d 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -195,6 +195,10 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting (self.bm.GetUserMarkIds(groupId).size() + self.bm.GetTrackIds(groupId).size()); } +- (BOOL)isSearchAllowed:(MWMMarkGroupID)groupId { + return self.bm.IsSearchAllowed(groupId); +} + - (void)prepareForSearch:(MWMMarkGroupID)groupId { self.bm.PrepareForSearch(groupId); } diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h index de9aeea8df..3742d64a22 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h @@ -32,7 +32,6 @@ NS_ASSUME_NONNULL_BEGIN @interface PlacePagePreviewData : NSObject @property(nonatomic, readonly, nullable) NSString *title; -@property(nonatomic, readonly, nullable) NSString *secondaryTitle; @property(nonatomic, readonly, nullable) NSString *subtitle; @property(nonatomic, readonly, nullable) NSString *coordinates; @property(nonatomic, readonly, nullable) NSString *address; diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm index 5a88e7fd5a..72abfde1ac 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm @@ -89,7 +89,6 @@ static PlacePageDataHotelType convertHotelType(std::optional Must be a URL that conforms to RFC 2396. This method parses URLString according to RFCs 1738 and 1808. - // The right way to encode the URL string should be: + // This deprecated method (almost) properly encodes whole string, while leaving & and / not encoded. + // A better way to encode the URL string should be: // 1. Split the (non-ASCII) string into components (host, path, query, fragment, etc.) - // 2. Encode each component separately (they have different allowed characters). + // 2. Encode each component separately (they have different rules). // 3. Merge them back into the string and create NSURL. - NSMutableCharacterSet * charset = [[NSMutableCharacterSet alloc] init]; - [charset formUnionWithCharacterSet:NSCharacterSet.URLHostAllowedCharacterSet]; - [charset formUnionWithCharacterSet:NSCharacterSet.URLPathAllowedCharacterSet]; - [charset formUnionWithCharacterSet:NSCharacterSet.URLQueryAllowedCharacterSet]; - [charset formUnionWithCharacterSet:NSCharacterSet.URLFragmentAllowedCharacterSet]; - [charset addCharactersInString:@"#;/?:@&=+$,"]; - NSString * encoded = [urlString stringByAddingPercentEncodingWithAllowedCharacters:charset]; - // Matrix has an url with two hashes which doesn't work for NSURL and NSURLComponent. - NSRange const matrixUrl = [encoded rangeOfString:@"#/#"]; - if (matrixUrl.location != NSNotFound) - encoded = [encoded stringByReplacingOccurrencesOfString:@"#/#" withString:@"#/%23"]; + NSString * encoded = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSURLComponents * urlc = [NSURLComponents componentsWithString:encoded]; if (!urlc) { diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.m b/iphone/Maps/Classes/Components/MWMTableViewController.m index 86d6c42e07..e53286a0f0 100644 --- a/iphone/Maps/Classes/Components/MWMTableViewController.m +++ b/iphone/Maps/Classes/Components/MWMTableViewController.m @@ -19,27 +19,6 @@ return NO; } -- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section -{ - [self fixHeaderAndFooterFontsInDarkMode:view]; -} - -- (void)tableView:(UITableView *)tableView willDisplayFooterView:(UIView *)view forSection:(NSInteger)section -{ - [self fixHeaderAndFooterFontsInDarkMode:view]; -} - -// Fix table section header font color for all tables, including Setting and Route Options. -- (void)fixHeaderAndFooterFontsInDarkMode:(UIView*)headerView { - if ([headerView isKindOfClass: [UITableViewHeaderFooterView class]]) { - UITableViewHeaderFooterView* header = (UITableViewHeaderFooterView *)headerView; - header.textLabel.textColor = [UIColor blackSecondaryText]; - if (self.tableView.style == UITableViewStyleGrouped) { - header.detailTextLabel.textColor = [UIColor blackSecondaryText]; - } - } -} - - (void)viewDidLoad { [super viewDidLoad]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 817b811dd0..74107c49a5 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -59,7 +59,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.sideButtonsHidden = NO; self.trafficButtonHidden = NO; self.isDirectionViewHidden = YES; - self.menuState = MWMBottomMenuStateInactive; self.menuRestoreState = MWMBottomMenuStateInactive; return self; } @@ -288,7 +287,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; _hidden = hidden; self.sideButtonsHidden = _sideButtonsHidden; self.trafficButtonHidden = _trafficButtonHidden; - self.menuState = hidden ? MWMBottomMenuStateHidden : MWMBottomMenuStateInactive; + self.menuState = _menuState = hidden ? MWMBottomMenuStateHidden : MWMBottomMenuStateInactive; } - (void)setZoomHidden:(BOOL)zoomHidden { diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index bd258b3885..e19913a81f 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -356,14 +356,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; */ } -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - // Cold start deep links should be handled when the map is initialized. - // Otherwise PP container view is nil, or there is no animation/selection of the point. - if (DeepLinkHandler.shared.isLaunchedByDeeplink) - (void)[DeepLinkHandler.shared handleDeepLink]; -} - - (void)viewDidLayoutSubviews { [super viewDidLayoutSubviews]; if (!self.mapView.drapeEngineCreated) @@ -560,11 +552,11 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; if (self.isViewLoaded) { auto searchState = MWMSearchManagerStateHidden; [MWMRouter stopRouting]; - if ([action isEqualToString:@"app.organicmaps.3daction.bookmarks"]) + if ([action isEqualToString:@"me.maps.3daction.bookmarks"]) [self.bookmarksCoordinator open]; - else if ([action isEqualToString:@"app.organicmaps.3daction.search"]) + else if ([action isEqualToString:@"me.maps.3daction.search"]) searchState = MWMSearchManagerStateDefault; - else if ([action isEqualToString:@"app.organicmaps.3daction.route"]) + else if ([action isEqualToString:@"me.maps.3daction.route"]) [self.controlsManager onRoutePrepare]; [MWMSearchManager manager].state = searchState; } else { diff --git a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift index 8b7b2d1a39..1928dcba98 100644 --- a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift +++ b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift @@ -16,11 +16,6 @@ } func applicationDidOpenUrl(_ url: URL) -> Bool { - // On the cold start, isLaunchedByDeeplink is set and handleDeepLink() call is delayed - // until the map view will be fully initialized. - guard !isLaunchedByDeeplink else { return true } - - // On the hot start, link can be processed immediately. self.url = url return handleDeepLink(url: url) } diff --git a/iphone/Maps/Core/Settings/MWMSettings.h b/iphone/Maps/Core/Settings/MWMSettings.h index 33098076bf..4579c000df 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.h +++ b/iphone/Maps/Core/Settings/MWMSettings.h @@ -31,7 +31,4 @@ NS_SWIFT_NAME(Settings) + (BOOL)isTrackWarningAlertShown; + (void)setTrackWarningAlertShown:(BOOL)shown; -+ (NSString *)donateUrl; -+ (BOOL)isNY; - @end diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index 2637a477b1..36294c7d16 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -77,9 +77,9 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown"; if ([MWMCarPlayService shared].isCarplayActivated) { UIUserInterfaceStyle style = [[MWMCarPlayService shared] interfaceStyle]; switch (style) { - case UIUserInterfaceStyleLight: return MWMThemeDay; - case UIUserInterfaceStyleDark: return MWMThemeNight; - case UIUserInterfaceStyleUnspecified: break; + case UIUserInterfaceStyleLight: return MWMThemeDay; + case UIUserInterfaceStyleDark: return MWMThemeNight; + case UIUserInterfaceStyleUnspecified: break; } } auto ud = NSUserDefaults.standardUserDefaults; @@ -148,17 +148,4 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown"; [ud setBool:shown forKey:kUDTrackWarningAlertWasShown]; [ud synchronize]; } - -+ (NSString *)donateUrl -{ - std::string url; - return settings::Get("DonateUrl", url) ? @(url.c_str()) : nil; -} - -+ (BOOL)isNY -{ - bool isNY; - return settings::Get("NY", isNY) ? isNY : false; -} - @end diff --git a/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/Contents.json b/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/Contents.json deleted file mode 100644 index 293e7cf83d..0000000000 --- a/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "ic_christmas_tree.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/ic_christmas_tree.svg b/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/ic_christmas_tree.svg deleted file mode 100644 index 54673aff67..0000000000 --- a/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/ic_christmas_tree.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json index 73c00596a7..da4a164c91 100644 --- a/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json +++ b/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } -} +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/Contents.json similarity index 51% rename from iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/Contents.json index a12c271ac5..725d7e5511 100644 --- a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "filename" : "ic_menu_donate.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "icTypeHotel.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { "template-rendering-intent" : "template" } -} +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/icTypeHotel.pdf b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/icTypeHotel.pdf new file mode 100644 index 0000000000..44d9c228a2 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/icTypeHotel.pdf differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/Contents.json new file mode 100644 index 0000000000..4ba8fb33b1 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_menu_discovery.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/ic_menu_discovery.pdf b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/ic_menu_discovery.pdf new file mode 100644 index 0000000000..1e0375726e Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/ic_menu_discovery.pdf differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg deleted file mode 100644 index 2ddaeefa50..0000000000 --- a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json new file mode 100644 index 0000000000..6e955e770b --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_menu_showcase.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_menu_showcase@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_menu_showcase@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png new file mode 100644 index 0000000000..38d763ba0f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png new file mode 100644 index 0000000000..30af8a65ba Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png new file mode 100644 index 0000000000..455ab799fc Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png differ diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings index 63953802b5..608d7f644c 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ar */ diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 20afa8f9b6..b4037243d7 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ar */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "ًلاحقا"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "البحث"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "قائمة الإشارات المرجعية"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "الإشارات المرجعية"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "اسئلة مكررة"; -/* Button in the main menu */ -"donate" = "ﻉﺮﺒﺘﻳ"; - /* Button in the main Help dialog */ "how_to_support_us" = "كيف يمكنك دعمنا؟"; @@ -710,8 +704,8 @@ "editor_storey_number" = "عدد الطوابق (بحد أقصى %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "يجب ألا يتجاوز عدد طوابق المبنى %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "يجب ألا يتجاوز عدد طوابق المبنى 25"; "editor_zip_code" = "الرمز البريدي"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "مسار"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "محطة شحن"; -"type.amenity.charging_station.motorcar" = "محطة شحن"; - "type.amenity.childcare" = "حضانة"; "type.amenity.cinema" = "سينما"; -"type.leisure.bowling_alley" = "ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ"; - "type.amenity.clinic" = "عيادة"; "type.amenity.college" = "كلية"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "ﺽﺭﻻﺍ ﺖﺤﺗ ﻒﻗﻮﻣ"; -"type.amenity.parking_entrance" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ"; - "type.amenity.parking_entrance.private" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ"; "type.amenity.parking_entrance.permissive" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ"; +"type.amenity.parking_entrance" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ"; + "type.amenity.parking_space" = "مكان لوقوف السيارات"; "type.amenity.parking_space.permissive" = "مكان لوقوف السيارات"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "هاتف الطوارئ"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "مدخل"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "ﻲﺴﻴﺋﺮﻟﺍ ﻞﺧﺪﻤﻟﺍ"; - "type.healthcare.laboratory" = "مختبر طبي"; "type.healthcare.physiotherapist" = "اخصائي علاج طبيعي"; -"type.healthcare.alternative" = "الطب البديل"; - -"type.healthcare.audiologist" = "السمع"; - -"type.healthcare.blood_donation" = "مركز التبرع بالدم"; - -"type.healthcare.optometrist" = "قياس البصر"; - -"type.healthcare.podiatrist" = "علاج الأرجل"; - -"type.healthcare.psychotherapist" = "العلاج النفسي"; - -"type.healthcare.sample_collection" = "أخذ العينات"; - -"type.healthcare.speech_therapist" = "علاج النطق"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "نفق"; -"type.highway.busway" = "ﺺﺼﺨﻣ ﺕﻼﻓﺎﺣ ﻖﻳﺮﻃ"; - "type.highway.bus_stop" = "موقف حافلة"; "type.highway.construction" = "طريق تحت الإنشاء"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "ملاهي مائية"; "type.leisure.beach_resort" = "منتجع شاطئي"; diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict index b28ce73203..83ac0d1279 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings index 8346bb6e19..aa1dcea8c1 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: be */ @@ -10,16 +10,16 @@ "search" = "Search"; /* Used in home screen quick actions. */ -"bookmarks" = "Закладкі"; +"bookmarks" = "Bookmarks"; /* Used in home screen quick actions. */ -"route" = "Маршрут"; +"route" = "Route"; /********** gps strings **********/ /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */ -"NSLocationAlwaysUsageDescription" = "Вызначэнне месцазнаходжання ў фонавым рэжыме неабходна для поўнага выкарыстання функцыянальнасці праграмы. Яно выкарыстоўваецца для навігацыі і захавання вашага нядаўна пройдзенага шляху."; +"NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track."; /* Needed to explain why we require access to GPS coordinates when the app is active. */ -"NSLocationWhenInUseUsageDescription" = "Вызначэнне вашага месцазнаходжання неабходна для навігацыі і для захавання вашага нядаўна пройдзенага шляху."; +"NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track."; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index ac5a9648e5..e7968490de 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: be */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Потым"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Шукаць"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Спісы закладак"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Закладкі"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Пытанні і адказы"; -/* Button in the main menu */ -"donate" = "Падтрымаць грашыма"; - /* Button in the main Help dialog */ "how_to_support_us" = "Як нас падтрымаць?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Колькасць паверхаў (максімум %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Колькасць паверхаў павінна быць не больш за %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Колькасць паверхаў павінна быць не больш за 25"; "editor_zip_code" = "Паштовы індэкс"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Сцежка"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsRu"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/ru/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Боўлінг"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Падземны паркінг"; -"type.amenity.parking_entrance" = "Уваход на паркоўку"; - "type.amenity.parking_entrance.private" = "Уваход на паркоўку"; "type.amenity.parking_entrance.permissive" = "Уваход на паркоўку"; +"type.amenity.parking_entrance" = "Уваход на паркоўку"; + "type.amenity.parking_space" = "Parking Space"; "type.amenity.parking_space.permissive" = "Parking Space"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Галоўны ўваход"; - "type.healthcare.laboratory" = "Медыцынская лабараторыя"; "type.healthcare.physiotherapist" = "Фізіятэрапеўт"; -"type.healthcare.alternative" = "Альтэрнатыўная медыцына"; - -"type.healthcare.audiologist" = "Аўдыялогія"; - -"type.healthcare.blood_donation" = "Цэнтр донарства крыві"; - -"type.healthcare.optometrist" = "Оптаметрыя"; - -"type.healthcare.podiatrist" = "Подологія"; - -"type.healthcare.psychotherapist" = "Псіхатэрапія"; - -"type.healthcare.sample_collection" = "Збор аналізаў"; - -"type.healthcare.speech_therapist" = "лагапедыя"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Тунэль"; -"type.highway.busway" = "Выдзеленая аўтобусная дарога"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Road Under Construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.stringsdict index 5d9908302f..f379115672 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings index 08a89068ea..fc25ba1665 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: bg */ diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 0018d68fe8..eae240d5ab 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: bg */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "По-късно"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Търсене"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bookmark Lists"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Отметки"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Въпроси и отговори"; -/* Button in the main menu */ -"donate" = "Дарете"; - /* Button in the main Help dialog */ "how_to_support_us" = "Как да ни подкрепите?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Брой етажи (максимум %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Броят на етажите не трябва да надвишава %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Броят на етажите не трябва да надвишава 25"; "editor_zip_code" = "Пощенски код"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Пътека"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Боулинг писта"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Подземен паркинг"; -"type.amenity.parking_entrance" = "Вход за паркинг"; - "type.amenity.parking_entrance.private" = "Вход за паркинг"; "type.amenity.parking_entrance.permissive" = "Вход за паркинг"; +"type.amenity.parking_entrance" = "Вход за паркинг"; + "type.amenity.parking_space" = "Parking Space"; "type.amenity.parking_space.permissive" = "Parking Space"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Главния вход"; - "type.healthcare.laboratory" = "Медицинска лаборатория"; "type.healthcare.physiotherapist" = "Физиотерапевт"; -"type.healthcare.alternative" = "Алтернативна медицина"; - -"type.healthcare.audiologist" = "Аудиология"; - -"type.healthcare.blood_donation" = "Център за кръводаряване"; - -"type.healthcare.optometrist" = "Оптометрия"; - -"type.healthcare.podiatrist" = "Подиология"; - -"type.healthcare.psychotherapist" = "Психотерапия"; - -"type.healthcare.sample_collection" = "Вземане на проби"; - -"type.healthcare.speech_therapist" = "Логопедия"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Тунел"; -"type.highway.busway" = "Обособен автобусен път"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Road Under Construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.stringsdict index 36acd9fa05..f7fb5fc250 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings index 3271b738bc..8a96274e60 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ca */ @@ -10,16 +10,16 @@ "search" = "Search"; /* Used in home screen quick actions. */ -"bookmarks" = "Marcadors"; +"bookmarks" = "Bookmarks"; /* Used in home screen quick actions. */ -"route" = "Ruta"; +"route" = "Route"; /********** gps strings **********/ /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */ -"NSLocationAlwaysUsageDescription" = "La detecció de la ubicació en segon pla és necessària per gaudir plenament de la funcionalitat de l'aplicació. S'utilitza per a la navegació i desar la ruta feta recentment."; +"NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track."; /* Needed to explain why we require access to GPS coordinates when the app is active. */ -"NSLocationWhenInUseUsageDescription" = "Determinar la vostra ubicació és necessari per a la navegació i per desar el vostre recorregut recentment."; +"NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track."; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings index 0c3fc1b4e0..8be93a3e74 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ca */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Més tard"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Cerca"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Llistes de marcadors"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Marcadors"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Preguntes més freqüents"; -/* Button in the main menu */ -"donate" = "Donatiu"; - /* Button in the main Help dialog */ "how_to_support_us" = "Com ajudar-nos?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Nombre de plantes (màxim %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "El nombre de plantes no pot excedir de %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "El nombre de plantes no pot excedir de 25"; "editor_zip_code" = "Codi postal"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Traça"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Bolera"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underground Parking"; -"type.amenity.parking_entrance" = "Parking entrance"; - "type.amenity.parking_entrance.private" = "Parking entrance"; "type.amenity.parking_entrance.permissive" = "Parking entrance"; +"type.amenity.parking_entrance" = "Parking entrance"; + "type.amenity.parking_space" = "Parking Space"; "type.amenity.parking_space.permissive" = "Parking Space"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrada principal"; - "type.healthcare.laboratory" = "Medical Laboratory"; "type.healthcare.physiotherapist" = "Physiotherapist"; -"type.healthcare.alternative" = "Alternative medicine"; - -"type.healthcare.audiologist" = "Audiology"; - -"type.healthcare.blood_donation" = "Blood donation center"; - -"type.healthcare.optometrist" = "Optometry"; - -"type.healthcare.podiatrist" = "Podiatry"; - -"type.healthcare.psychotherapist" = "Psychotherapy"; - -"type.healthcare.sample_collection" = "Sample collection"; - -"type.healthcare.speech_therapist" = "Logopedics"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Carretera dedicada a l'autobús"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Road Under Construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict index 44e372ec5b..541c085b2f 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings index d18cf74e1f..9cdcc69213 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: cs */ diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 61ff8ccf64..f265cadc70 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: cs */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Později"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Hledat"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Skupiny záložek"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Záložky"; /* Default bookmark list name */ @@ -262,7 +262,7 @@ "website" = "Webové stránky"; /* Text in About menu, opens Organic Maps news website */ -"news" = "Novinky"; +"news" = "Zprávy"; /* Text in menu */ "github" = "GitHub"; @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Otázky a odpovědi"; -/* Button in the main menu */ -"donate" = "Darovat"; - /* Button in the main Help dialog */ "how_to_support_us" = "Jak nás podpořit?"; @@ -509,7 +503,7 @@ "history" = "Historie"; -"search_not_found" = "Omlouváme se, nic nebylo nalezeno."; +"search_not_found" = "Omlouvám se, nic nenalezeno."; "search_not_found_query" = "Zkuste zadat jiný hledaný výraz."; @@ -704,14 +698,14 @@ "download_over_mobile_header" = "Stáhnout pomocí připojení přes mobilní síť?"; -"download_over_mobile_message" = "Toto by mohlo být s některými tarify nebo roamingem výrazně dražší."; +"download_over_mobile_message" = "Toto by mohli být s některými tarify nebo roamingem výrazně dražší."; "error_enter_correct_house_number" = "Zadejte správné číslo domu"; "editor_storey_number" = "Počet poschodí (max. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Opravte počet poschodí, max. %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Opravte počet poschodí, max. 25"; "editor_zip_code" = "PSČ"; @@ -840,7 +834,7 @@ "recent_track_background_dialog_message" = "Organic Maps používají geopozici na pozadí, aby se zaznamenala vaše nedávno ujetá trasa."; /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */ -"about_description" = "Organic Maps je bezplatná offline mapová aplikace s otevřeným zdrojovým kódem. Žádné reklamy. Žádné sledování. Pokud na mapě uvidíte chybu, opravte ji v OpenStreetMap. Projekt vytvářejí nadšenci v našem volném čase, takže potřebujeme vaši zpětnou vazbu a podporu."; +"about_description" = "Organic Maps jsou bezplatná offline mapová aplikace s otevřeným zdrojovým kódem. Žádné reklamy. Žádné sledování. Pokud na mapě vidíte chybu, opravte ji v OpenStreetMap. Projekt vytvářejí nadšenci v našem volném čase, takže potřebujeme vaši zpětnou vazbu a podporu."; "general_settings" = "Obecná nastavení"; @@ -864,7 +858,7 @@ "mobile_data" = "Mobilní data"; /* NOTE to translators: please synchronize your translation with the English one. */ -"mobile_data_description" = "K zobrazení podrobných informací o místech, jako jsou fotografie, ceny a recenze je třeba mobilní internet."; +"mobile_data_description" = "Ke zobrazení podrobných informací o místech, jako jsou fotografie, ceny a recenze, je třeba mobilní internet."; "mobile_data_option_never" = "Nikdy nepoužívat"; @@ -956,7 +950,7 @@ "restore" = "Obnovit"; -"privacy_policy" = "Zásady ochrany osobních údajů"; +"privacy_policy" = "Politika důvěrnosti"; "terms_of_use" = "Podmínky užívání"; @@ -974,7 +968,7 @@ "export_file" = "Exportovat soubor"; -"list_settings" = "Nastavení seznamu"; +"list_settings" = "Nástroje seznamu"; "delete_list" = "Smazat seznam"; @@ -998,17 +992,17 @@ "speedcams_notice_message" = "Automaticky - Upozorňovat na rychlostní radary, pokud hrozí riziko překročení rychlosti\nVždy - Vždy upozorňovat na rychlostní radary\nNikdy - Nikdy neupozorňovat na rychlostní radary"; -"power_managment_title" = "Režim spořič baterie"; +"power_managment_title" = "Nízkoenergetický režim"; -"power_managment_description" = "Pokud je zapnut automatický režim spořiče baterie, aplikace začne vypínat funkce vybíjející baterii, v závislosti na její momentální úrovni nabití."; +"power_managment_description" = "Pokud je nízkoenergetický režim zapojen, příloha bude vypínat funkce, které mrhají energii v závislosti na nynější nabíjení telefonu"; -"power_managment_setting_never" = "Nikdy nepoužívat"; +"power_managment_setting_never" = "Nikdy"; -"power_managment_setting_auto" = "Automatický"; +"power_managment_setting_auto" = "Auto"; -"power_managment_setting_manual_max" = "Maximální šetření baterií"; +"power_managment_setting_manual_max" = "Maximální šetření energií"; -"driving_options_title" = "Možnosti trasy"; +"driving_options_title" = "Možnosti řízení"; "driving_options_subheader" = "Vyhněte se na každé trase"; @@ -1026,7 +1020,7 @@ "define_to_avoid_btn" = "Definovat silnice, kterým se vyhnout"; -"change_driving_options_btn" = "Možnosti trasy aktivní"; +"change_driving_options_btn" = "Možnosti směrování byly povoleny"; "toll_road" = "Silnice s mýtným"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Dráha"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/cs/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Nabíjecí stanice"; -"type.amenity.charging_station.motorcar" = "Nabíjecí stanice"; - "type.amenity.childcare" = "Jesle"; "type.amenity.cinema" = "Kino"; -"type.leisure.bowling_alley" = "Bowlingová dráha"; - "type.amenity.clinic" = "Klinika"; "type.amenity.college" = "Vysoká škola"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Podzemní parkoviště"; -"type.amenity.parking_entrance" = "Vjezd na parkoviště"; - "type.amenity.parking_entrance.private" = "Vjezd na parkoviště"; "type.amenity.parking_entrance.permissive" = "Vjezd na parkoviště"; +"type.amenity.parking_entrance" = "Vjezd na parkoviště"; + "type.amenity.parking_space" = "Prostor pro parkování"; "type.amenity.parking_space.permissive" = "Prostor pro parkování"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Tísňového volání"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Vchod"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Hlavní vchod"; - "type.healthcare.laboratory" = "Lékařská laboratoř"; "type.healthcare.physiotherapist" = "Fyzioterapeut"; -"type.healthcare.alternative" = "Alternativní medicína"; - -"type.healthcare.audiologist" = "Audiologie"; - -"type.healthcare.blood_donation" = "Centrum dárcovství krve"; - -"type.healthcare.optometrist" = "Optometrie"; - -"type.healthcare.podiatrist" = "Podiatrie"; - -"type.healthcare.psychotherapist" = "Psychoterapie"; - -"type.healthcare.sample_collection" = "Odběr vzorků"; - -"type.healthcare.speech_therapist" = "Logopedie"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunel"; -"type.highway.busway" = "Vyhrazená autobusová silnice"; - "type.highway.bus_stop" = "Autobusová zastávka"; "type.highway.construction" = "Silnice v rekonstrukci"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Aquacentrum"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict index 5960ec54aa..cf59d2bf06 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings index c6be9a727f..152df20707 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: da */ diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index ed612be38a..6273c2cd10 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: da */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Senere"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Søg"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bogmærk sæt"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bogmærker"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Spørgsmål og svar"; -/* Button in the main menu */ -"donate" = "Doner"; - /* Button in the main Help dialog */ "how_to_support_us" = "Sådan støtter vi os?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Antal etager (maks %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Rediger bygningen med maksimum %d etager"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Rediger bygningen med maksimum 25 etager"; "editor_zip_code" = "Postnummer"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Rute"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Ladestation"; -"type.amenity.charging_station.motorcar" = "Ladestation"; - "type.amenity.childcare" = "Vuggestue"; "type.amenity.cinema" = "Biograf"; -"type.leisure.bowling_alley" = "Bowling bane"; - "type.amenity.clinic" = "Klinik"; "type.amenity.college" = "Universitet"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underjordisk parkering"; -"type.amenity.parking_entrance" = "Parkeringsindgang"; - "type.amenity.parking_entrance.private" = "Parkeringsindgang"; "type.amenity.parking_entrance.permissive" = "Parkeringsindgang"; +"type.amenity.parking_entrance" = "Parkeringsindgang"; + "type.amenity.parking_space" = "Parkeringsplads"; "type.amenity.parking_space.permissive" = "Parkeringsplads"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Nødtelefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Indgang"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Hovedindgang"; - "type.healthcare.laboratory" = "Medicinsk laboratorium"; "type.healthcare.physiotherapist" = "Fysioterapeut"; -"type.healthcare.alternative" = "Alternativ medicin"; - -"type.healthcare.audiologist" = "Audiologi"; - -"type.healthcare.blood_donation" = "Center for bloddonation"; - -"type.healthcare.optometrist" = "Optometri"; - -"type.healthcare.podiatrist" = "Fodterapi"; - -"type.healthcare.psychotherapist" = "Psykoterapi"; - -"type.healthcare.sample_collection" = "Prøvetagning"; - -"type.healthcare.speech_therapist" = "Tale terapi"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Dedikeret busvej"; - "type.highway.bus_stop" = "Busstoppested"; "type.highway.construction" = "Vej under opbygning"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Vandpark"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict index 35b1034395..17735f4ad3 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings index 9fe203c1cc..305d3a4df7 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: de */ @@ -10,7 +10,7 @@ "search" = "Suche"; /* Used in home screen quick actions. */ -"bookmarks" = "Lesezeichen"; +"bookmarks" = "Lesezeichengruppen"; /* Used in home screen quick actions. */ "route" = "Route"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 9788585fcf..a2570f33f8 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: de */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Später"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Suche"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Lesezeichenmappe"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Lesezeichen"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Fragen und Antworten"; -/* Button in the main menu */ -"donate" = "Spenden"; - /* Button in the main Help dialog */ "how_to_support_us" = "Wie unterstützen Sie uns?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Anzahl der Etagen (maximal %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Das Gebäude kann nicht mehr als %d Etagen haben"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Das Gebäude kann nicht mehr als 25 Etagen haben"; "editor_zip_code" = "Postleitzahl"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Strecke"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1281,7 +1272,7 @@ "type.amenity.bar" = "Bar"; -"type.amenity.bbq" = "Grillplatz"; +"type.amenity.bbq" = "Picknickplatz"; "type.amenity.bench" = "Parkbank"; @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Ladestation"; -"type.amenity.charging_station.motorcar" = "Ladestation"; - "type.amenity.childcare" = "Kindertagesstätte"; "type.amenity.cinema" = "Kino"; -"type.leisure.bowling_alley" = "Bowlingbahn"; - "type.amenity.clinic" = "Klinik"; "type.amenity.college" = "Hochschule"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Tiefgarage"; -"type.amenity.parking_entrance" = "Parkplatzeinfahrt"; - "type.amenity.parking_entrance.private" = "Parkplatzeinfahrt"; "type.amenity.parking_entrance.permissive" = "Parkplatzeinfahrt"; +"type.amenity.parking_entrance" = "Parkplatzeinfahrt"; + "type.amenity.parking_space" = "Parkplatz"; "type.amenity.parking_space.permissive" = "Parkplatz"; @@ -1640,7 +1627,7 @@ "type.craft.carpenter" = "Zimmermann"; -"type.craft.confectionery" = "Süßwarenladen"; +"type.craft.confectionery" = "Konditor"; "type.craft.electrician" = "Elektriker"; @@ -1775,7 +1762,7 @@ "type.cuisine.lebanese" = "Libanesisch"; -"type.cuisine.local" = "Lokale Küche"; +"type.cuisine.local" = "Regional"; "type.cuisine.malagasy" = "Madegassisch"; @@ -1807,7 +1794,7 @@ "type.cuisine.ramen" = "Ramen"; -"type.cuisine.regional" = "Regionale Küche"; +"type.cuisine.regional" = "Regional"; "type.cuisine.russian" = "Russisch"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Notruftelefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Eingang"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Haupteingang"; - "type.healthcare.laboratory" = "Medizinisches Labor"; "type.healthcare.physiotherapist" = "Physiotherapeut"; -"type.healthcare.alternative" = "Alternative Medizin"; - -"type.healthcare.audiologist" = "Audiologie"; - -"type.healthcare.blood_donation" = "Blutspendezentrum"; - -"type.healthcare.optometrist" = "Optometrie"; - -"type.healthcare.podiatrist" = "Podologie"; - -"type.healthcare.psychotherapist" = "Psychotherapie"; - -"type.healthcare.sample_collection" = "Probenahme"; - -"type.healthcare.speech_therapist" = "Logopedie"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Eigene Busstraße"; - "type.highway.bus_stop" = "Bushaltestelle"; "type.highway.construction" = "Straße im Bau"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Laufbahn"; -"type.leisure.track.area" = "Laufbahn"; - "type.leisure.water_park" = "Aquapark"; "type.leisure.beach_resort" = "Beach Resort"; @@ -2569,7 +2532,7 @@ "type.office.insurance" = "Versicherungsbüro"; -"type.office.lawyer" = "Anwaltskanzlei"; +"type.office.lawyer" = "Anwaltsbüro"; "type.office.ngo" = "Nichtregierungsorganisation"; @@ -3221,13 +3184,13 @@ "type.shop.beauty" = "Schönheitssalon"; -"type.shop.beverages" = "Getränkemarkt"; +"type.shop.beverages" = "Getränke"; "type.shop.bicycle" = "Fahrradladen"; "type.shop.bookmaker" = "Wettbüro"; -"type.shop.books" = "Buchhandlung"; +"type.shop.books" = "Büchergeschäft"; "type.shop.butcher" = "Metzgerei"; @@ -3239,7 +3202,7 @@ "type.shop.car_repair.tyres" = "Reifenservice"; -"type.shop.caravan" = "Wohnmobilhändler"; +"type.shop.caravan" = "RV Dealership"; "type.shop.chemist" = "Drogerie"; @@ -3249,7 +3212,7 @@ "type.shop.coffee" = "Kaffeegeschäft"; -"type.shop.computer" = "Computerfachgeschäft"; +"type.shop.computer" = "Computergeschäft"; "type.shop.confectionery" = "Süßwarengeschäft"; @@ -3259,7 +3222,7 @@ "type.shop.cosmetics" = "Kosmetikgeschäft"; -"type.shop.deli" = "Feinkostladen"; +"type.shop.deli" = "Feinkostgeschäft"; "type.shop.department_store" = "Kaufhaus"; @@ -3267,23 +3230,23 @@ "type.shop.dry_cleaning" = "Chemische Reinigung"; -"type.shop.electronics" = "Elektrofachgeschäft"; +"type.shop.electronics" = "Elektronik"; "type.shop.erotic" = "Erotikladen"; "type.shop.fabric" = "Textilgeschäft"; -"type.shop.farm" = "Hofladen"; +"type.shop.farm" = "Hoflebensmittelladen"; "type.shop.florist" = "Florist"; "type.shop.funeral_directors" = "Bestattungsinstitut"; -"type.shop.furniture" = "Möbelhaus"; +"type.shop.furniture" = "Möbelgeschäft"; "type.shop.garden_centre" = "Gärtnerei"; -"type.shop.gift" = "Geschenkeladen"; +"type.shop.gift" = "Geschenkladen"; "type.shop.greengrocer" = "Gemüseladen"; @@ -3297,7 +3260,7 @@ "type.shop.houseware" = "Haushaltswarengeschäft"; -"type.shop.jewelry" = "Juwelier"; +"type.shop.jewelry" = "Juweliergeschäft"; "type.shop.kiosk" = "Kiosk"; @@ -3325,7 +3288,7 @@ "type.shop.outdoor" = "Outdoor-Ausrüstung"; -"type.shop.pastry" = "Konditorei"; +"type.shop.pastry" = "Gebäck"; "type.shop.pawnbroker" = "Pfandleihe"; @@ -3363,7 +3326,7 @@ "type.shop.video_games" = "Gameshop"; -"type.shop.wine" = "Weinhandlung"; +"type.shop.wine" = "Wein- und Spirituosengeschäft"; "type.shop.antiques" = "Antiquitäten"; @@ -3387,7 +3350,7 @@ "type.shop.fishing" = "Angelgeschäft"; -"type.shop.interior_decoration" = "Einrichtungsgeschäft"; +"type.shop.interior_decoration" = "Innendekorationen"; "type.shop.lottery" = "Lotteriescheine"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict index 6e6edf5d7f..8ed87abc32 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings index ff19fbc16b..2a226ae4f8 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: el */ diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index e419ecc292..b7d238e9af 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: el */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Αργότερα"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Αναζήτηση"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Σύνολα αγαπημένων"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Αγαπημένα"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Ερωτήσεις και απαντήσεις"; -/* Button in the main menu */ -"donate" = "Προσφέρω"; - /* Button in the main Help dialog */ "how_to_support_us" = "Πώς να μας υποστηρίξετε;"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Αριθμός ορόφων (μέγιστο %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους 25"; "editor_zip_code" = "Ταχυδρομικός κώδικας"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Τροχιά"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Σταθμός φόρτισης"; -"type.amenity.charging_station.motorcar" = "Σταθμός φόρτισης"; - "type.amenity.childcare" = "Βρεφικός σταθμός"; "type.amenity.cinema" = "Κινηματογράφος"; -"type.leisure.bowling_alley" = "Αίθουσα σφαιρίσεως"; - "type.amenity.clinic" = "Κλινική"; "type.amenity.college" = "Κολέγιο"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Υπόγειος χώρος στάθμευσης"; -"type.amenity.parking_entrance" = "Είσοδος στάθμευσης"; - "type.amenity.parking_entrance.private" = "Είσοδος στάθμευσης"; "type.amenity.parking_entrance.permissive" = "Είσοδος στάθμευσης"; +"type.amenity.parking_entrance" = "Είσοδος στάθμευσης"; + "type.amenity.parking_space" = "Χώρος στάθμευσης"; "type.amenity.parking_space.permissive" = "Χώρος στάθμευσης"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Τηλέφωνο έκτακτης ανάγκης"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Είσοδος"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Κύρια είσοδος"; - "type.healthcare.laboratory" = "Ιατρικό Εργαστήριο"; "type.healthcare.physiotherapist" = "Φυσικοθεραπευτής"; -"type.healthcare.alternative" = "Εναλλακτική ιατρική"; - -"type.healthcare.audiologist" = "Ακοολογία"; - -"type.healthcare.blood_donation" = "Κέντρο αιμοδοσίας"; - -"type.healthcare.optometrist" = "Οπτομετρία"; - -"type.healthcare.podiatrist" = "Ποδιατρική"; - -"type.healthcare.psychotherapist" = "Ψυχοθεραπεία"; - -"type.healthcare.sample_collection" = "Δειγματοληψία"; - -"type.healthcare.speech_therapist" = "Λογοθεραπεία"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Σήραγγα"; -"type.highway.busway" = "Αφιερωμένος δρόμος λεωφορείων"; - "type.highway.bus_stop" = "Στάση λεωφορείου"; "type.highway.construction" = "Οδός υπό κατασκευή"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Υδάτινο πάρκο"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict index b0137442a4..a8cbeed0a4 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings index f1d2982e2a..0005335c1f 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: en-GB */ diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index c8a1c98006..4c67e9bec4 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: en-GB */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Later"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Search"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bookmark Lists"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bookmarks"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Frequently Asked Questions"; -/* Button in the main menu */ -"donate" = "Donate"; - /* Button in the main Help dialog */ "how_to_support_us" = "How to support us?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Number of floors (maximum of %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "The number of floors must non exceed %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "The number of floors must non exceed 25"; "editor_zip_code" = "ZIP Code"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Track"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Bowling Alley"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underground Parking"; -"type.amenity.parking_entrance" = "Parking entrance"; - "type.amenity.parking_entrance.private" = "Parking entrance"; "type.amenity.parking_entrance.permissive" = "Parking entrance"; +"type.amenity.parking_entrance" = "Parking entrance"; + "type.amenity.parking_space" = "Parking Space"; "type.amenity.parking_space.permissive" = "Parking Space"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Main Entrance"; - "type.healthcare.laboratory" = "Medical Laboratory"; "type.healthcare.physiotherapist" = "Physiotherapist"; -"type.healthcare.alternative" = "Alternative medicine"; - -"type.healthcare.audiologist" = "Audiology"; - -"type.healthcare.blood_donation" = "Blood donation center"; - -"type.healthcare.optometrist" = "Optometry"; - -"type.healthcare.podiatrist" = "Podiatry"; - -"type.healthcare.psychotherapist" = "Psychotherapy"; - -"type.healthcare.sample_collection" = "Sample collection"; - -"type.healthcare.speech_therapist" = "Logopedics"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Dedicated bus road"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Road Under Construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict index 6c08b571a6..55b32446b1 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings index 97b2798006..b26b8c30f7 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: en */ diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 4d2db04017..51e9771f26 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: en */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Later"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Search"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bookmark Lists"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bookmarks"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Frequently Asked Questions"; -/* Button in the main menu */ -"donate" = "Donate"; - /* Button in the main Help dialog */ "how_to_support_us" = "How to support us?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Number of floors (maximum of %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "The number of floors must non exceed %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "The number of floors must non exceed 25"; "editor_zip_code" = "ZIP Code"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Track"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Bowling Alley"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underground Parking"; -"type.amenity.parking_entrance" = "Parking entrance"; - "type.amenity.parking_entrance.private" = "Parking entrance"; "type.amenity.parking_entrance.permissive" = "Parking entrance"; +"type.amenity.parking_entrance" = "Parking entrance"; + "type.amenity.parking_space" = "Parking Space"; "type.amenity.parking_space.permissive" = "Parking Space"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Main Entrance"; - "type.healthcare.laboratory" = "Medical Laboratory"; "type.healthcare.physiotherapist" = "Physiotherapist"; -"type.healthcare.alternative" = "Alternative medicine"; - -"type.healthcare.audiologist" = "Audiology"; - -"type.healthcare.blood_donation" = "Blood donation center"; - -"type.healthcare.optometrist" = "Optometry"; - -"type.healthcare.podiatrist" = "Podiatry"; - -"type.healthcare.psychotherapist" = "Psychotherapy"; - -"type.healthcare.sample_collection" = "Sample collection"; - -"type.healthcare.speech_therapist" = "Logopedics"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Dedicated bus road"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Road Under Construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict index e6ad937d13..87447b94f4 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings index 04d283f83d..b6a4d5a83f 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: es-MX */ diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index a70f856454..193f5061ee 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: es-MX */ @@ -27,7 +27,7 @@ "leave_a_review" = "Escribir una opinión"; /* Choose measurement on first launch alert - choose imperial system button */ -"miles" = "Millas"; +"miles" = "Milla"; /* A text for current gps location point/arrow selected on the map */ "core_my_position" = "Mi posición"; @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Luego"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Buscar"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Grupos de marcadores"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Marcadores"; /* Default bookmark list name */ @@ -81,7 +81,7 @@ "address" = "Dirección"; /* Settings button in system menu */ -"settings" = "Ajustes"; +"settings" = "Configuración"; /* Measurement units title in settings activity */ "measurement_units" = "Unidades de medida"; @@ -155,28 +155,28 @@ /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */ "rv" = "Caravanas"; -"share_bookmarks_email_body" = "Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz\n¡Disfrute viajando con Organic Maps!"; +"share_bookmarks_email_body" = "Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábrelos si tienes instalado Organic Maps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este link: https://omaps.app/get?kmz\n¡Disfruta viajando con Organic Maps!"; /* message title of loading file */ -"load_kmz_title" = "Cargando marcadores"; +"load_kmz_title" = "Cargando favoritos"; /* Kmz file successful loading */ -"load_kmz_successful" = "¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores."; +"load_kmz_successful" = "¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestión de favoritos."; /* Kml file loading failed */ -"load_kmz_failed" = "La carga de marcadores ha fallado. El archivo puede estar corrupto o ser defectuoso."; +"load_kmz_failed" = "La carga de favoritos ha fallado. El archivo puede estar corrupto o ser defectuoso."; /* resource for context menu */ "edit" = "Editar"; /* Warning message when doing search around current position */ -"unknown_current_position" = "Su ubicación aún no ha sido determinada"; +"unknown_current_position" = "Tu ubicación aún no ha sido determinada"; /* Subject for emailed bookmark */ -"bookmark_share_email_subject" = "¡Mira mi marcador en el mapa de Organic Maps!"; +"bookmark_share_email_subject" = "Mira mi marcador en el mapa de Organic Maps!"; /* Subject for emailed position */ -"my_position_share_email_subject" = "¡Mira mi ubicación actual en el mapa en Organic Maps!"; +"my_position_share_email_subject" = "Mira mi ubicación actual en el mapa en Organic Maps!"; /* Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ "share" = "Compartir"; @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Preguntas frecuentes"; -/* Button in the main menu */ -"donate" = "Donar"; - /* Button in the main Help dialog */ "how_to_support_us" = "¿Cómo apoyarnos?"; @@ -310,10 +304,10 @@ "copyright" = "Derechos de autor"; /* Text in menu + Button in the main Help dialog */ -"report_a_bug" = "Informar de un fallo"; +"report_a_bug" = "Hay un error"; /* Alert text */ -"email_error_body" = "No se ha configurado el cliente de correo electrónico. Por favor, configúrelo o utilice alguna otra forma de ponerse en contacto con nosotros en %@"; +"email_error_body" = "No se ha configurado el cliente de correo electrónico. Por favor, configúralo o utiliza alguna otra forma de ponerte en contacto con nosotros en %@"; /* Alert title */ "email_error_title" = "Error de envío de correo"; @@ -351,7 +345,7 @@ "downloader_status_failed" = "Fallo"; /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */ -"downloader_delete_map_while_routing_dialog" = "Para eliminar el mapa, por favor, detenga la navegación."; +"downloader_delete_map_while_routing_dialog" = "Para eliminar el mapa, por favor, detén la navegación."; /* PointsInDifferentMWM */ "routing_failed_cross_mwm_building" = "Sólo se pueden crear rutas que estén totalmente contenidas en un mapa de una sola región."; @@ -369,7 +363,7 @@ "routing_download_maps_along" = "Descargue todos los mapas de su ruta"; /* Text for routing error dialog */ -"routing_requires_all_map" = "Para crear una ruta es necesario descargar y actualizar todos los mapas desde su ubicación a su destino."; +"routing_requires_all_map" = "Para crear una ruta es necesario descargar y actualizar todos los mapas de la ubicación de destino."; /* bookmark button text */ "bookmark" = "marcador"; @@ -445,7 +439,7 @@ "dialog_routing_error_location_not_found" = "No se puede crear la ruta. No se pudieron identificar las coordenadas actuales del GPS."; -"dialog_routing_location_turn_wifi" = "Verifique la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación."; +"dialog_routing_location_turn_wifi" = "Verifique la señal del GPS. Activar Wi-Fi mejorará la precisión de su ubicación."; "dialog_routing_location_turn_on" = "Activar servicios de ubicación"; @@ -509,9 +503,9 @@ "history" = "Historial"; -"search_not_found" = "Lo siento, no se han encontrado resultados."; +"search_not_found" = "Lo siento, no he encontrado nada."; -"search_not_found_query" = "Por favor, pruebe con otra consulta."; +"search_not_found_query" = "Por favor, prueba con otra consulta."; "search_history_title" = "Historial de búsquedas"; @@ -525,17 +519,17 @@ /* Place Page link to Wikimedia Commons. */ "wikimedia_commons" = "Wikimedia Commons"; -"p2p_your_location" = "Su ubicación"; +"p2p_your_location" = "Tu ubicación"; "p2p_start" = "Empezar"; -"p2p_from_here" = "Ruta desde"; +"p2p_from_here" = "Desde"; "p2p_to_here" = "Ruta hacia"; -"p2p_only_from_current" = "La navegación solo está disponible desde su ubicación actual."; +"p2p_only_from_current" = "La navegación solo está disponible desde tu ubicación actual."; -"p2p_reroute_from_current" = "¿Quiere que planeemos un ruta desde su ubicación actual?"; +"p2p_reroute_from_current" = "¿Quieres que planeemos un ruta desde tu ubicación actual?"; "editor_time_add" = "Añadir horario"; @@ -562,7 +556,7 @@ "editor_add_select_location" = "Ubicación"; -"editor_done_dialog_1" = "Ha cambiado el mapa del mundo. ¡No se lo guarde para usted! Dígaselo a sus amigos y edítenlo juntos."; +"editor_done_dialog_1" = "Has cambiado el mapa del mundo. No te lo guardes para ti. Díselo a tus amigos y edítenlo juntos."; "share_with_friends" = "Compartir con amigos"; @@ -578,9 +572,9 @@ "twentyfour_seven" = "24/7"; -"day_off_today" = "Cerrado hoy"; +"day_off_today" = "Día libre hoy"; -"day_off" = "Cerrado"; +"day_off" = "Día libre"; "today" = "Hoy"; @@ -600,7 +594,7 @@ "add_opening_hours" = "Añadir horarios de apertura"; -"no_osm_account" = "¿No tiene cuenta en OpenStreetMap?"; +"no_osm_account" = "¿No tienes cuenta en OpenStreetMap?"; "register_at_openstreetmap" = "Registrarse en OpenStreetMap"; @@ -610,7 +604,7 @@ "login" = "Iniciar sesión"; -"forgot_password" = "¿Ha olvidado su contraseña?"; +"forgot_password" = "¿Has olvidado tu contraseña?"; "osm_account" = "Cuenta OSM"; @@ -637,7 +631,7 @@ "choose_language" = "Elegir un idioma"; -"choose_street" = "Elija una calle"; +"choose_street" = "Elegir una calle"; "postal_code" = "Código postal"; @@ -662,15 +656,15 @@ "migration_download_error_dialog" = "Error de descarga"; -"common_check_internet_connection_dialog" = "Por favor, verifique los ajustes y asegúrese de que su dispositivo esté conectado a Internet."; +"common_check_internet_connection_dialog" = "Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet."; -"downloader_no_space_title" = "No hay suficiente espacio"; +"downloader_no_space_title" = "Sin espacio suficiente"; -"downloader_no_space_message" = "Por favor, elimine los datos innecesarios"; +"downloader_no_space_message" = "Por favor, elimina los datos innecesarios"; "editor_profile_changes" = "Cambios verificados"; -"editor_focus_map_on_location" = "Arrastre el mapa para seleccionar la ubicación correcta del objeto."; +"editor_focus_map_on_location" = "Arrastra el mapa para seleccionar la ubicación correcta del objeto."; "editor_add_select_category" = "Seleccionar categoría"; @@ -692,10 +686,10 @@ "message_invalid_feature_position" = "No se puede ubicar ningún objeto aquí"; -"login_to_make_edits_visible" = "Inicie sesión en OpenStreetMap.org para que otros usuarios puedan ver los cambios que haya efectuado."; +"login_to_make_edits_visible" = "Inicia sesión para que otros usuarios puedan ver los cambios que has efectuado."; /* Error dialog no space */ -"migration_no_space_message" = "Necesita más espacio para descargar. Por favor, elimine los datos innecesarios."; +"migration_no_space_message" = "Necesitas más espacio para descargar. Por favor, elimina los datos innecesarios."; "editor_sharing_title" = "He mejorado los mapas de Organic Maps"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Número de plantas (máx. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "El número de plantas no debe superar %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "El número de plantas no debe superar 25"; "editor_zip_code" = "Código postal"; @@ -750,7 +744,7 @@ "location_services_disabled_header" = "La identificación de la ubicación está desactivada"; -"location_services_disabled_message" = "Active el acceso a la geolocalización en los ajustes del dispositivo"; +"location_services_disabled_message" = "Activa el acceso a la geolocalización en los ajustes del dispositivo"; "location_services_disabled_1" = "1. Abre los ajustes"; @@ -809,18 +803,18 @@ "text_more_button" = "…más"; /* Phone number error message */ -"error_enter_correct_phone" = "Introduzca un número de teléfono correcto"; +"error_enter_correct_phone" = "Introduce un número de teléfono correcto"; -"error_enter_correct_web" = "Introduzca una dirección web válida"; +"error_enter_correct_web" = "Introduce una dirección web válida"; -"error_enter_correct_email" = "Introduzca un email válido"; +"error_enter_correct_email" = "Introduce un email válido"; "refresh" = "Actualizar"; "placepage_add_place_button" = "Añadir un lugar al mapa"; /* Displayed when saving some edits to the map to warn against publishing personal data */ -"editor_share_to_all_dialog_title" = "¿Quiere enviarlo a todos los usuarios?"; +"editor_share_to_all_dialog_title" = "¿Quieres enviarlo a todos los usuarios?"; /* Dialog before publishing the modifications to the public map. */ "editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato personal."; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Ruta"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1257,7 +1248,7 @@ "type.aeroway.aerodrome" = "Aeropuerto"; -"type.aeroway.aerodrome.international" = "Aeropuerto internacional"; +"type.aeroway.aerodrome.international" = "Aeropuerto"; "type.aeroway.apron" = "Plataforma"; @@ -1275,7 +1266,7 @@ "type.amenity.arts_centre" = "Centro de artes"; -"type.amenity.atm" = "Cajero automático"; +"type.amenity.atm" = "Cajero"; "type.amenity.bank" = "Banco"; @@ -1285,7 +1276,7 @@ "type.amenity.bench" = "Banco"; -"type.amenity.bicycle_parking" = "Aparcamiento de bicicletas"; +"type.amenity.bicycle_parking" = "Aparcamiento de bicis"; "type.amenity.bicycle_rental" = "Alquiler de bicicletas"; @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Estación de carga"; -"type.amenity.charging_station.motorcar" = "Estación de carga"; - "type.amenity.childcare" = "Guardería"; "type.amenity.cinema" = "Cine"; -"type.leisure.bowling_alley" = "Bolera"; - "type.amenity.clinic" = "Clínica"; "type.amenity.college" = "Colegio"; @@ -1361,7 +1348,7 @@ "type.amenity.hospital" = "Hospital"; -"type.amenity.hunting_stand" = "Puesto de caza"; +"type.amenity.hunting_stand" = "Galería de caza"; "type.amenity.ice_cream" = "Heladería"; @@ -1373,7 +1360,7 @@ "type.amenity.marketplace" = "Mercado"; -"type.amenity.motorcycle_parking" = "Aparcamiento de motocicletas"; +"type.amenity.motorcycle_parking" = "Aparcamiento de motos"; "type.amenity.nightclub" = "Discoteca"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Aparcamiento subterráneo"; -"type.amenity.parking_entrance" = "Entrada al aparcamiento"; - "type.amenity.parking_entrance.private" = "Entrada al aparcamiento"; "type.amenity.parking_entrance.permissive" = "Entrada al aparcamiento"; +"type.amenity.parking_entrance" = "Entrada al aparcamiento"; + "type.amenity.parking_space" = "Plaza de aparcamiento"; "type.amenity.parking_space.permissive" = "Plaza de aparcamiento"; @@ -1433,7 +1420,7 @@ "type.amenity.police" = "Policía"; -"type.amenity.post_box" = "Buzón de correos"; +"type.amenity.post_box" = "Buzón"; "type.amenity.post_office" = "Oficina de correos"; @@ -1534,7 +1521,7 @@ "type.amenity.waste_transfer_station" = "Estación de transferencia de residuos"; -"type.amenity.water_point" = "Fuente de agua para caravanas"; +"type.amenity.water_point" = "Fuente de agua"; "type.barrier" = "Barrera"; @@ -1570,7 +1557,7 @@ "type.barrier.swing_gate" = "Barrera"; -"type.barrier.toll_booth" = "Cabina de peaje"; +"type.barrier.toll_booth" = "Peaje"; "type.barrier.wall" = "Muro"; @@ -1651,7 +1638,7 @@ "type.craft.handicraft" = "Artesanía"; /* Heating, Ventilation, and Air Conditioning */ -"type.craft.hvac" = "Calefacción, ventilación y aire acondicionado"; +"type.craft.hvac" = "Aire acondicionado"; "type.craft.metal_construction" = "Trabajador del metal"; @@ -1841,57 +1828,35 @@ "type.cuisine.vietnamese" = "Cocina vietnamita"; -"type.emergency" = "Emergencia"; +"type.emergency" = "Emergency"; "type.emergency.defibrillator" = "Desfibrilador"; "type.emergency.fire_hydrant" = "Boca de incendio"; -"type.emergency.phone" = "Teléfono de emergencias"; +"type.emergency.phone" = "Teléfono de emergencia"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrada principal"; - "type.healthcare.laboratory" = "Laboratorio médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; -"type.healthcare.alternative" = "Medicina alternativa"; - -"type.healthcare.audiologist" = "Audiología"; - -"type.healthcare.blood_donation" = "Centro de donación de sangre"; - -"type.healthcare.optometrist" = "Optometría"; - -"type.healthcare.podiatrist" = "Podología"; - -"type.healthcare.psychotherapist" = "Psicoterapia"; - -"type.healthcare.sample_collection" = "Muestreo"; - -"type.healthcare.speech_therapist" = "Logopedia"; - /********** Types: Roads **********/ -"type.highway" = "Carretera"; +"type.highway" = "Highway"; -"type.highway.bridleway" = "Camino de caballos"; +"type.highway.bridleway" = "Bridle Path"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.bridleway.bridge" = "Puente"; -"type.highway.bridleway.permissive" = "Camino de caballos"; +"type.highway.bridleway.permissive" = "Bridle Path"; /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Túnel"; -"type.highway.busway" = "Carretera exclusiva para autobuses"; - "type.highway.bus_stop" = "Parada de autobús"; "type.highway.construction" = "Carretera en construcción"; @@ -1910,7 +1875,7 @@ "type.highway.footway" = "Camino"; -"type.highway.footway.alpine_hiking" = "Senderismo alpino"; +"type.highway.footway.alpine_hiking" = "Camino"; "type.highway.footway.area" = "Camino"; @@ -1923,7 +1888,7 @@ "type.highway.footway.difficult_alpine_hiking" = "Camino"; -"type.highway.footway.hiking" = "Sendero"; +"type.highway.footway.hiking" = "Camino"; "type.highway.footway.mountain_hiking" = "Camino"; @@ -1986,9 +1951,9 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.path.tunnel" = "Túnel"; -"type.highway.pedestrian" = "Calle peatonal"; +"type.highway.pedestrian" = "Calle"; -"type.highway.pedestrian.area" = "Calle peatonal"; +"type.highway.pedestrian.area" = "Calle"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.pedestrian.bridge" = "Puente"; @@ -2064,11 +2029,11 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.service.tunnel" = "Túnel"; -"type.highway.services" = "Área de servicio"; +"type.highway.services" = "Service Area"; "type.highway.speed_camera" = "Radar de velocidad"; -"type.highway.steps" = "Escaleras"; +"type.highway.steps" = "Camino"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.steps.bridge" = "Puente"; @@ -2092,26 +2057,26 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.tertiary_link.tunnel" = "Túnel"; -"type.highway.track" = "Pista"; +"type.highway.track" = "Calle"; -"type.highway.track.area" = "Pista"; +"type.highway.track.area" = "Calle"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.track.bridge" = "Puente"; -"type.highway.track.grade1" = "Pista"; +"type.highway.track.grade1" = "Calle"; -"type.highway.track.grade2" = "Pista"; +"type.highway.track.grade2" = "Calle"; -"type.highway.track.grade3" = "Pista"; +"type.highway.track.grade3" = "Calle"; -"type.highway.track.grade4" = "Pista"; +"type.highway.track.grade4" = "Calle"; -"type.highway.track.grade5" = "Pista"; +"type.highway.track.grade5" = "Calle"; -"type.highway.track.no.access" = "Pista"; +"type.highway.track.no.access" = "Calle"; -"type.highway.track.permissive" = "Pista"; +"type.highway.track.permissive" = "Calle"; /* These translations are used for all type.highway.*.tunnel. */ "type.highway.track.tunnel" = "Túnel"; @@ -2154,7 +2119,7 @@ "type.area_highway.path" = "Camino"; -"type.area_highway.pedestrian" = "Calle peatonal"; +"type.area_highway.pedestrian" = "Calle"; "type.area_highway.primary" = "Calle"; @@ -2166,9 +2131,9 @@ "type.area_highway.tertiary" = "Calle"; -"type.area_highway.steps" = "Escaleras"; +"type.area_highway.steps" = "Camino"; -"type.area_highway.track" = "Pista"; +"type.area_highway.track" = "Calle"; "type.area_highway.trunk" = "Calle"; @@ -2239,7 +2204,7 @@ "type.historic.ruins" = "Ruinas"; -"type.historic.ship" = "Barco"; +"type.historic.ship" = "Turismo"; "type.historic.tomb" = "Tumba"; @@ -2281,7 +2246,7 @@ "type.junction.roundabout" = "Rotonda"; -"type.landuse" = "Uso del suelo"; +"type.landuse" = "Landuse"; "type.landuse.allotments" = "Allotments"; @@ -2297,65 +2262,65 @@ "type.landuse.churchyard" = "Camposanto"; -"type.landuse.commercial" = "Zona comercial"; +"type.landuse.commercial" = "Commercial Area"; -"type.landuse.construction" = "Construcción"; +"type.landuse.construction" = "Construction"; "type.landuse.education" = "Instalaciones educativas"; -"type.landuse.farm" = "Granja"; +"type.landuse.farm" = "Farm"; "type.landuse.farmland" = "Terreno agrícola"; -"type.landuse.farmyard" = "Granja"; +"type.landuse.farmyard" = "Farmyard"; -"type.landuse.field" = "Campo"; +"type.landuse.field" = "Field"; "type.landuse.forest" = "Bosque"; -"type.landuse.forest.coniferous" = "Bosque de coníferas"; +"type.landuse.forest.coniferous" = "Bosque"; -"type.landuse.forest.deciduous" = "Bosque caducifolio"; +"type.landuse.forest.deciduous" = "Bosque"; -"type.landuse.forest.mixed" = "Bosque mixto"; +"type.landuse.forest.mixed" = "Bosque"; -"type.landuse.garages" = "Garajes"; +"type.landuse.garages" = "Garages"; "type.landuse.grass" = "Césped"; -"type.landuse.greenfield" = "Invernadero"; +"type.landuse.greenfield" = "Greenfield"; -"type.landuse.greenhouse_horticulture" = "Invernadero"; +"type.landuse.greenhouse_horticulture" = "Greenhouse"; -"type.landuse.industrial" = "Zona industrial"; +"type.landuse.industrial" = "Industrial Land"; "type.landuse.landfill" = "Vertedero"; -"type.landuse.meadow" = "Pradera"; +"type.landuse.meadow" = "Meadow"; -"type.landuse.military" = "Área militar"; +"type.landuse.military" = "Military Area"; -"type.landuse.orchard" = "Huerto"; +"type.landuse.orchard" = "Orchard"; -"type.landuse.quarry" = "Cantera"; +"type.landuse.quarry" = "Quarry"; "type.landuse.railway" = "Estructuras ferroviarias"; -"type.landuse.recreation_ground" = "Área recreativa"; +"type.landuse.recreation_ground" = "Recreation Ground"; "type.landuse.reservoir" = "Cuenca"; -"type.landuse.residential" = "Zona residencial"; +"type.landuse.residential" = "Residential Land"; -"type.landuse.retail" = "Zona comercial"; +"type.landuse.retail" = "Retail Land"; -"type.landuse.salt_pond" = "Estanque"; +"type.landuse.salt_pond" = "Pond"; "type.landuse.village_green" = "Land"; -"type.landuse.vineyard" = "Viñedo"; +"type.landuse.vineyard" = "Vineyard"; -"type.leisure" = "Ocio"; +"type.leisure" = "Leisure"; "type.leisure.common" = "Public Land"; @@ -2373,9 +2338,9 @@ "type.leisure.golf_course" = "Campo de golf"; -"type.leisure.ice_rink" = "Pisa de patinaje"; +"type.leisure.ice_rink" = "Ice Rink"; -"type.leisure.landscape_reserve" = "Reserva natural"; +"type.leisure.landscape_reserve" = "Landscape Reserve"; "type.leisure.marina" = "Marina"; @@ -2395,7 +2360,7 @@ "type.leisure.playground" = "Patio de recreo"; -"type.leisure.recreation_ground" = "Zona recreativa"; +"type.leisure.recreation_ground" = "Recreation Ground"; "type.leisure.sauna" = "Sauna"; @@ -2413,17 +2378,15 @@ "type.leisure.swimming_pool.private" = "Piscina"; -"type.leisure.track" = "Pista deportiva"; - -"type.leisure.track.area" = "Pista deportiva"; +"type.leisure.track" = "Track"; "type.leisure.water_park" = "Parque acuático"; -"type.leisure.beach_resort" = "Resort de playa"; +"type.leisure.beach_resort" = "Beach Resort"; "type.man_made" = "Man Made"; -"type.man_made.breakwater" = "Rompeolas"; +"type.man_made.breakwater" = "Breakwater"; "type.man_made.cairn" = "Cairn"; @@ -2431,29 +2394,29 @@ "type.man_made.cutline" = "Cutline"; -"type.man_made.survey_point" = "Punto geodésico"; +"type.man_made.survey_point" = "Survey Point"; -"type.man_made.flagpole" = "Mástil de bandera"; +"type.man_made.flagpole" = "Flagpole"; "type.man_made.lighthouse" = "Faro"; -"type.man_made.mast" = "Mástil"; +"type.man_made.mast" = "Mast"; -"type.man_made.pier" = "Muelle"; +"type.man_made.pier" = "Pier"; -"type.man_made.pipeline" = "Tubería"; +"type.man_made.pipeline" = "Pipeline"; -"type.man_made.pipeline.overground" = "Tubería aérea"; +"type.man_made.pipeline.overground" = "Overground Pipeline"; "type.man_made.silo" = "Silo"; -"type.man_made.storage_tank" = "Cisterna"; +"type.man_made.storage_tank" = "Storage Tank"; "type.man_made.surveillance" = "Cámara de vigilancia"; "type.man_made.tower" = "Torre"; -"type.man_made.wastewater_plant" = "Planta de tratamiento de aguas residuales"; +"type.man_made.wastewater_plant" = "Wastewater treatment plant"; "type.man_made.water_tap" = "Toma de agua"; @@ -2463,17 +2426,17 @@ "type.man_made.windmill" = "Molino"; -"type.man_made.works" = "Fábrica"; +"type.man_made.works" = "Industrial Works"; "type.mapswithme" = "mapswithme"; "type.mapswithme.grid" = "mapswithme-grid"; -"type.military" = "Militar"; +"type.military" = "Military"; "type.military.bunker" = "Búnker"; -"type.mountain_pass" = "Puerto de montaña"; +"type.mountain_pass" = "Mountain Pass"; "type.natural" = "Naturaleza"; @@ -2641,21 +2604,21 @@ "type.place.village" = "Pueblo"; -"type.power" = "Energía"; +"type.power" = "Power"; -"type.power.generator" = "Generador"; +"type.power.generator" = "Generator"; -"type.power.line" = "Línea eléctrica"; +"type.power.line" = "Power Line"; -"type.power.line.underground" = "Línea eléctrica subterránea"; +"type.power.line.underground" = "Underground Power Line"; -"type.power.minor_line" = "Línea eléctrica de baja tensión"; +"type.power.minor_line" = "Minor Power Line"; "type.power.pole" = "Poste eléctrico"; -"type.power.station" = "Estación eléctrica"; +"type.power.station" = "Power Station"; -"type.power.substation" = "Subestación eléctrica"; +"type.power.substation" = "Subestación"; "type.power.tower" = "Poste eléctrico"; @@ -2671,21 +2634,21 @@ "type.public_transport" = "Transporte público"; -"type.public_transport.platform" = "Plataforma"; +"type.public_transport.platform" = "Platform"; -"type.railway" = "Vía férrea"; +"type.railway" = "Railway"; -"type.railway.abandoned" = "Vía férrea abandonada"; +"type.railway.abandoned" = "Abandoned Railway"; "type.railway.abandoned.bridge" = "Abandoned Railway Bridge"; "type.railway.abandoned.tunnel" = "Abandoned Railway Tunnel"; -"type.railway.construction" = "Vía férrea en construcción"; +"type.railway.construction" = "Railway Construction"; -"type.railway.crossing" = "Paso a nivel"; +"type.railway.crossing" = "Railway Crossing"; -"type.railway.disused" = "Vía férrea en desuso"; +"type.railway.disused" = "Disused railway"; "type.railway.funicular" = "Funicular"; @@ -2709,13 +2672,13 @@ "type.railway.monorail.tunnel" = "Monorail Tunnel"; -"type.railway.narrow_gauge" = "Vía férrea de ancho estrecho"; +"type.railway.narrow_gauge" = "Narrow Gauge Rail"; "type.railway.narrow_gauge.bridge" = "Narrow Gauge Rail Bridge"; "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail Tunnel"; -"type.railway.platform" = "Plataforma de vía férrea"; +"type.railway.platform" = "Railway Platform"; "type.railway.preserved" = "Preserved Rail"; @@ -2969,7 +2932,7 @@ "type.railway.station.subway.yokohama" = "Metro"; -"type.railway.subway" = "Línea de metro"; +"type.railway.subway" = "Subway Line"; "type.railway.subway.bridge" = "Subway Line Bridge"; @@ -3193,7 +3156,7 @@ "type.railway.subway_entrance.yokohama" = "Entrada de metro"; -"type.railway.tram" = "Línea de tranvía"; +"type.railway.tram" = "Tram Line"; "type.railway.tram.bridge" = "Tram Line Bridge"; @@ -3207,9 +3170,9 @@ "type.railway.yard.tunnel" = "Railway Yard Tunnel"; -"type.route" = "Ruta"; +"type.route" = "route"; -"type.route.ferry" = "Ruta de ferry"; +"type.route.ferry" = "Ferry"; "type.route.shuttle_train" = "Shuttle Train"; @@ -3231,7 +3194,7 @@ "type.shop.butcher" = "Carnicería"; -"type.shop.car" = "Concesionario de coches"; +"type.shop.car" = "Venta de coches"; "type.shop.car_parts" = "Piezas de automóvil"; @@ -3239,15 +3202,15 @@ "type.shop.car_repair.tyres" = "Reparación de neumáticos"; -"type.shop.caravan" = "Concesionario de caravanas"; +"type.shop.caravan" = "RV Dealership"; "type.shop.chemist" = "Droguería"; -"type.shop.chocolate" = "Chocolatería"; +"type.shop.chocolate" = "Tienda"; "type.shop.clothes" = "Tienda de ropa"; -"type.shop.coffee" = "Tienda de café"; +"type.shop.coffee" = "Tienda"; "type.shop.computer" = "Tienda de informática"; @@ -3271,7 +3234,7 @@ "type.shop.erotic" = "Sex Shop"; -"type.shop.fabric" = "Tienda de telas"; +"type.shop.fabric" = "Tienda"; "type.shop.farm" = "Tienda de alimentos de granja"; @@ -3311,19 +3274,19 @@ "type.shop.mobile_phone" = "Móviles"; -"type.shop.money_lender" = "Prestamista"; +"type.shop.money_lender" = "Tienda"; "type.shop.motorcycle" = "Tienda de motos"; -"type.shop.music" = "Tienda de discos"; +"type.shop.music" = "Disquería"; -"type.shop.musical_instrument" = "Instrumentos musicales"; +"type.shop.musical_instrument" = "Tienda"; "type.shop.newsagent" = "Puesto de venta de periódicos"; "type.shop.optician" = "Óptica"; -"type.shop.outdoor" = "Equipamiento de ocio al aire libre"; +"type.shop.outdoor" = "Equipamiento"; "type.shop.pastry" = "Panadería"; @@ -3347,7 +3310,7 @@ "type.shop.tattoo" = "Tatuajes"; -"type.shop.tea" = "Tienda de té"; +"type.shop.tea" = "Tienda"; "type.shop.ticket" = "Venta de entradas"; @@ -3357,7 +3320,7 @@ "type.shop.tyres" = "Tienda de neumáticos"; -"type.shop.variety_store" = "Tienda de variedades"; +"type.shop.variety_store" = "Tienda de Variedades"; "type.shop.video" = "Tienda de vídeo"; @@ -3367,7 +3330,7 @@ "type.shop.antiques" = "Antigüedades"; -"type.shop.art" = "Tienda de arte"; +"type.shop.art" = "Tienda de artes"; "type.shop.baby_goods" = "Tienda de niños"; @@ -3387,13 +3350,13 @@ "type.shop.fishing" = "Tienda de pesca"; -"type.shop.interior_decoration" = "Decoración de interiores"; +"type.shop.interior_decoration" = "Decoraciones interiores"; "type.shop.lottery" = "Boletos de lotería"; "type.shop.medical_supply" = "Suministros médicos"; -"type.shop.nutrition_supplements" = "Suplementos nutricionales"; +"type.shop.nutrition_supplements" = "Suplementos Nutricionales"; "type.shop.paint" = "Pinturas"; @@ -3470,7 +3433,7 @@ "type.sport.padel" = "Pádel"; -"type.sport.futsal" = "Fútbol sala"; +"type.sport.futsal" = "Futsal"; "type.sport.ice_hockey" = "Hockey sobre hielo"; @@ -3482,7 +3445,7 @@ "type.tourism" = "Turismo"; -"type.tourism.alpine_hut" = "Refugio de montaña"; +"type.tourism.alpine_hut" = "Cabaña"; "type.tourism.apartment" = "Apartamentos"; @@ -3502,13 +3465,13 @@ "type.tourism.attraction.specified" = "Atracción turística"; -"type.tourism.camp_site" = "Camping"; +"type.tourism.camp_site" = "Campamento"; "type.tourism.caravan_site" = "Zona de caravanas"; "type.tourism.chalet" = "Chalé"; -"type.tourism.gallery" = "Galería"; +"type.tourism.gallery" = "Turismo"; "type.tourism.guest_house" = "Casa de huéspedes"; @@ -3516,7 +3479,7 @@ "type.tourism.hotel" = "Hotel"; -"type.tourism.information" = "Información turística"; +"type.tourism.information" = "Información"; "type.tourism.information.board" = "Tablón de información"; @@ -3530,7 +3493,7 @@ "type.tourism.museum" = "Museo"; -"type.tourism.picnic_site" = "Zona de picnic"; +"type.tourism.picnic_site" = "Picnic"; "type.tourism.resort" = "Resort"; @@ -3542,29 +3505,29 @@ "type.tourism.zoo" = "Zoo"; -"type.traffic_calming" = "Reducción de velocidad"; +"type.traffic_calming" = "Traffic Calming"; -"type.traffic_calming.bump" = "Banda reductora"; +"type.traffic_calming.bump" = "Traffic Bump"; -"type.traffic_calming.hump" = "Resalte"; +"type.traffic_calming.hump" = "Traffic Hump"; -"type.waterway" = "Curso de agua"; +"type.waterway" = "Waterway"; "type.waterway.canal" = "Canal"; "type.waterway.canal.tunnel" = "Canal"; -"type.waterway.dam" = "Presa"; +"type.waterway.dam" = "Dam"; -"type.waterway.ditch" = "Zanja"; +"type.waterway.ditch" = "Ditch"; -"type.waterway.ditch.tunnel" = "Zanja"; +"type.waterway.ditch.tunnel" = "Ditch"; -"type.waterway.dock" = "Muelle"; +"type.waterway.dock" = "Waterway Dock"; -"type.waterway.drain" = "Desagüe"; +"type.waterway.drain" = "Drain"; -"type.waterway.drain.tunnel" = "Desagüe"; +"type.waterway.drain.tunnel" = "Drain"; "type.waterway.lock_gate" = "Compuerta"; @@ -3574,17 +3537,17 @@ "type.waterway.riverbank" = "Río"; -"type.waterway.stream" = "Arroyo"; +"type.waterway.stream" = "Río"; -"type.waterway.stream.ephemeral" = "Arroyo efímero"; +"type.waterway.stream.ephemeral" = "Río"; -"type.waterway.stream.intermittent" = "Arroyo intermitente"; +"type.waterway.stream.intermittent" = "Río"; -"type.waterway.stream.tunnel" = "Arroyo"; +"type.waterway.stream.tunnel" = "Río"; "type.waterway.waterfall" = "Cascada"; -"type.waterway.weir" = "Presa"; +"type.waterway.weir" = "Weir"; "type.wheelchair" = "Silla de ruedas"; @@ -3594,36 +3557,36 @@ "type.wheelchair.yes" = "Equipado para discapacitados"; -"type.aerialway.j.bar" = "Telesilla barra en J"; +"type.aerialway.j.bar" = "J-bar Lift"; -"type.aerialway.magic_carpet" = "Alfombra mágica"; +"type.aerialway.magic_carpet" = "Magic Carpet"; -"type.aerialway.platter" = "Telesilla de disco"; +"type.aerialway.platter" = "Platter Lift"; -"type.aerialway.rope_tow" = "Telesilla de cuerda"; +"type.aerialway.rope_tow" = "Rope Tow"; -"type.aerialway.t.bar" = "Telesilla barra en T"; +"type.aerialway.t.bar" = "T-bar Lift"; -"type.piste_type" = "Tipo de pista"; +"type.piste_type" = "Piste Type"; -"type.piste_type.downhill" = "Pista de esquí alpino"; +"type.piste_type.downhill" = "Downhill Ski Run"; -"type.piste_type.downhill.advanced" = "Pista de esquí alpino"; +"type.piste_type.downhill.advanced" = "Downhill Ski Run"; -"type.piste_type.downhill.easy" = "Pista de esquí alpino"; +"type.piste_type.downhill.easy" = "Downhill Ski Run"; -"type.piste_type.downhill.expert" = "Pista de esquí alpino"; +"type.piste_type.downhill.expert" = "Downhill Ski Run"; -"type.piste_type.downhill.freeride" = "Pista de esquí alpino"; +"type.piste_type.downhill.freeride" = "Downhill Ski Run"; -"type.piste_type.downhill.intermediate" = "Pista de esquí alpino"; +"type.piste_type.downhill.intermediate" = "Downhill Ski Run"; -"type.piste_type.downhill.novice" = "Pista de esquí alpino"; +"type.piste_type.downhill.novice" = "Downhill Ski Run"; -"type.piste_type.nordic" = "Pista de esquí nórdico"; +"type.piste_type.nordic" = "Nordic Ski Trail"; -"type.piste_type.sled" = "Pista para trineos"; +"type.piste_type.sled" = "Sledding Piste"; "type.building_part" = "Edificio"; -"type.amenity.events_venue" = "Lugar para eventos"; +"type.amenity.events_venue" = "Lugar de los eventos"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict index ee0ded1d9f..52412d7054 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings index 2300ac3898..fc2d81b354 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: es */ diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index b2e40ef18d..73ab570efe 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: es */ @@ -27,7 +27,7 @@ "leave_a_review" = "Escribir una opinión"; /* Choose measurement on first launch alert - choose imperial system button */ -"miles" = "Millas"; +"miles" = "Milla"; /* A text for current gps location point/arrow selected on the map */ "core_my_position" = "Mi posición"; @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Luego"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Buscar"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Grupos de marcadores"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Marcadores"; /* Default bookmark list name */ @@ -81,7 +81,7 @@ "address" = "Dirección"; /* Settings button in system menu */ -"settings" = "Ajustes"; +"settings" = "Configuración"; /* Measurement units title in settings activity */ "measurement_units" = "Unidades de medida"; @@ -155,28 +155,28 @@ /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */ "rv" = "Caravanas"; -"share_bookmarks_email_body" = "Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz\n¡Disfrute viajando con Organic Maps!"; +"share_bookmarks_email_body" = "Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábrelos si tienes instalado Organic Maps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este link: https://omaps.app/get?kmz\n¡Disfruta viajando con Organic Maps!"; /* message title of loading file */ -"load_kmz_title" = "Cargando marcadores"; +"load_kmz_title" = "Cargando favoritos"; /* Kmz file successful loading */ -"load_kmz_successful" = "¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores."; +"load_kmz_successful" = "¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestión de favoritos."; /* Kml file loading failed */ -"load_kmz_failed" = "La carga de marcadores ha fallado. El archivo puede estar corrupto o ser defectuoso."; +"load_kmz_failed" = "La carga de favoritos ha fallado. El archivo puede estar corrupto o ser defectuoso."; /* resource for context menu */ "edit" = "Editar"; /* Warning message when doing search around current position */ -"unknown_current_position" = "Su ubicación aún no ha sido determinada"; +"unknown_current_position" = "Tu ubicación aún no ha sido determinada"; /* Subject for emailed bookmark */ -"bookmark_share_email_subject" = "¡Mira mi marcador en el mapa de Organic Maps!"; +"bookmark_share_email_subject" = "Mira mi marcador en el mapa de Organic Maps!"; /* Subject for emailed position */ -"my_position_share_email_subject" = "¡Mira mi ubicación actual en el mapa en Organic Maps!"; +"my_position_share_email_subject" = "Mira mi ubicación actual en el mapa en Organic Maps!"; /* Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ "share" = "Compartir"; @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Preguntas frecuentes"; -/* Button in the main menu */ -"donate" = "Donar"; - /* Button in the main Help dialog */ "how_to_support_us" = "¿Cómo apoyarnos?"; @@ -310,10 +304,10 @@ "copyright" = "Derechos de autor"; /* Text in menu + Button in the main Help dialog */ -"report_a_bug" = "Informar de un fallo"; +"report_a_bug" = "Hay un error"; /* Alert text */ -"email_error_body" = "No se ha configurado el cliente de correo electrónico. Por favor, configúrelo o utilice alguna otra forma de ponerse en contacto con nosotros en %@"; +"email_error_body" = "No se ha configurado el cliente de correo electrónico. Por favor, configúralo o utiliza alguna otra forma de ponerte en contacto con nosotros en %@"; /* Alert title */ "email_error_title" = "Error de envío de correo"; @@ -351,7 +345,7 @@ "downloader_status_failed" = "Fallo"; /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */ -"downloader_delete_map_while_routing_dialog" = "Para eliminar el mapa, por favor, detenga la navegación."; +"downloader_delete_map_while_routing_dialog" = "Para eliminar el mapa, por favor, detén la navegación."; /* PointsInDifferentMWM */ "routing_failed_cross_mwm_building" = "Sólo se pueden crear rutas que estén totalmente contenidas en un mapa de una sola región."; @@ -369,7 +363,7 @@ "routing_download_maps_along" = "Descargue todos los mapas de su ruta"; /* Text for routing error dialog */ -"routing_requires_all_map" = "Para crear una ruta es necesario descargar y actualizar todos los mapas desde su ubicación a su destino."; +"routing_requires_all_map" = "Para crear una ruta es necesario descargar y actualizar todos los mapas de la ubicación de destino."; /* bookmark button text */ "bookmark" = "marcador"; @@ -445,7 +439,7 @@ "dialog_routing_error_location_not_found" = "No se puede crear la ruta. No se pudieron identificar las coordenadas actuales del GPS."; -"dialog_routing_location_turn_wifi" = "Verifique la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación."; +"dialog_routing_location_turn_wifi" = "Verifique la señal del GPS. Activar Wi-Fi mejorará la precisión de su ubicación."; "dialog_routing_location_turn_on" = "Activar servicios de ubicación"; @@ -509,9 +503,9 @@ "history" = "Historial"; -"search_not_found" = "Lo siento, no se han encontrado resultados."; +"search_not_found" = "Lo siento, no he encontrado nada."; -"search_not_found_query" = "Por favor, pruebe con otra consulta."; +"search_not_found_query" = "Por favor, prueba con otra consulta."; "search_history_title" = "Historial de búsquedas"; @@ -525,17 +519,17 @@ /* Place Page link to Wikimedia Commons. */ "wikimedia_commons" = "Wikimedia Commons"; -"p2p_your_location" = "Su ubicación"; +"p2p_your_location" = "Tu ubicación"; "p2p_start" = "Empezar"; -"p2p_from_here" = "Ruta desde"; +"p2p_from_here" = "Desde"; "p2p_to_here" = "Ruta hacia"; -"p2p_only_from_current" = "La navegación solo está disponible desde su ubicación actual."; +"p2p_only_from_current" = "La navegación solo está disponible desde tu ubicación actual."; -"p2p_reroute_from_current" = "¿Quiere que planeemos un ruta desde su ubicación actual?"; +"p2p_reroute_from_current" = "¿Quieres que planeemos un ruta desde tu ubicación actual?"; "editor_time_add" = "Añadir horario"; @@ -562,7 +556,7 @@ "editor_add_select_location" = "Ubicación"; -"editor_done_dialog_1" = "Ha cambiado el mapa del mundo. ¡No se lo guarde para usted! Dígaselo a sus amigos y edítenlo juntos."; +"editor_done_dialog_1" = "Has cambiado el mapa del mundo. No te lo guardes para ti. Díselo a tus amigos y edítenlo juntos."; "share_with_friends" = "Compartir con amigos"; @@ -578,9 +572,9 @@ "twentyfour_seven" = "24/7"; -"day_off_today" = "Cerrado hoy"; +"day_off_today" = "Día libre hoy"; -"day_off" = "Cerrado"; +"day_off" = "Día libre"; "today" = "Hoy"; @@ -600,7 +594,7 @@ "add_opening_hours" = "Añadir horarios de apertura"; -"no_osm_account" = "¿No tiene cuenta en OpenStreetMap?"; +"no_osm_account" = "¿No tienes cuenta en OpenStreetMap?"; "register_at_openstreetmap" = "Registrarse en OpenStreetMap"; @@ -610,7 +604,7 @@ "login" = "Iniciar sesión"; -"forgot_password" = "¿Ha olvidado su contraseña?"; +"forgot_password" = "¿Has olvidado tu contraseña?"; "osm_account" = "Cuenta OSM"; @@ -637,7 +631,7 @@ "choose_language" = "Elegir un idioma"; -"choose_street" = "Elija una calle"; +"choose_street" = "Elegir una calle"; "postal_code" = "Código postal"; @@ -662,15 +656,15 @@ "migration_download_error_dialog" = "Error de descarga"; -"common_check_internet_connection_dialog" = "Por favor, verifique los ajustes y asegúrese de que su dispositivo esté conectado a Internet."; +"common_check_internet_connection_dialog" = "Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet."; -"downloader_no_space_title" = "No hay suficiente espacio"; +"downloader_no_space_title" = "Sin espacio suficiente"; -"downloader_no_space_message" = "Por favor, elimine los datos innecesarios"; +"downloader_no_space_message" = "Por favor, elimina los datos innecesarios"; "editor_profile_changes" = "Cambios verificados"; -"editor_focus_map_on_location" = "Arrastre el mapa para seleccionar la ubicación correcta del objeto."; +"editor_focus_map_on_location" = "Arrastra el mapa para seleccionar la ubicación correcta del objeto."; "editor_add_select_category" = "Seleccionar categoría"; @@ -692,10 +686,10 @@ "message_invalid_feature_position" = "No se puede ubicar ningún objeto aquí"; -"login_to_make_edits_visible" = "Inicie sesión en OpenStreetMap.org para que otros usuarios puedan ver los cambios que haya efectuado."; +"login_to_make_edits_visible" = "Inicia sesión para que otros usuarios puedan ver los cambios que has efectuado."; /* Error dialog no space */ -"migration_no_space_message" = "Necesita más espacio para descargar. Por favor, elimine los datos innecesarios."; +"migration_no_space_message" = "Necesitas más espacio para descargar. Por favor, elimina los datos innecesarios."; "editor_sharing_title" = "He mejorado los mapas de Organic Maps"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Número de plantas (máx. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "El número de plantas no debe superar %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "El número de plantas no debe superar 25"; "editor_zip_code" = "Código postal"; @@ -750,7 +744,7 @@ "location_services_disabled_header" = "La identificación de la ubicación está desactivada"; -"location_services_disabled_message" = "Active el acceso a la geolocalización en los ajustes del dispositivo"; +"location_services_disabled_message" = "Activa el acceso a la geolocalización en los ajustes del dispositivo"; "location_services_disabled_1" = "1. Abre los ajustes"; @@ -809,18 +803,18 @@ "text_more_button" = "…más"; /* Phone number error message */ -"error_enter_correct_phone" = "Introduzca un número de teléfono correcto"; +"error_enter_correct_phone" = "Introduce un número de teléfono correcto"; -"error_enter_correct_web" = "Introduzca una dirección web válida"; +"error_enter_correct_web" = "Introduce una dirección web válida"; -"error_enter_correct_email" = "Introduzca un email válido"; +"error_enter_correct_email" = "Introduce un email válido"; "refresh" = "Actualizar"; "placepage_add_place_button" = "Añadir un lugar al mapa"; /* Displayed when saving some edits to the map to warn against publishing personal data */ -"editor_share_to_all_dialog_title" = "¿Quiere enviarlo a todos los usuarios?"; +"editor_share_to_all_dialog_title" = "¿Quieres enviarlo a todos los usuarios?"; /* Dialog before publishing the modifications to the public map. */ "editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato personal."; @@ -956,7 +950,7 @@ "restore" = "Restaurar"; -"privacy_policy" = "Política de privacidad"; +"privacy_policy" = "Política de Privacidad"; "terms_of_use" = "Condiciones de uso"; @@ -972,13 +966,13 @@ "popular_place" = "Popular"; -"export_file" = "Exportar archivo"; +"export_file" = "Exportar como archivo"; -"list_settings" = "Ajustes de la lista"; +"list_settings" = "Configurar lista"; "delete_list" = "Eliminar lista"; -"hide_from_map" = "Ocultar del mapa"; +"hide_from_map" = "Ocultar en el mapa"; "bookmark_list_description_hint" = "Agregue una descripción (texto o html)"; @@ -996,7 +990,7 @@ "place_description_title" = "Descripción del lugar"; -"speedcams_notice_message" = "Auto - Advierte sobre las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - Siempre alerta sobre las cámaras\nNunca - Nunca advierte acerca de las cámaras"; +"speedcams_notice_message" = "Auto - advierte sobre las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - siempre alerta sobre las cámaras\nNunca - nunca advierte acerca de las cámaras"; "power_managment_title" = "Modo de ahorro de energía"; @@ -1008,7 +1002,7 @@ "power_managment_setting_manual_max" = "Ahorro de energía máximo"; -"driving_options_title" = "Opciones de enrutamiento"; +"driving_options_title" = "Configuración de desvío"; "driving_options_subheader" = "Evitar en todas las rutas"; @@ -1020,13 +1014,13 @@ "avoid_motorways" = "Autopistas"; -"unable_to_calc_alert_title" = "No se puede calcular la ruta"; +"unable_to_calc_alert_title" = "No se puede construir una ruta"; -"unable_to_calc_alert_subtitle" = "Desafortunadamente, no pudimos encontrar una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo"; +"unable_to_calc_alert_subtitle" = "Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambia la configuración y vuelve a intentarlo"; -"define_to_avoid_btn" = "Defina las carreteras a evitar"; +"define_to_avoid_btn" = "Personaliza la ruta de desvío"; -"change_driving_options_btn" = "Opciones de enrutamiento habilitadas"; +"change_driving_options_btn" = "Configuración de desvío activada"; "toll_road" = "Carretera con pago de peaje"; @@ -1042,7 +1036,7 @@ "trip_start" = "Vamos"; -"pick_destination" = "Destino"; +"pick_destination" = "Objetivo"; "follow_my_position" = "Centrar"; @@ -1050,7 +1044,7 @@ "then_turn" = "Después"; -"redirect_route_alert" = "¿Quiere reconstruir la ruta?"; +"redirect_route_alert" = "¿Quieres reconstruir la ruta?"; /* A generic "Yes" button in dialogs */ "yes" = "Sí"; @@ -1059,28 +1053,28 @@ "no" = "No"; /* E.g. "WiFi:Yes" */ -"yes_available" = "sí"; +"yes_available" = "Sí"; /* E.g. "WiFi:No" */ -"no_available" = "no"; +"no_available" = "No"; -"trip_finished" = "¡Ya ha llegado!"; +"trip_finished" = "¡Llegaste!"; -"keyboard_availability_alert" = "Teclado no disponible durante la conducción"; +"keyboard_availability_alert" = "Teclado no disponible durante el movimiento"; -"dialog_routing_change_start_carplay" = "No se puede construir la ruta desde su ubicación actual"; +"dialog_routing_change_start_carplay" = "No se puede construir la ruta desde la ubicación actual"; -"dialog_routing_change_end_carplay" = "No se puede construir una ruta al destino. Elija por favor otro punto"; +"dialog_routing_change_end_carplay" = "No se puede construir la ruta al punto final. Elige otra"; -"dialog_routing_check_gps_carplay" = "No hay señal GPS. Muévase por favor a una zona abierta"; +"dialog_routing_check_gps_carplay" = "No hay señal GPS. Ve a una zona abierta"; -"dialog_routing_unable_locate_route_carplay" = "No se puede construir una ruta. Especifique por favor otros puntos de ruta"; +"dialog_routing_unable_locate_route_carplay" = "No se puede construir una ruta. Elige otros puntos de ruta"; -"dialog_routing_download_files_carplay" = "Para construir una ruta, descargue los mapas faltantes en su dispositivo"; +"dialog_routing_download_files_carplay" = "Para construir una ruta, descarga los mapas ausentes en tu dispositivo"; -"dialog_routing_system_error_carplay" = "Ocurrió un error. Reinicie la aplicación"; +"dialog_routing_system_error_carplay" = "Ocurrió un error. Reinicia la aplicación"; -"dialog_routing_rebuild_from_current_location_carplay" = "La ruta se reconstruirá desde su ubicación actual"; +"dialog_routing_rebuild_from_current_location_carplay" = "La ruta se reconstruirá desde tu ubicación actual"; "dialog_routing_rebuild_for_vehicle_carplay" = "La ruta se cambiará a coche"; @@ -1092,15 +1086,15 @@ "avoid_ferry_carplay_1" = "Sin ferri"; -"avoid_ferry_carplay_2" = "Evitar ferris"; +"avoid_ferry_carplay_2" = "Sin ferri"; "avoid_tolls_carplay_1" = "Sin peaje"; -"avoid_tolls_carplay_2" = "Evitar peaje de pago"; +"avoid_tolls_carplay_2" = "Sin peaje"; -"speedcams_alert_title_carplay_1" = "Cám.velocidad"; +"speedcams_alert_title_carplay_1" = "Cám.velocidad."; -"speedcams_alert_title_carplay_2" = "Alerta velocidad"; +"speedcams_alert_title_carplay_2" = "Alerta velocidad."; "download_map_carplay" = "Descargue los mapas en la aplicación Organic Maps en su dispositivo"; @@ -1157,7 +1151,7 @@ "parkings" = "Estacionamiento"; -"fuel_places" = "Gasolineras"; +"fuel_places" = "Gasolinera"; "medicine" = "Medicina"; @@ -1169,11 +1163,11 @@ "dialog_pedestrian_route_is_long_header" = "Ruta de metro no encontrada"; -"dialog_pedestrian_route_is_long_message" = "Elija por favor el punto de inicio o fin de ruta más cercano a una estación de metro"; +"dialog_pedestrian_route_is_long_message" = "Elige el punto de inicio o fin de ruta más cercano al metro"; "button_layer_isolines" = "Alturas"; -"isolines_activation_error_dialog" = "Para usar la altitud de relieve, actualice o descargue el mapa del área deseada"; +"isolines_activation_error_dialog" = "Para usar la altitud de relieve, actualiza o descarga el mapa del área deseada"; "isolines_location_error_dialog" = "La altitud de relieve aún no está disponible en esta región"; @@ -1195,13 +1189,13 @@ "elevation_profile_difficulty" = "Dificultad"; -"elevation_profile_time" = "Tiempo:"; +"elevation_profile_time" = "Lapso:"; -"isolines_toast_zooms_1_10" = "Amplíe el mapa para ver las isolíneas"; +"isolines_toast_zooms_1_10" = "Amplía el mapa para ver las isolíneas"; -"downloader_updating_ios" = "Actualizando"; +"downloader_updating_ios" = "Actualización"; -"downloader_loading_ios" = "Descargando"; +"downloader_loading_ios" = "Cargando"; /* Autoupdate dialog on start */ "whats_new_auto_update_title" = "Actualice sus mapas descargados"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Ruta"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1257,7 +1248,7 @@ "type.aeroway.aerodrome" = "Aeropuerto"; -"type.aeroway.aerodrome.international" = "Aeropuerto internacional"; +"type.aeroway.aerodrome.international" = "Aeropuerto"; "type.aeroway.apron" = "Plataforma"; @@ -1275,7 +1266,7 @@ "type.amenity.arts_centre" = "Centro de arte"; -"type.amenity.atm" = "Cajero automático"; +"type.amenity.atm" = "Cajero"; "type.amenity.bank" = "Banco"; @@ -1285,7 +1276,7 @@ "type.amenity.bench" = "Banco"; -"type.amenity.bicycle_parking" = "Aparcamiento de bicicletas"; +"type.amenity.bicycle_parking" = "Aparcamiento de bicis"; "type.amenity.bicycle_rental" = "Alquiler de bicicletas"; @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Estación de carga"; -"type.amenity.charging_station.motorcar" = "Estación de carga"; - "type.amenity.childcare" = "Guardería"; "type.amenity.cinema" = "Cine"; -"type.leisure.bowling_alley" = "Bolera"; - "type.amenity.clinic" = "Clínica"; "type.amenity.college" = "Colegio"; @@ -1357,11 +1344,11 @@ "type.amenity.grave_yard" = "Cementerio"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.amenity.grave_yard.christian" = "Cementerio cristiano"; +"type.amenity.grave_yard.christian" = "Cementerio"; "type.amenity.hospital" = "Hospital"; -"type.amenity.hunting_stand" = "Puesto de caza"; +"type.amenity.hunting_stand" = "Galería de caza"; "type.amenity.ice_cream" = "Heladería"; @@ -1373,7 +1360,7 @@ "type.amenity.marketplace" = "Mercado"; -"type.amenity.motorcycle_parking" = "Aparcamiento de motocicletas"; +"type.amenity.motorcycle_parking" = "Aparcamiento de motos"; "type.amenity.nightclub" = "Discoteca"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Aparcamiento subterráneo"; -"type.amenity.parking_entrance" = "Entrada al aparcamiento"; - "type.amenity.parking_entrance.private" = "Entrada al aparcamiento"; "type.amenity.parking_entrance.permissive" = "Entrada al aparcamiento"; +"type.amenity.parking_entrance" = "Entrada al aparcamiento"; + "type.amenity.parking_space" = "Plaza de aparcamiento"; "type.amenity.parking_space.permissive" = "Plaza de aparcamiento"; @@ -1433,7 +1420,7 @@ "type.amenity.police" = "Policía"; -"type.amenity.post_box" = "Buzón de correos"; +"type.amenity.post_box" = "Buzón"; "type.amenity.post_office" = "Oficina de correos"; @@ -1534,7 +1521,7 @@ "type.amenity.waste_transfer_station" = "Estación de transferencia de residuos"; -"type.amenity.water_point" = "Fuente de agua para caravanas"; +"type.amenity.water_point" = "Fuente de agua"; "type.barrier" = "Barrera"; @@ -1570,7 +1557,7 @@ "type.barrier.swing_gate" = "Barrera"; -"type.barrier.toll_booth" = "Cabina de peaje"; +"type.barrier.toll_booth" = "Peaje"; "type.barrier.wall" = "Muro"; @@ -1651,7 +1638,7 @@ "type.craft.handicraft" = "Artesanía"; /* Heating, Ventilation, and Air Conditioning */ -"type.craft.hvac" = "Calefacción, ventilación y aire acondicionado"; +"type.craft.hvac" = "Aire acondicionado"; "type.craft.metal_construction" = "Trabajador del metal"; @@ -1841,57 +1828,35 @@ "type.cuisine.vietnamese" = "Cocina vietnamita"; -"type.emergency" = "Emergencia"; +"type.emergency" = "Emergency"; "type.emergency.defibrillator" = "Desfibrilador"; "type.emergency.fire_hydrant" = "Boca de incendio"; -"type.emergency.phone" = "Teléfono de emergencias"; +"type.emergency.phone" = "Teléfono de emergencia"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrada principal"; - "type.healthcare.laboratory" = "Laboratorio médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; -"type.healthcare.alternative" = "Medicina alternativa"; - -"type.healthcare.audiologist" = "Audiología"; - -"type.healthcare.blood_donation" = "Centro de donación de sangre"; - -"type.healthcare.optometrist" = "Optometría"; - -"type.healthcare.podiatrist" = "Podología"; - -"type.healthcare.psychotherapist" = "Psicoterapia"; - -"type.healthcare.sample_collection" = "Muestreo"; - -"type.healthcare.speech_therapist" = "Logopedia"; - /********** Types: Roads **********/ -"type.highway" = "Carretera"; +"type.highway" = "Highway"; -"type.highway.bridleway" = "Camino de caballos"; +"type.highway.bridleway" = "Bridle Path"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.bridleway.bridge" = "Puente"; -"type.highway.bridleway.permissive" = "Camino de caballos"; +"type.highway.bridleway.permissive" = "Bridle Path"; /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Túnel"; -"type.highway.busway" = "Carretera exclusiva para autobuses"; - "type.highway.bus_stop" = "Parada de autobús"; "type.highway.construction" = "Carretera en construcción"; @@ -1910,12 +1875,12 @@ "type.highway.footway" = "Camino"; -"type.highway.footway.alpine_hiking" = "Senderismo alpino"; +"type.highway.footway.alpine_hiking" = "Camino"; -"type.highway.footway.area" = "Zona peatonal"; +"type.highway.footway.area" = "Camino"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.footway.bridge" = "Puente peatonal"; +"type.highway.footway.bridge" = "Puente"; "type.highway.footway.demanding_alpine_hiking" = "Camino"; @@ -1923,14 +1888,14 @@ "type.highway.footway.difficult_alpine_hiking" = "Camino"; -"type.highway.footway.hiking" = "Sendero"; +"type.highway.footway.hiking" = "Camino"; "type.highway.footway.mountain_hiking" = "Camino"; "type.highway.footway.permissive" = "Camino"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.footway.tunnel" = "Túnel peatonal"; +"type.highway.footway.tunnel" = "Túnel"; "type.highway.ford" = "Vado (de lugar)"; @@ -1986,15 +1951,15 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.path.tunnel" = "Túnel"; -"type.highway.pedestrian" = "Calle peatonal"; +"type.highway.pedestrian" = "Calle"; -"type.highway.pedestrian.area" = "Zona peatonal"; +"type.highway.pedestrian.area" = "Calle"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.pedestrian.bridge" = "Puente peatonal"; +"type.highway.pedestrian.bridge" = "Puente"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.pedestrian.tunnel" = "Túnel peatonal"; +"type.highway.pedestrian.tunnel" = "Túnel"; "type.highway.primary" = "Calle"; @@ -2064,11 +2029,11 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.service.tunnel" = "Túnel"; -"type.highway.services" = "Área de servicio"; +"type.highway.services" = "Service Area"; "type.highway.speed_camera" = "Radar de velocidad"; -"type.highway.steps" = "Escaleras"; +"type.highway.steps" = "Camino"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.steps.bridge" = "Puente"; @@ -2092,26 +2057,26 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.tertiary_link.tunnel" = "Túnel"; -"type.highway.track" = "Pista"; +"type.highway.track" = "Calle"; -"type.highway.track.area" = "Pista"; +"type.highway.track.area" = "Calle"; /* These translations are used for all type.highway.*.bridge. */ "type.highway.track.bridge" = "Puente"; -"type.highway.track.grade1" = "Pista"; +"type.highway.track.grade1" = "Calle"; -"type.highway.track.grade2" = "Pista"; +"type.highway.track.grade2" = "Calle"; -"type.highway.track.grade3" = "Pista"; +"type.highway.track.grade3" = "Calle"; -"type.highway.track.grade4" = "Pista"; +"type.highway.track.grade4" = "Calle"; -"type.highway.track.grade5" = "Pista"; +"type.highway.track.grade5" = "Calle"; -"type.highway.track.no.access" = "Pista"; +"type.highway.track.no.access" = "Calle"; -"type.highway.track.permissive" = "Pista"; +"type.highway.track.permissive" = "Calle"; /* These translations are used for all type.highway.*.tunnel. */ "type.highway.track.tunnel" = "Túnel"; @@ -2154,7 +2119,7 @@ "type.area_highway.path" = "Camino"; -"type.area_highway.pedestrian" = "Calle peatonal"; +"type.area_highway.pedestrian" = "Calle"; "type.area_highway.primary" = "Calle"; @@ -2166,9 +2131,9 @@ "type.area_highway.tertiary" = "Calle"; -"type.area_highway.steps" = "Escaleras"; +"type.area_highway.steps" = "Camino"; -"type.area_highway.track" = "Pista"; +"type.area_highway.track" = "Calle"; "type.area_highway.trunk" = "Calle"; @@ -2239,7 +2204,7 @@ "type.historic.ruins" = "Ruinas"; -"type.historic.ship" = "Barco"; +"type.historic.ship" = "Turismo"; "type.historic.tomb" = "Tumba"; @@ -2281,7 +2246,7 @@ "type.junction.roundabout" = "Rotonda"; -"type.landuse" = "Uso del suelo"; +"type.landuse" = "Landuse"; "type.landuse.allotments" = "Allotments"; @@ -2293,69 +2258,69 @@ "type.landuse.cemetery" = "Cementerio"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.landuse.cemetery.christian" = "Cementerio cristiano"; +"type.landuse.cemetery.christian" = "Cementerio"; "type.landuse.churchyard" = "Camposanto"; -"type.landuse.commercial" = "Zona comercial"; +"type.landuse.commercial" = "Commercial Area"; -"type.landuse.construction" = "Construcción"; +"type.landuse.construction" = "Construction"; "type.landuse.education" = "Instalaciones educativas"; -"type.landuse.farm" = "Granja"; +"type.landuse.farm" = "Farm"; "type.landuse.farmland" = "Tierras agrícolas"; -"type.landuse.farmyard" = "Granja"; +"type.landuse.farmyard" = "Farmyard"; -"type.landuse.field" = "Campo"; +"type.landuse.field" = "Field"; "type.landuse.forest" = "Bosque"; -"type.landuse.forest.coniferous" = "Bosque de coníferas"; +"type.landuse.forest.coniferous" = "Bosque"; -"type.landuse.forest.deciduous" = "Bosque caducifolio"; +"type.landuse.forest.deciduous" = "Bosque"; -"type.landuse.forest.mixed" = "Bosque mixto"; +"type.landuse.forest.mixed" = "Bosque"; -"type.landuse.garages" = "Garajes"; +"type.landuse.garages" = "Garages"; "type.landuse.grass" = "Césped"; -"type.landuse.greenfield" = "Invernadero"; +"type.landuse.greenfield" = "Greenfield"; -"type.landuse.greenhouse_horticulture" = "Invernadero"; +"type.landuse.greenhouse_horticulture" = "Greenhouse"; -"type.landuse.industrial" = "Zona industrial"; +"type.landuse.industrial" = "Industrial Land"; "type.landuse.landfill" = "Vertedero"; -"type.landuse.meadow" = "Pradera"; +"type.landuse.meadow" = "Meadow"; -"type.landuse.military" = "Área militar"; +"type.landuse.military" = "Military Area"; -"type.landuse.orchard" = "Huerto"; +"type.landuse.orchard" = "Orchard"; -"type.landuse.quarry" = "Cantera"; +"type.landuse.quarry" = "Quarry"; "type.landuse.railway" = "Instalaciones ferroviarias"; -"type.landuse.recreation_ground" = "Área recreativa"; +"type.landuse.recreation_ground" = "Recreation Ground"; "type.landuse.reservoir" = "Cuenca"; -"type.landuse.residential" = "Zona residencial"; +"type.landuse.residential" = "Residential Land"; -"type.landuse.retail" = "Zona comercial"; +"type.landuse.retail" = "Retail Land"; -"type.landuse.salt_pond" = "Estanque"; +"type.landuse.salt_pond" = "Pond"; "type.landuse.village_green" = "Land"; -"type.landuse.vineyard" = "Viñedo"; +"type.landuse.vineyard" = "Vineyard"; -"type.leisure" = "Ocio"; +"type.leisure" = "Leisure"; "type.leisure.common" = "Public Land"; @@ -2369,17 +2334,17 @@ "type.leisure.garden" = "Jardín"; -"type.leisure.garden.residential" = "Jardín residencial"; +"type.leisure.garden.residential" = "Jardín"; "type.leisure.golf_course" = "Campo de golf"; -"type.leisure.ice_rink" = "Pisa de patinaje"; +"type.leisure.ice_rink" = "Ice Rink"; -"type.leisure.landscape_reserve" = "Reserva natural"; +"type.leisure.landscape_reserve" = "Landscape Reserve"; "type.leisure.marina" = "Marina"; -"type.leisure.nature_reserve" = "Reserva natural"; +"type.leisure.nature_reserve" = "Territorio reservado"; "type.leisure.park" = "Parque"; @@ -2395,7 +2360,7 @@ "type.leisure.playground" = "Patio de recreo"; -"type.leisure.recreation_ground" = "Zona recreativa"; +"type.leisure.recreation_ground" = "Recreation Ground"; "type.leisure.sauna" = "Sauna"; @@ -2411,19 +2376,17 @@ "type.leisure.swimming_pool" = "Piscina"; -"type.leisure.swimming_pool.private" = "Piscina privada"; +"type.leisure.swimming_pool.private" = "Piscina"; -"type.leisure.track" = "Pista deportiva"; - -"type.leisure.track.area" = "Pista deportiva"; +"type.leisure.track" = "Track"; "type.leisure.water_park" = "Parque acuático"; -"type.leisure.beach_resort" = "Resort de playa"; +"type.leisure.beach_resort" = "Beach Resort"; "type.man_made" = "Man Made"; -"type.man_made.breakwater" = "Rompeolas"; +"type.man_made.breakwater" = "Breakwater"; "type.man_made.cairn" = "Cairn"; @@ -2431,29 +2394,29 @@ "type.man_made.cutline" = "Cutline"; -"type.man_made.survey_point" = "Punto geodésico"; +"type.man_made.survey_point" = "Survey Point"; -"type.man_made.flagpole" = "Mástil de bandera"; +"type.man_made.flagpole" = "Flagpole"; "type.man_made.lighthouse" = "Faro"; -"type.man_made.mast" = "Mástil"; +"type.man_made.mast" = "Mast"; -"type.man_made.pier" = "Muelle"; +"type.man_made.pier" = "Pier"; -"type.man_made.pipeline" = "Tubería"; +"type.man_made.pipeline" = "Pipeline"; -"type.man_made.pipeline.overground" = "Tubería aérea"; +"type.man_made.pipeline.overground" = "Overground Pipeline"; "type.man_made.silo" = "Silo"; -"type.man_made.storage_tank" = "Cisterna"; +"type.man_made.storage_tank" = "Storage Tank"; "type.man_made.surveillance" = "Cámara de vigilancia"; "type.man_made.tower" = "Torre"; -"type.man_made.wastewater_plant" = "Planta de tratamiento de aguas residuales"; +"type.man_made.wastewater_plant" = "Wastewater treatment plant"; "type.man_made.water_tap" = "Toma de agua"; @@ -2463,17 +2426,17 @@ "type.man_made.windmill" = "Molino"; -"type.man_made.works" = "Fábrica"; +"type.man_made.works" = "Industrial Works"; "type.mapswithme" = "mapswithme"; "type.mapswithme.grid" = "mapswithme-grid"; -"type.military" = "Militar"; +"type.military" = "Military"; "type.military.bunker" = "Búnker"; -"type.mountain_pass" = "Puerto de montaña"; +"type.mountain_pass" = "Mountain Pass"; "type.natural" = "Naturaleza"; @@ -2641,21 +2604,21 @@ "type.place.village" = "Pueblo"; -"type.power" = "Energía"; +"type.power" = "Power"; -"type.power.generator" = "Generador"; +"type.power.generator" = "Generator"; -"type.power.line" = "Línea eléctrica"; +"type.power.line" = "Power Line"; -"type.power.line.underground" = "Línea eléctrica subterránea"; +"type.power.line.underground" = "Underground Power Line"; -"type.power.minor_line" = "Línea eléctrica de baja tensión"; +"type.power.minor_line" = "Minor Power Line"; "type.power.pole" = "Poste eléctrico"; -"type.power.station" = "Estación eléctrica"; +"type.power.station" = "Power Station"; -"type.power.substation" = "Subestación eléctrica"; +"type.power.substation" = "Subestación"; "type.power.tower" = "Poste eléctrico"; @@ -2671,21 +2634,21 @@ "type.public_transport" = "Transporte público"; -"type.public_transport.platform" = "Plataforma"; +"type.public_transport.platform" = "Platform"; -"type.railway" = "Vía férrea"; +"type.railway" = "Railway"; -"type.railway.abandoned" = "Vía férrea abandonada"; +"type.railway.abandoned" = "Abandoned Railway"; "type.railway.abandoned.bridge" = "Abandoned Railway Bridge"; "type.railway.abandoned.tunnel" = "Abandoned Railway Tunnel"; -"type.railway.construction" = "Vía férrea en construcción"; +"type.railway.construction" = "Railway Construction"; -"type.railway.crossing" = "Paso a nivel"; +"type.railway.crossing" = "Railway Crossing"; -"type.railway.disused" = "Vía férrea en desuso"; +"type.railway.disused" = "Disused railway"; "type.railway.funicular" = "Funicular"; @@ -2693,7 +2656,7 @@ "type.railway.funicular.tunnel" = "Funicular Tunnel"; -"type.railway.halt" = "Punto de parada"; +"type.railway.halt" = "Estación de tren"; "type.railway.level_crossing" = "Cruce de ferrocarril"; @@ -2709,13 +2672,13 @@ "type.railway.monorail.tunnel" = "Monorail Tunnel"; -"type.railway.narrow_gauge" = "Vía férrea de ancho estrecho"; +"type.railway.narrow_gauge" = "Narrow Gauge Rail"; "type.railway.narrow_gauge.bridge" = "Narrow Gauge Rail Bridge"; "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail Tunnel"; -"type.railway.platform" = "Plataforma de vía férrea"; +"type.railway.platform" = "Railway Platform"; "type.railway.preserved" = "Preserved Rail"; @@ -2969,7 +2932,7 @@ "type.railway.station.subway.yokohama" = "Metro"; -"type.railway.subway" = "Línea de metro"; +"type.railway.subway" = "Subway Line"; "type.railway.subway.bridge" = "Subway Line Bridge"; @@ -3193,7 +3156,7 @@ "type.railway.subway_entrance.yokohama" = "Entrada al metro"; -"type.railway.tram" = "Línea de tranvía"; +"type.railway.tram" = "Tram Line"; "type.railway.tram.bridge" = "Tram Line Bridge"; @@ -3207,9 +3170,9 @@ "type.railway.yard.tunnel" = "Railway Yard Tunnel"; -"type.route" = "Ruta"; +"type.route" = "route"; -"type.route.ferry" = "Ruta de ferry"; +"type.route.ferry" = "Ferry"; "type.route.shuttle_train" = "Shuttle Train"; @@ -3231,7 +3194,7 @@ "type.shop.butcher" = "Carnicería"; -"type.shop.car" = "Concesionario de coches"; +"type.shop.car" = "Venta de coches"; "type.shop.car_parts" = "Piezas de automóvil"; @@ -3239,15 +3202,15 @@ "type.shop.car_repair.tyres" = "Reparación de neumáticos"; -"type.shop.caravan" = "Concesionario de caravanas"; +"type.shop.caravan" = "RV Dealership"; "type.shop.chemist" = "Droguería"; -"type.shop.chocolate" = "Chocolatería"; +"type.shop.chocolate" = "Tienda"; "type.shop.clothes" = "Tienda de ropa"; -"type.shop.coffee" = "Tienda de café"; +"type.shop.coffee" = "Tienda"; "type.shop.computer" = "Tienda de informática"; @@ -3271,7 +3234,7 @@ "type.shop.erotic" = "Sex Shop"; -"type.shop.fabric" = "Tienda de telas"; +"type.shop.fabric" = "Tienda"; "type.shop.farm" = "Tienda de alimentos de granja"; @@ -3311,19 +3274,19 @@ "type.shop.mobile_phone" = "Móviles"; -"type.shop.money_lender" = "Prestamista"; +"type.shop.money_lender" = "Tienda"; "type.shop.motorcycle" = "Tienda de motos"; -"type.shop.music" = "Tienda de discos"; +"type.shop.music" = "Disquería"; -"type.shop.musical_instrument" = "Instrumentos musicales"; +"type.shop.musical_instrument" = "Tienda"; "type.shop.newsagent" = "Puesto de venta de periódicos"; "type.shop.optician" = "Óptica"; -"type.shop.outdoor" = "Equipamiento de ocio al aire libre"; +"type.shop.outdoor" = "Equipamiento"; "type.shop.pastry" = "Pastelería"; @@ -3347,7 +3310,7 @@ "type.shop.tattoo" = "Tatuajes"; -"type.shop.tea" = "Tienda de té"; +"type.shop.tea" = "Tienda"; "type.shop.ticket" = "Venta de entradas"; @@ -3357,7 +3320,7 @@ "type.shop.tyres" = "Tienda de neumáticos"; -"type.shop.variety_store" = "Tienda de variedades"; +"type.shop.variety_store" = "Tienda de Variedades"; "type.shop.video" = "Tienda de vídeo"; @@ -3367,7 +3330,7 @@ "type.shop.antiques" = "Antigüedades"; -"type.shop.art" = "Tienda de arte"; +"type.shop.art" = "Tienda de artes"; "type.shop.baby_goods" = "Tienda de niños"; @@ -3387,13 +3350,13 @@ "type.shop.fishing" = "Tienda de pesca"; -"type.shop.interior_decoration" = "Decoración de interiores"; +"type.shop.interior_decoration" = "Decoraciones interiores"; "type.shop.lottery" = "Boletos de lotería"; "type.shop.medical_supply" = "Suministros médicos"; -"type.shop.nutrition_supplements" = "Suplementos nutricionales"; +"type.shop.nutrition_supplements" = "Suplementos Nutricionales"; "type.shop.paint" = "Pinturas"; @@ -3448,7 +3411,7 @@ /* Used to tag a scuba diving site. */ "type.sport.scuba_diving" = "Submarinismo"; -"type.sport.shooting" = "Tiro deportivo"; +"type.sport.shooting" = "Tiroteo"; "type.sport.skateboard" = "Monopatinaje"; @@ -3470,7 +3433,7 @@ "type.sport.padel" = "Pádel"; -"type.sport.futsal" = "Fútbol sala"; +"type.sport.futsal" = "Futsal"; "type.sport.ice_hockey" = "Hockey sobre hielo"; @@ -3482,7 +3445,7 @@ "type.tourism" = "Turismo"; -"type.tourism.alpine_hut" = "Refugio de montaña"; +"type.tourism.alpine_hut" = "Cabaña"; "type.tourism.apartment" = "Apartamentos"; @@ -3502,13 +3465,13 @@ "type.tourism.attraction.specified" = "Atracción turística"; -"type.tourism.camp_site" = "Camping"; +"type.tourism.camp_site" = "Campamento"; "type.tourism.caravan_site" = "Zona de caravanas"; "type.tourism.chalet" = "Chalé"; -"type.tourism.gallery" = "Galería"; +"type.tourism.gallery" = "Turismo"; "type.tourism.guest_house" = "Casa de huéspedes"; @@ -3516,7 +3479,7 @@ "type.tourism.hotel" = "Hotel"; -"type.tourism.information" = "Información turística"; +"type.tourism.information" = "Información"; "type.tourism.information.board" = "Tablón de información"; @@ -3530,7 +3493,7 @@ "type.tourism.museum" = "Museo"; -"type.tourism.picnic_site" = "Zona de picnic"; +"type.tourism.picnic_site" = "Picnic"; "type.tourism.resort" = "Resort"; @@ -3542,29 +3505,29 @@ "type.tourism.zoo" = "Zoo"; -"type.traffic_calming" = "Reducción de velocidad"; +"type.traffic_calming" = "Traffic Calming"; -"type.traffic_calming.bump" = "Banda reductora"; +"type.traffic_calming.bump" = "Traffic Bump"; -"type.traffic_calming.hump" = "Resalte"; +"type.traffic_calming.hump" = "Traffic Hump"; -"type.waterway" = "Curso de agua"; +"type.waterway" = "Waterway"; "type.waterway.canal" = "Canal"; "type.waterway.canal.tunnel" = "Canal"; -"type.waterway.dam" = "Presa"; +"type.waterway.dam" = "Dam"; -"type.waterway.ditch" = "Zanja"; +"type.waterway.ditch" = "Ditch"; -"type.waterway.ditch.tunnel" = "Zanja"; +"type.waterway.ditch.tunnel" = "Ditch"; -"type.waterway.dock" = "Muelle"; +"type.waterway.dock" = "Waterway Dock"; -"type.waterway.drain" = "Desagüe"; +"type.waterway.drain" = "Drain"; -"type.waterway.drain.tunnel" = "Desagüe"; +"type.waterway.drain.tunnel" = "Drain"; "type.waterway.lock_gate" = "Compuerta"; @@ -3574,17 +3537,17 @@ "type.waterway.riverbank" = "Río"; -"type.waterway.stream" = "Arroyo"; +"type.waterway.stream" = "Río"; -"type.waterway.stream.ephemeral" = "Arroyo efímero"; +"type.waterway.stream.ephemeral" = "Río"; -"type.waterway.stream.intermittent" = "Arroyo intermitente"; +"type.waterway.stream.intermittent" = "Río"; -"type.waterway.stream.tunnel" = "Arroyo"; +"type.waterway.stream.tunnel" = "Río"; "type.waterway.waterfall" = "Cascada"; -"type.waterway.weir" = "Presa"; +"type.waterway.weir" = "Weir"; "type.wheelchair" = "Silla de ruedas"; @@ -3594,36 +3557,36 @@ "type.wheelchair.yes" = "Equipado para discapacitados"; -"type.aerialway.j.bar" = "Telesilla barra en J"; +"type.aerialway.j.bar" = "J-bar Lift"; -"type.aerialway.magic_carpet" = "Alfombra mágica"; +"type.aerialway.magic_carpet" = "Magic Carpet"; -"type.aerialway.platter" = "Telesilla de disco"; +"type.aerialway.platter" = "Platter Lift"; -"type.aerialway.rope_tow" = "Telesilla de cuerda"; +"type.aerialway.rope_tow" = "Rope Tow"; -"type.aerialway.t.bar" = "Telesilla barra en T"; +"type.aerialway.t.bar" = "T-bar Lift"; -"type.piste_type" = "Tipo de pista"; +"type.piste_type" = "Piste Type"; -"type.piste_type.downhill" = "Pista de esquí alpino"; +"type.piste_type.downhill" = "Downhill Ski Run"; -"type.piste_type.downhill.advanced" = "Pista de esquí alpino"; +"type.piste_type.downhill.advanced" = "Downhill Ski Run"; -"type.piste_type.downhill.easy" = "Pista de esquí alpino"; +"type.piste_type.downhill.easy" = "Downhill Ski Run"; -"type.piste_type.downhill.expert" = "Pista de esquí alpino"; +"type.piste_type.downhill.expert" = "Downhill Ski Run"; -"type.piste_type.downhill.freeride" = "Pista de esquí alpino"; +"type.piste_type.downhill.freeride" = "Downhill Ski Run"; -"type.piste_type.downhill.intermediate" = "Pista de esquí alpino"; +"type.piste_type.downhill.intermediate" = "Downhill Ski Run"; -"type.piste_type.downhill.novice" = "Pista de esquí alpino"; +"type.piste_type.downhill.novice" = "Downhill Ski Run"; -"type.piste_type.nordic" = "Pista de esquí nórdico"; +"type.piste_type.nordic" = "Nordic Ski Trail"; -"type.piste_type.sled" = "Pista para trineos"; +"type.piste_type.sled" = "Sledding Piste"; "type.building_part" = "Edificio"; -"type.amenity.events_venue" = "Lugar para eventos"; +"type.amenity.events_venue" = "Lugar de los eventos"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict index c94dca9def..2993ed58a3 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ NSStringFormatValueTypeKey d one - Se encontró %d archivo. Lo verá después de la conversión. + Se encontró %d archivo. Lo verás después de la conversión. other - Se han encontrado %d archivos. Los verá después de la conversión. + Se han encontrado %d archivos. Los verás después de la conversión. @@ -52,9 +52,9 @@ NSStringFormatValueTypeKey d one - %d objeto + %d objecto other - %d objetos + %d objectos diff --git a/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings index 67f1c4c21d..2671b9c944 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: et */ @@ -10,7 +10,7 @@ "search" = "Search"; /* Used in home screen quick actions. */ -"bookmarks" = "Järjehoidjad"; +"bookmarks" = "Bookmarks"; /* Used in home screen quick actions. */ "route" = "Marsruut"; @@ -19,7 +19,7 @@ /********** gps strings **********/ /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */ -"NSLocationAlwaysUsageDescription" = "Rakenduse funktsionaalsuse täielikuks nautimiseks on vaja asukoha tuvastamist taustal. Seda kasutatakse navigeerimiseks ja hiljuti reisitud tee salvestamiseks."; +"NSLocationAlwaysUsageDescription" = "Detecting location in the background is necessary to fully enjoy the functionality of the app. It is used for navigation and saving your recently traveled track."; /* Needed to explain why we require access to GPS coordinates when the app is active. */ -"NSLocationWhenInUseUsageDescription" = "Teie asukoha määramine on vajalik navigeerimiseks ja hiljuti reisitud raja salvestamiseks."; +"NSLocationWhenInUseUsageDescription" = "Determining your location is necessary for navigation and for saving your recently traveled track."; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings index 122e653381..23b553cfc7 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: et */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Hiljem"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Otsi"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Järjehoidjate loetelud"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Järjehoidjad"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Korduma kippuvad küsimused"; -/* Button in the main menu */ -"donate" = "Anneta"; - /* Button in the main Help dialog */ "how_to_support_us" = "Kuidas meid toetada?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Korruste arv (maks. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Korruste arv ei või olla üle %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Korruste arv ei või olla üle 25"; "editor_zip_code" = "Postiindeks"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Rada"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Laadimisjaam"; -"type.amenity.charging_station.motorcar" = "Laadimisjaam"; - "type.amenity.childcare" = "Lasteaed"; "type.amenity.cinema" = "Kino"; -"type.leisure.bowling_alley" = "Bowlingusaal"; - "type.amenity.clinic" = "Kliinik"; "type.amenity.college" = "Kolledž"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Maa-alune parkimine"; -"type.amenity.parking_entrance" = "Parkla sissepääs"; - "type.amenity.parking_entrance.private" = "Parkla sissepääs"; "type.amenity.parking_entrance.permissive" = "Parkla sissepääs"; +"type.amenity.parking_entrance" = "Parkla sissepääs"; + "type.amenity.parking_space" = "Parkimiskoht"; "type.amenity.parking_space.permissive" = "Parkimiskoht"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Hädaabi telefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Sissepääs"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Peasissekäik"; - "type.healthcare.laboratory" = "Meditsiinilabor"; "type.healthcare.physiotherapist" = "Füsioterapeut"; -"type.healthcare.alternative" = "Alternatiivne meditsiin"; - -"type.healthcare.audiologist" = "Audioloogia"; - -"type.healthcare.blood_donation" = "Vereloovutuskeskus"; - -"type.healthcare.optometrist" = "Optomeetria"; - -"type.healthcare.podiatrist" = "Jalaravi"; - -"type.healthcare.psychotherapist" = "Psühhoteraapia"; - -"type.healthcare.sample_collection" = "Proovivõtmine"; - -"type.healthcare.speech_therapist" = "Logopeedia"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Spetsiaalne bussitee"; - "type.highway.bus_stop" = "Bussipeatus"; "type.highway.construction" = "Ehitusjärgus tee"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Jooksurada"; -"type.leisure.track.area" = "Jooksurada"; - "type.leisure.water_park" = "Veepark"; "type.leisure.beach_resort" = "Rannakuurort"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict index c2fcd88419..0857fb69c6 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings index 7c2d99dabe..29df357adc 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: eu */ diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index 2e58f85a40..4ac1470c22 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: eu */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Geroago"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Bilatu"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Markagailu taldeak"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Markagailuak"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Maiz galderak"; -/* Button in the main menu */ -"donate" = "Dohaintza eman"; - /* Button in the main Help dialog */ "how_to_support_us" = "Nola lagundu diguzu?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Solairu kopurua (gehienez %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Landare kopurua ez da %detik gorakoa izan behar"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Landare kopurua ez da 25etik gorakoa izan behar"; "editor_zip_code" = "Posta kodea"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Ibilbidea"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Kargatzeko geltokia"; -"type.amenity.charging_station.motorcar" = "Kargatzeko geltokia"; - "type.amenity.childcare" = "Haurtzaindegia"; "type.amenity.cinema" = "Filmak"; -"type.leisure.bowling_alley" = "Bolatokia"; - "type.amenity.clinic" = "Klinika"; "type.amenity.college" = "Unibertsitatea"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Lurpeko Aparkalekua"; -"type.amenity.parking_entrance" = "Aparkalekuaren sarrera"; - "type.amenity.parking_entrance.private" = "Aparkalekuaren sarrera"; "type.amenity.parking_entrance.permissive" = "Aparkalekuaren sarrera"; +"type.amenity.parking_entrance" = "Aparkalekuaren sarrera"; + "type.amenity.parking_space" = "Aparkaleku"; "type.amenity.parking_space.permissive" = "Aparkaleku"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Larrialdi zenbakia"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Sarrera"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Sarrera Nagusia"; - "type.healthcare.laboratory" = "Medikuntza laborategia"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; -"type.healthcare.alternative" = "Medikuntza alternatiboa"; - -"type.healthcare.audiologist" = "Audiologia"; - -"type.healthcare.blood_donation" = "Odol Emate Zentroa"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podologia"; - -"type.healthcare.psychotherapist" = "Psikoterapia"; - -"type.healthcare.sample_collection" = "Laginketa"; - -"type.healthcare.speech_therapist" = "Logopedia"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunel"; -"type.highway.busway" = "Autobus errepidea"; - "type.highway.bus_stop" = "Autobus geltokia"; "type.highway.construction" = "Eraikitzen ari diren errepidea"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Ur-parkea"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict index 3deeb6a9a9..185824aea5 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings index 79f3b098f6..287bf8d886 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: fa */ diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index acdd145580..38fec5bc76 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: fa */ @@ -15,7 +15,7 @@ /* Button which deletes downloaded country */ "delete" = "حذف"; -"download_maps" = "دانلود نقشه‌ها"; +"download_maps" = "دانلود نقشه ها"; /* Settings/Downloader - info for country which started downloading */ "downloading" = "درحال دانلود"; @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "بعداً"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "جست‌وجو"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,20 +71,20 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bookmark Lists"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ -"bookmarks" = "نشانه‌ها"; +/* "Bookmarks" dialog title */ +"bookmarks" = "نشانه ها"; /* Default bookmark list name */ "core_my_places" = "مکان من"; /* Editor title above street and house number */ -"address" = "آدرس"; +"address" = "ادرس"; /* Settings button in system menu */ "settings" = "تنظیمات"; /* Measurement units title in settings activity */ -"measurement_units" = "واحد اندازه‌گیری"; +"measurement_units" = "واحد اندازه گیری"; /********** Search categories **********/ @@ -117,7 +117,7 @@ "entertainment" = "سرگرمی"; /* Search category for ATMs; any changes should be duplicated in categories.txt @atm! */ -"atm" = "خود‌پرداز"; +"atm" = "خود پرداز"; /* Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! */ "nightlife" = "تفریحات شبانه"; @@ -150,21 +150,21 @@ "recycling" = "بازیافت"; /* Search category for water; any changes should be duplicated in categories.txt @water! also used to sort bookmarks by type */ -"water" = "آب"; +"water" = "اب"; /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */ -"rv" = "RV برای"; +"rv" = "RV ﯼﺍﺮﺑ"; "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!"; /* message title of loading file */ -"load_kmz_title" = "در حال بارگیری نشانه‌ها"; +"load_kmz_title" = "در حال بارگیری نشانه ها"; /* Kmz file successful loading */ -"load_kmz_successful" = "نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید"; +"load_kmz_successful" = "نشانه ها با موفقیت بارگذاری شد!شما می توانید ان ها را در نقشه یا بخش مدیریت نشانه ها بیابید"; /* Kml file loading failed */ -"load_kmz_failed" = "بارگذاری نشانه‌ها با شکست مواجه شد.ممکن است فایل آسیب دیده یا معیوب باشد"; +"load_kmz_failed" = "بارگذاری نشانه ها با شکست مواجح شد.ممکن است فایل اسیب دیده یا معیوب باشد"; /* resource for context menu */ "edit" = "ویرایش"; @@ -194,7 +194,7 @@ "version" = "ورژن: %@"; /* Data version in «About» screen, %@ is replaced by a local, human readable date. */ -"data_version" = "OpenStreetMap: %@ داده‌های"; +"data_version" = "OpenStreetMap: %@ ﯼﺎﻫ ﻩﺩﺍﺩ"; /* Title for tracks category in bookmarks manager */ "tracks_title" = "مسیر"; @@ -206,7 +206,7 @@ "prefs_group_route" = "مسیریابی"; -"pref_zoom_title" = "دکمه‌های بزرگنمایی"; +"pref_zoom_title" = "دکمه های درشت نمایی"; /* Settings «Map» category: «Night style» title */ "pref_map_style_title" = "حالت شب"; @@ -224,7 +224,7 @@ "pref_map_3d_title" = "نمای چشم انداز"; /* Settings «Map» category: «3D buildings» title */ -"pref_map_3d_buildings_title" = "ساختمان‌های سه بعدی"; +"pref_map_3d_buildings_title" = "ساختمان های سه بعدی"; /* Settings «Route» category: «Tts enabled» title */ "pref_tts_enable_title" = "دستور العمل صوتی"; @@ -238,7 +238,7 @@ /* Settings «Map» category: «Record track» title */ "pref_track_record_title" = "مسیر اخیر"; -"pref_map_auto_zoom" = "بزرگنمایی خودکار"; +"pref_map_auto_zoom" = "بزرگ نمایی خودکار"; "duration_disabled" = "خاموش"; @@ -252,7 +252,7 @@ "duration_1_day" = "1 روز"; -"recent_track_help_text" = "با این قابلیت شما می توانید مسیری که می پیمایید را در یک دوره مشخص ضبط نماید و آن را بر روی نقشه ببینید.لطفا توجه نمایید:فعال سازی این قابلیت باعث افزایش مصرف باتری موبایل شما می شود.مسیر به طور خودکار بعد از مدت مشخص شده حذف خواهد شد"; +"recent_track_help_text" = "با این قابلیت شما می توانید مسیری که می پیمایید را در یک دوره مشخص ضبط نماید و ان را بر روی نقشه ببینید.لطفا توجه نمایید:فعال سازی این قابلیت باعث افزایش مصرف باتری موبایل شما می شود.مسیر به طور خودکار بعد از مدت مشخص شده حذف خواهد شد"; "placepage_distance" = "مسافت"; @@ -262,7 +262,7 @@ "website" = "وب سایت"; /* Text in About menu, opens Organic Maps news website */ -"news" = "اخبار"; +"news" = "ﺭﺎﺒﺧﺍ"; /* Text in menu */ "github" = "GitHub"; @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -298,10 +295,7 @@ "help" = "کمک"; /* Button in the main Help dialog */ -"faq" = "پرسش‌های زیاد پرسیده شده"; - -/* Button in the main menu */ -"donate" = "حمایت مالی"; +"faq" = "ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ"; /* Button in the main Help dialog */ "how_to_support_us" = "چگونه از ما حمایت کنیم؟"; @@ -313,16 +307,16 @@ "report_a_bug" = "گزارش خطا"; /* Alert text */ -"email_error_body" = "کلاینت ایمیل شما پیکربندی نشده است.لطفا آن را پیکربندی کنید یا از طریق دیگر با ما تماس بگیرید %@"; +"email_error_body" = "کلاینت ایمیل شما پیکربندی نشده است.لطفا ان را پیکربندی کنید یا از طریق دیگر با ما تماس بگیرید %@"; /* Alert title */ "email_error_title" = "خطا در ارسال ایمیل"; /* Settings item title */ -"pref_calibration_title" = "تنظیم کردن قطب نما"; +"pref_calibration_title" = "تنظیم کردن قظب نما"; /* Update all button text */ -"downloader_update_all_button" = "آپدیت همه"; +"downloader_update_all_button" = "اپدیت همه"; /* Downloaded maps list header */ "downloader_downloaded_subtitle" = "دانلود شده"; @@ -336,7 +330,7 @@ "downloader_near_me_subtitle" = "نزدیک من"; /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */ -"downloader_status_maps" = "نقشه‌ها"; +"downloader_status_maps" = "نقشه ها"; "downloader_download_all_button" = "دانلود همه"; @@ -345,16 +339,16 @@ "downloader_search_results" = "یافت شد"; /* Status of outdated country in the list */ -"downloader_status_outdated" = "بروزرسانی"; +"downloader_status_outdated" = "به روز رسانی"; /* Status of failed country in the list */ "downloader_status_failed" = "ناموفق"; /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */ -"downloader_delete_map_while_routing_dialog" = "برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید"; +"downloader_delete_map_while_routing_dialog" = "برای حذف نقشه لطفا مسیر یابی را متوقف کنید"; /* PointsInDifferentMWM */ -"routing_failed_cross_mwm_building" = "تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند."; +"routing_failed_cross_mwm_building" = "تنها مسیر هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند."; /* Context menu item for downloader. */ "downloader_download_map" = "دانلود نقشه"; @@ -366,13 +360,13 @@ "downloader_delete_map" = "حذف نقشه"; /* Text for routing error dialog */ -"routing_download_maps_along" = "دانلود تمامی نقشه‌ها در طول مسیر‌تان"; +"routing_download_maps_along" = "دانلود تمامی نقشه ها در طول مسیر تان"; /* Text for routing error dialog */ -"routing_requires_all_map" = "به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه‌های شما از مبدا تا مقصد را بروزرسانی کنیم."; +"routing_requires_all_map" = "به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه های شما از مبدا تا مقصد را به روز رسانی کنیم."; /* bookmark button text */ -"bookmark" = "نشانه‌ها"; +"bookmark" = "نشانه ها"; "save" = "ذخیره"; @@ -385,7 +379,7 @@ "yellow" = "زرد"; /* blue color */ -"blue" = "آبی"; +"blue" = "ابی"; /* green color */ "green" = "سبز"; @@ -409,13 +403,13 @@ "light_blue" = "آبی کمرنگ"; /* cyan color */ -"cyan" = "فیروزه‌ای"; +"cyan" = "فیروزه ای"; /* teal color */ "teal" = "آبی سیر"; /* lime color */ -"lime" = "زرد لیمویی"; +"lime" = "زرد لیویی"; /* deep orange color */ "deep_orange" = "نارنجی سیر"; @@ -437,7 +431,7 @@ "dialog_routing_disclaimer_recommendations" = "—مسیر پیشنهادی باید فقط به عنوان یک توصیه دانست"; -"dialog_routing_disclaimer_borders" = "—در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر‌هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز‌های کشور‌ها را رد کند که این در بعضی مناطق غیر مجاز است."; +"dialog_routing_disclaimer_borders" = "—در مسیرهایی که از مناطق مرزی میگذرد احتیاط کنید:مسیر هایی که بوسیله اپلیکیشن ما ایجاد می شود گاهی اوقات ممکن است مرز های کشور ها را رد کند که این در بعضی مناطق غیر مجاز است."; "dialog_routing_disclaimer_beware" = "لطفا هوشیار و ایمن در جاده بمانید!"; @@ -445,13 +439,13 @@ "dialog_routing_error_location_not_found" = "ناتوان از ایجاد مسیر.موقعیت مکانی شما شناسایی نشد"; -"dialog_routing_location_turn_wifi" = "لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت‌یابی فعال کنید."; +"dialog_routing_location_turn_wifi" = "لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت یابی فعال کنید."; "dialog_routing_location_turn_on" = "فعال کردن سرویس موقعیت مکانی (GPS)"; "dialog_routing_location_unknown_turn_on" = "ناتوان از مشخص کردن موقعیت مکانی شما.لطفا سرویس موقعیت مکانی خود را فعال کنید."; -"dialog_routing_download_files" = "دانلود فایل‌های مورد نیاز"; +"dialog_routing_download_files" = "دانلود فایل های مورد نیاز"; "dialog_routing_download_and_update_all" = "Download and update all map and routing information along the projected path to calculate route."; @@ -463,13 +457,13 @@ "dialog_routing_start_not_determined" = "مسیر ایجاد نشد.ناتوان در تعیین نقطه شروع"; -"dialog_routing_select_closer_start" = "لطفا نقطه شروع را نزدیک‌تر به جاده انتخاب کنید."; +"dialog_routing_select_closer_start" = "لطفا نقطه شروع رانزدیک تر به جاده انتخاب کنید."; "dialog_routing_change_end" = "تنظیم مقصد"; "dialog_routing_end_not_determined" = "مسیر ایجاد نشد.ناتوان در تعیین مقصد."; -"dialog_routing_select_closer_end" = "لطفا مقصد تعیین شده را نزدیک‌تر به جاده انتخاب نمایید."; +"dialog_routing_select_closer_end" = "لطفا مقصد تعیین شده را نزدیک تر به جاده انتخاب نمایید."; "dialog_routing_change_intermediate" = "ناتوان در تعیین نقطه میانی."; @@ -483,9 +477,9 @@ "not_now" = "اکنون خیر"; -"dialog_routing_download_and_build_cross_route" = "ایا مایل به دانلود نقشه و ایجاد مسیر‌های بهینه بیشتری که نقشه‌های بیشتری را پوشش میدهد هستید؟"; +"dialog_routing_download_and_build_cross_route" = "ایا مایل به دانلود نقشه و ایجاد مسیر های بهینه بیشتری که نقشه های بیشتری را پوشش میدهد هستید؟"; -"dialog_routing_download_cross_route" = "دانلود نقشه‌های اضافی برای ایجاد مسیری بهتر که حاشیه‌های این نقشه را رد می کند."; +"dialog_routing_download_cross_route" = "دانلود نقشه های اضافی برای ایجاد مسیری بهتر که حاشیه های این نقشه را رد می کند."; /********** Strings for downloading map from search **********/ @@ -505,19 +499,19 @@ /* Text for routing::RouterResultCode::FileTooOld dialog. */ "dialog_routing_download_and_update_maps" = "Download and update all map along the projected path to calculate route."; -"categories" = "دسته‌بندی‌ها"; +"categories" = "دسته بندی ها"; "history" = "تاریخچه"; "search_not_found" = "متاسفانه چیزی پیدا نشد"; -"search_not_found_query" = "با تغییر در معیار‌های جستجو دوباره امتحان کنید"; +"search_not_found_query" = "با تغییر در معیار های جست و جو دوباره امتحان کنید"; -"search_history_title" = "سوابق جستجو"; +"search_history_title" = "سوابق جست وجو"; -"search_history_text" = "مشاهده جستجو‌های اخیر"; +"search_history_text" = "مشاهده جست وجو های اخیر"; -"clear_search" = "پاک کردن سابقه جستجوها"; +"clear_search" = "پاک کردن سابقه جست وجو ها"; /* Place Page link to Wikipedia article (if map object has it). */ "read_in_wikipedia" = "ویکی پدیا"; @@ -533,9 +527,9 @@ "p2p_to_here" = "مسیر به"; -"p2p_only_from_current" = "مسیر‌یابی فقط از موقعیت کنونی شما قابل انجام است."; +"p2p_only_from_current" = "مسیر یابی فقط از موقعیت کنونی شما قابل انجام است."; -"p2p_reroute_from_current" = "آیا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟"; +"p2p_reroute_from_current" = "ایا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟"; "editor_time_add" = "اضافه کردن برنامه ریزی"; @@ -600,7 +594,7 @@ "add_opening_hours" = "اضافه کردن ساعت بازگشایی"; -"no_osm_account" = "آیا حساب OpenStreetMap ندارید؟"; +"no_osm_account" = "ایا حساب OpenStreetMap ندارید؟"; "register_at_openstreetmap" = "ثبت نام در OpenStreetMap"; @@ -641,7 +635,7 @@ "postal_code" = "کد پستی"; -"cuisine" = "غذا‌خوری"; +"cuisine" = "غذا خوری"; "select_cuisine" = "انتخاب غذاخوری"; @@ -654,9 +648,9 @@ "please_note" = "لطفا توجه داشته باشد"; -"downloader_delete_map_dialog" = "تمام ویرایش‌های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد."; +"downloader_delete_map_dialog" = "تمام ویرایش های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد."; -"downloader_update_maps" = "بروزرسانی نقشه‌ها"; +"downloader_update_maps" = "بروزرسانی نقشه ها"; "downloader_search_field_hint" = "یافتن نقشه"; @@ -666,7 +660,7 @@ "downloader_no_space_title" = "فظای کافی موجود نیست"; -"downloader_no_space_message" = "لطفا داده‌های غیر ضروری را از دستگاه خود حذف کنید"; +"downloader_no_space_message" = "لطفا داده های غیر ضروری را از دستگاه خود حذف کنید"; "editor_profile_changes" = "تغییرات تایید شد"; @@ -676,7 +670,7 @@ "editor_add_select_category_popular_subtitle" = "پرطرفدار"; -"editor_add_select_category_all_subtitle" = "همه دسته‌بندی‌ها"; +"editor_add_select_category_all_subtitle" = "همه دسته بندی ها"; "editor_edit_place_title" = "درحال ویرایش"; @@ -686,7 +680,7 @@ "editor_edit_place_category_title" = "دسته بندی"; -"whatsnew_editor_message_1" = "اضافه کردن مکان به نقشه و ویرایش آن مستقیما از طریق این اپلیکیشن."; +"whatsnew_editor_message_1" = "اضافه کردن مکان به نقشه و ویرایش ان مستقیما از طریق این اپلیکیشن."; "dialog_incorrect_feature_position" = "تغییر موقعیت"; @@ -695,34 +689,34 @@ "login_to_make_edits_visible" = "وارد شوید تا دیگر کاربران نیز بتوانند تغییرات ایجاد شده توسط شما را ببینند"; /* Error dialog no space */ -"migration_no_space_message" = "برای دانلود، شما نیازمند فضای ذخیره سازی بیشتری هستید.لطفا داده‌های غیر ضروری خود را حذف کنید."; +"migration_no_space_message" = "برای دانلود,شما نیازمند فضای ذخیره سازی بیشتری هستید.لطفا داده های غیر ضروری خود را حذف کنید."; -"editor_sharing_title" = "من نقشه‌های Organic Maps را بهبود بخشیدم"; +"editor_sharing_title" = "من نقشه های Organic Maps را بهبود بخشیدم"; /* Downloaded 10 **of** 20 <- it is that "of" */ "downloader_of" = "%1$d از %2$d"; "download_over_mobile_header" = "دانلود بر روی یک شبکه دیتای موبایل؟"; -"download_over_mobile_message" = "این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد."; +"download_over_mobile_message" = "این کار می تواند برای شما در بعضی طرح ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد."; "error_enter_correct_house_number" = "وارد کردن شماره ساختمان معتبر"; "editor_storey_number" = "تعداد طبقات ( حداکثر %d )"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "تعداد طبقات نباید بیش از %d باشد"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "تعداد طبقات نباید بیش از 25 باشد"; "editor_zip_code" = "کدپستی"; -"error_enter_correct_zip_code" = "یک کد‌ پستی معتبر وارد کنید"; +"error_enter_correct_zip_code" = "یک کد پستی معتبر وارد کنید"; /* Place Page title for long tap */ "core_placepage_unknown_place" = "مکان ناشناس"; -"editor_other_info" = "ارسال یادداشت به ویرایش‌کنندگان OSM"; +"editor_other_info" = "ارسال یادداشت به ویرایشکنندگان OSM"; -"editor_detailed_description_hint" = "اظهار نظر بیشتر"; +"editor_detailed_description_hint" = "اظهارنظر بیشتر"; "editor_detailed_description" = "شما یک سری تغییرات در نقشه را برای انجمن OpenStreetMap ارسال کردید.جزئیات اضافی را که نتوانستید در Organic Maps ویرایش کنید را برایشان بنویسید."; @@ -732,10 +726,10 @@ "downloader_no_downloaded_maps_title" = "شما هیچ نقشه دانلود شده ای ندارید"; -"downloader_no_downloaded_maps_message" = "برای جست وجو یک مکان و استفاده از قابلیت ناوبری، نقشه‌ها را دانلود کنید."; +"downloader_no_downloaded_maps_message" = "برای جست وجو یک مکان و استفاده از قابلیت ناوبری, نقشه ها را دانلود کنید."; /* Error title that appears after certain time without location. */ -"current_location_unknown_title" = "آیا یافتن مکان‌تان را ادامه می دهید؟"; +"current_location_unknown_title" = "ایا یافتن مکان تان را ادامه می دهید؟"; /* Error that appears after certain time without location. */ "current_location_unknown_message" = "مکان شما ناشناس مانده است.ممکن است شما داخل یک ساختمان یا تونل باشید."; @@ -784,11 +778,11 @@ "placepage_call_button" = "تماس"; -"placepage_edit_bookmark_button" = "ویرایش نشانه‌ها"; +"placepage_edit_bookmark_button" = "ویرایش نشانه ها"; -"placepage_bookmark_name_hint" = "نام نشانه‌ها"; +"placepage_bookmark_name_hint" = "نام نشانه ها"; -"placepage_personal_notes_hint" = "یاداشت‌های شخصی"; +"placepage_personal_notes_hint" = "یاداشت های شخصی"; "placepage_delete_bookmark_button" = "حذف نشانه"; @@ -796,11 +790,11 @@ "editor_comment_hint" = "اظهار نظر"; -"editor_reset_edits_message" = "آیا تغییرات محلی را نادیده می گیرید؟"; +"editor_reset_edits_message" = "ایا تغییرات محلی را نادیده می گیرید؟"; "editor_reset_edits_button" = "نادیده گرفتن"; -"editor_remove_place_message" = "آیا مکان ثبت شده حذف شود؟"; +"editor_remove_place_message" = "ایا مکان ثبت شده حذف شود؟"; "editor_remove_place_button" = "حذف"; @@ -820,24 +814,24 @@ "placepage_add_place_button" = "اضافه کردن یک مکان به نقشه"; /* Displayed when saving some edits to the map to warn against publishing personal data */ -"editor_share_to_all_dialog_title" = "آیا می خواهید آن را برای دیگر کاربران ارسال کنید؟"; +"editor_share_to_all_dialog_title" = "ایا می خواهید ان را برای دیگر کاربران ارسال کنید؟"; /* Dialog before publishing the modifications to the public map. */ "editor_share_to_all_dialog_message_1" = "مطمئن شوید که هیچ اطلاعات شخصی وارد نکرده باشد."; -"editor_share_to_all_dialog_message_2" = "ویرایشگران OpenStreetMap ﺗﻐﯿﯿﺮﺍﺕ ﺭﺍ ﺑﺮﺭﺳﯽ ﮐﺮﺩﻩ ﻭ ﺩﺭ ﺻﻮﺭﺕ ﺩﺍﺷﺘﻦ ﻫﺮﮔﻮﻧﻪ ﺳﻮﺍﻝ ﺑﺎ ﺷﻤﺎ ﺗﻤﺎﺱ ﺧﻮﺍﻫﻨﺪ ﮔﺮﻓﺖ."; +"editor_share_to_all_dialog_message_2" = ".ﺖﻓﺮﮔ ﺪﻨﻫﺍﻮﺧ ﺱﺎﻤﺗ ﺎﻤﺷ ﺎﺑ ﻝﺍﻮﺳ ﻪﻧﻮﮔﺮﻫ ﻦﺘﺷﺍﺩ ﺕﺭﻮﺻ ﺭﺩ ﻭ ﻩﺩﺮﮐ ﯽﺳﺭﺮﺑ ﺍﺭ ﺕﺍﺮﯿﯿﻐﺗ Ope"; "navigation_stop_button" = "توقف"; /* iOS dialog for the case when recent track recording is on and the app comes back from background */ -"recent_track_background_dialog_title" = "غیرفعال‌سازی ذخیره مسیر اخیرا طی شده"; +"recent_track_background_dialog_title" = "غیرفعال سازی ذخیره مسیر اخیرا طی شده"; "off_recent_track_background_button" = "غیرفعال"; /* For sharing via SMS and so on */ "sharing_call_action_look" = "بررسی کنید"; -"recent_track_background_dialog_message" = "Organic Maps از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر‌هایی که اخیرا سفر کرده اید استفاده می کند."; +"recent_track_background_dialog_message" = "Organic Maps از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر هایی که اخیرا سفر کرده اید استفاده می کند."; /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */ "about_description" = "Organic Maps یک برنامه نقشه آفلاین رایگان و منبع باز است. بدون تبلیغات بدون ردیابی اگر خطایی روی نقشه مشاهده کردید، لطفاً آن را در OpenStreetMap برطرف کنید. این پروژه توسط علاقه مندان در اوقات فراغت ما ایجاد می شود، بنابراین ما به بازخورد و پشتیبانی شما نیاز داریم."; @@ -864,13 +858,13 @@ "mobile_data" = "دیتای موبایل"; /* NOTE to translators: please synchronize your translation with the English one. */ -"mobile_data_description" = "برای نمایش جزئیات مکان مانند تصاویر قیمت‌ها و بازخورد‌ها به اینترنت همراه نیاز است"; +"mobile_data_description" = "برای نمایش جزئیات مکان مانند تصاویر قیمت ها و بازخورد ها به اینترنت همراه نیاز است"; "mobile_data_option_never" = "هرگز"; "mobile_data_option_ask" = "همیشه بپرس"; -"traffic_update_maps_text" = "برای نمایش ترافیک، نقشه می بایستی بروزرسانی شود."; +"traffic_update_maps_text" = "برای نمایش ترافیک,نقشه می بایستی بروزرسانی شود."; "big_font" = "افزایش اندازه متن بر روی نقشه"; @@ -911,7 +905,7 @@ "error_enter_correct_name" = "لطفا نام صحیح را وارد کنید"; -"bookmark_lists" = "لیست‌ها"; +"bookmark_lists" = "لیست ها"; /* Do not display all bookmark lists on the map */ "bookmark_lists_hide_all" = "پنهان کردن همه"; @@ -964,7 +958,7 @@ "button_layer_subway" = "مترو"; -"layers_title" = "لایه‌های نقشه"; +"layers_title" = "لایه های نقشه"; "subway_data_unavailable" = "نقشه مترو موجود نیست"; @@ -986,7 +980,7 @@ "download_button" = "دانلود"; -"speedcams_alert_title" = "دوربین‌های سرعت"; +"speedcams_alert_title" = "دوربین های سرعت"; "speedcam_option_auto" = "خودکار"; @@ -996,7 +990,7 @@ "place_description_title" = "توضیحات محل"; -"speedcams_notice_message" = "خودکار- در صورتی که خطر تجاوز از سرعت مجاز وجود داشت، نسبت به دوربین‌های کنترل سرعت هشدار دهد\nهمیشه-همیشه درباره دوربین‌های کنترل سرعت هشدار دهد\nهرگز-هرگز درباره دوربین‌های کنترل سرعت هشدار ندهد"; +"speedcams_notice_message" = "خودکار- در صورتی که خطر تجاوز از سرعت مجاز وجود داشت، نسبت به دوربین های کنترل سرعت هشدار دهد\nهمیشه-همیشه درباره دوربین های کنترل سرعت هشدار دهد\nهرگز-هرگز درباره دوربین های کنترل سرعت هشدار ندهد"; "power_managment_title" = "حالت ذخیره انرژی"; @@ -1008,37 +1002,37 @@ "power_managment_setting_manual_max" = "حداکثر ذخیره انرژی"; -"driving_options_title" = "گزینه‌های رانندگی"; +"driving_options_title" = "گزینه های رانندگی"; "driving_options_subheader" = "اجتناب از تمامی مسیرها"; -"avoid_tolls" = "جاده‌های دارای عوارض"; +"avoid_tolls" = "جاده های دارای عوارض"; -"avoid_unpaved" = "جاده‌های آسفالت نشده"; +"avoid_unpaved" = "جاده های آسفالت نشده"; -"avoid_ferry" = "گذرگاه‌های جاده‌ای"; +"avoid_ferry" = "گذرگاه های جاده ای"; -"avoid_motorways" = "بزرگراه‌ها"; +"avoid_motorways" = "بزرگراه ها"; "unable_to_calc_alert_title" = "امکان محاسبه مسیر نیست"; -"unable_to_calc_alert_subtitle" = "متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید"; +"unable_to_calc_alert_subtitle" = "متأسفانه، احتمالاً به دلیل گزینه های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید"; -"define_to_avoid_btn" = "جاده‌های لغو شده را تعریف نمایید"; +"define_to_avoid_btn" = "جاده های لغو شده را تعریف نمایید"; -"change_driving_options_btn" = "گزینه‌های مسیریابی فعال شد"; +"change_driving_options_btn" = "گزینه های مسیریابی فعال شد"; "toll_road" = "جاده دارای عوارض"; "unpaved_road" = "جاده آسفالت نشده"; -"ferry_crossing" = "گذرگاه جاده‌ای"; +"ferry_crossing" = "گذرگاه جاده ای"; -"avoid_toll_roads_placepage" = "اجتناب از جاده‌های دارای عوارض"; +"avoid_toll_roads_placepage" = "اجتناب از جاده های دارای عوارض"; -"avoid_unpaved_roads_placepage" = "اجتناب از جاده‌های آسفالت نشده"; +"avoid_unpaved_roads_placepage" = "اجتناب از جاده های آسفالت نشده"; -"avoid_ferry_crossing_placepage" = "اجتناب از گذرگاه‌های کشتی"; +"avoid_ferry_crossing_placepage" = "اجتناب از گذرگاه های کشتی"; "trip_start" = "برویم"; @@ -1076,7 +1070,7 @@ "dialog_routing_unable_locate_route_carplay" = "امکان ایجاد مسیر نیست. لطفاً نقاط مسیر دیگری را مشخص کنید"; -"dialog_routing_download_files_carplay" = "برای ایجاد مسیر، نقشه‌های ناقص را روی دستگاه خود را دانلود کنید"; +"dialog_routing_download_files_carplay" = "برای ایجاد مسیر، نقشه های ناقص را روی دستگاه خود را دانلود کنید"; "dialog_routing_system_error_carplay" = "خطایی رخ داد. لطفاً برنامه را دوباره اجرا کنید"; @@ -1102,7 +1096,7 @@ "speedcams_alert_title_carplay_2" = "هشدارهای سرعت"; -"download_map_carplay" = "لطفا نقشه‌ها را در نرم افزار Organic Maps روی دستگاه خود دانلود کنید"; +"download_map_carplay" = "لطفا نقشه ها را در نرم افزار Organic Maps روی دستگاه خود دانلود کنید"; "carplay_roundabout_exit" = "خروجی %s"; @@ -1137,7 +1131,7 @@ "tourist_places" = "مناظر"; -"museums" = "موزه‌ها"; +"museums" = "موزهها"; "parks" = "پارکها"; @@ -1204,10 +1198,10 @@ "downloader_loading_ios" = "در حال دانلود"; /* Autoupdate dialog on start */ -"whats_new_auto_update_title" = "نقشه‌های دانلود شده خود را به روز کنید"; +"whats_new_auto_update_title" = "نقشه های دانلود شده خود را به روز کنید"; /* Autoupdate dialog on start */ -"whats_new_auto_update_message" = "بروزرسانی نقشه‌ها اطلاعات مربوط به اشیا را به روز نگه می دارد"; +"whats_new_auto_update_message" = "به روز رسانی نقشه ها اطلاعات مربوط به اشیا را به روز نگه می دارد"; /* Autoupdate dialog on start */ "whats_new_auto_update_button_size" = "بروزرسانی (%s)"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "مسیر"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsIR"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "ایستگاه شارژ"; -"type.amenity.charging_station.motorcar" = "ایستگاه شارژ"; - "type.amenity.childcare" = "شیرخوارگاه"; "type.amenity.cinema" = "سرگرمی"; -"type.leisure.bowling_alley" = "ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ"; - "type.amenity.clinic" = "کلینیک"; "type.amenity.college" = "دانشگاه"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "ﯽﻨﯿﻣﺯ ﺮﯾﺯ ﮓﻨﯿﮐﺭﺎﭘ"; -"type.amenity.parking_entrance" = "ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ"; - "type.amenity.parking_entrance.private" = "ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ"; "type.amenity.parking_entrance.permissive" = "ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ"; +"type.amenity.parking_entrance" = "ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ"; + "type.amenity.parking_space" = "جای پارک"; "type.amenity.parking_space.permissive" = "جای پارک"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "تلفن اضطراری"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "ورودی"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "ﯽﻠﺻﺍ ﯼﺩﻭﺭﻭ"; - "type.healthcare.laboratory" = "ﯽﮑﺷﺰﭘ ﻩﺎﮕﺸﯾﺎﻣﺯﺁ"; "type.healthcare.physiotherapist" = "فیزیوتراپیست"; -"type.healthcare.alternative" = "طب جایگزین"; - -"type.healthcare.audiologist" = "شنوایی شناسی"; - -"type.healthcare.blood_donation" = "مرکز اهدای خون"; - -"type.healthcare.optometrist" = "بینایی سنجی"; - -"type.healthcare.podiatrist" = "پزشکی پا"; - -"type.healthcare.psychotherapist" = "روان درمانی"; - -"type.healthcare.sample_collection" = "نمونه برداری"; - -"type.healthcare.speech_therapist" = "گفتار درمانی"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "تونل"; -"type.highway.busway" = "ﺱﻮﺑﻮﺗﺍ ﯽﺻﺎﺼﺘﺧﺍ ﻩﺩﺎﺟ"; - "type.highway.bus_stop" = "حمل و نقل"; "type.highway.construction" = "جاده در دست ساخت است"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "گردشگری"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict index 13cc836ddb..1ebf9fcf89 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings index 77db01d06c..d4a99daa36 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: fi */ diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 0a7b914a16..449d938639 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: fi */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Myöhemmin"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Haku"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Kirjanmerkkivalikoimat"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Kirjanmerkit"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Kysymykset ja vastaukset"; -/* Button in the main menu */ -"donate" = "Lahjoittaa"; - /* Button in the main Help dialog */ "how_to_support_us" = "Kuinka tukea meitä?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Kerrosten määrä (maks. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Muokkaa kerroksia, enintään %d kerrosta"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Muokkaa kerroksia, enintään 25 kerrosta"; "editor_zip_code" = "Postinumero"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Reitti"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Latausasema"; -"type.amenity.charging_station.motorcar" = "Latausasema"; - "type.amenity.childcare" = "Päivähoito"; "type.amenity.cinema" = "Elokuvateatteri"; -"type.leisure.bowling_alley" = "Keilarata"; - "type.amenity.clinic" = "Klinikka"; "type.amenity.college" = "Korkeakoulu"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Maanalainen pysäköinti"; -"type.amenity.parking_entrance" = "Pysäköinnin sisäänkäynti"; - "type.amenity.parking_entrance.private" = "Pysäköinnin sisäänkäynti"; "type.amenity.parking_entrance.permissive" = "Pysäköinnin sisäänkäynti"; +"type.amenity.parking_entrance" = "Pysäköinnin sisäänkäynti"; + "type.amenity.parking_space" = "Parkkipaikka"; "type.amenity.parking_space.permissive" = "Parkkipaikka"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Hätäpuhelin"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Sisäänkäynti"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Pääsisäänkäynti"; - "type.healthcare.laboratory" = "Lääketieteellinen laboratorio"; "type.healthcare.physiotherapist" = "Fysioterapeutti"; -"type.healthcare.alternative" = "Vaihtoehtoinen lääketiede"; - -"type.healthcare.audiologist" = "Audiologia"; - -"type.healthcare.blood_donation" = "Verenluovutuskeskus"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Jalkaterapia"; - -"type.healthcare.psychotherapist" = "Psykoterapia"; - -"type.healthcare.sample_collection" = "Näytteenotto"; - -"type.healthcare.speech_therapist" = "Logopedia"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunneli"; -"type.highway.busway" = "Oma bussitie"; - "type.highway.bus_stop" = "Bussipysäkki"; "type.highway.construction" = "Rakenteilla oleva tie"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Vesipuisto"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict index 3cf70c64e3..be2b29dab5 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings index 5f73fbe618..e77a87c9c4 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: fr */ diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index a9bd1a5c69..26557d1b71 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: fr */ @@ -24,7 +24,7 @@ "kilometres" = "kilomètres"; /* Leave Review dialog - Review button */ -"leave_a_review" = "Laisser un commentaire"; +"leave_a_review" = "Laisser une critique"; /* Choose measurement on first launch alert - choose imperial system button */ "miles" = "Miles"; @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Plus tard"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Recherche"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Groupes de signets"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Signets"; /* Default bookmark list name */ @@ -93,7 +93,7 @@ "eat" = "Un endroit pour manger"; /* Search category for grocery stores; any changes should be duplicated in categories.txt @food! */ -"food" = "Epiceries"; +"food" = "Les courses"; /* Search category for public transport; any changes should be duplicated in categories.txt @transport! */ "transport" = "Transport"; @@ -164,7 +164,7 @@ "load_kmz_successful" = "Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l'écran du Gestionnaire de signets."; /* Kml file loading failed */ -"load_kmz_failed" = "Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux."; +"load_kmz_failed" = "Échec lors du téléversement des signets. Le fichier peut être corrompu ou défectueux."; /* resource for context menu */ "edit" = "Modifier"; @@ -173,10 +173,10 @@ "unknown_current_position" = "Votre position n'a pas encore été déterminée"; /* Subject for emailed bookmark */ -"bookmark_share_email_subject" = "Hé, regardez mon signet sur la carte Organic Maps !"; +"bookmark_share_email_subject" = "Hé, regarde mon signet sur la carte Organic Maps !"; /* Subject for emailed position */ -"my_position_share_email_subject" = "Hé, regardez ma position actuelle sur la carte Organic Maps !"; +"my_position_share_email_subject" = "Hé, regarde ma position actuelle sur la carte Organic Maps !"; /* Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ "share" = "Partager"; @@ -194,7 +194,7 @@ "version" = "Version : %@"; /* Data version in «About» screen, %@ is replaced by a local, human readable date. */ -"data_version" = "Données OpenStreetMap : %@"; +"data_version" = "Données OpenStreetMap : %@"; /* Title for tracks category in bookmarks manager */ "tracks_title" = "Parcours"; @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Foire aux questions"; -/* Button in the main menu */ -"donate" = "Faire un don"; - /* Button in the main Help dialog */ "how_to_support_us" = "Comment nous soutenir?"; @@ -338,7 +332,7 @@ /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */ "downloader_status_maps" = "Cartes"; -"downloader_download_all_button" = "Tout télécharger"; +"downloader_download_all_button" = "Télécharger tout"; "downloader_downloading" = "Téléchargement en cours :"; @@ -348,7 +342,7 @@ "downloader_status_outdated" = "Mettre à jour"; /* Status of failed country in the list */ -"downloader_status_failed" = "Echec"; +"downloader_status_failed" = "A échoué"; /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */ "downloader_delete_map_while_routing_dialog" = "Veuillez interrompre la navigation pour supprimer la carte."; @@ -391,7 +385,7 @@ "green" = "Vert"; /* purple color */ -"purple" = "Violet"; +"purple" = "Pourpre"; /* orange color */ "orange" = "Orange"; @@ -465,11 +459,11 @@ "dialog_routing_select_closer_start" = "Choisissez un point de départ à proximité d'une route."; -"dialog_routing_change_end" = "Ajustez la destination"; +"dialog_routing_change_end" = "Modifiez la destination"; "dialog_routing_end_not_determined" = "Impossible de localiser la destination. L'itinéraire n'a pas pu être créé."; -"dialog_routing_select_closer_end" = "Choisissez un lieu de destination à proximité d'une route."; +"dialog_routing_select_closer_end" = "Choisissez une destination à proximité d'une route."; "dialog_routing_change_intermediate" = "Impossible de localiser le point intermédiaire."; @@ -479,7 +473,7 @@ "dialog_routing_application_error" = "Impossible de créer l'itinéraire à cause d'une erreur dans l'application."; -"dialog_routing_try_again" = "Veuillez réessayer"; +"dialog_routing_try_again" = "Réessayer"; "not_now" = "Pas maintenant"; @@ -554,7 +548,7 @@ "editor_time_advanced" = "Mode avancé"; -"editor_time_simple" = "Mode simplifié"; +"editor_time_simple" = "Mode simple"; "editor_hours_closed" = "Heures de fermeture"; @@ -562,7 +556,7 @@ "editor_add_select_location" = "Emplacement"; -"editor_done_dialog_1" = "Vous avez modifié la carte du monde ! Ne le cachez pas ! Dites-le à vos amis, et modifiez-la ensemble."; +"editor_done_dialog_1" = "Vous avez modifié la carte du monde ! Ne le cachez pas ! Dites-le à vos amis, et modifiez-le ensemble."; "share_with_friends" = "Partagez avec vos amis"; @@ -574,9 +568,9 @@ "closed_now" = "Fermé actuellement"; /* Place Page opening hours text */ -"daily" = "Quotidien"; +"daily" = "Tous les jours"; -"twentyfour_seven" = "24/24 et 7/7"; +"twentyfour_seven" = "Jour et nuit"; "day_off_today" = "Fermé aujourd'hui"; @@ -617,7 +611,7 @@ "logout" = "Déconnexion"; /* Information text: "Last upload 11.01.2016" */ -"last_upload" = "Dernier envoi"; +"last_upload" = "Dernier téléchargement"; "thank_you" = "Merci"; @@ -710,12 +704,12 @@ "editor_storey_number" = "Nombre d'étages (max %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Le nombre d'étages ne doit pas dépasser %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Le nombre d'étages ne doit pas dépasser 25"; "editor_zip_code" = "Code postal"; -"error_enter_correct_zip_code" = "Entrer un code postal correct"; +"error_enter_correct_zip_code" = "Entrer le code postal correct"; /* Place Page title for long tap */ "core_placepage_unknown_place" = "Lieu inconnu"; @@ -752,7 +746,7 @@ "location_services_disabled_message" = "Permettre l'accès à la géolocalisation dans les paramètres de l'appareil"; -"location_services_disabled_1" = "1. Ouvrir les paramètres"; +"location_services_disabled_1" = "1. Ouvrir Paramètres"; "location_services_disabled_2" = "2. Appuyer sur Localisation"; @@ -790,7 +784,7 @@ "placepage_personal_notes_hint" = "Remarques personnelles"; -"placepage_delete_bookmark_button" = "Supprimer le signet"; +"placepage_delete_bookmark_button" = "Supprimer signet"; "editor_edits_sent_message" = "Vos modifications suggérées ont été envoyées"; @@ -806,7 +800,7 @@ "editor_place_doesnt_exist" = "Ce lieu n'existe pas"; -"text_more_button" = "…plus"; +"text_more_button" = "…Afficher la suite"; /* Phone number error message */ "error_enter_correct_phone" = "Saisissez un numéro de téléphone valide"; @@ -823,7 +817,7 @@ "editor_share_to_all_dialog_title" = "Souhaitez-vous l’envoyer à tous les utilisateurs ?"; /* Dialog before publishing the modifications to the public map. */ -"editor_share_to_all_dialog_message_1" = "Assurez-vous de n’avoir pas saisi de données personnelles."; +"editor_share_to_all_dialog_message_1" = "Assurez-vous de n’avoir saisi aucunes données personnelles."; "editor_share_to_all_dialog_message_2" = "Les éditeurs d'OpenStreetMap vérifieront vos modifications et vous contacteront s'ils ont des questions."; @@ -972,13 +966,13 @@ "popular_place" = "Populaire"; -"export_file" = "Exporter le fichier"; +"export_file" = "Exporter comme fichier"; -"list_settings" = "Paramètres de la liste"; +"list_settings" = "Paramètres liste"; -"delete_list" = "Supprimer la liste"; +"delete_list" = "Supprimer liste"; -"hide_from_map" = "Masquer sur la carte"; +"hide_from_map" = "Masquer de la carte"; "bookmark_list_description_hint" = "Tapez une description (texte ou html)"; @@ -1026,7 +1020,7 @@ "define_to_avoid_btn" = "Définissez les routes à éviter"; -"change_driving_options_btn" = "Paramètres d'itinéraire activés"; +"change_driving_options_btn" = "Paramètres d'itinéraire activées"; "toll_road" = "Route à péage"; @@ -1046,7 +1040,7 @@ "follow_my_position" = "Recentrer"; -"search_results" = "Résultats de la recherche"; +"search_results" = "Résultats de recherche"; "then_turn" = "Ensuite"; @@ -1059,10 +1053,10 @@ "no" = "Non"; /* E.g. "WiFi:Yes" */ -"yes_available" = "oui"; +"yes_available" = "Oui"; /* E.g. "WiFi:No" */ -"no_available" = "non"; +"no_available" = "Non"; "trip_finished" = "Vous êtes arrivé !"; @@ -1088,7 +1082,7 @@ "avoid_unpaved_carplay_1" = "Pas de route en terre"; -"avoid_unpaved_carplay_2" = "Eviter les routes non revêtues"; +"avoid_unpaved_carplay_2" = "Pas de route non revêtue"; "avoid_ferry_carplay_1" = "Pas de traversée en ferry"; @@ -1100,7 +1094,7 @@ "speedcams_alert_title_carplay_1" = "Radars de vitesse"; -"speedcams_alert_title_carplay_2" = "Avertissements radars de vitesse"; +"speedcams_alert_title_carplay_2" = "Infos radars de vitesse"; "download_map_carplay" = "Téléchargez des cartes dans l'application Organic Maps sur votre appareil"; @@ -1116,7 +1110,7 @@ "sort_distance" = "Trier par distance"; -"sort_date" = "Classer par date"; +"sort_date" = "Classer pa date"; "week_ago_sorttype" = "Il y a une semaine"; @@ -1173,17 +1167,17 @@ "button_layer_isolines" = "Terrain"; -"isolines_activation_error_dialog" = "Pour activer et utiliser la couche topographique, mettez à jour ou téléchargez la carte de l'endroit désiré"; +"isolines_activation_error_dialog" = "Pour utiliser les lignes d'altitude, mettez à jour ou téléchargez la carte de l'endroit désiré"; "isolines_location_error_dialog" = "Les lignes d'élévation ne sont pas encore disponibles dans cette région"; "elevation_profile_diff_level" = "Niveau de difficulté"; -"elevation_profile_diff_level_easy" = "Facile"; +"elevation_profile_diff_level_easy" = "Faible"; "elevation_profile_diff_level_moderate" = "Moyen"; -"elevation_profile_diff_level_hard" = "Difficile"; +"elevation_profile_diff_level_hard" = "Haut"; "elevation_profile_ascent" = "Montée"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Route"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1309,16 +1300,12 @@ "type.amenity.casino" = "Casino"; -"type.amenity.charging_station" = "Borne de recharge"; - -"type.amenity.charging_station.motorcar" = "Borne de recharge"; +"type.amenity.charging_station" = "Station de recharge"; "type.amenity.childcare" = "Garderie"; "type.amenity.cinema" = "Cinéma"; -"type.leisure.bowling_alley" = "Salle de bowling"; - "type.amenity.clinic" = "Clinique"; "type.amenity.college" = "Enseignement post-secondaire"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Stationnement souterrain"; -"type.amenity.parking_entrance" = "Entrée du stationnement"; - "type.amenity.parking_entrance.private" = "Entrée du stationnement"; "type.amenity.parking_entrance.permissive" = "Entrée du stationnement"; +"type.amenity.parking_entrance" = "Entrée du stationnement"; + "type.amenity.parking_space" = "Place de stationnement"; "type.amenity.parking_space.permissive" = "Place de stationnement"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Téléphone d'urgence"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrée"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrée principale"; - "type.healthcare.laboratory" = "Laboratoire médical"; "type.healthcare.physiotherapist" = "Physiothérapeute"; -"type.healthcare.alternative" = "Médecine alternative"; - -"type.healthcare.audiologist" = "Audiologie"; - -"type.healthcare.blood_donation" = "Centre de don du sang"; - -"type.healthcare.optometrist" = "Optométrie"; - -"type.healthcare.podiatrist" = "Podologie"; - -"type.healthcare.psychotherapist" = "Psychothérapie"; - -"type.healthcare.sample_collection" = "Prélèvements biologiques"; - -"type.healthcare.speech_therapist" = "Logopédie"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Route réservée aux bus"; - "type.highway.bus_stop" = "Arrêt de bus"; "type.highway.construction" = "Route en construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Piste de course"; -"type.leisure.track.area" = "Piste de course"; - "type.leisure.water_park" = "Centre aquatique"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict index 808eaa22ae..e02aa6e153 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ @@ -19,8 +19,6 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d - one - %d signet other %d signets @@ -40,6 +38,8 @@ %d fichier a été trouvé. Vous le verrez après la conversion. other %d fichiers ont été trouvés. Vous les verrez après la conversion. + zero + %d fichier a été trouvé. Vous le verrez après la conversion. @@ -53,10 +53,8 @@ NSStringPluralRuleType NSStringFormatValueTypeKey d - one - %d objet other - %d objets + lieu %d diff --git a/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings index 6b4c3de3ab..96b9cef4f9 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: he */ diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 263edd7630..e854052699 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: he */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "מאוחר יותר"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Search"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "רשימות אתרים"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "רשימות אתרים"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "תובושתו תולאש"; -/* Button in the main menu */ -"donate" = "םוֹרתְלִ"; - /* Button in the main Help dialog */ "how_to_support_us" = "כיצד לתמוך בנו?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Number of floors (maximum of %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "The number of floors must non exceed %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "The number of floors must non exceed 25"; "editor_zip_code" = "ZIP Code"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "מַסלוּל"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "גנילואב םלוא"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "תיעקרק - תת הינח"; -"type.amenity.parking_entrance" = "הינחל הסינכ"; - "type.amenity.parking_entrance.private" = "הינחל הסינכ"; "type.amenity.parking_entrance.permissive" = "הינחל הסינכ"; +"type.amenity.parking_entrance" = "הינחל הסינכ"; + "type.amenity.parking_space" = "Parking Space"; "type.amenity.parking_space.permissive" = "Parking Space"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "תישארה הסינכ"; - "type.healthcare.laboratory" = "תיאופר הדבעמ"; "type.healthcare.physiotherapist" = "פיזיותרפיסט"; -"type.healthcare.alternative" = "רפואה אלטרנטיבית"; - -"type.healthcare.audiologist" = "אודיולוגיה"; - -"type.healthcare.blood_donation" = "מרכז תרומת דם"; - -"type.healthcare.optometrist" = "אופטומטריה"; - -"type.healthcare.podiatrist" = "פודיאטריה"; - -"type.healthcare.psychotherapist" = "פסיכותרפיה"; - -"type.healthcare.sample_collection" = "דְגִימָה"; - -"type.healthcare.speech_therapist" = "ריפוי בדיבור"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "מִנהָרָה"; -"type.highway.busway" = "ידועיי סובוטוא שיבכ"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Road Under Construction"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict index 3feaaf166b..a2f2be447f 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings index 0c9cd30f7c..3cdd706b94 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: hu */ diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 234e84ddf2..d84ca1528f 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: hu */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Később"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Keresés"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Könyvjelzőcsoportok"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Könyvjelzők"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Kérdések és válaszok"; -/* Button in the main menu */ -"donate" = "Adományozni"; - /* Button in the main Help dialog */ "how_to_support_us" = "Hogyan támogathatsz minket?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Az emeletek száma (legfeljebb %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Ez az épület legfeljebb %d emeletes lehet"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Legfeljebb 25 emeletes épület szerkesztése"; "editor_zip_code" = "Irányítószám"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Útvonal"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Töltő állomás"; -"type.amenity.charging_station.motorcar" = "Töltő állomás"; - "type.amenity.childcare" = "Bölcsőde"; "type.amenity.cinema" = "Mozi"; -"type.leisure.bowling_alley" = "Tekepálya"; - "type.amenity.clinic" = "Klinika"; "type.amenity.college" = "Kollégium"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Mélygarázs"; -"type.amenity.parking_entrance" = "Parkoló bejárata"; - "type.amenity.parking_entrance.private" = "Parkoló bejárata"; "type.amenity.parking_entrance.permissive" = "Parkoló bejárata"; +"type.amenity.parking_entrance" = "Parkoló bejárata"; + "type.amenity.parking_space" = "Parkolóhely"; "type.amenity.parking_space.permissive" = "Parkolóhely"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Sürgősségi telefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Bejárat"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Főbejárat"; - "type.healthcare.laboratory" = "Orvosi laboratórium"; "type.healthcare.physiotherapist" = "Fizioterapeuta"; -"type.healthcare.alternative" = "Alternatív gyógyászat"; - -"type.healthcare.audiologist" = "Audiológia"; - -"type.healthcare.blood_donation" = "Véradó központ"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podiatria"; - -"type.healthcare.psychotherapist" = "Pszichoterápia"; - -"type.healthcare.sample_collection" = "Mintavétel"; - -"type.healthcare.speech_therapist" = "Logopédia"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Alagút"; -"type.highway.busway" = "Kijelölt buszút"; - "type.highway.bus_stop" = "Buszmegálló"; "type.highway.construction" = "Útépítés"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Aquapark"; "type.leisure.beach_resort" = "Beach Resort"; @@ -3243,7 +3206,7 @@ "type.shop.chemist" = "Drogéria"; -"type.shop.chocolate" = "Csokoládébolt"; +"type.shop.chocolate" = "Bolt"; "type.shop.clothes" = "Ruhabolt"; @@ -3291,7 +3254,7 @@ "type.shop.hairdresser" = "Fodrász"; -"type.shop.hardware" = "Barkácsüzlet"; +"type.shop.hardware" = "Hardver üzlet"; "type.shop.health_food" = "Egészségügyi élelmiszerbolt"; @@ -3323,7 +3286,7 @@ "type.shop.optician" = "Optika"; -"type.shop.outdoor" = "Túrafelszerelés"; +"type.shop.outdoor" = "Kültéri felszerelés"; "type.shop.pastry" = "Cukrászsütemény"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict index 47d515fb1c..5aae50e4da 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings index 2058a2ea32..33e7678239 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: id */ diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index c6576182c2..544bb9032e 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: id */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Nanti"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Cari"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Set Penanda"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Penanda"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Pertanyaan dan jawaban"; -/* Button in the main menu */ -"donate" = "Menyumbangkan"; - /* Button in the main Help dialog */ "how_to_support_us" = "Bagaimana cara mendukung kami?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Jumlah lantai (maksimum %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Edit bangunan dengan maksimum %d lantai"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Edit bangunan dengan maksimum 25 lantai"; "editor_zip_code" = "Kode Pos"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Trek"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Pusat Pengisian Daya"; -"type.amenity.charging_station.motorcar" = "Pusat Pengisian Daya"; - "type.amenity.childcare" = "Penitipan Anak"; "type.amenity.cinema" = "Bioskop"; -"type.leisure.bowling_alley" = "Arena Bowling"; - "type.amenity.clinic" = "Klinik"; "type.amenity.college" = "Kampus"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Parkir bawah tanah"; -"type.amenity.parking_entrance" = "Pintu masuk parkir"; - "type.amenity.parking_entrance.private" = "Pintu masuk parkir"; "type.amenity.parking_entrance.permissive" = "Pintu masuk parkir"; +"type.amenity.parking_entrance" = "Pintu masuk parkir"; + "type.amenity.parking_space" = "Tempat parkir"; "type.amenity.parking_space.permissive" = "Tempat parkir"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Telepon darurat"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Pintu masuk"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Pintu masuk utama"; - "type.healthcare.laboratory" = "Laboratorium medis"; "type.healthcare.physiotherapist" = "Fisioterapis"; -"type.healthcare.alternative" = "Pengobatan alternatif"; - -"type.healthcare.audiologist" = "Audiologi"; - -"type.healthcare.blood_donation" = "Pusat Donor Darah"; - -"type.healthcare.optometrist" = "Optometri"; - -"type.healthcare.podiatrist" = "Podiatri"; - -"type.healthcare.psychotherapist" = "Psikoterapi"; - -"type.healthcare.sample_collection" = "Pengambilan sampel"; - -"type.healthcare.speech_therapist" = "Logopedik"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Terowongan"; -"type.highway.busway" = "Jalan khusus bus"; - "type.highway.bus_stop" = "Halte bus"; "type.highway.construction" = "Jalan sedang dibangun"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Taman air"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict index 2e7a80e0ef..4d8652b8ca 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings index 4c4856e770..f83d5956b1 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: it */ @@ -10,7 +10,7 @@ "search" = "Cerca"; /* Used in home screen quick actions. */ -"bookmarks" = "Luoghi preferiti"; +"bookmarks" = "Segnalibri"; /* Used in home screen quick actions. */ "route" = "Linea"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 1f5ff1c6ca..1691efd460 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: it */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Più tardi"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Cerca"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Elenchi di luoghi preferiti"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Luoghi preferiti"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Domande frequenti"; -/* Button in the main menu */ -"donate" = "Donare"; - /* Button in the main Help dialog */ "how_to_support_us" = "Come sostenerci?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Numero di piani (massimo %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Il numero di piani non deve superare %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Il numero di piani non deve superare 25"; "editor_zip_code" = "Codice postale"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Percorso"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/it/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Stazione di ricarica"; -"type.amenity.charging_station.motorcar" = "Stazione di ricarica"; - "type.amenity.childcare" = "Asilo"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Sala da bowling"; - "type.amenity.clinic" = "Clinica"; "type.amenity.college" = "Collegio"; @@ -1345,7 +1332,7 @@ "type.amenity.ferry_terminal" = "Traghetto"; -"type.amenity.fire_station" = "Squadra antincendio"; +"type.amenity.fire_station" = "Scuadra antincendio"; "type.amenity.food_court" = "Area ristorazione"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Parcheggio sotterraneo"; -"type.amenity.parking_entrance" = "Ingresso parcheggio"; - "type.amenity.parking_entrance.private" = "Ingresso parcheggio"; "type.amenity.parking_entrance.permissive" = "Ingresso parcheggio"; +"type.amenity.parking_entrance" = "Ingresso parcheggio"; + "type.amenity.parking_space" = "Parcheggio"; "type.amenity.parking_space.permissive" = "Parcheggio"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Telefono di emergenza"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Ingresso"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrata principale"; - "type.healthcare.laboratory" = "Laboratorio Medico"; "type.healthcare.physiotherapist" = "Fisioterapista"; -"type.healthcare.alternative" = "Medicina alternativa"; - -"type.healthcare.audiologist" = "Audiologia"; - -"type.healthcare.blood_donation" = "Centro di donazione del sangue"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podologia"; - -"type.healthcare.psychotherapist" = "Psicoterapia"; - -"type.healthcare.sample_collection" = "Campionamento"; - -"type.healthcare.speech_therapist" = "Logopedia"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Strada dedicata agli autobus"; - "type.highway.bus_stop" = "Fermata dell'autobus"; "type.highway.construction" = "Strada in costruzione"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Pista da corsa"; -"type.leisure.track.area" = "Pista da corsa"; - "type.leisure.water_park" = "Parco acquatico"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict index 39c7e9316a..9efc16dbfd 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings index 1aa336f8fa..08a76dfe4a 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ja */ diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 8117a5fa70..77a7f066cc 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ja */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "次の機会に"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "検索"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "ブックマークセット"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "ブックマーク"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "質問と回答"; -/* Button in the main menu */ -"donate" = "寄付"; - /* Button in the main Help dialog */ "how_to_support_us" = "どのように私たちを支持する方法？"; @@ -710,8 +704,8 @@ "editor_storey_number" = "フロアの数（最大%d）"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "最高%d階までのビルを編集"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "最高25階までのビルを編集"; "editor_zip_code" = "郵便番号"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "トラック"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "充電ステーション"; -"type.amenity.charging_station.motorcar" = "充電ステーション"; - "type.amenity.childcare" = "託児所"; "type.amenity.cinema" = "映画館"; -"type.leisure.bowling_alley" = "ボーリング場"; - "type.amenity.clinic" = "クリニック"; "type.amenity.college" = "カレッジ"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "地下駐車場"; -"type.amenity.parking_entrance" = "駐車場入口"; - "type.amenity.parking_entrance.private" = "駐車場入口"; "type.amenity.parking_entrance.permissive" = "駐車場入口"; +"type.amenity.parking_entrance" = "駐車場入口"; + "type.amenity.parking_space" = "駐車スペース"; "type.amenity.parking_space.permissive" = "駐車スペース"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "緊急電話"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "エントランス"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "正面玄関"; - "type.healthcare.laboratory" = "医療研究所"; "type.healthcare.physiotherapist" = "理学療法士"; -"type.healthcare.alternative" = "代替医療"; - -"type.healthcare.audiologist" = "オーディオロジー"; - -"type.healthcare.blood_donation" = "献血センター"; - -"type.healthcare.optometrist" = "オプトメトリー"; - -"type.healthcare.podiatrist" = "足病学"; - -"type.healthcare.psychotherapist" = "心理療法"; - -"type.healthcare.sample_collection" = "サンプリング"; - -"type.healthcare.speech_therapist" = "ロゴペディックス"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "馬道(トンネル)"; -"type.highway.busway" = "バス専用道路"; - "type.highway.bus_stop" = "バス停"; "type.highway.construction" = "工事中の道路"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "トラック"; -"type.leisure.track.area" = "トラック"; - "type.leisure.water_park" = "ウォーターパーク"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict index a25826d2e6..c948c9a1b6 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings index 2d63f2aac5..b8ee994583 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ko */ diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 1c34063f2f..85df8ad179 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ko */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "후"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "검색하기"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "세트를 즐겨찾기에 추가"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "북마크"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "질문과 답변"; -/* Button in the main menu */ -"donate" = "기부"; - /* Button in the main Help dialog */ "how_to_support_us" = "우리를 지원하는 방법?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "층 수(최대 %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "최대 %d층까지 입력하세요"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "최대 25층까지 입력하세요"; "editor_zip_code" = "우편번호"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "길"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "충전 역"; -"type.amenity.charging_station.motorcar" = "충전 역"; - "type.amenity.childcare" = "보육"; "type.amenity.cinema" = "영화관"; -"type.leisure.bowling_alley" = "볼링장"; - "type.amenity.clinic" = "클리닉"; "type.amenity.college" = "칼리지"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "지하주차장"; -"type.amenity.parking_entrance" = "주차장 입구"; - "type.amenity.parking_entrance.private" = "주차장 입구"; "type.amenity.parking_entrance.permissive" = "주차장 입구"; +"type.amenity.parking_entrance" = "주차장 입구"; + "type.amenity.parking_space" = "주차장"; "type.amenity.parking_space.permissive" = "주차장"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "긴급 전화"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "입구"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "정문"; - "type.healthcare.laboratory" = "의료 연구실"; "type.healthcare.physiotherapist" = "물리치료사"; -"type.healthcare.alternative" = "대체 약품"; - -"type.healthcare.audiologist" = "청력학"; - -"type.healthcare.blood_donation" = "헌혈센터"; - -"type.healthcare.optometrist" = "검안"; - -"type.healthcare.podiatrist" = "발병학"; - -"type.healthcare.psychotherapist" = "심리치료"; - -"type.healthcare.sample_collection" = "견본 추출"; - -"type.healthcare.speech_therapist" = "대화 요법"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "터널"; -"type.highway.busway" = "버스전용도로"; - "type.highway.bus_stop" = "버스 정류장"; "type.highway.construction" = "공사 중 도로"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "워터파크"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict index 2dbd1dde23..1d6c00e805 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings index c4cc7a6729..a5342e20a9 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: mr */ diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings index 522eaa10b1..b403ecc526 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: mr */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "नंतर"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "शोधा"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "खूणपत्र याद्या"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "खूणपत्रे"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "वारंवार विचारलेले प्रश्न"; -/* Button in the main menu */ -"donate" = "Donate"; - /* Button in the main Help dialog */ "how_to_support_us" = "आम्हाला आधार कसा द्यायचा?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "मजल्यांची संख्या (कमाल %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "मजल्यांची संख्या %d पेक्षा जास्त नसावी"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "मजल्यांची संख्या २५ पेक्षा जास्त नसावी"; "editor_zip_code" = "पिनकोड"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "ट्रॅक"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "चार्जिंग केंद्र"; -"type.amenity.charging_station.motorcar" = "चार्जिंग केंद्र"; - "type.amenity.childcare" = "बालवाडी"; "type.amenity.cinema" = "चित्रपटगृह"; -"type.leisure.bowling_alley" = "गोलंदाजी गल्ली"; - "type.amenity.clinic" = "चिकित्सालय"; "type.amenity.college" = "महाविद्यालय"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underground Parking"; -"type.amenity.parking_entrance" = "Parking entrance"; - "type.amenity.parking_entrance.private" = "Parking entrance"; "type.amenity.parking_entrance.permissive" = "Parking entrance"; +"type.amenity.parking_entrance" = "Parking entrance"; + "type.amenity.parking_space" = "पार्किंगची जागा"; "type.amenity.parking_space.permissive" = "पार्किंगची जागा"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "संकटकालीन फोन"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "प्रवेशद्वार"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "मुख्य प्रवेशद्वार"; - "type.healthcare.laboratory" = "वैद्यकीय प्रयोगशाळा"; "type.healthcare.physiotherapist" = "फिजिओथेरपिस्ट"; -"type.healthcare.alternative" = "पर्यायी औषध"; - -"type.healthcare.audiologist" = "ऑडिओलॉजी"; - -"type.healthcare.blood_donation" = "रक्तदान केंद्र"; - -"type.healthcare.optometrist" = "ऑप्टोमेट्री"; - -"type.healthcare.podiatrist" = "पोडियाट्री"; - -"type.healthcare.psychotherapist" = "मानसोपचार"; - -"type.healthcare.sample_collection" = "नमुना"; - -"type.healthcare.speech_therapist" = "स्पीच थेरपी"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "बोगदा"; -"type.highway.busway" = "समर्पित बस रस्ता"; - "type.highway.bus_stop" = "बस थांबा"; "type.highway.construction" = "बांधकामाधीन रस्ता"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "ट्रॅक"; -"type.leisure.track.area" = "ट्रॅक"; - "type.leisure.water_park" = "जल उद्यान"; "type.leisure.beach_resort" = "समुद्री रिसॉर्ट"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict index 73c4ea4d2c..e523add903 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings index a5cc28b75e..50ce19a68e 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: nb */ diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index e06dc7a3a6..25afccf7f7 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: nb */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Senere"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Søk"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bokmerk sett"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bokmerker"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Spørsmål og svar"; -/* Button in the main menu */ -"donate" = "Donere"; - /* Button in the main Help dialog */ "how_to_support_us" = "Hvordan støtte oss?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Antall etasjer (maks. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Rediger bygningen med maks. %d etasjer"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Rediger bygningen med maks. 25 etasjer"; "editor_zip_code" = "Postnummer"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Rute"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Ladestasjon"; -"type.amenity.charging_station.motorcar" = "Ladestasjon"; - "type.amenity.childcare" = "Daghjem"; "type.amenity.cinema" = "Kino"; -"type.leisure.bowling_alley" = "Bowlinghall"; - "type.amenity.clinic" = "Klinikk"; "type.amenity.college" = "Høyskole"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underjordisk parkering"; -"type.amenity.parking_entrance" = "Parkeringsinngang"; - "type.amenity.parking_entrance.private" = "Parkeringsinngang"; "type.amenity.parking_entrance.permissive" = "Parkeringsinngang"; +"type.amenity.parking_entrance" = "Parkeringsinngang"; + "type.amenity.parking_space" = "Parkeringsplass"; "type.amenity.parking_space.permissive" = "Parkeringsplass"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Nødtelefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Inngang"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Hovedinngang"; - "type.healthcare.laboratory" = "Medisinsk laboratorium"; "type.healthcare.physiotherapist" = "Fysioterapeut"; -"type.healthcare.alternative" = "Alternativ medisin"; - -"type.healthcare.audiologist" = "Audiologi"; - -"type.healthcare.blood_donation" = "Bloddonasjonssenter"; - -"type.healthcare.optometrist" = "Optometri"; - -"type.healthcare.podiatrist" = "Fotterapi"; - -"type.healthcare.psychotherapist" = "Psykoterapi"; - -"type.healthcare.sample_collection" = "Prøvetaking"; - -"type.healthcare.speech_therapist" = "Snakketerapi"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Dedikert bussvei"; - "type.highway.bus_stop" = "Busstopp"; "type.highway.construction" = "Veikonstruksjon"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Vannpark"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict index d80b29c7b4..3dde3e68f7 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings index ed3320dd73..fb36374b39 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: nl */ diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 17f2b4ec6e..6c34199217 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: nl */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Later"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Zoeken"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bladwijzergroepen"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bladwijzers"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Vragen en antwoorden"; -/* Button in the main menu */ -"donate" = "Doneren"; - /* Button in the main Help dialog */ "how_to_support_us" = "Hoe ons te steunen?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Aantal verdiepingen (max. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Het gebouw mag niet meer dan %d verdiepingen hebben"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Bewerk het gebouw met maximaal 25 verdiepingen"; "editor_zip_code" = "Postcode"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Track"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Oplaadstation"; -"type.amenity.charging_station.motorcar" = "Oplaadstation"; - "type.amenity.childcare" = "Crèche"; "type.amenity.cinema" = "Bioscoop"; -"type.leisure.bowling_alley" = "Bowlingbaan"; - "type.amenity.clinic" = "Kliniek"; "type.amenity.college" = "Hogeschool"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Ondergrondse parking"; -"type.amenity.parking_entrance" = "Parkeeringang"; - "type.amenity.parking_entrance.private" = "Parkeeringang"; "type.amenity.parking_entrance.permissive" = "Parkeeringang"; +"type.amenity.parking_entrance" = "Parkeeringang"; + "type.amenity.parking_space" = "Parkeerplek"; "type.amenity.parking_space.permissive" = "Parkeerplek"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Praatpaal"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Ingang"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Hoofdingang"; - "type.healthcare.laboratory" = "Medisch laboratorium"; "type.healthcare.physiotherapist" = "Fysiotherapeut"; -"type.healthcare.alternative" = "Alternatieve geneeskunde"; - -"type.healthcare.audiologist" = "Audiologie"; - -"type.healthcare.blood_donation" = "Bloeddonatiecentrum"; - -"type.healthcare.optometrist" = "Optometrie"; - -"type.healthcare.podiatrist" = "Podologie"; - -"type.healthcare.psychotherapist" = "Psychotherapie"; - -"type.healthcare.sample_collection" = "Bemonstering"; - -"type.healthcare.speech_therapist" = "Logopedie"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Speciale busweg"; - "type.highway.bus_stop" = "Bushalte"; "type.highway.construction" = "Baan in aanbouw"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Parcours"; -"type.leisure.track.area" = "Parcours"; - "type.leisure.water_park" = "Waterpark"; "type.leisure.beach_resort" = "Strandresort"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict index 2ef21ffe54..52a643e06b 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings index d9339080b3..2950a6a170 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: pl */ diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index a22391f2dc..c13ae95ef6 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: pl */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Później"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Wyszukaj"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Zestawy zakładek"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Zakładki"; /* Default bookmark list name */ @@ -99,7 +99,7 @@ "transport" = "Transport"; /* Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! */ -"fuel" = "Stacja paliw"; +"fuel" = "Stacja benzynowa"; /* Search category for parking lots; any changes should be duplicated in categories.txt @parking! */ "parking" = "Parking"; @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Pytania i odpowiedzi"; -/* Button in the main menu */ -"donate" = "Wspomóż"; - /* Button in the main Help dialog */ "how_to_support_us" = "Jak nas wspierać?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Liczba pięter (maks. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Edytuj budynek z maksymalną liczbą %d pięter"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Edytuj budynek z maksymalną liczbą 25 pięter"; "editor_zip_code" = "Kod pocztowy"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Trasa"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Stacja ładowania"; -"type.amenity.charging_station.motorcar" = "Stacja ładowania"; - "type.amenity.childcare" = "Opieka nad dziećmi"; "type.amenity.cinema" = "Kino"; -"type.leisure.bowling_alley" = "Kręgielnia"; - "type.amenity.clinic" = "Klinika"; "type.amenity.college" = "Szkoła wyższa"; @@ -1351,7 +1338,7 @@ "type.amenity.fountain" = "Fontanna"; -"type.amenity.fuel" = "Stacja paliw"; +"type.amenity.fuel" = "Stacja benzynowa"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ "type.amenity.grave_yard" = "Cmentarz"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Parking podziemny"; -"type.amenity.parking_entrance" = "Wejście na parking"; - "type.amenity.parking_entrance.private" = "Wejście na parking"; "type.amenity.parking_entrance.permissive" = "Wejście na parking"; +"type.amenity.parking_entrance" = "Wejście na parking"; + "type.amenity.parking_space" = "Miejsce parkingowe"; "type.amenity.parking_space.permissive" = "Miejsce parkingowe"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Telefon alarmowy"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Wejście"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Główne wejście"; - "type.healthcare.laboratory" = "Laboratorium Medyczne"; "type.healthcare.physiotherapist" = "Fizjoterapeuta"; -"type.healthcare.alternative" = "Medycyna alternatywna"; - -"type.healthcare.audiologist" = "Audiologia"; - -"type.healthcare.blood_donation" = "Centrum krwiodawstwa"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podiatria"; - -"type.healthcare.psychotherapist" = "Psychoterapia"; - -"type.healthcare.sample_collection" = "Próbkowanie"; - -"type.healthcare.speech_therapist" = "Logopeda"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunel drogowy dla koni"; -"type.highway.busway" = "Dedykowana droga autobusowa"; - "type.highway.bus_stop" = "Przystanek autobusowy"; "type.highway.construction" = "Droga w trakcie budowy"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Park wodny"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict index 2eb0ba2c34..2a8dd4ab92 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings index a1a376cba1..97e7bcc932 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: pt-BR */ diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index 1851c910f9..857ea42d36 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: pt-BR */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Mais tarde"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Buscar"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Conjuntos de favoritos"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Favoritos"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Perguntas e respostas"; -/* Button in the main menu */ -"donate" = "Doar"; - /* Button in the main Help dialog */ "how_to_support_us" = "Como nos apoiar?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Número de andares (máx. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "O número de andares não pode ser maior que %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "O número de andares não pode ultrapassar 25"; "editor_zip_code" = "CEP"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Percurso"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Eletroposto"; -"type.amenity.charging_station.motorcar" = "Eletroposto"; - "type.amenity.childcare" = "Creche"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Pista de boliche"; - "type.amenity.clinic" = "Clínica"; "type.amenity.college" = "Escola técnica"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Estacionamento subterrâneo"; +"type.amenity.parking_entrance.private" = "Parking entrance"; + +"type.amenity.parking_entrance.permissive" = "Parking entrance"; + "type.amenity.parking_entrance" = "Entrada do estacionamento"; -"type.amenity.parking_entrance.private" = "Entrada do estacionamento"; - -"type.amenity.parking_entrance.permissive" = "Entrada do estacionamento"; - "type.amenity.parking_space" = "Lugar de estacionamento"; "type.amenity.parking_space.permissive" = "Lugar de estacionamento"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Telefone de emergência"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrada principal"; - "type.healthcare.laboratory" = "Laboratório médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; -"type.healthcare.alternative" = "Medicina alternativa"; - -"type.healthcare.audiologist" = "Fonoaudiologia"; - -"type.healthcare.blood_donation" = "Hemocentro"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podiatria"; - -"type.healthcare.psychotherapist" = "Psicoterapia"; - -"type.healthcare.sample_collection" = "Amostragem"; - -"type.healthcare.speech_therapist" = "Terapia da fala"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Túnel para cavaleiros"; -"type.highway.busway" = "Via exclusiva de ônibus"; - "type.highway.bus_stop" = "Ponto de ônibus"; "type.highway.construction" = "Pista em construção"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Pista para esportes não motorizados"; -"type.leisure.track.area" = "Pista para esportes não motorizados"; - "type.leisure.water_park" = "Parque aquático"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict index 932963acf8..6dfbd5c77d 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings index fa3c6c24af..28f4194aba 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: pt */ diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index af1332bdad..5bb91bc680 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: pt */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Mais tarde"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Pesquisar"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Conjuntos de favoritos"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Favoritos"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Perguntas e respostas"; -/* Button in the main menu */ -"donate" = "Doar"; - /* Button in the main Help dialog */ "how_to_support_us" = "Como nos apoiar?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Número de pisos (máx. %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "O número de pisos não pode ser maior que %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Editar o edifício com um máximo de 25 pisos"; "editor_zip_code" = "Código Postal"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Percurso"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Posto de carregamento elétrico"; -"type.amenity.charging_station.motorcar" = "Posto de carregamento elétrico"; - "type.amenity.childcare" = "Creche"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Pista de bowling"; - "type.amenity.clinic" = "Clínica ou centro de saúde"; "type.amenity.college" = "Escola técnica"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Estacionamento subterrâneo"; -"type.amenity.parking_entrance" = "Entrada do estacionamento"; - "type.amenity.parking_entrance.private" = "Entrada do estacionamento"; "type.amenity.parking_entrance.permissive" = "Entrada do estacionamento"; +"type.amenity.parking_entrance" = "Entrada do estacionamento"; + "type.amenity.parking_space" = "Lugar de estacionamento"; "type.amenity.parking_space.permissive" = "Lugar de estacionamento"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Telefone de emergência"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Entrada principal"; - "type.healthcare.laboratory" = "Laboratório médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; -"type.healthcare.alternative" = "Medicina alternativa"; - -"type.healthcare.audiologist" = "Audiologia"; - -"type.healthcare.blood_donation" = "Centro de Doação de Sangue"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podiatria"; - -"type.healthcare.psychotherapist" = "Psicoterapia"; - -"type.healthcare.sample_collection" = "Amostragem"; - -"type.healthcare.speech_therapist" = "Terapia da fala"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Túnel"; -"type.highway.busway" = "Via exclusiva de autocarro"; - "type.highway.bus_stop" = "Paragem de autocarros"; "type.highway.construction" = "Estrada em construção"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Pista para desportos não motorizados"; -"type.leisure.track.area" = "Pista para desportos não motorizados"; - "type.leisure.water_park" = "Parque aquático"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict index 6a572db72e..a10b4e5250 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings index f7267934e5..6468aae5b0 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ro */ @@ -10,7 +10,7 @@ "search" = "Căutare"; /* Used in home screen quick actions. */ -"bookmarks" = "Locuri preferate"; +"bookmarks" = "Marcaje"; /* Used in home screen quick actions. */ "route" = "Traseu"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index f9a6b0c079..3ee6cecd9d 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ro */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Mai târziu"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Caută"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Liste cu locuri preferate"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Locuri preferate"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Întrebări frecvente"; -/* Button in the main menu */ -"donate" = "Donează"; - /* Button in the main Help dialog */ "how_to_support_us" = "Cum să ne sprijiniți?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Număr de etaje (maximum %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Numărul de etaje nu trebuie să depășească %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Numărul de etaje nu trebuie să depășească 25"; "editor_zip_code" = "Cod poștal"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Traseu"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Stație încărcare"; -"type.amenity.charging_station.motorcar" = "Stație încărcare"; - "type.amenity.childcare" = "De îngrijire a copilului"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Popicărie"; - "type.amenity.clinic" = "Clinică"; "type.amenity.college" = "Colegiu"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Parcare subterană"; -"type.amenity.parking_entrance" = "Intrare parcare"; - "type.amenity.parking_entrance.private" = "Intrare parcare"; "type.amenity.parking_entrance.permissive" = "Intrare parcare"; +"type.amenity.parking_entrance" = "Intrare parcare"; + "type.amenity.parking_space" = "Loc de parcare"; "type.amenity.parking_space.permissive" = "Loc de parcare"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Telefon de urgență"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Intrare"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Intrarea principala"; - "type.healthcare.laboratory" = "Laborator medical"; "type.healthcare.physiotherapist" = "Fizioterapeut"; -"type.healthcare.alternative" = "Medicină alternativă"; - -"type.healthcare.audiologist" = "Audiologie"; - -"type.healthcare.blood_donation" = "Centrul de donare de sânge"; - -"type.healthcare.optometrist" = "Optometrie"; - -"type.healthcare.podiatrist" = "Podiatrie"; - -"type.healthcare.psychotherapist" = "Psihoterapie"; - -"type.healthcare.sample_collection" = "Eșantionare"; - -"type.healthcare.speech_therapist" = "Logopedie"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunel"; -"type.highway.busway" = "Drum dedicat autobuzului"; - "type.highway.bus_stop" = "Stație de autobuz"; "type.highway.construction" = "Drum în construcție"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Parc acvatic"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict index a36c4122a8..b268ea8ac7 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings index 7015b883ec..77b30b77c5 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ru */ diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index ff8208ac07..e46c888485 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: ru */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Не сейчас"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Поиск"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Списки меток"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Метки"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Вопросы и ответы"; -/* Button in the main menu */ -"donate" = "Поддержать рублём"; - /* Button in the main Help dialog */ "how_to_support_us" = "Как наc поддержать?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Количество этажей (максимум %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Количество этажей не должно превышать %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Количество этажей не должно превышать 25"; "editor_zip_code" = "Почтовый индекс"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Трек"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsRu"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/ru/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Зарядная станция"; -"type.amenity.charging_station.motorcar" = "Зарядная станция"; - "type.amenity.childcare" = "Детская комната"; "type.amenity.cinema" = "Кинотеатр"; -"type.leisure.bowling_alley" = "Боулинг"; - "type.amenity.clinic" = "Поликлиника"; "type.amenity.college" = "Колледж"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Подземный паркинг"; -"type.amenity.parking_entrance" = "Въезд на парковку"; - "type.amenity.parking_entrance.private" = "Въезд на парковку"; "type.amenity.parking_entrance.permissive" = "Въезд на парковку"; +"type.amenity.parking_entrance" = "Въезд на парковку"; + "type.amenity.parking_space" = "Парковочное место"; "type.amenity.parking_space.permissive" = "Парковочное место"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Телефон для экстренных вызовов"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Вход"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Главный вход"; - "type.healthcare.laboratory" = "Медицинская лаборатория"; "type.healthcare.physiotherapist" = "Физиотерапевт"; -"type.healthcare.alternative" = "Альтернативная медицина"; - -"type.healthcare.audiologist" = "Аудиология"; - -"type.healthcare.blood_donation" = "Центр донорства крови"; - -"type.healthcare.optometrist" = "Оптометрия"; - -"type.healthcare.podiatrist" = "Подиатрия"; - -"type.healthcare.psychotherapist" = "Психотерапия"; - -"type.healthcare.sample_collection" = "Сбор анализов"; - -"type.healthcare.speech_therapist" = "Логопедия"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Тоннель"; -"type.highway.busway" = "Выделенная автобусная дорога"; - "type.highway.bus_stop" = "Остановка"; "type.highway.construction" = "Строящаяся дорога"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Беговая дорожка"; -"type.leisure.track.area" = "Беговая дорожка"; - "type.leisure.water_park" = "Аквапарк"; "type.leisure.beach_resort" = "Пляжный курорт"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict index 87e8f5adc9..a7381831bb 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings index 34aac7493f..fc620466f8 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: sk */ diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 0b6f9786e8..43d59fda02 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: sk */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Neskôr"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Hľadať"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Skupiny záložiek"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Záložky"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Otázky a odpovede"; -/* Button in the main menu */ -"donate" = "Darovať"; - /* Button in the main Help dialog */ "how_to_support_us" = "Ako nás podporiť?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Počet poschodí (max %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Upraviť s maximálne %d poschodiami"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Upraviť s maximálne 25 poschodiami"; "editor_zip_code" = "PSČ"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Šľapaj Stopy"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Dobíjacia stanica"; -"type.amenity.charging_station.motorcar" = "Dobíjacia stanica"; - "type.amenity.childcare" = "Jasle"; "type.amenity.cinema" = "Kino"; -"type.leisure.bowling_alley" = "Bowlingová dráha"; - "type.amenity.clinic" = "Poliklinika"; "type.amenity.college" = "Vysoká škola"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Podzemné parkovisko"; -"type.amenity.parking_entrance" = "Vstup na parkovisko"; - "type.amenity.parking_entrance.private" = "Vstup na parkovisko"; "type.amenity.parking_entrance.permissive" = "Vstup na parkovisko"; +"type.amenity.parking_entrance" = "Vstup na parkovisko"; + "type.amenity.parking_space" = "Parkovacie miesto"; "type.amenity.parking_space.permissive" = "Parkovacie miesto"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Tiesňového volania"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Vstup"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Hlavný vchod"; - "type.healthcare.laboratory" = "Lekárske laboratórium"; "type.healthcare.physiotherapist" = "Fyzioterapeut"; -"type.healthcare.alternative" = "Alternatívna medicína"; - -"type.healthcare.audiologist" = "Audiológia"; - -"type.healthcare.blood_donation" = "Centrum darcovstva krvi"; - -"type.healthcare.optometrist" = "Optometria"; - -"type.healthcare.podiatrist" = "Podiatria"; - -"type.healthcare.psychotherapist" = "Psychoterapia"; - -"type.healthcare.sample_collection" = "Vzorkovanie|Zber vzoriek"; - -"type.healthcare.speech_therapist" = "Logopédia"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunel"; -"type.highway.busway" = "Vyhradená autobusová cesta"; - "type.highway.bus_stop" = "Autobusová zastávka"; "type.highway.construction" = "Cesta vo výstavbe"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Vodný park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict index d73fce84ef..bc0ced1b9f 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings index 8ac3910c38..6dbcf5d363 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: sv */ diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index d0a6d73b7f..9dd675a4c7 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: sv */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Senare"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Sök"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bokmärkessamlingar"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bokmärken"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Frågor och svar"; -/* Button in the main menu */ -"donate" = "Donera"; - /* Button in the main Help dialog */ "how_to_support_us" = "Hur stöder vi oss?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Antal våningar (max %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Redigera byggnaden med max %d våningar"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Redigera byggnaden med max 25 våningar"; "editor_zip_code" = "Postnr"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Rutt"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Laddstation"; -"type.amenity.charging_station.motorcar" = "Laddstation"; - "type.amenity.childcare" = "Barnomsorg"; "type.amenity.cinema" = "Bio"; -"type.leisure.bowling_alley" = "Bowlinghall"; - "type.amenity.clinic" = "Klinik"; "type.amenity.college" = "Högskola"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Underjordisk parkering"; -"type.amenity.parking_entrance" = "Parkering entré"; - "type.amenity.parking_entrance.private" = "Parkering entré"; "type.amenity.parking_entrance.permissive" = "Parkering entré"; +"type.amenity.parking_entrance" = "Parkering entré"; + "type.amenity.parking_space" = "Parkeringsplats"; "type.amenity.parking_space.permissive" = "Parkeringsplats"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Nödtelefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entré"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Huvudentré"; - "type.healthcare.laboratory" = "Medicinskt laboratorium"; "type.healthcare.physiotherapist" = "Fysioterapeut"; -"type.healthcare.alternative" = "Alternativ medicin"; - -"type.healthcare.audiologist" = "Audiologi"; - -"type.healthcare.blood_donation" = "Centrum för blodgivning"; - -"type.healthcare.optometrist" = "Optometri"; - -"type.healthcare.podiatrist" = "Fotvård"; - -"type.healthcare.psychotherapist" = "Psykoterapi"; - -"type.healthcare.sample_collection" = "Provtagning"; - -"type.healthcare.speech_therapist" = "Logopedics"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Dedikerad bussväg"; - "type.highway.bus_stop" = "Busshållplats"; "type.highway.construction" = "Väg under uppförande"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Äventyrspark"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict index c61bddbaaf..60f8250c9d 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings index 52a69a1f53..204301f29f 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: sw */ diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 233f6ad657..794a4572ef 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: sw */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Later"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Search"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Bookmark Lists"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Bookmarks"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Maswali na majibu"; -/* Button in the main menu */ -"donate" = "Changia"; - /* Button in the main Help dialog */ "how_to_support_us" = "Jinsi ya kutuunga mkono?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Number of floors (maximum of %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "The number of floors must non exceed %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "The number of floors must non exceed 25"; "editor_zip_code" = "ZIP Code"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Track"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.motorcar" = "Charging Station"; - "type.amenity.childcare" = "Nursery"; "type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Njia ya Bowling"; - "type.amenity.clinic" = "Clinic"; "type.amenity.college" = "College"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Maegesho ya chini ya ardhi"; -"type.amenity.parking_entrance" = "Mlango wa maegesho"; - "type.amenity.parking_entrance.private" = "Mlango wa maegesho"; "type.amenity.parking_entrance.permissive" = "Mlango wa maegesho"; +"type.amenity.parking_entrance" = "Mlango wa maegesho"; + "type.amenity.parking_space" = "Sehemu ya maegesho"; "type.amenity.parking_space.permissive" = "Sehemu ya maegesho"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Emergency Phone"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Mlango Mkuu"; - "type.healthcare.laboratory" = "Maabara ya Matibabu"; "type.healthcare.physiotherapist" = "Mtaalamu wa Physiotherapist"; -"type.healthcare.alternative" = "Dawa mbadala"; - -"type.healthcare.audiologist" = "Mtaalamu wa kusikia"; - -"type.healthcare.blood_donation" = "Kituo cha Uchangiaji Damu"; - -"type.healthcare.optometrist" = "Optometry"; - -"type.healthcare.podiatrist" = "Matibabu ya miguu"; - -"type.healthcare.psychotherapist" = "Tiba ya kisaikolojia"; - -"type.healthcare.sample_collection" = "Sampuli"; - -"type.healthcare.speech_therapist" = "Tiba ya hotuba"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Mtaro"; -"type.highway.busway" = "Barabara ya basi iliyotengwa"; - "type.highway.bus_stop" = "Bus Stop"; "type.highway.construction" = "Barabara inatengenezwa"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Water Park"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict index cbbce75074..75d68a1ca9 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings index 152d6174b6..9789f20f39 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: th */ diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index c2b20399e5..c0088ba06f 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: th */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "ภายหลัง"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "ค้นหา"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "ชุดของบุ๊กมาร์ก"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "บุ๊กมาร์ก"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "คำถามและคำตอบ"; -/* Button in the main menu */ -"donate" = "บริจาค"; - /* Button in the main Help dialog */ "how_to_support_us" = "วิธีการสนับสนุนเรา"; @@ -710,8 +704,8 @@ "editor_storey_number" = "จำนวนชั้น (มากสุด %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "แก้ไขอาคารที่มีจำนวนชั้นมากกว่า %d"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "แก้ไขอาคารที่มีจำนวนชั้นมากกว่า 25"; "editor_zip_code" = "รหัสไปรษณีย์"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "ติดตาม"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "สถานีชาร์จ"; -"type.amenity.charging_station.motorcar" = "สถานีชาร์จ"; - "type.amenity.childcare" = "สถานรับเลี้ยงเด็ก"; "type.amenity.cinema" = "โรงภาพยนตร์"; -"type.leisure.bowling_alley" = "ลานโบว์ลิ่ง"; - "type.amenity.clinic" = "คลินิก"; "type.amenity.college" = "วิทยาลัย"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "ที่จอดรถใต้ดิน"; -"type.amenity.parking_entrance" = "ทางเข้าที่จอดรถ"; - "type.amenity.parking_entrance.private" = "ทางเข้าที่จอดรถ"; "type.amenity.parking_entrance.permissive" = "ทางเข้าที่จอดรถ"; +"type.amenity.parking_entrance" = "ทางเข้าที่จอดรถ"; + "type.amenity.parking_space" = "พื้นที่จอดรถ"; "type.amenity.parking_space.permissive" = "พื้นที่จอดรถ"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "โทรศัพท์ฉุกเฉิน"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "ทางเข้า"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "ทางเข้าหลัก"; - "type.healthcare.laboratory" = "ห้องปฏิบัติการทางการแพทย์"; "type.healthcare.physiotherapist" = "นักกายภาพบำบัด"; -"type.healthcare.alternative" = "การแพทย์ทางเลือก"; - -"type.healthcare.audiologist" = "โสตวิทยา"; - -"type.healthcare.blood_donation" = "ศูนย์รับบริจาคโลหิต"; - -"type.healthcare.optometrist" = "ทัศนมาตรศาสตร์"; - -"type.healthcare.podiatrist" = "แก้โรคเท้า"; - -"type.healthcare.psychotherapist" = "จิตบำบัด"; - -"type.healthcare.sample_collection" = "การสุ่มตัวอย่าง"; - -"type.healthcare.speech_therapist" = "การบำบัดด้วยการพูด"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "อุโมงค์"; -"type.highway.busway" = "ถนนทางเดินรถโดยเฉพาะ"; - "type.highway.bus_stop" = "ป้ายรถเมล์"; "type.highway.construction" = "ทางกำลังอยู่ในการก่อสร้าง"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "สวนน้ำ"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict index f6a4ae8b05..69749d6e27 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings index de0c0a9318..4b56864ca4 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: tr */ diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 24ec0fa044..2a33b71e30 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: tr */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Daha sonra"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Ara"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Yer İmi Listeleri"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Yer İmleri"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Sıkça Sorulan Sorular"; -/* Button in the main menu */ -"donate" = "Bağış yapın"; - /* Button in the main Help dialog */ "how_to_support_us" = "Sizi nasıl destekleyebilirim?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Kat sayısı (en fazla %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Kat sayısı %d'i geçmemelidir"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Kat sayısı 25'i geçmemelidir"; "editor_zip_code" = "Posta Kodu"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Kayıt"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsTR"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmapstr"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/tr/"; - /********** Types **********/ @@ -1265,7 +1256,7 @@ "type.aeroway.helipad" = "Helikopter pisti"; -"type.aeroway.runway" = "Pist"; +"type.aeroway.runway" = "Koşu yolu"; "type.aeroway.taxiway" = "Taksi yolu"; @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Şarj İstasyonu"; -"type.amenity.charging_station.motorcar" = "Şarj İstasyonu"; - "type.amenity.childcare" = "Kreş"; "type.amenity.cinema" = "Sinema"; -"type.leisure.bowling_alley" = "Bowling pisti"; - "type.amenity.clinic" = "Klinik"; "type.amenity.college" = "Kolej"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Yeraltı otoparkı"; -"type.amenity.parking_entrance" = "Otopark girişi"; - "type.amenity.parking_entrance.private" = "Otopark girişi"; "type.amenity.parking_entrance.permissive" = "Otopark girişi"; +"type.amenity.parking_entrance" = "Otopark girişi"; + "type.amenity.parking_space" = "Park Alanı"; "type.amenity.parking_space.permissive" = "Park Alanı"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Acil Telefon"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Giriş"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Ana giriş"; - "type.healthcare.laboratory" = "Tıbbi Laboratuvar"; "type.healthcare.physiotherapist" = "Fizyoterapist"; -"type.healthcare.alternative" = "Alternatif tıp"; - -"type.healthcare.audiologist" = "Odyoloji"; - -"type.healthcare.blood_donation" = "Kan Bağışı Merkezi"; - -"type.healthcare.optometrist" = "Optometri"; - -"type.healthcare.podiatrist" = "Podiatri"; - -"type.healthcare.psychotherapist" = "Psikoterapi"; - -"type.healthcare.sample_collection" = "Örnekleme"; - -"type.healthcare.speech_therapist" = "Logopedi"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Tünel"; -"type.highway.busway" = "Özel otobüs yolu"; - "type.highway.bus_stop" = "Otobüs Durağı"; "type.highway.construction" = "Yapım Aşamasında Yol"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Pist"; -"type.leisure.track.area" = "Pist"; - "type.leisure.water_park" = "Su Parkı"; "type.leisure.beach_resort" = "Sahil Tatil Yeri"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict index 664851b1d8..901c079299 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings index f8738f347b..fe79dc2c1a 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: uk */ diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index ead93ea2de..d3706cf37d 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: uk */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Не зараз"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Пошук"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Списки мiток"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Мітки"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Питання та відповіді"; -/* Button in the main menu */ -"donate" = "Підтримати грошима"; - /* Button in the main Help dialog */ "how_to_support_us" = "Як нас підтримати?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Кількість поверхів (максимум %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Редагуйте будівлі висотою максимум %d поверхів"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Редагуйте будівлі висотою максимум 25 поверхів"; "editor_zip_code" = "Поштовий індекс"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Маршрут"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Зарядна станція"; -"type.amenity.charging_station.motorcar" = "Зарядна станція"; - "type.amenity.childcare" = "Дитяча кімната"; "type.amenity.cinema" = "Кінотеатр"; -"type.leisure.bowling_alley" = "Боулінг"; - "type.amenity.clinic" = "Поліклініка"; "type.amenity.college" = "Коледж"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Підземний паркінг"; -"type.amenity.parking_entrance" = "Вхід на паркінг"; - "type.amenity.parking_entrance.private" = "Вхід на паркінг"; "type.amenity.parking_entrance.permissive" = "Вхід на паркінг"; +"type.amenity.parking_entrance" = "Вхід на паркінг"; + "type.amenity.parking_space" = "Паркувальне місце"; "type.amenity.parking_space.permissive" = "Паркувальне місце"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Аварійний телефон"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Вхід"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Головний вхід"; - "type.healthcare.laboratory" = "Медична лабораторія"; "type.healthcare.physiotherapist" = "Фізіотерапевт"; -"type.healthcare.alternative" = "Альтернативна медицина"; - -"type.healthcare.audiologist" = "Аудіологія"; - -"type.healthcare.blood_donation" = "Центр донорства крові"; - -"type.healthcare.optometrist" = "Оптометрія"; - -"type.healthcare.podiatrist" = "Подологія"; - -"type.healthcare.psychotherapist" = "Психотерапія"; - -"type.healthcare.sample_collection" = "Збір аналізів"; - -"type.healthcare.speech_therapist" = "Логопедія"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Тунель"; -"type.highway.busway" = "Виділена автобусна дорога"; - "type.highway.bus_stop" = "Зупинка"; "type.highway.construction" = "Дорога, що будується"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Бігова доріжка"; -"type.leisure.track.area" = "Бігова доріжка"; - "type.leisure.water_park" = "Аквапарк"; "type.leisure.beach_resort" = "Пляжний курорт"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict index 9e660e44b6..620b1a39f9 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings index 663f155a64..a63ff06146 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: vi */ diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index 4c5a93a062..010b3d20f8 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: vi */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "Để sau"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "Tìm kiếm"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "Đánh dấu Bộ"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "Đánh dấu"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "Facebook"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "Câu hỏi và trả lời"; -/* Button in the main menu */ -"donate" = "Quyên tặng"; - /* Button in the main Help dialog */ "how_to_support_us" = "Làm thế nào để hỗ trợ chúng tôi?"; @@ -710,8 +704,8 @@ "editor_storey_number" = "Số tầng (tối đa %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "Sửa tòa nhà có tối đa %d tầng"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "Sửa tòa nhà có tối đa 25 tầng"; "editor_zip_code" = "Mã ZIP"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "Dấu chân"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "Trạm Sạc điện"; -"type.amenity.charging_station.motorcar" = "Trạm Sạc điện"; - "type.amenity.childcare" = "Nhà trẻ"; "type.amenity.cinema" = "Rạp chiếu phim"; -"type.leisure.bowling_alley" = "Sân chơi bowling"; - "type.amenity.clinic" = "Phòng khám"; "type.amenity.college" = "Trường đại học"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "Bãi đậu xe ngầm"; -"type.amenity.parking_entrance" = "Lối vào bãi đậu xe"; - "type.amenity.parking_entrance.private" = "Lối vào bãi đậu xe"; "type.amenity.parking_entrance.permissive" = "Lối vào bãi đậu xe"; +"type.amenity.parking_entrance" = "Lối vào bãi đậu xe"; + "type.amenity.parking_space" = "Chỗ để xe"; "type.amenity.parking_space.permissive" = "Chỗ để xe"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "Điện thoại khẩn cấp"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Lối vào"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Lối vào chính"; - "type.healthcare.laboratory" = "Phòng thí nghiệm y tế"; "type.healthcare.physiotherapist" = "Nhà vật lý trị liệu"; -"type.healthcare.alternative" = "Liều thuốc thay thế"; - -"type.healthcare.audiologist" = "Thính học"; - -"type.healthcare.blood_donation" = "Trung tâm hiến máu"; - -"type.healthcare.optometrist" = "Khúc xạ nhãn khoa"; - -"type.healthcare.podiatrist" = "khoa bàn chân"; - -"type.healthcare.psychotherapist" = "Tâm lý trị liệu"; - -"type.healthcare.sample_collection" = "lấy mẫu"; - -"type.healthcare.speech_therapist" = "Ngôn ngữ trị liệu"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "Đường hầm"; -"type.highway.busway" = "Đường dành riêng cho xe buýt"; - "type.highway.bus_stop" = "Bến xe buýt"; "type.highway.construction" = "Đường đang thi công"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "Công Viên Nước"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict index 1a38fd52bd..a590c3dd80 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings index 8a0734cd37..1f0d186f48 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: zh-Hans */ diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index cbe98a94eb..18db0a9b6d 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: zh-Hans */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "稍后"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "搜索"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "书签集"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "书签"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "脸书"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "问题和解答"; -/* Button in the main menu */ -"donate" = "捐"; - /* Button in the main Help dialog */ "how_to_support_us" = "如何支持我们？"; @@ -710,8 +704,8 @@ "editor_storey_number" = "楼号 (最大 %d)"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "最多可编辑 %d 层的建筑"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "编辑最多 25 层的建筑"; "editor_zip_code" = "邮政编码"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "追踪"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "充电站"; -"type.amenity.charging_station.motorcar" = "充电站"; - "type.amenity.childcare" = "托儿所"; "type.amenity.cinema" = "电影院"; -"type.leisure.bowling_alley" = "保龄球馆"; - "type.amenity.clinic" = "诊所"; "type.amenity.college" = "学院"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "地下停车场"; -"type.amenity.parking_entrance" = "停车场入口"; - "type.amenity.parking_entrance.private" = "停车场入口"; "type.amenity.parking_entrance.permissive" = "停车场入口"; +"type.amenity.parking_entrance" = "停车场入口"; + "type.amenity.parking_space" = "停车位"; "type.amenity.parking_space.permissive" = "停车位"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "紧急电话"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "入口"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "主要入口"; - "type.healthcare.laboratory" = "医学实验室"; "type.healthcare.physiotherapist" = "物理治疗师"; -"type.healthcare.alternative" = "替代医学"; - -"type.healthcare.audiologist" = "听力学家"; - -"type.healthcare.blood_donation" = "献血中心"; - -"type.healthcare.optometrist" = "验光师"; - -"type.healthcare.podiatrist" = "足疗师"; - -"type.healthcare.psychotherapist" = "心理治疗师"; - -"type.healthcare.sample_collection" = "样本采集设施"; - -"type.healthcare.speech_therapist" = "语言治疗师"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "隧道"; -"type.highway.busway" = "巴士专用道"; - "type.highway.bus_stop" = "公交站"; "type.highway.construction" = "在建道路"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "賽道"; -"type.leisure.track.area" = "賽道"; - "type.leisure.water_park" = "水上乐园"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict index 588c34e491..f0c8fb727b 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings index bc4d324fbc..64a0696338 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: zh-Hant */ diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 52fe29e360..154001fe21 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -1,6 +1,6 @@ /** * Apple Strings File - * Generated by Twine + * Generated by Twine 1.1.1 * Language: zh-Hant */ @@ -35,7 +35,7 @@ /* Update maps later/Buy pro version later button text */ "later" = "稍後"; -/* View and button titles for accessibility, please also edit it in iphone/plist.txt */ +/* View and button titles for accessibility */ "search" = "搜尋"; /* Settings/Downloader - 3G download warning dialog confirm button */ @@ -71,7 +71,7 @@ /* "Bookmark Lists" dialog title */ "bookmark_sets" = "收藏夾"; -/* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */ +/* "Bookmarks" dialog title */ "bookmarks" = "書籤"; /* Default bookmark list name */ @@ -273,9 +273,6 @@ /* Text in menu */ "matrix" = "[matrix]"; -/* Text in menu */ -"mastodon" = "Mastodon"; - /* Text in menu */ "facebook" = "臉書"; @@ -300,9 +297,6 @@ /* Button in the main Help dialog */ "faq" = "問題和解答"; -/* Button in the main menu */ -"donate" = "捐"; - /* Button in the main Help dialog */ "how_to_support_us" = "如何支持我們？"; @@ -710,8 +704,8 @@ "editor_storey_number" = "樓層數（最大 %d）"; -/* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */ -"error_enter_correct_storey_number" = "編輯最多 %d 層的建築"; +/* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */ +"error_enter_correct_storey_number" = "編輯最多 25 層的建築"; "editor_zip_code" = "郵遞區號"; @@ -1227,15 +1221,12 @@ /* edit track screen title */ "track_title" = "追踪"; -/* Telegram group url for the "?" About page */ +/* Telegram group url for the help page */ "telegram_url" = "https://t.me/OrganicMapsApp"; -/* Instagram account url for the "?" About page */ +/* Instagram account url for the help page */ "instagram_url" = "https://www.instagram.com/organicmaps.app"; -/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ -"translated_om_site_url" = "https://organicmaps.app/"; - /********** Types **********/ @@ -1311,14 +1302,10 @@ "type.amenity.charging_station" = "充電站"; -"type.amenity.charging_station.motorcar" = "充電站"; - "type.amenity.childcare" = "保育"; "type.amenity.cinema" = "電影院"; -"type.leisure.bowling_alley" = "保齡球館"; - "type.amenity.clinic" = "診所"; "type.amenity.college" = "學院"; @@ -1395,12 +1382,12 @@ "type.amenity.parking.underground" = "地下停車場"; -"type.amenity.parking_entrance" = "停車場入口"; - "type.amenity.parking_entrance.private" = "停車場入口"; "type.amenity.parking_entrance.permissive" = "停車場入口"; +"type.amenity.parking_entrance" = "停車場入口"; + "type.amenity.parking_space" = "停車地點"; "type.amenity.parking_space.permissive" = "停車地點"; @@ -1849,32 +1836,12 @@ "type.emergency.phone" = "緊急電話"; -/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "入口"; -/* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "主要入口"; - "type.healthcare.laboratory" = "醫學實驗室"; "type.healthcare.physiotherapist" = "物理治療師"; -"type.healthcare.alternative" = "替代藥物"; - -"type.healthcare.audiologist" = "聽力學"; - -"type.healthcare.blood_donation" = "捐血中心"; - -"type.healthcare.optometrist" = "驗光"; - -"type.healthcare.podiatrist" = "足病學"; - -"type.healthcare.psychotherapist" = "心理治療"; - -"type.healthcare.sample_collection" = "採樣"; - -"type.healthcare.speech_therapist" = "言語治療"; - /********** Types: Roads **********/ @@ -1890,8 +1857,6 @@ /* These translations are used for all type.highway.*.tunnel. */ "type.highway.bridleway.tunnel" = "隧道"; -"type.highway.busway" = "巴士專用道"; - "type.highway.bus_stop" = "巴士站"; "type.highway.construction" = "在建道路"; @@ -2415,8 +2380,6 @@ "type.leisure.track" = "Track"; -"type.leisure.track.area" = "Track"; - "type.leisure.water_park" = "水上樂園"; "type.leisure.beach_resort" = "Beach Resort"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict index fd9d146c3c..29af2b9c59 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict @@ -2,7 +2,7 @@ diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index aea2ab8a24..f5a902ed5d 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -594,7 +594,7 @@ FA853BB326BC3B8A0026D455 /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BB226BC3B8A0026D455 /* libgeometry.a */; }; FA853BB526BC3B8A0026D455 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BB426BC3B8A0026D455 /* libicu.a */; }; FA853BB726BC3B8A0026D455 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BB626BC3B8A0026D455 /* libindexer.a */; }; - FA853BB926BC3B8A0026D455 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BB826BC3B8A0026D455 /* libcppjansson.a */; }; + FA853BB926BC3B8A0026D455 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BB826BC3B8A0026D455 /* libjansson.a */; }; FA853BBB26BC3B8A0026D455 /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BBA26BC3B8A0026D455 /* libkml.a */; }; FA853BBD26BC3B8A0026D455 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BBC26BC3B8A0026D455 /* libmap.a */; }; FA853BBF26BC3B8A0026D455 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BBE26BC3B8A0026D455 /* minizip.framework */; }; @@ -1576,7 +1576,7 @@ FA853BB226BC3B8A0026D455 /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; }; FA853BB426BC3B8A0026D455 /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; FA853BB626BC3B8A0026D455 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FA853BB826BC3B8A0026D455 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FA853BB826BC3B8A0026D455 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FA853BBA26BC3B8A0026D455 /* libkml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libkml.a; sourceTree = BUILT_PRODUCTS_DIR; }; FA853BBC26BC3B8A0026D455 /* libmap.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmap.a; sourceTree = BUILT_PRODUCTS_DIR; }; FA853BBE26BC3B8A0026D455 /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1672,7 +1672,7 @@ FA853BB326BC3B8A0026D455 /* libgeometry.a in Frameworks */, FA853BB526BC3B8A0026D455 /* libicu.a in Frameworks */, FA853BB726BC3B8A0026D455 /* libindexer.a in Frameworks */, - FA853BB926BC3B8A0026D455 /* libcppjansson.a in Frameworks */, + FA853BB926BC3B8A0026D455 /* libjansson.a in Frameworks */, FA853BBB26BC3B8A0026D455 /* libkml.a in Frameworks */, FA853BBD26BC3B8A0026D455 /* libmap.a in Frameworks */, FA853BBF26BC3B8A0026D455 /* minizip.framework in Frameworks */, @@ -1810,7 +1810,7 @@ FA853BB226BC3B8A0026D455 /* libgeometry.a */, FA853BB426BC3B8A0026D455 /* libicu.a */, FA853BB626BC3B8A0026D455 /* libindexer.a */, - FA853BB826BC3B8A0026D455 /* libcppjansson.a */, + FA853BB826BC3B8A0026D455 /* libjansson.a */, FA853BBA26BC3B8A0026D455 /* libkml.a */, FA853BBC26BC3B8A0026D455 /* libmap.a */, FA853BBE26BC3B8A0026D455 /* minizip.framework */, @@ -4503,7 +4503,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2022.11.17; + MARKETING_VERSION = 2021.06.20; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug; PROVISIONING_PROFILE_SPECIFIER = "CarPlay Debug"; @@ -4524,7 +4524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2022.11.17; + MARKETING_VERSION = 2021.06.20; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps; PROVISIONING_PROFILE_SPECIFIER = "CarPlay Release"; @@ -4545,7 +4545,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); INFOPLIST_FILE = OMaps.plist; OTHER_CFLAGS = ( @@ -4586,7 +4585,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); INFOPLIST_FILE = OMaps.plist; OTHER_CFLAGS = ( diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist index 5793c6988d..7c03d23ccf 100644 --- a/iphone/Maps/OMaps.plist +++ b/iphone/Maps/OMaps.plist @@ -127,7 +127,7 @@ UIApplicationShortcutItemTitle search UIApplicationShortcutItemType - app.organicmaps.3daction.search + me.maps.3daction.search UIApplicationShortcutItemIconFile @@ -135,7 +135,7 @@ UIApplicationShortcutItemTitle bookmarks UIApplicationShortcutItemType - app.organicmaps.3daction.bookmarks + me.maps.3daction.bookmarks UIApplicationShortcutItemIconFile @@ -143,7 +143,7 @@ UIApplicationShortcutItemTitle route UIApplicationShortcutItemType - app.organicmaps.3daction.route + me.maps.3daction.route UIBackgroundModes diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift index f2e0da5ca2..9a3002adcb 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift @@ -1,8 +1,8 @@ protocol BottomMenuInteractorProtocol: AnyObject { func close() func addPlace() + func downloadRoutes() func downloadMaps() - func donate() func openSettings() func shareLocation(cell: BottomMenuItemCell) } @@ -43,13 +43,8 @@ extension BottomMenuInteractor: BottomMenuInteractorProtocol { delegate?.addPlace() } - func donate() { + func downloadRoutes() { close() - guard var url = Settings.donateUrl() else { return } - if url == "https://organicmaps.app/donate/" { - url = L("translated_om_site_url") + "donate/" - } - viewController?.openUrl(url, inSafari: true) } func downloadMaps() { diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift index 7b8d950a0c..1a80d3e1df 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift @@ -5,8 +5,8 @@ protocol BottomMenuPresenterProtocol: UITableViewDelegate, UITableViewDataSource class BottomMenuPresenter: NSObject { enum CellType: Int, CaseIterable { case addPlace + //case downloadRoutes case downloadMaps - case donate case settings case share } @@ -26,8 +26,6 @@ class BottomMenuPresenter: NSObject { self.interactor = interactor self.sections = sections } - - let disableDonate = Settings.donateUrl() == nil } extension BottomMenuPresenter: BottomMenuPresenterProtocol { @@ -44,49 +42,58 @@ extension BottomMenuPresenter { } func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - section == Sections.layers.rawValue ? 1 : CellType.allCases.count - (disableDonate ? 1 : 0) + section == Sections.layers.rawValue ? 1 : CellType.allCases.count } - private func correctedRow(_ row: Int) -> Int { - disableDonate && row >= CellType.donate.rawValue ? row + 1 : row - } - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { if indexPath.section == Sections.layers.rawValue { let cell = tableView.dequeueReusableCell(cell: BottomMenuLayersCell.self)! cell.onClose = { [weak self] in self?.onClosePressed() } return cell } - let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)! - switch CellType(rawValue: correctedRow(indexPath.row))! { - case .addPlace: - let enabled = MWMNavigationDashboardManager.shared().state == .hidden && FrameworkHelper.canEditMap() - cell.configure(imageName: "ic_add_place", - title: L("placepage_add_place_button"), - badgeCount: 0, - enabled: enabled) - case .downloadMaps: - cell.configure(imageName: "ic_menu_download", - title: L("download_maps"), - badgeCount: MapsAppDelegate.theApp().badgeNumber(), - enabled: true) - case .donate: - cell.configure(imageName: Settings.isNY() ? "ic_christmas_tree" : "ic_menu_donate", - title: L("donate"), - badgeCount: 0, - enabled: true) - case .settings: - cell.configure(imageName: "ic_menu_settings", - title: L("settings"), - badgeCount: 0, - enabled: true) - case .share: - cell.configure(imageName: "ic_menu_share", - title: L("share_my_location"), - badgeCount: 0, - enabled: true) + if indexPath.section == Sections.items.rawValue { + let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)! + switch CellType(rawValue: indexPath.row)! { + case .addPlace: + let enabled = MWMNavigationDashboardManager.shared().state == .hidden && FrameworkHelper.canEditMap() + cell.configure(imageName: "ic_add_place", + title: L("placepage_add_place_button"), + badgeCount: 0, + enabled: enabled) +// case .downloadRoutes: +// cell.configure(imageName: "ic_menu_routes", title: L("download_guides")) + case .downloadMaps: + cell.configure(imageName: "ic_menu_download", + title: L("download_maps"), + badgeCount: MapsAppDelegate.theApp().badgeNumber(), + enabled: true) + case .settings: + cell.configure(imageName: "ic_menu_settings", + title: L("settings"), + badgeCount: 0, + enabled: true) + case .share: + cell.configure(imageName: "ic_menu_share", + title: L("share_my_location"), + badgeCount: 0, + enabled: true) + } + return cell } - return cell + fatalError() + } + + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return section > 0 ? 12 : 0 + } + + func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + if section > 0 { + let view = UIView() + view.styleName = "BlackOpaqueBackground"; + return view; + } + return nil } } @@ -99,13 +106,13 @@ extension BottomMenuPresenter { return } tableView.deselectRow(at: indexPath, animated: true) - switch CellType(rawValue: correctedRow(indexPath.row))! { + switch CellType(rawValue: indexPath.row)! { case .addPlace: interactor.addPlace() +// case .downloadRoutes: +// interactor.downloadRoutes() case .downloadMaps: interactor.downloadMaps() - case .donate: - interactor.donate() case .settings: interactor.openSettings() case .share: diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift index 28b020084d..fc258d1e90 100644 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift +++ b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift @@ -26,14 +26,6 @@ class BottomTabBarViewController: UIViewController { return MWMMapViewControlsManager.manager()?.tabBarController } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - if Settings.isNY() { - helpButton.setTitle("🎄", for: .normal) - helpButton.setImage(nil, for: .normal) - } - } - override func viewDidLoad() { super.viewDidLoad() presenter.configure() diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib index bba0e936c0..07eea5bf60 100644 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib +++ b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib @@ -1,9 +1,9 @@ - + - + @@ -30,7 +30,6 @@

## Features

- The Linux version of Organic Maps has not reached feature parity - with the Android and iPhone versions yet, and has not been optimized - for mobile devices yet. Organic Maps is the ultimate companion app for travelers, tourists, hikers, and cyclists:

    @@ -99,138 +96,17 @@ OrganicMaps.desktop - https://organicmaps.app/images/screenshots/Desktop_light_routing.png + https://organicmaps.app/images/screenshots/hiking.jpg - https://organicmaps.app/images/screenshots/Desktop_dark_routing.png + https://organicmaps.app/images/screenshots/prague.jpg - https://organicmaps.app/images/screenshots/Desktop_light_overview.png - - - https://organicmaps.app/images/screenshots/Desktop_dark_overview.png + https://organicmaps.app/images/screenshots/dark.jpg - - -

    Highlights:

    -
      -
    • New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria
      • -
    • Filtered wrong search results in the list and on the map
      • -
    • Fixed crash on opening
      • -
    -

    Map Styles:

    -
      -
    • Better icons for main and secondary building entrances
      • -
    -

    Translations:

    -
      -
    • Fixed Persian, Polish, and German translations
      • -
    -     -     - - -

    Highlights:

    -
      -
    • New OpenStreetMap data as of January 21, 2023
      • -
    • Fixed import of some KML tracks
      • -
    • Automatic search for the current position in 30 hours of inactivity instead of 8 hours
      • -
    • Improved search categories results
      • -
    • Proper spelling of Australia in search results
      • -
    • leisure=track is now searchable
      • -
    -

    Routing:

    -
      -
    • Proper handling of elevation for hiking and cycling
      • -
    • Fixed inter-region routing
      • -
    • Fixed routing via some bridges
      • -
    • Busways are supported
      • -
    • Added Croatia to Schengen area
      • -
    -

    Map Styles:

    -
      -
    • Fixed Buenos Aires metro icons
      • -
    • Added Bowling Alley
      • -
    • Fixed historic=fountain and tourism=information-office icon
      • -
    • Equal icon sizes for springs & hot springs
      • -
    -

    Editor:

    -
      -
    • Allowed editing names with /\°[] symbols
      • -
    • Added amenity=public_bookcase
      • -
    • Increased the maximum editable building floors from 25 to 50
      • -
    -

    Translations:

    -
      -
    • Fixed Brazil, Czech, French, Hungarian, Spanish (Mexican), Turkish
      • -
    • Fixed TTS translations for Finnish and Portuguese
      • -
    -

    Linux:

    -
      -
    • Import upper-case KML and KMZ files on case-sensitive Linux file systems
      • -
    • Use Organic Maps server to check if a connection is alive
      • -
    -     -     - - -

    Highlights:

    -
      -
    • New OpenStreetMap data as of December 16, 2022
      • -
    • Improved routing algorithm
      • -
    • Do not route over highway=construction :)
      • -
    • Support multiple track geometry in KML files
      • -
    • Fixed KML 2.3 track import from OpenTracks
      • -
    • Faster parsing and rendering of complex KML tracks
      • -
    • Allow adding some shops, galleries, music schools in Editor
      • -
    • Improved city borders in search results
      • -
    -

    Map Styles:

    -
      -
    • Improved, less bright icons in Night mode
      • -
    • Fixed subway icons in some cities
      • -
    • Properly draw barriers for areas and relations
      • -
    • Fixed duplicated names on the world map
      • -
    • Updated cave, mountain pass, peak, volcano, emergency phone, historic ship, ice cream, nightclub, music shop, stadium, video games icons
      • -
    • Fixed wrong priorities of leisure=pitch, historic, post office
      • -
    • More consistent filled/round icons (round means some kind of business/service)
      • -
    -

    Translations:

    -
      -
    • TTS (Text-To-Speech) for Brazil, Mexican Spanish and Norwegian
      • -
    • Fixed German and Hungarian search strings
      • -
    • Updated Czech, Spanish translations
      • -
    -     -     - - -

    Highlights:

    -
      -
    • New OSM maps data as of November 19
      • -
    • Fixed map dragging on Linux
      • -
    • Use "+" key to zoom in
      • -
    • Improved docs about building OM with WSL
      • -
    • Use high-resolution icons on high-DPI displays
      • -
    -

    Routing and Navigation:

    -
      -
    • Corrected bicycle's speed for better routing
      • -
    -

    Styles:

    -
      -
    • Fixed some improperly overlapping types
      • -
    • Added highway=busway and physiotherapist
      • -
    • Islands and archipelagos are now visible on World Map
      • -
    • Draw waterway=dam as background area
      • -
    • Water draw priority is lesser now than pier
      • -
    • Fixed leisure areas
      • -
    -     -

    Highlights:

    @@ -253,7 +129,7 @@
  • Show all found results on the map screen
  • Improved villages search
  • Show only matched categories if they were selected from the list, not names
    • -
  • Fixed street synonyms for nordic languages
    • +
  • Fixed street synonyms for nordic languages

Styles:

    diff --git a/qt_tstfrm/test_main_loop.cpp b/qt_tstfrm/test_main_loop.cpp index 434bff4483..0ea25f72ef 100644 --- a/qt_tstfrm/test_main_loop.cpp +++ b/qt_tstfrm/test_main_loop.cpp @@ -40,9 +40,6 @@ void RunTestLoop(char const * testName, testing::RenderFunction && fn, bool auto int argc = 1; QApplication app(argc, &raw); - // Pretty icons on HDPI displays. - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - if (autoExit) QTimer::singleShot(3000, &app, SLOT(quit())); @@ -62,8 +59,6 @@ void RunTestInOpenGLOffscreenEnvironment(char const * testName, bool apiOpenGLES int argc = 1; QApplication app(argc, &raw); - // Pretty icons on HDPI displays. - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QSurfaceFormat fmt; fmt.setAlphaBufferSize(8); diff --git a/routing/edge_estimator.cpp b/routing/edge_estimator.cpp index 31d816e1d6..4beaa9ec74 100644 --- a/routing/edge_estimator.cpp +++ b/routing/edge_estimator.cpp @@ -17,6 +17,7 @@ namespace routing { +using namespace routing; using namespace std; using namespace traffic; using measurement_utils::KmphToMps; @@ -27,7 +28,7 @@ geometry::Altitude constexpr kMountainSicknessAltitudeM = 2500; double TimeBetweenSec(ms::LatLon const & from, ms::LatLon const & to, double speedMpS) { - ASSERT_GREATER(speedMpS, 0.0, ("from:", from, "to:", to)); + CHECK_GREATER(speedMpS, 0.0, ("from:", from, "to:", to)); double const distanceM = ms::DistanceOnEarth(from, to); return distanceM / speedMpS; @@ -42,123 +43,75 @@ double CalcTrafficFactor(SpeedGroup speedGroup) } double const percentage = 0.01 * kSpeedGroupThresholdPercentage[static_cast(speedGroup)]; - ASSERT_GREATER(percentage, 0.0, (speedGroup)); + CHECK_GREATER(percentage, 0.0, (speedGroup)); return 1.0 / percentage; } -double GetSpeedMpS(EdgeEstimator::Purpose purpose, Segment const & segment, RoadGeometry const & road) -{ - SpeedKMpH const & speed = road.GetSpeed(segment.IsForward()); - double const speedMpS = KmphToMps(purpose == EdgeEstimator::Purpose::Weight ? speed.m_weight : speed.m_eta); - ASSERT_GREATER(speedMpS, 0.0, (segment)); - return speedMpS; -} - -bool IsTransit(std::optional type) -{ - return type && (type == HighwayType::RouteFerry || type == HighwayType::RouteShuttleTrain); -} - -template +template double CalcClimbSegment(EdgeEstimator::Purpose purpose, Segment const & segment, - RoadGeometry const & road, CalcSpeed && calcSpeed) + RoadGeometry const & road, GetClimbPenalty && getClimbPenalty) { + LatLonWithAltitude const & from = road.GetJunction(segment.GetPointId(false /* front */)); + LatLonWithAltitude const & to = road.GetJunction(segment.GetPointId(true /* front */)); + SpeedKMpH const & speed = road.GetSpeed(segment.IsForward()); + double const distance = road.GetDistance(segment.GetSegmentIdx()); - double speedMpS = GetSpeedMpS(purpose, segment, road); + double const speedMpS = + KmphToMps(purpose == EdgeEstimator::Purpose::Weight ? speed.m_weight : speed.m_eta); + CHECK_GREATER(speedMpS, 0.0, ("from:", from.GetLatLon(), "to:", to.GetLatLon(), "speed:", speed)); + double const timeSec = distance / speedMpS; - static double constexpr kSmallDistanceM = 1; // we have altitude threshold is 0.5m - if (distance > kSmallDistanceM && !IsTransit(road.GetHighwayType())) - { - LatLonWithAltitude const & from = road.GetJunction(segment.GetPointId(false /* front */)); - LatLonWithAltitude const & to = road.GetJunction(segment.GetPointId(true /* front */)); + if (base::AlmostEqualAbs(distance, 0.0, 0.1)) + return timeSec; - ASSERT(to.GetAltitude() != geometry::kInvalidAltitude && from.GetAltitude() != geometry::kInvalidAltitude, ()); - auto const altitudeDiff = to.GetAltitude() - from.GetAltitude(); - - if (altitudeDiff != 0) - { - speedMpS = calcSpeed(speedMpS, altitudeDiff / distance, to.GetAltitude()); - ASSERT_GREATER(speedMpS, 0.0, (segment)); - } - } - - return distance / speedMpS; + double const altitudeDiff = + static_cast(to.GetAltitude()) - static_cast(from.GetAltitude()); + return timeSec * getClimbPenalty(purpose, altitudeDiff / distance, to.GetAltitude()); } } // namespace -double GetPedestrianClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, geometry::Altitude altitudeM) +double GetPedestrianClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, + geometry::Altitude altitudeM) { double constexpr kMinPenalty = 1.0; // Descent penalty is less then the ascent penalty. double const impact = tangent >= 0.0 ? 1.0 : 0.35; + tangent = std::abs(tangent); if (altitudeM >= kMountainSicknessAltitudeM) - return kMinPenalty + (10.0 + (altitudeM - kMountainSicknessAltitudeM) * 10.0 / 1500.0) * fabs(tangent) * impact; - - if (purpose == EdgeEstimator::Purpose::Weight) { - tangent = fabs(tangent); - // Some thoughts about gradient and foot walking: https://gre-kow.livejournal.com/26916.html - // 3cm diff with avg foot length 60cm is imperceptible (see Hungary_UseFootways). - double constexpr kTangentThreshold = 3.0/60.0; - if (tangent < kTangentThreshold) - return kMinPenalty; - - // ETA coefficients are calculated in https://github.com/mapsme/omim-scripts/pull/21 - auto const penalty = purpose == EdgeEstimator::Purpose::Weight - ? 5.0 * tangent + 7.0 * tangent * tangent - : 3.01 * tangent + 3.54 * tangent * tangent; - - return kMinPenalty + penalty * impact; - } - else - { - // Use Tobler’s Hiking Function for ETA like more comprehensive. See France_Uphill_Downlhill test. - // Why not in Weight? See Crimea_Altitude_Mountains test. - // https://mtntactical.com/research/yet-calculating-movement-uneven-terrain/ - // Returns factor: W(0) / W(tangent). - return exp(-3.5 * (0.05 - fabs(tangent + 0.05))); + return kMinPenalty + (10.0 + (altitudeM - kMountainSicknessAltitudeM) * 10.0 / 1500.0) * + std::abs(tangent) * impact; } + + // ETA coefficients are calculated in https://github.com/mapsme/omim-scripts/pull/21 + auto const penalty = purpose == EdgeEstimator::Purpose::Weight + ? 5.0 * tangent + 7.0 * tangent * tangent + : 3.01 * tangent + 3.54 * tangent * tangent; + + return kMinPenalty + penalty * impact; } -double GetBicycleClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, geometry::Altitude altitudeM) +double GetBicycleClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, + geometry::Altitude altitudeM) { double constexpr kMinPenalty = 1.0; double const impact = tangent >= 0.0 ? 1.0 : 0.35; + tangent = std::abs(tangent); if (altitudeM >= kMountainSicknessAltitudeM) - return kMinPenalty + 50.0 * fabs(tangent) * impact; + return kMinPenalty + 50.0 * tangent * impact; - // By VNG: This approach is strange at least because it always returns penalty > 1 (even for downhill) - /* - tangent = fabs(tangent); // ETA coefficients are calculated in https://github.com/mapsme/omim-scripts/pull/22 auto const penalty = purpose == EdgeEstimator::Purpose::Weight ? 10.0 * tangent + 26.0 * tangent * tangent : 8.8 * tangent + 6.51 * tangent * tangent; return kMinPenalty + penalty * impact; - */ - - // https://web.tecnico.ulisboa.pt/~rosamfelix/gis/declives/SpeedSlopeFactor.html - double const slope = tangent * 100; - - double factor; - if (slope < -30) - factor = 1.5; - else if (slope < 0) - { - // Min factor (max speed) will be at slope = -13. - factor = 1 + 2 * 0.7 / 13.0 * slope + 0.7 / 169 * slope * slope; - } - else if (slope <= 20) - factor = 1 + slope * slope / 49; - else - factor = 10.0; - return factor; } -double GetCarClimbPenalty(EdgeEstimator::Purpose, double, geometry::Altitude) +double GetCarClimbPenalty(EdgeEstimator::Purpose /* purpose */, double /* tangent */, + geometry::Altitude /* altitudeM */) { return 1.0; } @@ -279,13 +232,10 @@ public: UNREACHABLE(); } - double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const override + double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, + Purpose purpose) const override { - return CalcClimbSegment(purpose, segment, road, - [purpose](double speedMpS, double tangent, geometry::Altitude altitude) - { - return speedMpS / GetPedestrianClimbPenalty(purpose, tangent, altitude); - }); + return CalcClimbSegment(purpose, segment, road, GetPedestrianClimbPenalty); } }; @@ -311,41 +261,10 @@ public: UNREACHABLE(); } - double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const override + double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, + Purpose purpose) const override { - return CalcClimbSegment(purpose, segment, road, - [purpose](double speedMpS, double tangent, geometry::Altitude altitude) - { - auto const factor = GetBicycleClimbPenalty(purpose, tangent, altitude); - ASSERT_GREATER(factor, 0.0, ()); - - /// @todo Take out "bad" bicycle road (path, track, footway, ...) check into BicycleModel? - static double constexpr badBicycleRoadSpeed = KmphToMps(9); - if (speedMpS <= badBicycleRoadSpeed) - { - if (factor > 1) - speedMpS /= factor; - } - else - { - if (factor > 1) - { - // Calculate uphill speed according to the average bicycle speed, because "good-roads" like - // residential, secondary, cycleway are "equal-low-speed" uphill and road type doesn't matter. - static double constexpr avgBicycleSpeed = KmphToMps(20); - double const upperBound = avgBicycleSpeed / factor; - if (speedMpS > upperBound) - { - // Add small weight to distinguish roads by class (10 is a max factor value). - speedMpS = upperBound + (purpose == Purpose::Weight ? speedMpS / (10 * avgBicycleSpeed) : 0); - } - } - else - speedMpS /= factor; - } - - return speedMpS; - }); + return CalcClimbSegment(purpose, segment, road, GetBicycleClimbPenalty); } }; @@ -370,7 +289,7 @@ CarEstimator::CarEstimator(DataSource * dataSourcePtr, std::shared_ptr trafficStash, double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH) : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH, dataSourcePtr, numMwmIds) - , m_trafficStash(std::move(trafficStash)) + , m_trafficStash(move(trafficStash)) { } @@ -395,7 +314,7 @@ double CarEstimator::GetFerryLandingPenalty(Purpose purpose) const double CarEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const { - double result = road.GetDistance(segment.GetSegmentIdx()) / GetSpeedMpS(purpose, segment, road); + double result = CalcClimbSegment(purpose, segment, road, GetCarClimbPenalty); if (m_trafficStash) { @@ -407,7 +326,7 @@ double CarEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry con { // Current time estimation are too optimistic. // Need more accurate tuning: traffic lights, traffic jams, road models and so on. - // Add some penalty to make estimation more realistic. + // Add some penalty to make estimation of a more realistic. /// @todo Make accurate tuning, remove penalty. result *= 1.8; } diff --git a/routing/edge_estimator.hpp b/routing/edge_estimator.hpp index 5edf81df8d..f7c36d4aa2 100644 --- a/routing/edge_estimator.hpp +++ b/routing/edge_estimator.hpp @@ -7,6 +7,7 @@ #include "routing_common/vehicle_model.hpp" #include "geometry/latlon.hpp" +#include "geometry/point2d.hpp" #include "geometry/point_with_altitude.hpp" #include diff --git a/routing/fake_ending.cpp b/routing/fake_ending.cpp index 4ddacaf8c9..4daac6ef0d 100644 --- a/routing/fake_ending.cpp +++ b/routing/fake_ending.cpp @@ -12,11 +12,11 @@ #include #include -namespace routing -{ using namespace routing; using namespace std; +namespace routing +{ LatLonWithAltitude CalcProjectionToSegment(LatLonWithAltitude const & begin, LatLonWithAltitude const & end, m2::PointD const & point) diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp index 57e4c9f2f0..3190c6776c 100644 --- a/routing/features_road_graph.cpp +++ b/routing/features_road_graph.cpp @@ -7,8 +7,17 @@ #include "routing_common/vehicle_model.hpp" +#include "indexer/classificator.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/scales.hpp" + #include "coding/point_coding.hpp" +#include "geometry/distance_on_sphere.hpp" + +#include "base/logging.hpp" +#include "base/macros.hpp" + #include namespace routing @@ -74,7 +83,7 @@ VehicleModelInterface * FeaturesRoadGraphBase::CrossCountryVehicleModel::GetVehi ASSERT(vehicleModel, ()); ASSERT_EQUAL(m_maxSpeed, vehicleModel->GetMaxWeightSpeed(), ()); - itr = m_cache.emplace(featureId.m_mwmId, std::move(vehicleModel)).first; + itr = m_cache.emplace(featureId.m_mwmId, move(vehicleModel)).first; return itr->second.get(); } @@ -256,11 +265,7 @@ void FeaturesRoadGraphBase::ExtractRoadInfo(FeatureID const & featureId, Feature ri.m_junctions.resize(pointsCount); for (size_t i = 0; i < pointsCount; ++i) - { - auto & pt = ri.m_junctions[i]; - pt.SetPoint(ft.GetPoint(i)); - pt.SetAltitude(altitudes[i]); - } + ri.m_junctions[i] = { ft.GetPoint(i), altitudes[i] }; } IRoadGraph::RoadInfo const & FeaturesRoadGraphBase::GetCachedRoadInfo( diff --git a/routing/geometry.cpp b/routing/geometry.cpp index 5ed34b1c84..5f2a7742ad 100644 --- a/routing/geometry.cpp +++ b/routing/geometry.cpp @@ -200,19 +200,8 @@ void RoadGeometry::Load(VehicleModelInterface const & vehicleModel, FeatureType #ifdef DEBUG // I'd like to check these big jumps manually, if any. - if (altitudes && i > 0) - { - // Since we store integer altitudes, 1 is a possible error for 2 points. - geometry::Altitude constexpr kError = 1; - - auto const altDiff = abs((*altitudes)[i] - (*altitudes)[i-1]); - if (altDiff > kError) - { - double const dist = ms::DistanceOnEarth(m_junctions[i-1].GetLatLon(), m_junctions[i].GetLatLon()); - if ((altDiff - kError) / dist > 0.3) - LOG(LWARNING, ("Altitudes jump:", m_junctions[i-1], m_junctions[i])); - } - } + if (altitudes && i > 0 && abs((*altitudes)[i] - (*altitudes)[i-1]) > 30) + LOG(LWARNING, ("Altitudes jump:", m_junctions[i], m_junctions[i-1])); #endif } m_distances.resize(count - 1, -1); diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp index e82c14db4e..399b1d07f8 100644 --- a/routing/index_graph.cpp +++ b/routing/index_graph.cpp @@ -17,11 +17,11 @@ #include #include -namespace routing -{ using namespace base; using namespace std; +namespace routing +{ bool IsUTurn(Segment const & u, Segment const & v) { return u.GetFeatureId() == v.GetFeatureId() && u.GetSegmentIdx() == v.GetSegmentIdx() && diff --git a/routing/index_graph_starter.cpp b/routing/index_graph_starter.cpp index 8167c20b99..3b0fe9270c 100644 --- a/routing/index_graph_starter.cpp +++ b/routing/index_graph_starter.cpp @@ -12,11 +12,20 @@ #include #include +namespace +{ +using namespace routing; +using namespace std; + +Segment GetReverseSegment(Segment const & segment) +{ + return Segment(segment.GetMwmId(), segment.GetFeatureId(), segment.GetSegmentIdx(), + !segment.IsForward()); +} +} // namespace namespace routing { -using namespace std; - // IndexGraphStarter::Ending ----------------------------------------------------------------------- void IndexGraphStarter::Ending::FillMwmIds() { @@ -72,7 +81,7 @@ void IndexGraphStarter::SetGuides(GuidesGraph const & guides) { m_guides = guide void IndexGraphStarter::SetRegionsGraphMode(std::shared_ptr regionsSparseGraph) { - m_regionsGraph = std::move(regionsSparseGraph); + m_regionsGraph = move(regionsSparseGraph); m_graph.SetRegionsGraphMode(true); } @@ -347,7 +356,7 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding) otherSegments[p.m_segment].push_back(p.m_junction); // We use |otherEnding| to generate proper fake edges in case both endings have projections // to the same segment. Direction of p.m_segment does not matter. - otherSegments[p.m_segment.GetReversed()].push_back(p.m_junction); + otherSegments[GetReverseSegment(p.m_segment)].push_back(p.m_junction); } } @@ -412,7 +421,7 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding) if (!projection.m_isOneWay) { - auto const backwardSegment = projection.m_segment.GetReversed(); + auto const backwardSegment = GetReverseSegment(projection.m_segment); FakeVertex backwardPartOfReal( backwardSegment.GetMwmId(), isStart ? projection.m_junction : frontJunction, isStart ? backJunction : projection.m_junction, FakeVertex::Type::PartOfReal); @@ -439,7 +448,7 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding cons otherSegments[p.m_segment] = p.m_junction; // We use |otherEnding| to generate proper fake edges in case both endings have projections // to the same segment. Direction of p.m_segment does not matter. - otherSegments[p.m_segment.GetReversed()] = p.m_junction; + otherSegments[GetReverseSegment(p.m_segment)] = p.m_junction; } // Add pure fake vertex @@ -495,7 +504,7 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding cons if (!strictForward && !projection.m_isOneWay) { - auto const backwardSegment = projection.m_segment.GetReversed(); + auto const backwardSegment = GetReverseSegment(projection.m_segment); FakeVertex backwardPartOfReal( backwardSegment.GetMwmId(), isStart ? projection.m_junction : frontJunction, isStart ? backJunction : projection.m_junction, FakeVertex::Type::PartOfReal); @@ -515,38 +524,6 @@ void IndexGraphStarter::ConnectLoopToGuideSegments( m_fake.ConnectLoopToGuideSegments(loop, realSegment, realFrom, realTo, partsOfReal); } -HighwayCategory IndexGraphStarter::GetHighwayCategory(Segment seg) const -{ - if (IsFakeSegment(seg)) - { - Segment real; - if (m_fake.FindReal(seg, real)) - seg = real; - else - return HighwayCategory::Unknown; - } - - auto const hwType = m_graph.GetIndexGraph(seg.GetMwmId()).GetRoadGeometry(seg.GetFeatureId()).GetHighwayType(); - if (!hwType) - return HighwayCategory::Unknown; - - switch (*hwType) - { - case HighwayType::HighwayMotorway: case HighwayType::HighwayMotorwayLink: - case HighwayType::HighwayTrunk: case HighwayType::HighwayTrunkLink: - return HighwayCategory::Major; - case HighwayType::HighwayPrimary: case HighwayType::HighwayPrimaryLink: - return HighwayCategory::Primary; - case HighwayType::HighwaySecondary: case HighwayType::HighwaySecondaryLink: - case HighwayType::HighwayTertiary: case HighwayType::HighwayTertiaryLink: - return HighwayCategory::Usual; - case HighwayType::RouteFerry: case HighwayType::RailwayRailMotorVehicle: case HighwayType::RouteShuttleTrain: - return HighwayCategory::Transit; - default: - return HighwayCategory::Minor; - } -} - void IndexGraphStarter::AddStart(FakeEnding const & startEnding, FakeEnding const & finishEnding, bool strictForward) { diff --git a/routing/index_graph_starter.hpp b/routing/index_graph_starter.hpp index 05af5d5eae..35db01188c 100644 --- a/routing/index_graph_starter.hpp +++ b/routing/index_graph_starter.hpp @@ -2,21 +2,30 @@ #include "routing/base/astar_graph.hpp" #include "routing/base/astar_vertex_data.hpp" +#include "routing/base/routing_result.hpp" #include "routing/fake_ending.hpp" #include "routing/fake_feature_ids.hpp" #include "routing/fake_graph.hpp" #include "routing/fake_vertex.hpp" #include "routing/guides_graph.hpp" #include "routing/index_graph.hpp" +#include "routing/joint.hpp" #include "routing/latlon_with_altitude.hpp" +#include "routing/route_point.hpp" #include "routing/route_weight.hpp" #include "routing/segment.hpp" #include "routing/world_graph.hpp" #include "routing_common/num_mwm_id.hpp" +#include +#include +#include +#include +#include #include #include +#include #include namespace routing @@ -24,13 +33,6 @@ namespace routing class FakeEdgesContainer; class RegionsSparseGraph; -// Group highway types on categories (classes) to use in leaps candidates filtering. -enum class HighwayCategory : uint8_t -{ - // Do not change order! - Major, Primary, Usual, Minor, Transit, Unknown -}; - // IndexGraphStarter adds fake start and finish vertices for AStarAlgorithm. class IndexGraphStarter : public AStarGraph { @@ -162,8 +164,8 @@ public: double CalculateETA(Segment const & from, Segment const & to) const; double CalculateETAWithoutPenalty(Segment const & segment) const; - /// @name For compatibility with IndexGraphStarterJoints. - /// @{ + // For compatibility with IndexGraphStarterJoints + // @{ void SetAStarParents(bool forward, Parents & parents) { m_graph.SetAStarParents(forward, parents); @@ -185,12 +187,7 @@ public: { return GetGraph().GetIndexGraph(segment.GetMwmId()).IsJointOrEnd(segment, fromStart); } - - RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2) - { - return GetGraph().GetCrossBorderPenalty(mwmId1, mwmId2); - } - /// @} + // @} // Start or finish ending information. struct Ending @@ -213,8 +210,6 @@ public: LatLonWithAltitude realFrom, LatLonWithAltitude realTo, std::vector> const & partsOfReal); - HighwayCategory GetHighwayCategory(Segment seg) const; - private: // Creates fake edges for fake ending and adds it to fake graph. |otherEnding| is used to // generate proper fake edges in case both endings have projections to the same segment. diff --git a/routing/index_graph_starter_joints.hpp b/routing/index_graph_starter_joints.hpp index 41e8880e53..db40ed71fa 100644 --- a/routing/index_graph_starter_joints.hpp +++ b/routing/index_graph_starter_joints.hpp @@ -5,21 +5,21 @@ #include "routing/fake_feature_ids.hpp" #include "routing/joint_segment.hpp" -#include "routing/mwm_hierarchy_handler.hpp" #include "routing/segment.hpp" #include "geometry/latlon.hpp" #include "base/assert.hpp" -#include "3party/skarupke/bytell_hash_map.hpp" // needed despite of IDE warning - #include +#include #include #include #include +#include #include +#include "3party/skarupke/bytell_hash_map.hpp" namespace routing { @@ -520,9 +520,9 @@ void IndexGraphStarterJoints::GetEdgeList( if (!FillEdgesAndParentsWeights(vertexData, isOutgoing, firstFakeId, edges, parentWeights)) return; - auto const & vertex = vertexData.m_vertex; if (!isOutgoing) { + auto const & vertex = vertexData.m_vertex; // |parentSegment| is parent-vertex from which we search children. // For correct weight calculation we should get weight of JointSegment, that // ends in |parentSegment| and add |parentWeight[i]| to the saved value. @@ -533,18 +533,25 @@ void IndexGraphStarterJoints::GetEdgeList( for (size_t i = 0; i < edges.size(); ++i) { // Saving weight of current edges for returning in the next iterations. - auto & w = edges[i].GetWeight(); + auto const & w = edges[i].GetWeight(); auto const & t = edges[i].GetTarget(); - // By VNG: Revert to the MM original code, since Cross-MWM borders penalty is assigned in the end of this function. - /// @todo I still have doubts on how we "fetch" weight for ingoing edges with m_savedWeight. - m_savedWeight[t] = w; + auto res = m_savedWeight.insert(std::make_pair(t, w)); + if (!res.second) + { + // Actually, the edge's weight should be an invariant, no matter how we reached it. + // This is true, except for the case in Cross MWM routing with GetCrossBorderPenalty. + // We add this penalty if its parent edge is in another MWM. Also, after that, we can + // reach the edge from within its current MWM and the penalty will be overwritten. + // So keep *max* weight here. Check CrossCountry_XXX tests. + res.first->second = std::max(res.first->second, w); + } // For parent JointSegment we know its weight without last segment, because for each child // it will differ (child_1 => parent != child_2 => parent), but (!) we save this weight in // |parentWeights[]|. So the weight of an ith edge is a cached "weight of parent JointSegment" + // "parentWeight[i]". - w = weight + parentWeights[i]; + edges[i].GetWeight() = weight + parentWeights[i]; } // Delete useless weight of parent JointSegment. @@ -556,22 +563,6 @@ void IndexGraphStarterJoints::GetEdgeList( for (size_t i = firstFakeId; i < edges.size(); ++i) edges[i].GetWeight() += parentWeights[i]; } - - auto const vertexMwmId = vertex.GetMwmId(); - if (vertexMwmId != kFakeNumMwmId) - { - /// @todo By VNG: Main problem with current (borders penalty) approach and bidirectional A* is that: - /// a weight of v1->v2 transition moving forward (v1 outgoing) should be the same as - /// a weight of v1->v2 transition moving backward (v2 ingoing). This is impossible in current (m_savedWeight) - /// logic, so I moved Cross-MWM penalty into separate block here after _all_ weights calculations. - - for (auto & e : edges) - { - auto const targetMwmId = e.GetTarget().GetMwmId(); - if (targetMwmId != kFakeNumMwmId && vertexMwmId != targetMwmId) - e.GetWeight() += m_graph.GetCrossBorderPenalty(vertexMwmId, targetMwmId); - } - } } template diff --git a/routing/index_road_graph.cpp b/routing/index_road_graph.cpp index f228d4f83d..3bdf4911d7 100644 --- a/routing/index_road_graph.cpp +++ b/routing/index_road_graph.cpp @@ -10,10 +10,12 @@ #include #include +using namespace std; + namespace routing { -IndexRoadGraph::IndexRoadGraph(IndexGraphStarter & starter, std::vector const & segments, - std::vector const & junctions, +IndexRoadGraph::IndexRoadGraph(IndexGraphStarter & starter, vector const & segments, + vector const & junctions, MwmDataSource & dataSource) : m_dataSource(dataSource), m_starter(starter), m_segments(segments) { diff --git a/routing/index_router.cpp b/routing/index_router.cpp index d5f37aa242..25739400ad 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -871,51 +871,17 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode( return l.m_distance < r.m_distance; }); - // Additional heuristic to reduce number of candidates. - // Group candidates by category and accept no more than *2* routes of each. - // https://github.com/organicmaps/organicmaps/issues/2998 - // https://github.com/organicmaps/organicmaps/issues/3625 - class HighwayCategoryChecker - { - IndexGraphStarter const & m_starter; - std::array(HighwayCategory::Unknown)> m_curr, m_upper; - - public: - HighwayCategoryChecker(IndexGraphStarter const & starter) : m_starter(starter) - { - // Check Germany_Italy_Malcesine test when changing this constants. - // 2 - max number of leaps candidates per highway category. - m_curr.fill(0); - m_upper.fill(2); - } - bool operator()(Segment const & seg) - { - HighwayCategory const cat = m_starter.GetHighwayCategory(seg); - if (cat == HighwayCategory::Unknown) - return false; - - uint8_t const idx = static_cast(cat); - ASSERT_LESS(idx, m_curr.size(), ()); - return ++m_curr[idx] <= m_upper[idx]; - } - }; - keys[0].clear(); keys[1].clear(); - HighwayCategoryChecker checkers[2] = {starter, starter}; - for (auto & r : routes) { - Segment const * be[] = { &r.m_path[1], &r.m_path[r.m_path.size() - 2] }; - for (uint8_t idx = 0; idx < 2; ++idx) + auto const be = getBegEnd(r); + for (size_t idx = 0; idx < 2; ++idx) { - if (keys[idx].size() < kMaxVertices && - keys[idx].insert(be[idx]->GetFeatureId()).second && - checkers[idx](*be[idx])) + if (keys[idx].size() < kMaxVertices && keys[idx].insert(be[idx]).second) { - uint8_t const nextIdx = (idx + 1) % 2; - keys[nextIdx].insert(be[nextIdx]->GetFeatureId()); - checkers[nextIdx](*be[nextIdx]); + size_t const nextIdx = (idx + 1) % 2; + keys[nextIdx].insert(be[nextIdx]); candidates.push_back(std::move(r)); break; diff --git a/routing/mwm_hierarchy_handler.cpp b/routing/mwm_hierarchy_handler.cpp index a2e258ae8e..82277f4caf 100644 --- a/routing/mwm_hierarchy_handler.cpp +++ b/routing/mwm_hierarchy_handler.cpp @@ -20,7 +20,7 @@ std::unordered_set kSchengenArea = { "France", "Germany", "Greece", "Hungary", "Iceland", "Italy", "Latvia", "Liechtenstein", "Lithuania", "Luxembourg", "Malta", "Netherlands", "Norway", "Poland", "Portugal", "Slovakia", "Slovenia", "Spain", - "Sweden", "Switzerland", "Croatia" + "Sweden", "Switzerland" }; /// @return Top level hierarchy name for MWMs \a mwmName. diff --git a/routing/restrictions_serialization.cpp b/routing/restrictions_serialization.cpp index a8f7ce85ed..b09a305073 100644 --- a/routing/restrictions_serialization.cpp +++ b/routing/restrictions_serialization.cpp @@ -2,12 +2,14 @@ #include +using namespace std; + namespace { -char constexpr kNo[] = "No"; -char constexpr kOnly[] = "Only"; -char constexpr kNoUTurn[] = "NoUTurn"; -char constexpr kOnlyUTurn[] = "OnlyUTurn"; +char const kNo[] = "No"; +char const kOnly[] = "Only"; +char const kNoUTurn[] = "NoUTurn"; +char const kOnlyUTurn[] = "OnlyUTurn"; } // namespace namespace routing @@ -21,7 +23,7 @@ std::vector const RestrictionHeader::kRestrictionTypes = { }; // static -uint32_t const Restriction::kInvalidFeatureId = std::numeric_limits::max(); +uint32_t const Restriction::kInvalidFeatureId = numeric_limits::max(); bool Restriction::operator==(Restriction const & restriction) const { @@ -54,7 +56,7 @@ void RestrictionHeader::Reset() m_restrictionCount.emplace(type, 0); } -std::string DebugPrint(Restriction::Type const & type) +string DebugPrint(Restriction::Type const & type) { switch (type) { @@ -66,9 +68,9 @@ std::string DebugPrint(Restriction::Type const & type) return "Unknown"; } -std::string DebugPrint(Restriction const & restriction) +string DebugPrint(Restriction const & restriction) { - std::ostringstream out; + ostringstream out; out << "[" << DebugPrint(restriction.m_type) << "]: {"; for (size_t i = 0; i < restriction.m_featureIds.size(); ++i) { diff --git a/routing/road_access.cpp b/routing/road_access.cpp index 44df4a6a93..53c51bcb4c 100644 --- a/routing/road_access.cpp +++ b/routing/road_access.cpp @@ -6,12 +6,14 @@ #include #include +using namespace std; + namespace { -std::string const kNames[] = {"No", "Private", "Destination", "Yes", "Count"}; +string const kNames[] = {"No", "Private", "Destination", "Yes", "Count"}; template -void PrintKV(std::ostringstream & oss, KV const & kvs, size_t maxKVToShow) +void PrintKV(ostringstream & oss, KV const & kvs, size_t maxKVToShow) { size_t i = 0; for (auto const & kv : kvs) @@ -42,20 +44,20 @@ namespace routing */ RoadAccess::RoadAccess() : m_currentTimeGetter([]() { return GetCurrentTimestamp(); }) {} -std::pair RoadAccess::GetAccess( +pair RoadAccess::GetAccess( uint32_t featureId, RouteWeight const & weightToFeature) const { return GetAccess(featureId, weightToFeature.GetWeight()); } -std::pair RoadAccess::GetAccess( +pair RoadAccess::GetAccess( RoadPoint const & point, RouteWeight const & weightToPoint) const { return GetAccess(point, weightToPoint.GetWeight()); } -std::pair RoadAccess::GetAccess( - uint32_t featureId, double weight) const +pair RoadAccess::GetAccess(uint32_t featureId, + double weight) const { auto const itConditional = m_wayToAccessConditional.find(featureId); if (itConditional != m_wayToAccessConditional.cend()) @@ -73,8 +75,8 @@ std::pair RoadAccess::GetAccess( return GetAccessWithoutConditional(featureId); } -std::pair RoadAccess::GetAccess( - RoadPoint const & point, double weight) const +pair RoadAccess::GetAccess(RoadPoint const & point, + double weight) const { auto const itConditional = m_pointToAccessConditional.find(point); if (itConditional != m_pointToAccessConditional.cend()) @@ -92,7 +94,7 @@ std::pair RoadAccess::GetAccess( return GetAccessWithoutConditional(point); } -std::pair RoadAccess::GetAccessWithoutConditional( +pair RoadAccess::GetAccessWithoutConditional( uint32_t featureId) const { // todo(@m) This may or may not be too slow. Consider profiling this and using @@ -104,7 +106,7 @@ std::pair RoadAccess::GetAccessWithout return {Type::Yes, Confidence::Sure}; } -std::pair RoadAccess::GetAccessWithoutConditional( +pair RoadAccess::GetAccessWithoutConditional( RoadPoint const & point) const { auto const it = m_pointToAccess.find(point); @@ -122,7 +124,7 @@ bool RoadAccess::operator==(RoadAccess const & rhs) const } // static -std::optional RoadAccess::GetConfidenceForAccessConditional( +optional RoadAccess::GetConfidenceForAccessConditional( time_t momentInTime, osmoh::OpeningHours const & openingHours) { auto const left = momentInTime - kConfidenceIntervalSeconds / 2; @@ -132,7 +134,7 @@ std::optional RoadAccess::GetConfidenceForAccessConditio auto const rightOpen = openingHours.IsOpen(right); if (!leftOpen && !rightOpen) - return {}; + return nullopt; return leftOpen && rightOpen ? Confidence::Sure : Confidence::Maybe; } @@ -140,11 +142,11 @@ std::optional RoadAccess::GetConfidenceForAccessConditio // Functions --------------------------------------------------------------------------------------- time_t GetCurrentTimestamp() { - using system_clock = std::chrono::system_clock; + using system_clock = chrono::system_clock; return system_clock::to_time_t(system_clock::now()); } -std::string ToString(RoadAccess::Type type) +string ToString(RoadAccess::Type type) { if (type <= RoadAccess::Type::Count) return kNames[static_cast(type)]; @@ -152,7 +154,7 @@ std::string ToString(RoadAccess::Type type) return "Bad RoadAccess::Type"; } -void FromString(std::string_view s, RoadAccess::Type & result) +void FromString(string_view s, RoadAccess::Type & result) { for (size_t i = 0; i <= static_cast(RoadAccess::Type::Count); ++i) { @@ -166,9 +168,9 @@ void FromString(std::string_view s, RoadAccess::Type & result) CHECK(false, ("Could not read RoadAccess from the string", s)); } -std::string DebugPrint(RoadAccess::Conditional const & conditional) +string DebugPrint(RoadAccess::Conditional const & conditional) { - std::stringstream ss; + stringstream ss; ss << " { "; for (auto const & access : conditional.GetAccesses()) { @@ -178,7 +180,7 @@ std::string DebugPrint(RoadAccess::Conditional const & conditional) return ss.str(); } -std::string DebugPrint(RoadAccess::Confidence confidence) +string DebugPrint(RoadAccess::Confidence confidence) { switch (confidence) { @@ -188,12 +190,12 @@ std::string DebugPrint(RoadAccess::Confidence confidence) UNREACHABLE(); } -std::string DebugPrint(RoadAccess::Type type) { return ToString(type); } +string DebugPrint(RoadAccess::Type type) { return ToString(type); } -std::string DebugPrint(RoadAccess const & r) +string DebugPrint(RoadAccess const & r) { size_t const kMaxIdsToShow = 10; - std::ostringstream oss; + ostringstream oss; oss << "WayToAccess { FeatureTypes ["; PrintKV(oss, r.GetWayToAccess(), kMaxIdsToShow); oss << "], PointToAccess ["; diff --git a/routing/road_access.hpp b/routing/road_access.hpp index 88b6ffbdd8..84824210f4 100644 --- a/routing/road_access.hpp +++ b/routing/road_access.hpp @@ -1,10 +1,15 @@ #pragma once -#include "routing/road_point.hpp" -#include "routing/route_weight.hpp" +#include "routing/segment.hpp" +#include "routing/vehicle_mask.hpp" +#include "base/assert.hpp" + +#include #include #include +#include +#include #include #include "3party/skarupke/flat_hash_map.hpp" diff --git a/routing/road_access_serialization.hpp b/routing/road_access_serialization.hpp index 9af47dba14..d7e428ad85 100644 --- a/routing/road_access_serialization.hpp +++ b/routing/road_access_serialization.hpp @@ -13,6 +13,7 @@ #include "coding/bit_streams.hpp" #include "coding/reader.hpp" +#include "coding/sha1.hpp" #include "coding/varint.hpp" #include "coding/write_to_sink.hpp" @@ -21,9 +22,14 @@ #include #include +#include #include +#include +#include #include +#include "3party/skarupke/flat_hash_map.hpp" + namespace routing { class RoadAccessSerializer final diff --git a/routing/route_weight.cpp b/routing/route_weight.cpp index 8c75f3129a..fbb96632da 100644 --- a/routing/route_weight.cpp +++ b/routing/route_weight.cpp @@ -4,15 +4,17 @@ #include +using namespace std; + namespace { -template ::value, void>> +template ::value, void>> bool SumWillOverflow(Number lhs, Number rhs) { if (lhs > 0) - return rhs > std::numeric_limits::max() - lhs; + return rhs > numeric_limits::max() - lhs; if (lhs < 0) - return rhs < std::numeric_limits::min() - lhs; + return rhs < numeric_limits::min() - lhs; return false; } } // namespace @@ -47,8 +49,8 @@ RouteWeight RouteWeight::operator+(RouteWeight const & rhs) const RouteWeight RouteWeight::operator-(RouteWeight const & rhs) const { - ASSERT_NOT_EQUAL(m_numPassThroughChanges, std::numeric_limits::min(), ()); - ASSERT_NOT_EQUAL(m_numAccessChanges, std::numeric_limits::min(), ()); + ASSERT_NOT_EQUAL(m_numPassThroughChanges, numeric_limits::min(), ()); + ASSERT_NOT_EQUAL(m_numAccessChanges, numeric_limits::min(), ()); ASSERT( !SumWillOverflow(m_numPassThroughChanges, static_cast(-rhs.m_numPassThroughChanges)), (m_numPassThroughChanges, -rhs.m_numPassThroughChanges)); @@ -130,7 +132,7 @@ double RouteWeight::GetIntegratedWeight() const return res; } -std::ostream & operator<<(std::ostream & os, RouteWeight const & routeWeight) +ostream & operator<<(ostream & os, RouteWeight const & routeWeight) { os << "(" << static_cast(routeWeight.GetNumPassThroughChanges()) << ", " diff --git a/routing/routing_benchmarks/helpers.cpp b/routing/routing_benchmarks/helpers.cpp index ed9696c2e4..564c5c3762 100644 --- a/routing/routing_benchmarks/helpers.cpp +++ b/routing/routing_benchmarks/helpers.cpp @@ -27,6 +27,8 @@ #include #include +using namespace std; + namespace { m2::PointD GetPointOnEdge(routing::Edge const & e, double posAlong) @@ -41,17 +43,17 @@ m2::PointD GetPointOnEdge(routing::Edge const & e, double posAlong) } // namespace RoutingTest::RoutingTest(routing::IRoadGraph::Mode mode, routing::VehicleType type, - std::set const & neededMaps) - : m_mode(mode), m_type(type), m_neededMaps(neededMaps), m_numMwmIds(std::make_unique()) + set const & neededMaps) + : m_mode(mode), m_type(type), m_neededMaps(neededMaps), m_numMwmIds(make_unique()) { classificator::Load(); Platform & platform = GetPlatform(); m_cig = storage::CountryInfoReader::CreateCountryInfoGetter(platform); - platform::FindAllLocalMapsAndCleanup(std::numeric_limits::max(), m_localFiles); + platform::FindAllLocalMapsAndCleanup(numeric_limits::max(), m_localFiles); - std::set registeredMaps; + set registeredMaps; for (auto const & localFile : m_localFiles) { m_numMwmIds->RegisterFile(localFile.GetCountryFile()); @@ -105,11 +107,11 @@ void RoutingTest::TestRouters(m2::PointD const & startPos, m2::PointD const & fi void RoutingTest::TestTwoPointsOnFeature(m2::PointD const & startPos, m2::PointD const & finalPos) { - std::vector> startEdges; + vector> startEdges; GetNearestEdges(startPos, startEdges); TEST(!startEdges.empty(), ()); - std::vector> finalEdges; + vector> finalEdges; GetNearestEdges(finalPos, finalEdges); TEST(!finalEdges.empty(), ()); @@ -121,9 +123,9 @@ void RoutingTest::TestTwoPointsOnFeature(m2::PointD const & startPos, m2::PointD TestRouters(startPosOnFeature, finalPosOnFeature); } -std::unique_ptr RoutingTest::CreateRouter(std::string const & name) +unique_ptr RoutingTest::CreateRouter(string const & name) { - std::vector neededLocalFiles; + vector neededLocalFiles; neededLocalFiles.reserve(m_neededMaps.size()); for (auto const & file : m_localFiles) { @@ -131,13 +133,13 @@ std::unique_ptr RoutingTest::CreateRouter(std::string const & neededLocalFiles.push_back(file); } - std::unique_ptr router = integration::CreateVehicleRouter( + unique_ptr router = integration::CreateVehicleRouter( m_dataSource, *m_cig, m_trafficCache, neededLocalFiles, m_type); return router; } void RoutingTest::GetNearestEdges(m2::PointD const & pt, - std::vector> & edges) + vector> & edges) { routing::MwmDataSource dataSource(m_dataSource, nullptr /* numMwmIDs */); routing::FeaturesRoadGraph graph(dataSource, m_mode, CreateModelFactory()); diff --git a/routing/routing_callbacks.hpp b/routing/routing_callbacks.hpp index 2d444e3836..cc61da5afa 100644 --- a/routing/routing_callbacks.hpp +++ b/routing/routing_callbacks.hpp @@ -108,7 +108,7 @@ inline std::string ToString(RouterResultCode code) case RouterResultCode::HasWarnings: return "HasWarnings"; } - std::string result = "Unknown RouterResultCode: " + std::to_string(static_cast(code)); + std::string const result = "Unknown RouterResultCode: " + std::to_string(static_cast(code)); ASSERT(false, (result)); return result; } diff --git a/routing/routing_consistency_tests/routing_consistency_tests.cpp b/routing/routing_consistency_tests/routing_consistency_tests.cpp index 60f2e9318d..c8929e8b3e 100644 --- a/routing/routing_consistency_tests/routing_consistency_tests.cpp +++ b/routing/routing_consistency_tests/routing_consistency_tests.cpp @@ -18,7 +18,7 @@ #include "gflags/gflags.h" -namespace routing_consistency_tests +namespace testingmain { using namespace routing; using namespace std; @@ -194,6 +194,6 @@ int RunRoutingConsistencyTests(int argc, char ** argv) return 0; } -} // namespace testingmain routing_consistency_tests +} // namespace testingmain -int main(int argc, char ** argv) { return ::routing_consistency_tests::RunRoutingConsistencyTests(argc, argv); } +int main(int argc, char ** argv) { return ::testingmain::RunRoutingConsistencyTests(argc, argv); } diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp index 576660bae7..435db58f62 100644 --- a/routing/routing_helpers.hpp +++ b/routing/routing_helpers.hpp @@ -8,8 +8,6 @@ #include "routing_common/car_model.hpp" #include "routing_common/pedestrian_model.hpp" -#include "indexer/classificator.hpp" - #include "geometry/point_with_altitude.hpp" #include "geometry/rect2d.hpp" #include "geometry/segment2d.hpp" @@ -45,18 +43,8 @@ bool IsBicycleRoad(Types const & types) template bool IsRoad(Types const & types) { - if (IsCarRoad(types)) - return true; - - if (PedestrianModel::AllLimitsInstance().HasRoadType(types) || IsBicycleRoad(types)) - { - // https://github.com/organicmaps/organicmaps/issues/3929 - // In case when road has pedestrian/bicycle=designated + highway=construction types. - static uint32_t const constructionType = classif().GetTypeByPath({"highway", "construction"}); - return !base::IsExist(types, constructionType); - } - - return false; + return IsCarRoad(types) || PedestrianModel::AllLimitsInstance().HasRoadType(types) || + IsBicycleRoad(types); } void FillSegmentInfo(std::vector const & times, std::vector & routeSegments); diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/routing/routing_integration_tests/bicycle_route_test.cpp index 6cb69238c1..4ee90b7654 100644 --- a/routing/routing_integration_tests/bicycle_route_test.cpp +++ b/routing/routing_integration_tests/bicycle_route_test.cpp @@ -6,6 +6,7 @@ #include "geometry/mercator.hpp" +#include "base/math.hpp" namespace bicycle_route_test { @@ -57,12 +58,15 @@ UNIT_TEST(NetherlandsAmsterdamBicycleNo) UNIT_TEST(NetherlandsAmsterdamBicycleYes) { - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), + TRouteResult const routeResult = + CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(52.32872, 5.07527), {0.0, 0.0}, mercator::FromLatLon(52.33853, 5.08941)); - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - TestRouteTime(*routeResult.first, 296.487); + Route const & route = *routeResult.first; + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + TEST_ALMOST_EQUAL_ABS(route.GetTotalTimeSec(), 336.0, 10.0, ()); } // This test on tag cycleway=opposite for a streets which have oneway=yes. @@ -140,25 +144,21 @@ UNIT_TEST(CrossMwmKaliningradRegionToLiepaja) // Test on riding up from Adeje (sea level) to Vilaflor (altitude 1400 meters). UNIT_TEST(SpainTenerifeAdejeVilaflor) { - TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(28.11984, -16.72592), {0., 0.}, - mercator::FromLatLon(28.15865, -16.63704)); - TEST_EQUAL(res.second, RouterResultCode::NoError, ()); - - TestRouteLength(*res.first, 26997.4); - TestRouteTime(*res.first, 11017.5); + // Route length: 30440 meters. ETA: 10022.6 seconds. + // Can't say ETA is good or not, but avg speed is 3m/s, which looks ok. + integration::CalculateRouteAndTestRouteTime( + integration::GetVehicleComponents(VehicleType::Bicycle), + mercator::FromLatLon(28.11984, -16.72592), {0.0, 0.0}, + mercator::FromLatLon(28.15865, -16.63704), 10022.6 /* expectedTimeSeconds */); } // Test on riding down from Vilaflor (altitude 1400 meters) to Adeje (sea level). UNIT_TEST(SpainTenerifeVilaflorAdeje) { - TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(28.15865, -16.63704), {0., 0.}, - mercator::FromLatLon(28.11984, -16.72592)); - TEST_EQUAL(res.second, RouterResultCode::NoError, ()); - - TestRouteLength(*res.first, 25413.6); - TestRouteTime(*res.first, 4974.78); + integration::CalculateRouteAndTestRouteTime( + integration::GetVehicleComponents(VehicleType::Bicycle), + mercator::FromLatLon(28.15865, -16.63704), {0.0, 0.0}, + mercator::FromLatLon(28.11984, -16.72592), 7979.9 /* expectedTimeSeconds */); } // Two tests on not building route against traffic on road with oneway:bicycle=yes. @@ -173,7 +173,8 @@ UNIT_TEST(Munich_OnewayBicycle1) UNIT_TEST(Munich_OnewayBicycle2) { - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(48.17819, 11.57286), {0.0, 0.0}, mercator::FromLatLon(48.17867, 11.57303), 201.532 /* expectedRouteMeters */); } @@ -182,50 +183,9 @@ UNIT_TEST(Munich_OnewayBicycle2) UNIT_TEST(London_GreenwichTunnel) { // Avoiding barrier=gate https://www.openstreetmap.org/node/3881243716 - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(51.4817397, -0.0100070258), {0.0, 0.0}, mercator::FromLatLon(51.4883739, -0.00809729298), 1332.8 /* expectedRouteMeters */); } - -UNIT_TEST(Batumi_AvoidServiceDetour) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(41.6380014, 41.6269446), {0.0, 0.0}, - mercator::FromLatLon(41.6392113, 41.6260084), 156.465 /* expectedRouteMeters */); -} - -UNIT_TEST(Gdansk_AvoidLongCyclewayDetour) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(54.2632738, 18.6771661), {0.0, 0.0}, - mercator::FromLatLon(54.2698882, 18.6765837), 753.837 /* expectedRouteMeters */); -} - -// https://github.com/organicmaps/organicmaps/issues/4145 -UNIT_TEST(Belarus_StraightFootway) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(53.8670285, 30.3162749), {0.0, 0.0}, - mercator::FromLatLon(53.876436, 30.3348084), 1613.34 /* expectedRouteMeters */); -} - -UNIT_TEST(Spain_Madrid_ElevationsDetour) -{ - TRouteResult const r1 = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(40.459616, -3.690031), {0., 0.}, - mercator::FromLatLon(40.4408171, -3.69261893)); - TEST_EQUAL(r1.second, RouterResultCode::NoError, ()); - - TRouteResult const r2 = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(40.459616, -3.690031), {0., 0.}, - mercator::FromLatLon(40.4403523, -3.69267444)); - TEST_EQUAL(r2.second, RouterResultCode::NoError, ()); - - TEST(r1.first && r2.first, ()); - - // The first route is 50% shorter, but the second one is better by ETA because of elevation. - // Can't say for sure is it ok or not, so this test may fail in future. - TEST_LESS(r1.first->GetTotalDistanceMeters() * 1.5, r2.first->GetTotalDistanceMeters(), ()); - TEST_GREATER(r1.first->GetTotalTimeSec(), r2.first->GetTotalTimeSec(), ()); -} } // namespace bicycle_route_test diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/routing/routing_integration_tests/bicycle_turn_test.cpp index 9e4282c688..4966aad734 100644 --- a/routing/routing_integration_tests/bicycle_turn_test.cpp +++ b/routing/routing_integration_tests/bicycle_turn_test.cpp @@ -82,9 +82,8 @@ UNIT_TEST(RussiaMoscowSalameiNerisPossibleTurnCorrectionBicycleWayTurnTest) UNIT_TEST(Russia_Moscow_SalameiNerisNoUTurnBicycleWay_TurnTest) { - using namespace integration; - - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.85854, 37.36795), {0.0, 0.0}, mercator::FromLatLon(55.85765, 37.36793)); @@ -92,22 +91,19 @@ UNIT_TEST(Russia_Moscow_SalameiNerisNoUTurnBicycleWay_TurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - /// @todo This route goes not as expected after adding surface=ground into nearby paths. - TestRouteLength(route, 252.735); + /// @note This route goes not as expected after adding surface=ground here: + /// https://www.openstreetmap.org/way/605548369. - // Expected 1. + // Test for unexpected but factual route. + integration::TestTurnCount(route, 3 /* expectedTurnCount */); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); + // Test for expected but not factual route. /* - TestTurnCount(route, 3); - GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); - GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnRight); - GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); - */ - - // Expected 2. - /* - TestTurnCount(route, 2); - GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnLeft); - GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); + integration::TestTurnCount(route, 2); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnLeft); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); */ } @@ -180,13 +176,13 @@ UNIT_TEST(TurnsNearAltufievskoeShosseLongFakeSegmentTest) TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.91569, 37.58972), {0.0, 0.0}, - mercator::FromLatLon(55.9162315, 37.5861694)); + mercator::FromLatLon(55.91608, 37.58614)); Route const & route = *routeResult.first; RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 5 /* expectedTurnCount */); + integration::TestTurnCount(route, 3 /* expectedTurnCount */); // Complicated case. // RoutingEngineResult::GetPossibleTurns at (turn_m_index == 3) @@ -196,10 +192,8 @@ UNIT_TEST(TurnsNearAltufievskoeShosseLongFakeSegmentTest) integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); - integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightLeft); - integration::GetNthTurn(route, 4).TestValid().TestDirection(CarDirection::TurnLeft); - integration::TestRouteLength(route, 273.384); + integration::TestRouteLength(route, 289.784); } UNIT_TEST(TurnsNearMoscowRiverShortFakeSegmentTest) @@ -224,9 +218,8 @@ UNIT_TEST(TurnsNearMoscowRiverShortFakeSegmentTest) UNIT_TEST(TurnsNearMKAD85kmShortFakeSegmentTest) { - using namespace integration; - - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.91788, 37.58603), {0.0, 0.0}, mercator::FromLatLon(55.91684, 37.57884)); @@ -234,23 +227,18 @@ UNIT_TEST(TurnsNearMKAD85kmShortFakeSegmentTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - TestRouteLength(route, 1700); + integration::TestTurnCount(route, 9 /* expectedTurnCount */); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); + integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::EnterRoundAbout); + integration::GetNthTurn(route, 4).TestValid().TestDirection(CarDirection::LeaveRoundAbout); + integration::GetNthTurn(route, 5).TestValid().TestDirection(CarDirection::EnterRoundAbout); + integration::GetNthTurn(route, 6).TestValid().TestDirection(CarDirection::LeaveRoundAbout); + integration::GetNthTurn(route, 7).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 8).TestValid().TestDirection(CarDirection::TurnLeft); - TestTurnCount(route, 9); - GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); - GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::GoStraight); // Fix after "small segment" below. - GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); - GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::EnterRoundAbout); - GetNthTurn(route, 4).TestValid().TestDirection(CarDirection::LeaveRoundAbout); - GetNthTurn(route, 5).TestValid().TestDirection(CarDirection::EnterRoundAbout); - GetNthTurn(route, 6).TestValid().TestDirection(CarDirection::LeaveRoundAbout); - GetNthTurn(route, 7).TestValid().TestDirection(CarDirection::TurnRight); - GetNthTurn(route, 8).TestValid().TestDirection(CarDirection::TurnLeft); - - /// @todo Should fix this small segment. - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(55.9164647, 37.5862981), {0.0, 0.0}, - mercator::FromLatLon(55.9147746, 37.5852526), 200, 0.005); + integration::TestRouteLength(route, 1704.21); } UNIT_TEST(TurnsNearKhladkombinatTest) @@ -264,12 +252,11 @@ UNIT_TEST(TurnsNearKhladkombinatTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestRouteLength(route, 478.295); + integration::TestTurnCount(route, 2 /* expectedTurnCount */); - integration::TestTurnCount(route, 3 /* expectedTurnCount */); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnLeft); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnRight); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); - integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); - integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); + integration::TestRouteLength(route, 484.3); } } // namespace bicycle_turn_test diff --git a/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp b/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp index de712aa44f..0bea971ed2 100644 --- a/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp +++ b/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp @@ -21,7 +21,7 @@ #include #include -namespace concurrent_feature_parsing_test +namespace { using namespace platform; using namespace std; @@ -102,4 +102,4 @@ UNIT_TEST(ConcurrentFeatureParsingTest) for (auto const & mwm : mwms) TestConcurrentAccessToFeatures(mwm); } -} // namespace concurrent_feature_parsing_test +} // namespace diff --git a/routing/routing_integration_tests/guides_tests.cpp b/routing/routing_integration_tests/guides_tests.cpp index c670edd7cf..6e456a908c 100644 --- a/routing/routing_integration_tests/guides_tests.cpp +++ b/routing/routing_integration_tests/guides_tests.cpp @@ -5,6 +5,8 @@ #include "routing/route.hpp" #include "routing/routing_callbacks.hpp" +#include "geometry/latlon.hpp" + #include namespace guides_tests @@ -67,9 +69,9 @@ UNIT_TEST(Guides_TwoPointsOnTrackOneViaOsm) Checkpoints const checkpoints{mercator::FromLatLon(48.13998, 11.56982), mercator::FromLatLon(48.14448, 11.57259)}; - double const expectedDistM = 788.681; - double const expectedTimeS = 903.3; - size_t const expectedPointsCount = 13; + double const expectedDistM = 702.4; + double const expectedTimeS = 821.6; + size_t const expectedPointsCount = 11; TestGuideRoute(checkpoints, expectedDistM, expectedTimeS, expectedPointsCount); ReverseCheckpoints(checkpoints); @@ -84,7 +86,7 @@ UNIT_TEST(Guides_FinishPointOnTrack) Checkpoints const checkpoints{mercator::FromLatLon(48.1394659, 11.575924), mercator::FromLatLon(48.1407632, 11.5716992)}; - TestGuideRoute(checkpoints, 840.1 /* expectedDistM */, 762.098 /* expectedTimeS */, 37 /* expectedPointsCount */); + TestGuideRoute(checkpoints, 840.1 /* expectedDistM */, 771.3 /* expectedTimeS */, 37 /* expectedPointsCount */); } // Start checkpoint is on the track, finish checkpoint is far away. We build the first part of the @@ -105,6 +107,6 @@ UNIT_TEST(Guides_MultipleIntermediatePoints) mercator::FromLatLon(48.14192, 11.57548), mercator::FromLatLon(48.14106, 11.57279), mercator::FromLatLon(48.14044, 11.57061)}); - TestGuideRoute(checkpoints, 1258.05 /* expectedDistM */, 1076.53 /* expectedTimeS */, 66 /* expectedPointsCount */); + TestGuideRoute(checkpoints, 1258.05 /* expectedDistM */, 1094.78 /* expectedTimeS */, 66 /* expectedPointsCount */); } } // namespace guides_tests diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/routing/routing_integration_tests/pedestrian_route_test.cpp index 287cd3f841..e299e36dd0 100644 --- a/routing/routing_integration_tests/pedestrian_route_test.cpp +++ b/routing/routing_integration_tests/pedestrian_route_test.cpp @@ -74,10 +74,12 @@ UNIT_TEST(Zgrad315parkingToMusicSchoolBus_BadRoute) UNIT_TEST(Zgrad924aToKrukovo) { + // New valid distance here (OSRM makes the same route). + // Connect this footway? https://www.openstreetmap.org/way/970708358#map=19/55.98064/37.17245 integration::CalculateRouteAndTestRouteLength( integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(55.9844, 37.1808), {0., 0.}, - mercator::FromLatLon(55.9802, 37.1736), 1305.48); + mercator::FromLatLon(55.9802, 37.1736), 2461.); } UNIT_TEST(MoscowMailRuStarbucksToPetrovskoRazumovskyAlley) @@ -587,9 +589,9 @@ UNIT_TEST(NoTurnOnForkingRoad2_TurnTest) integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(55.68336, 37.49492), {0.0, 0.0}, mercator::FromLatLon(55.68488, 37.49789)); - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - TEST(routeResult.first, ()); Route const & route = *routeResult.first; + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); integration::TestRouteLength(route, 300.0); @@ -602,66 +604,3 @@ UNIT_TEST(NoTurnOnForkingRoad2_TurnTest) TEST_EQUAL(t[0].m_pedestrianTurn, PedestrianDirection::TurnRight, ()); TEST_EQUAL(t[1].m_pedestrianTurn, PedestrianDirection::TurnRight, ()); } - -UNIT_TEST(Hungary_UseFootways) -{ - integration::CalculateRouteAndTestRouteLength( - integration::GetVehicleComponents(VehicleType::Pedestrian), - mercator::FromLatLon(45.8587043, 18.2863972), {0., 0.}, - mercator::FromLatLon(45.858625, 18.285348), 95.7657, 0.02 /* relativeError */); -} - -UNIT_TEST(France_Uphill_Downlhill) -{ - using namespace integration; - using mercator::FromLatLon; - - double timeDownhill, timeUphill; - { - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian), - FromLatLon(45.32111, 3.69535), {0., 0.}, - FromLatLon(45.235327, 3.857533)); - - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - - TestRouteLength(route, 20947.5); - timeDownhill = route.GetTotalTimeSec(); - TEST_GREATER(timeDownhill, 4 * 3600, ()); - } - - { - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian), - FromLatLon(45.235327, 3.857533), {0., 0.}, - FromLatLon(45.32111, 3.69535)); - - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - - TestRouteLength(route, 20947.5); - timeUphill = route.GetTotalTimeSec(); - TEST_GREATER(timeUphill, 4 * 3600, ()); - } - - TEST_GREATER(timeUphill - timeDownhill, 1000, ()); -} - -// https://github.com/organicmaps/organicmaps/issues/1342 -UNIT_TEST(Crimea_Altitude_Mountains) -{ - integration::CalculateRouteAndTestRouteLength( - integration::GetVehicleComponents(VehicleType::Pedestrian), - mercator::FromLatLon(44.7600296, 34.3247698), {0., 0.}, - mercator::FromLatLon(44.7632754, 34.313077), 1303.43); -} - -// https://github.com/organicmaps/organicmaps/issues/2803 -UNIT_TEST(Italy_Rome_Altitude_Footway) -{ - integration::CalculateRouteAndTestRouteLength( - integration::GetVehicleComponents(VehicleType::Pedestrian), - mercator::FromLatLon(41.899384, 12.4980887), {0., 0.}, - mercator::FromLatLon(41.9007759, 12.4994956), 203.861); -} diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp index 5fc1d36462..3f505fa63c 100644 --- a/routing/routing_integration_tests/route_test.cpp +++ b/routing/routing_integration_tests/route_test.cpp @@ -12,789 +12,759 @@ namespace route_test { using namespace routing; -using namespace integration; -using mercator::FromLatLon; +using namespace std; -UNIT_TEST(StrangeCaseInAfrica) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(19.20789, 30.50663), {0., 0.}, - FromLatLon(19.17289, 30.47315), 7645.0); -} + UNIT_TEST(StrangeCaseInAfrica) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(19.20789, 30.50663), {0., 0.}, + mercator::FromLatLon(19.17289, 30.47315), 7645.0); + } -UNIT_TEST(MoscowKashirskoeShosseCrossing) -{ - // OSRM agrees here: https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.66216%2C37.63259%3B55.66237%2C37.63560 - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.66216, 37.63259), {0., 0.}, - FromLatLon(55.66237, 37.63560), 2877.81); -} + UNIT_TEST(MoscowKashirskoeShosseCrossing) + { + // OSRM agrees here: https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.66216%2C37.63259%3B55.66237%2C37.63560 + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.66216, 37.63259), {0., 0.}, + mercator::FromLatLon(55.66237, 37.63560), 2877.81); + } -UNIT_TEST(MoscowToSVOAirport) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.75100, 37.61790), {0.0, 0.0}, - FromLatLon(55.97310, 37.41460), 37284.0); + UNIT_TEST(MoscowToSVOAirport) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.75100, 37.61790), {0.0, 0.0}, + mercator::FromLatLon(55.97310, 37.41460), 37284.0); + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.97310, 37.41460), {0.0, 0.0}, + mercator::FromLatLon(55.75100, 37.61790), 39129.8); + } - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.97310, 37.41460), {0.0, 0.0}, - FromLatLon(55.75100, 37.61790), 39129.8); -} + // Restrictions tests. Check restrictions generation, if there are any errors. + UNIT_TEST(RestrictionTestNeatBaumanAndTTK) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.77398, 37.68469), {0., 0.}, + mercator::FromLatLon(55.77201, 37.68789), 1032.); + } -// Restrictions tests. Check restrictions generation, if there are any errors. -UNIT_TEST(RestrictionTestNeatBaumanAndTTK) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.77398, 37.68469), {0., 0.}, - FromLatLon(55.77201, 37.68789), 1032.); -} + UNIT_TEST(RestrictionTestNearMetroShodnenskaya) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.85043, 37.43824), {0., 0.}, + mercator::FromLatLon(55.85191, 37.43910), 510.); + } -UNIT_TEST(RestrictionTestNearMetroShodnenskaya) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.85043, 37.43824), {0., 0.}, - FromLatLon(55.85191, 37.43910), 510.); -} + // Strange asserts near Cupertino test + UNIT_TEST(CaliforniaCupertinoFindPhantomAssertTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(37.33409, -122.03458), {0., 0.}, + mercator::FromLatLon(37.33498, -122.03575), 1438.); + } -// Strange asserts near Cupertino test -UNIT_TEST(CaliforniaCupertinoFindPhantomAssertTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(37.33409, -122.03458), {0., 0.}, - FromLatLon(37.33498, -122.03575), 1438.); -} + // Path in the last map through the other map. + UNIT_TEST(RussiaUfaToUstKatavTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(54.7304, 55.9554), {0., 0.}, mercator::FromLatLon(54.9228, 58.1469), 164667.); + } -// Path in the last map through the other map. -UNIT_TEST(RussiaUfaToUstKatavTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(54.7304, 55.9554), {0., 0.}, - FromLatLon(54.9228, 58.1469), 164667.); -} + UNIT_TEST(RussiaMoscowNoServiceCrossing) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.77787, 37.70405), {0., 0.}, + mercator::FromLatLon(55.77682, 37.70391), 3140.); + } -UNIT_TEST(RussiaMoscowNoServiceCrossing) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.77787, 37.70405), {0., 0.}, - FromLatLon(55.77682, 37.70391), 3140.); -} + UNIT_TEST(RussiaMoscowShortWayToService) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.77787, 37.70405), {0., 0.}, + mercator::FromLatLon(55.77691, 37.70428), 171.); + } -UNIT_TEST(RussiaMoscowShortWayToService) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.77787, 37.70405), {0., 0.}, - FromLatLon(55.77691, 37.70428), 171.); -} + UNIT_TEST(PriceIslandLoadCrossGeometryTest) + { + size_t constexpr kExpectedPointsNumber = 56; + // Forward + TRouteResult route = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(46.16255, -63.81643), {0., 0.}, + mercator::FromLatLon(46.25401, -63.70213)); + TEST_EQUAL(route.second, RouterResultCode::NoError, ()); + CHECK(route.first, ()); + integration::TestRoutePointsNumber(*route.first, kExpectedPointsNumber); + // And backward case + route = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(46.25401, -63.70213), {0., 0.}, + mercator::FromLatLon(46.16255, -63.81643)); + TEST_EQUAL(route.second, RouterResultCode::NoError, ()); + CHECK(route.first, ()); + integration::TestRoutePointsNumber(*route.first, kExpectedPointsNumber); + } -UNIT_TEST(PriceIslandLoadCrossGeometryTest) -{ - size_t constexpr kExpectedPointsNumber = 56; - // Forward - TRouteResult route = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(46.16255, -63.81643), {0., 0.}, - FromLatLon(46.25401, -63.70213)); - TEST_EQUAL(route.second, RouterResultCode::NoError, ()); - TEST(route.first, ()); - TestRoutePointsNumber(*route.first, kExpectedPointsNumber); + // Cross mwm tests. + UNIT_TEST(RussiaMoscowLeningradskiy39GerPanfilovtsev22RouteTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + {37.53758809983519, 67.536162466434234}, {0., 0.}, {37.40993977728661, 67.644784047393685}, + 14296.); + } - // And backward case - route = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(46.25401, -63.70213), {0., 0.}, - FromLatLon(46.16255, -63.81643)); - TEST_EQUAL(route.second, RouterResultCode::NoError, ()); - TEST(route.first, ()); - TestRoutePointsNumber(*route.first, kExpectedPointsNumber); -} + UNIT_TEST(NederlandLeeuwardenToDenOeverTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(53.2076, 5.7082), {0., 0.}, mercator::FromLatLon(52.9337, 5.0308), 59500.); + } -// Cross mwm tests. -UNIT_TEST(RussiaMoscowLeningradskiy39GerPanfilovtsev22RouteTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - {37.53758809983519, 67.536162466434234}, {0., 0.}, {37.40993977728661, 67.644784047393685}, - 14296.); -} + UNIT_TEST(RussiaMoscowGerPanfilovtsev22SolodchaPravdiRouteTest) + { + // OSRM agrees here to use motorways instead of city roads. + // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.858%2C37.410%3B54.794%2C39.837 + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.85792, 37.40992), {0., 0.}, + mercator::FromLatLon(54.79390, 39.83656), 263920.); + } -UNIT_TEST(NederlandLeeuwardenToDenOeverTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(53.2076, 5.7082), {0., 0.}, - FromLatLon(52.9337, 5.0308), 59500.); -} + UNIT_TEST(RussiaMoscowBelarusMinsk) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.750650, 37.617673), {0., 0.}, + mercator::FromLatLon(53.902114, 27.562020), 712649.0); + } -UNIT_TEST(RussiaMoscowGerPanfilovtsev22SolodchaPravdiRouteTest) -{ - // OSRM agrees here to use motorways instead of city roads. - // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.858%2C37.410%3B54.794%2C39.837 - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.85792, 37.40992), {0., 0.}, - FromLatLon(54.79390, 39.83656), 263920.); -} + UNIT_TEST(UKRugbyStIvesRouteTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(52.37076, -1.26530), {0., 0.}, + mercator::FromLatLon(50.21480, -5.47994), 455902.); + } -UNIT_TEST(RussiaMoscowBelarusMinsk) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.750650, 37.617673), {0., 0.}, - FromLatLon(53.902114, 27.562020), 712649.0); -} + UNIT_TEST(RussiaMoscow_ItalySienaCenter_SplittedMotorway) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.79690, 37.53759), {0., 0.}, + mercator::FromLatLon(43.32677, 11.32792), 2870710.); + } -UNIT_TEST(UKRugbyStIvesRouteTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(52.37076, -1.26530), {0., 0.}, - FromLatLon(50.21480, -5.47994), 455902.); -} + UNIT_TEST(PeruSingleRoadTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(-14.22061, -73.35969), {0., 0.}, + mercator::FromLatLon(-14.22389, -73.44281), 15900.); + } -UNIT_TEST(RussiaMoscow_ItalySienaCenter_SplittedMotorway) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.79690, 37.53759), {0., 0.}, - FromLatLon(43.32677, 11.32792), 2870710.); -} + UNIT_TEST(RussiaMoscowFranceParisCenterRouteTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.75271, 37.62618), {0., 0.}, mercator::FromLatLon(48.86123, 2.34129), 2840940.); + } -UNIT_TEST(PeruSingleRoadTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(-14.22061, -73.35969), {0., 0.}, - FromLatLon(-14.22389, -73.44281), 15900.); -} + UNIT_TEST(EnglandToFranceRouteLeMansTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(51.09276, 1.11369), {0., 0.}, mercator::FromLatLon(50.93227, 1.82725), 64755.6); + } -UNIT_TEST(RussiaMoscowFranceParisCenterRouteTest) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.75271, 37.62618), {0., 0.}, FromLatLon(48.86123, 2.34129), 2840940.); -} + UNIT_TEST(RussiaMoscowStartAtTwowayFeatureTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(55.771, 37.5184), {0., 0.}, mercator::FromLatLon(55.7718, 37.5178), 147.4); + } -UNIT_TEST(EnglandToFranceRouteLeMansTest) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(51.09276, 1.11369), {0., 0.}, FromLatLon(50.93227, 1.82725), 64755.6); -} + UNIT_TEST(RussiaMoscowRegionToBelarusBorder) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.464182, 35.943947), {0.0, 0.0}, + mercator::FromLatLon(52.442467, 31.609642), 554000.); + } -UNIT_TEST(RussiaMoscowStartAtTwowayFeatureTest) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.771, 37.5184), {0., 0.}, FromLatLon(55.7718, 37.5178), 147.4); -} + UNIT_TEST(GermanyToTallinCrossMwmRoute) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(48.397416, 16.515289), {0.0, 0.0}, + mercator::FromLatLon(59.437214, 24.745355), 1650000.); + } -UNIT_TEST(RussiaMoscowRegionToBelarusBorder) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.464182, 35.943947), {0.0, 0.0}, - FromLatLon(52.442467, 31.609642), 554000.); -} + // Strange map edits in Africa borders. Routing not linked now. + /* + UNIT_TEST(RussiaMoscowLenigradskiy39RepublicOfSouthAfricaCapeTownCenterRouteTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.79721, 37.53786), {0., 0.}, + mercator::FromLatLon(-33.9286, 18.41837), 13701400.0); + } + */ -UNIT_TEST(GermanyToTallinCrossMwmRoute) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(48.397416, 16.515289), {0.0, 0.0}, - FromLatLon(59.437214, 24.745355), 1650000.); -} + UNIT_TEST(MoroccoToSahrawiCrossMwmTest) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(27.15587, -13.23059), {0., 0.}, + mercator::FromLatLon(27.94049, -12.88800), 100864); + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(27.94049, -12.88800), {0., 0.}, + mercator::FromLatLon(27.15587, -13.23059), 100864); + } -// Strange map edits in Africa borders. Routing not linked now. + UNIT_TEST(AlbaniaToMontenegroCrossTest) + { + // Road from Albania to Montenegro. Test turnaround finding at border (when start/stop + // points are inside borders and one of segments has outside points). + // Forward + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(42.01535, 19.40044), {0., 0.}, + mercator::FromLatLon(42.01201, 19.36286), 3674.); + // And backward case + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(42.01201, 19.36286), {0., 0.}, + mercator::FromLatLon(42.01535, 19.40044), 3674.); + } + + UNIT_TEST(CanadaBridgeCrossToEdwardIsland) + { + // Forward + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(46.13418, -63.84656), {0., 0.}, + mercator::FromLatLon(46.26739, -63.63907), 23000.); + // And backward case + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(46.26739, -63.63907), {0., 0.}, + mercator::FromLatLon(46.13418, -63.84656), 23000.); + } + + UNIT_TEST(ParisCrossDestinationInForwardHeapCase) + { + // Forward + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(49.85015, 2.24296), {0., 0.}, mercator::FromLatLon(48.85458, 2.36291), 127162.0); + // And backward case + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(48.85458, 2.36291), {0., 0.}, mercator::FromLatLon(49.85027, 2.24283), 137009.0); + } + + UNIT_TEST(RussiaSmolenskRussiaMoscowTimeTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(54.7998, 32.05489), {0., 0.}, mercator::FromLatLon(55.753, 37.60169)); + + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + integration::TestRouteTime(route, 18045.9); + } + + UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22TimeTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.7971, 37.53804), {0., 0.}, mercator::FromLatLon(55.8579, 37.40990)); + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + integration::TestRouteTime(route, 1044.42); + } + + UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22SubrouteTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.7971, 37.53804), {0., 0.}, mercator::FromLatLon(55.8579, 37.40990)); + + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + TEST_EQUAL(route.GetSubrouteCount(), 1, ()); + vector info; + route.GetSubrouteInfo(0, info); + TEST_EQUAL(route.GetPoly().GetSize(), info.size() + 1, ()); + size_t constexpr kExpectedPointsNumber = 335; + integration::TestRoutePointsNumber(route, kExpectedPointsNumber); + } + + UNIT_TEST(USALosAnglesAriaTwentyninePalmsHighwayTimeTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(34.0739, -115.3212), {0.0, 0.0}, + mercator::FromLatLon(34.0928, -115.5930)); + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + TEST_LESS(route.GetTotalTimeSec(), numeric_limits::max() / 2.0, ()); + } + + // Test on routing along features with tag man_made:pier. + UNIT_TEST(CanadaVictoriaVancouverTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(48.47831, -123.32749), {0.0, 0.0}, + mercator::FromLatLon(49.26242, -123.11553)); + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + } + + // Test on the route with the finish near zero length edge. + UNIT_TEST(BelarusSlonimFinishNearZeroEdgeTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(53.08279, 25.30036), {0.0, 0.0}, + mercator::FromLatLon(53.09443, 25.34356)); + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + } + + // Test on the route with the start near zero length edge. + UNIT_TEST(BelarusSlonimStartNearZeroEdgeTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(53.09422, 25.34411), {0.0, 0.0}, + mercator::FromLatLon(53.09271, 25.3467)); + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + } + + // Test on roads with tag maxspeed=none. + UNIT_TEST(GermanyBerlinMunichTimeTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(52.51172, 13.39468), {0., 0.}, + mercator::FromLatLon(48.13294, 11.60352)); + + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + integration::TestRouteTime(route, 19053.0); + } + + // Test on roads with tag route=shuttle_train. This train has defined maxspeed=100. + UNIT_TEST(GermanyShuttleTrainTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(54.78370, 8.83528), {0., 0.}, mercator::FromLatLon(54.91681, 8.31346)); + + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + integration::TestRouteLength(route, 44116.7); + integration::TestRouteTime(route, 2509.81); + } + + UNIT_TEST(TolyattiFeatureThatCrossSeveralMwmsTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(52.67316, 48.22478), {0., 0.}, + mercator::FromLatLon(53.49143, 49.52386)); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + + integration::TestRouteTime(route, 8102.0); + } + + // Test on removing speed cameras from the route for maps from Jan 2019, + // and on the absence of speed cameras in maps for later maps for Switzerland. + UNIT_TEST(SwitzerlandNoSpeedCamerasInRouteTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(47.5194, 8.73093), {0., 0.}, mercator::FromLatLon(46.80592, 7.13724)); + + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + auto const & routeSegments = route.GetRouteSegments(); + for (auto const & routeSegment : routeSegments) + { + TEST(routeSegment.GetSpeedCams().empty(), + (routeSegment.GetSegment(), routeSegment.GetRoadNameInfo().m_name)); + } + } + + // Test on warning about speed cameras for countries where speed cameras partly prohibited. + UNIT_TEST(GermanyWarningAboutSpeedCamerasTest) + { + TRouteResult const routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(52.38465, 13.41906), {0., 0.}, + mercator::FromLatLon(52.67564, 13.27453)); + + RouterResultCode const result = routeResult.second; + TEST_EQUAL(result, RouterResultCode::NoError, ()); + + CHECK(routeResult.first, ()); + Route const & route = *routeResult.first; + TEST(route.CrossMwmsPartlyProhibitedForSpeedCams(), ()); + } + + // TODO (@gmoryes) uncomment this after many-via restrictions will be in mwms. /* -UNIT_TEST(RussiaMoscowLenigradskiy39RepublicOfSouthAfricaCapeTownCenterRouteTest) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.79721, 37.53786), {0., 0.}, - FromLatLon(-33.9286, 18.41837), 13701400.0); -} + UNIT_TEST(SpainRestirctionOnlyMany) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(43.38234, -5.67648), {0.0, 0.0}, + mercator::FromLatLon(43.38222, -5.69083), 8289.0); + } + + UNIT_TEST(RussiaMoscowRestirctionOnlyMany) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.991578, 37.212476), {0.0, 0.0}, + mercator::FromLatLon(55.991845, 37.215312), 799.0); + } */ -UNIT_TEST(MoroccoToSahrawiCrossMwmTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(27.15587, -13.23059), {0., 0.}, - FromLatLon(27.94049, -12.88800), 100864); - - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(27.94049, -12.88800), {0., 0.}, - FromLatLon(27.15587, -13.23059), 100864); -} - -UNIT_TEST(AlbaniaToMontenegroCrossTest) -{ - // Road from Albania to Montenegro. Test turnaround finding at border (when start/stop - // points are inside borders and one of segments has outside points). - // Forward - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(42.01535, 19.40044), {0., 0.}, - FromLatLon(42.01201, 19.36286), 3674.); - - // And backward case - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(42.01201, 19.36286), {0., 0.}, - FromLatLon(42.01535, 19.40044), 3674.); -} - -UNIT_TEST(CanadaBridgeCrossToEdwardIsland) -{ - // Forward - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(46.13418, -63.84656), {0., 0.}, - FromLatLon(46.26739, -63.63907), 23000.); - - // And backward case - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(46.26739, -63.63907), {0., 0.}, - FromLatLon(46.13418, -63.84656), 23000.); -} - -UNIT_TEST(ParisCrossDestinationInForwardHeapCase) -{ - // Forward - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(49.85015, 2.24296), {0., 0.}, - FromLatLon(48.85458, 2.36291), 127162.0); - - // And backward case - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(48.85458, 2.36291), {0., 0.}, - FromLatLon(49.85027, 2.24283), 137009.0); -} - -UNIT_TEST(RussiaSmolenskRussiaMoscowTimeTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(54.7998, 32.05489), {0., 0.}, - FromLatLon(55.753, 37.60169)); - - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - TestRouteTime(route, 18045.9); -} - -UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22TimeTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.7971, 37.53804), {0., 0.}, - FromLatLon(55.8579, 37.40990)); - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - TestRouteTime(route, 1044.42); -} - -UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22SubrouteTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.7971, 37.53804), {0., 0.}, - FromLatLon(55.8579, 37.40990)); - - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - TEST_EQUAL(route.GetSubrouteCount(), 1, ()); - std::vector info; - route.GetSubrouteInfo(0, info); - TEST_EQUAL(route.GetPoly().GetSize(), info.size() + 1, ()); - size_t constexpr kExpectedPointsNumber = 335; - TestRoutePointsNumber(route, kExpectedPointsNumber); -} - -UNIT_TEST(USALosAnglesAriaTwentyninePalmsHighwayTimeTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(34.0739, -115.3212), {0.0, 0.0}, - FromLatLon(34.0928, -115.5930)); - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - TEST_LESS(route.GetTotalTimeSec(), std::numeric_limits::max() / 2.0, ()); -} - -// Test on routing along features with tag man_made:pier. -UNIT_TEST(CanadaVictoriaVancouverTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(48.47831, -123.32749), {0.0, 0.0}, - FromLatLon(49.26242, -123.11553)); - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); -} - -// Test on the route with the finish near zero length edge. -UNIT_TEST(BelarusSlonimFinishNearZeroEdgeTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(53.08279, 25.30036), {0.0, 0.0}, - FromLatLon(53.09443, 25.34356)); - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); -} - -// Test on the route with the start near zero length edge. -UNIT_TEST(BelarusSlonimStartNearZeroEdgeTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(53.09422, 25.34411), {0.0, 0.0}, - FromLatLon(53.09271, 25.3467)); - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); -} - -// Test on roads with tag maxspeed=none. -UNIT_TEST(GermanyBerlinMunichTimeTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(52.51172, 13.39468), {0., 0.}, - FromLatLon(48.13294, 11.60352)); - - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - - // New time is closer to GraphHopper timing: - // https://www.openstreetmap.org/directions?engine=graphhopper_car&route=52.51172%2C13.39468%3B48.13294%2C11.60352 - TestRouteTime(route, 19321.7); -} - -// Test on roads with tag route=shuttle_train. This train has defined maxspeed=100. -UNIT_TEST(GermanyShuttleTrainTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(54.78370, 8.83528), {0., 0.}, - FromLatLon(54.91681, 8.31346)); - - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - TestRouteLength(route, 44116.7); - TestRouteTime(route, 2529.63); -} - -UNIT_TEST(TolyattiFeatureThatCrossSeveralMwmsTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(52.67316, 48.22478), {0., 0.}, - FromLatLon(53.49143, 49.52386)); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - - TestRouteTime(route, 8102.0); -} - -// Test on removing speed cameras from the route for maps from Jan 2019, -// and on the absence of speed cameras in maps for later maps for Switzerland. -UNIT_TEST(SwitzerlandNoSpeedCamerasInRouteTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(47.5194, 8.73093), {0., 0.}, - FromLatLon(46.80592, 7.13724)); - - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - auto const & routeSegments = route.GetRouteSegments(); - for (auto const & routeSegment : routeSegments) - TEST(routeSegment.GetSpeedCams().empty(), (routeSegment.GetSegment())); -} - -// Test on warning about speed cameras for countries where speed cameras partly prohibited. -UNIT_TEST(GermanyWarningAboutSpeedCamerasTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(52.38465, 13.41906), {0., 0.}, - FromLatLon(52.67564, 13.27453)); - - RouterResultCode const result = routeResult.second; - TEST_EQUAL(result, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *routeResult.first; - TEST(route.CrossMwmsPartlyProhibitedForSpeedCams(), ()); -} - -UNIT_TEST(Spain_RestirctionOnlyMany) -{ - // This relation https://www.openstreetmap.org/relation/7610329 - // See also Valhalla engine. - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(43.38234, -5.67648), {0.0, 0.0}, - FromLatLon(43.38222, -5.69083), 8289.15); -} - -UNIT_TEST(Russia_Moscow_RestirctionOnlyMany) -{ - // This relation https://www.openstreetmap.org/relation/581743 - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.991986, 37.2131072), {0.0, 0.0}, - FromLatLon(55.9918083, 37.215531), 894.853); -} - -// Test that fake segments are not built from start to roads with hwtag=nocar for car routing. -UNIT_TEST(SpainBilbaoAirportNoCarTest) -{ - TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(43.29969, -2.91312), {0., 0.}, - FromLatLon(43.29904, -2.9108)); - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - Route const & route = *(routeResult.first); - std::vector const & routeSegments = route.GetRouteSegments(); - TEST_GREATER(routeSegments.size(), 2, ()); - - // Note. routeSegments[0] is a start segment(point). routeSegments[1] is a fake segment - // which goes from the route start to a segment of the road graph. - // routeSegments[1].GetDistFromBeginningMeters() is the length of the first fake segment. - // Start point is located near a road with hwtag=no. - // So if routeSegments[1].GetDistFromBeginningMeters() is long enough the segment - // with hwtag=no is no used. - TEST_GREATER(routeSegments[1].GetDistFromBeginningMeters(), 20.0, ()); -} - -// Test when start is located near mwm border. In that case it's possible that one of -// closest edges is a dead end within one mwm. The end of this dead end should -// be taken into account in |IndexGraphStarterJoints::FindFirstJoints()|. -UNIT_TEST(EnglandLondonStartNearMwmBorderTest) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(51.603582, 0.266995), {0., 0.}, - FromLatLon(51.606785, 0.264055), 416.8); -} - -// Test that toll road is not crossed by a fake edge if RouingOptions are set to Road::Toll. -// Test on necessity calling RectCoversPolyline() after DataSource::ForEachInRect() while looking for fake edges. -UNIT_TEST(RussiaMoscowNotCrossingTollRoadTest) -{ - auto & vehicleComponents = GetVehicleComponents(VehicleType::Car); - - auto const start = FromLatLon(55.93934, 37.406); - m2::PointD finish[] = { FromLatLon(55.9414245, 37.4489627), FromLatLon(55.9421391, 37.4484832) }; - + // Test that fake segments are not built from start to roads with hwtag=nocar for car routing. + UNIT_TEST(SpainBilbaoAirportNoCarTest) { - // Avoid motorway toll road and build route through minor residential roads (short but slow). - RoutingOptionSetter optionsGuard(RoutingOptions::Road::Toll); + TRouteResult routeResult = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(43.29969, -2.91312), {0., 0.}, + mercator::FromLatLon(43.29904, -2.9108)); + TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - // 1. End point is near the motorway toll road, but choose a minor track as end segment. - CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0}, finish[0], 8427.71); + CHECK(routeResult.first, ()); + Route const & route = *(routeResult.first); + std::vector const & routeSegments = route.GetRouteSegments(); + TEST_GREATER(routeSegments.size(), 2, ()); - // 2. End point is near the service road via the motorway toll road, but choose a minor track as end segment. - CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0},finish[1], 8972.7); + // Note. routeSegments[0] is a start segment(point). routeSegments[1] is a fake segment + // which goes from the route start to a segment of the road graph. + // routeSegments[1].GetDistFromBeginningMeters() is the length of the first fake segment. + // Start point is located near a road with hwtag=no. + // So if routeSegments[1].GetDistFromBeginningMeters() is long enough the segment + // with hwtag=no is no used. + TEST_GREATER(routeSegments[1].GetDistFromBeginningMeters(), 20.0, ()); } + // Test when start is located near mwm border. In that case it's possible that one of + // closest edges is a dead end within one mwm. The end of this dead end should + // be taken into account in |IndexGraphStarterJoints::FindFirstJoints()|. + UNIT_TEST(EnglandLondonStartNearMwmBorderTest) { - // Normal route via the motorway toll road (long but fast). - CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0}, finish[0], 20604.9); - CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0}, finish[1], 20689.6); + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(51.603582, 0.266995), {0., 0.}, + mercator::FromLatLon(51.606785, 0.264055), 416.8); } -} -UNIT_TEST(NoCrash_RioGrandeCosmopolis) -{ - TRouteResult const route = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(-32.17641, -52.16350), {0., 0.}, - FromLatLon(-22.64374, -47.19720)); + // Test that toll road is not crossed by a fake edge if RouingOptions are set to Road::Toll. + // Test on necessity calling RectCoversPolyline() after DataSource::ForEachInRect() while looking for fake edges. + UNIT_TEST(RussiaMoscowNotCrossingTollRoadTest) + { + auto & vehicleComponents = integration::GetVehicleComponents(VehicleType::Car); - TEST_EQUAL(route.second, RouterResultCode::NoError, ()); -} + auto const start = mercator::FromLatLon(55.93934, 37.406); + m2::PointD finish[] = { mercator::FromLatLon(55.9414245, 37.4489627), mercator::FromLatLon(55.9421391, 37.4484832) }; -UNIT_TEST(AreMwmsNear_HelsinkiPiter) -{ - TRouteResult const route = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(60.87083, 26.53612), {0., 0.}, - FromLatLon(60.95360, 28.53979)); + { + // Avoid motorway toll road and build route through minor residential roads (short but slow). + RoutingOptionSetter optionsGuard(RoutingOptions::Road::Toll); - TEST_EQUAL(route.second, RouterResultCode::NoError, ()); -} + // 1. End point is near the motorway toll road, but choose a minor track as end segment. + integration::CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0}, finish[0], 8427.71); -// Test RussiaShorterFakeEdges1 and RussiaShorterFakeEdges2 are on reducing -// |kSpeedOffroadKMpH| for car routing. This lets us make -// fake edges shorter that prevent crossing lakes, forests and so on. -UNIT_TEST(RussiaBlackLakeShorterFakeEdges1) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.62466, 39.71385), {0., 0.}, - FromLatLon(55.63114, 39.70979), 1469.54); -} + // 2. End point is near the service road via the motorway toll road, but choose a minor track as end segment. + integration::CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0},finish[1], 8972.7); + } -UNIT_TEST(RussiaShorterFakeEdges2) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(55.31103, 38.80954), {0., 0.}, - FromLatLon(55.31155, 38.8217), 2489.8); -} + { + // Normal route via the motorway toll road (long but fast). + integration::CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0}, finish[0], 20604.9); + integration::CalculateRouteAndTestRouteLength(vehicleComponents, start, {0.0, 0.0}, finish[1], 20689.6); + } + } -// https://github.com/organicmaps/organicmaps/issues/1788 -UNIT_TEST(Germany_ShortRouteWithPassThroughChanges) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(49.512076, 8.284476), {0., 0.}, - FromLatLon(49.523783, 8.288701), 2014.); -} + UNIT_TEST(NoCrash_RioGrandeCosmopolis) + { + TRouteResult route = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(-32.17641, -52.16350), {0., 0.}, + mercator::FromLatLon(-22.64374, -47.19720)); -// https://github.com/organicmaps/organicmaps/issues/821 -UNIT_TEST(Ukraine_UmanOdessa) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(48.7498, 30.2203), {0., 0.}, - FromLatLon(46.4859, 30.6837), 265163.); -} + TEST_EQUAL(route.second, RouterResultCode::NoError, ()); + } -// https://github.com/organicmaps/organicmaps/issues/1736 -UNIT_TEST(Belgium_LiegeBrugge) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(50.645205, 5.573507), {0., 0.}, - FromLatLon(51.208479, 3.225558), 193436.); -} + UNIT_TEST(AreMwmsNear_HelsinkiPiter) + { + TRouteResult route = + integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(60.87083, 26.53612), {0., 0.}, + mercator::FromLatLon(60.95360, 28.53979)); -// https://github.com/organicmaps/organicmaps/issues/1627 -UNIT_TEST(Spain_MadridSevilla) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(40.415322, -3.703517), {0., 0.}, - FromLatLon(37.388667, -5.995355), 528667.); -} + TEST_EQUAL(route.second, RouterResultCode::NoError, ()); + } -UNIT_TEST(Belarus_Lithuania_MinskVilnius) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(53.902837, 27.562144), {0., 0.}, - FromLatLon(54.686821, 25.283189), 183231.); -} + // Test RussiaShorterFakeEdges1 and RussiaShorterFakeEdges2 are on reducing + // |kSpeedOffroadKMpH| for car routing. This lets us make + // fake edges shorter that prevent crossing lakes, forests and so on. + UNIT_TEST(RussiaBlackLakeShorterFakeEdges1) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.62466, 39.71385), {0., 0.}, + mercator::FromLatLon(55.63114, 39.70979), 1469.54); + } -// https://github.com/organicmaps/organicmaps/issues/338 -UNIT_TEST(Russia_MendeleevoReutov) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(56.036866, 37.232630), {0., 0.}, - FromLatLon(55.762128, 37.856665), 66261.9); -} + UNIT_TEST(RussiaShorterFakeEdges2) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.31103, 38.80954), {0., 0.}, mercator::FromLatLon(55.31155, 38.8217), 2489.8); + } -// https://github.com/organicmaps/organicmaps/issues/1721 -UNIT_TEST(Austria_Croatia_SalzburgZagreb) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(47.795928, 13.047597), {0., 0.}, - FromLatLon(45.812822, 15.977049), 414275); -} + // https://github.com/organicmaps/organicmaps/issues/1788 + UNIT_TEST(Germany_ShortRouteWithPassThroughChanges) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(49.512076, 8.284476), {0., 0.}, + mercator::FromLatLon(49.523783, 8.288701), 2014.); + } -// https://github.com/organicmaps/organicmaps/issues/1071 -UNIT_TEST(Russia_MoscowDesnogorsk) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.715208, 37.396528), {0., 0.}, - FromLatLon(54.151853, 33.287128), 355887); -} + // https://github.com/organicmaps/organicmaps/issues/821 + UNIT_TEST(Ukraine_UmanOdessa) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(48.7498, 30.2203), {0., 0.}, + mercator::FromLatLon(46.4859, 30.6837), 265163.); + } -// https://github.com/organicmaps/organicmaps/issues/1271 -UNIT_TEST(USA_DontLeaveHighway) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(34.1801345, -118.885005), {0., 0.}, - FromLatLon(34.1767471, -118.869327), 1523); -} + // https://github.com/organicmaps/organicmaps/issues/1736 + UNIT_TEST(Belgium_LiegeBrugge) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(50.645205, 5.573507), {0., 0.}, + mercator::FromLatLon(51.208479, 3.225558), 193436.); + } -// https://github.com/organicmaps/organicmaps/issues/2085 -UNIT_TEST(USA_NorthCarolina_CrossMWMs) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(35.6233244, -78.3917262), {0., 0.}, - FromLatLon(36.0081839, -81.5245347), 333425); -} + // https://github.com/organicmaps/organicmaps/issues/1627 + UNIT_TEST(Spain_MadridSevilla) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(40.415322, -3.703517), {0., 0.}, + mercator::FromLatLon(37.388667, -5.995355), 528667.); + } -// https://github.com/organicmaps/organicmaps/issues/1565 -UNIT_TEST(Cyprus_NoUTurnFromFake) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(34.70639, 33.1184951), {0., 0.}, - FromLatLon(34.7065239, 33.1184222), 384.238); + UNIT_TEST(Belarus_Lithuania_MinskVilnius) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(53.902837, 27.562144), {0., 0.}, + mercator::FromLatLon(54.686821, 25.283189), 183231.); + } - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(34.7068976, 33.1199084), {0., 0.}, - FromLatLon(34.7070505, 33.1198391), 670.077); -} + // https://github.com/organicmaps/organicmaps/issues/338 + UNIT_TEST(Russia_MendeleevoReutov) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(56.036866, 37.232630), {0., 0.}, + mercator::FromLatLon(55.762128, 37.856665), 66261.9); + } -UNIT_TEST(Crimea_UseGravelTertiary) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(45.362591, 36.471533), {0., 0.}, - FromLatLon(45.475055, 36.341766), 18815.6); + // https://github.com/organicmaps/organicmaps/issues/1721 + UNIT_TEST(Austria_Croatia_SalzburgZagreb) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(47.795928, 13.047597), {0., 0.}, + mercator::FromLatLon(45.812822, 15.977049), 414275); + } - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(45.470764, 36.331289), {0., 0.}, - FromLatLon(45.424964, 36.080336), 55220.2); -} + // https://github.com/organicmaps/organicmaps/issues/1071 + UNIT_TEST(Russia_MoscowDesnogorsk) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.715208, 37.396528), {0., 0.}, + mercator::FromLatLon(54.151853, 33.287128), 355887); + } -// https://github.com/organicmaps/organicmaps/issues/2475 -UNIT_TEST(Spain_LinksJunction) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(38.8031, 0.0383), {0., 0.}, - FromLatLon(38.8228, 0.0357), 3479.63); -} + // https://github.com/organicmaps/organicmaps/issues/1271 + UNIT_TEST(USA_DontLeaveHighway) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(34.1801345, -118.885005), {0., 0.}, + mercator::FromLatLon(34.1767471, -118.869327), 1523); + } -// https://github.com/organicmaps/organicmaps/issues/1773 -UNIT_TEST(Netherlands_CrossMwm_A15) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(51.847656, 4.089189), {0., 0.}, - FromLatLon(51.651632, 4.725924), 70596.3); -} + // https://github.com/organicmaps/organicmaps/issues/2085 + UNIT_TEST(USA_NorthCarolina_CrossMWMs) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(35.6233244, -78.3917262), {0., 0.}, + mercator::FromLatLon(36.0081839, -81.5245347), 333425); + } -// https://github.com/organicmaps/organicmaps/issues/2494 -UNIT_TEST(Netherlands_CrossMwm_GoudaToApenheul) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(52.0181, 4.7111), {0., 0.}, - FromLatLon(52.2153, 5.9187), 103576); -} + // https://github.com/organicmaps/organicmaps/issues/1565 + UNIT_TEST(Cyprus_NoUTurnFromFake) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(34.70639, 33.1184951), {0., 0.}, + mercator::FromLatLon(34.7065239, 33.1184222), 384.238); -// https://github.com/organicmaps/organicmaps/issues/2285 -UNIT_TEST(Hawaii_KeepH1) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(21.277841, -157.779314), {0., 0.}, - FromLatLon(21.296098, -157.823823), 5289.31); -} + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(34.7068976, 33.1199084), {0., 0.}, + mercator::FromLatLon(34.7070505, 33.1198391), 670.077); + } -// https://github.com/organicmaps/organicmaps/issues/1668 -UNIT_TEST(Russia_Moscow_KeepPrimary) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.7083688, 37.6213856), {0., 0.}, - FromLatLon(55.724623, 37.62588), 1921.88); -} + UNIT_TEST(Crimea_UseGravelTertiary) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(45.362591, 36.471533), {0., 0.}, + mercator::FromLatLon(45.475055, 36.341766), 18815.6); -// https://github.com/organicmaps/organicmaps/issues/1727 -// https://github.com/organicmaps/organicmaps/issues/2020 -// https://github.com/organicmaps/organicmaps/issues/2057 -UNIT_TEST(DontUseLinksWhenRidingOnMotorway) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(32.16881, 34.90656), {0., 0.}, - FromLatLon(32.1588823, 34.9330855), 2847.33); + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(45.470764, 36.331289), {0., 0.}, + mercator::FromLatLon(45.424964, 36.080336), 55220.2); + } - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(43.587808, 1.495385), {0., 0.}, - FromLatLon(43.600145, 1.490489), 1457.16); + // https://github.com/organicmaps/organicmaps/issues/2475 + UNIT_TEST(Spain_LinksJunction) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(38.8031, 0.0383), {0., 0.}, + mercator::FromLatLon(38.8228, 0.0357), 3479.63); + } - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(34.0175371, -84.3272339), {0., 0.}, - FromLatLon(34.0298011, -84.3182477), 1609.76); -} + // https://github.com/organicmaps/organicmaps/issues/1773 + UNIT_TEST(Netherlands_CrossMwm_A15) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(51.847656, 4.089189), {0., 0.}, + mercator::FromLatLon(51.651632, 4.725924), 70596.3); + } -UNIT_TEST(Russia_UseDonMotorway) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(54.5775321, 38.2206224), {0., 0.}, - FromLatLon(49.9315563, 40.5529881), 608031); -} + // https://github.com/organicmaps/organicmaps/issues/2494 + UNIT_TEST(Netherlands_CrossMwm_GoudaToApenheul) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(52.0181, 4.7111), {0., 0.}, + mercator::FromLatLon(52.2153, 5.9187), 103576); + } -UNIT_TEST(Germany_Italy_Malcesine) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(48.4101446, 11.5892265), {0., 0.}, - FromLatLon(45.7662964, 10.8111554), 427135); + // https://github.com/organicmaps/organicmaps/issues/2285 + UNIT_TEST(Hawaii_KeepH1) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(21.277841, -157.779314), {0., 0.}, + mercator::FromLatLon(21.296098, -157.823823), 5289.31); + } - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(45.7662964, 10.8111554), {0., 0.}, - FromLatLon(48.4101446, 11.5892265), 431341); -} + // https://github.com/organicmaps/organicmaps/issues/1668 + UNIT_TEST(Russia_Moscow_KeepPrimary) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.7083688, 37.6213856), {0., 0.}, + mercator::FromLatLon(55.724623, 37.62588), 1921.88); + } -// https://github.com/organicmaps/organicmaps/issues/3363 -UNIT_TEST(Belarus_UseP27_PastawyBraslaw) -{ - CalculateRouteAndTestRouteLength( - GetVehicleComponents(VehicleType::Car), - FromLatLon(55.1187744, 26.8460319), {0., 0.}, - FromLatLon(55.6190911, 27.0938092), 86239.8); -} + // https://github.com/organicmaps/organicmaps/issues/1727 + // https://github.com/organicmaps/organicmaps/issues/2020 + // https://github.com/organicmaps/organicmaps/issues/2057 + UNIT_TEST(DontUseLinksWhenRidingOnMotorway) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(32.16881, 34.90656), {0., 0.}, + mercator::FromLatLon(32.1588823, 34.9330855), 2847.33); -// https://github.com/organicmaps/organicmaps/issues/3257 -UNIT_TEST(Turkey_AvoidMountainsSecondary) -{ - TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Car), - FromLatLon(41.0027, 27.6752), {0., 0.}, - FromLatLon(40.6119, 27.1136)); + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(43.587808, 1.495385), {0., 0.}, + mercator::FromLatLon(43.600145, 1.490489), 1457.16); - TestRouteLength(*res.first, 100329.0); - TestRouteTime(*res.first, 5342.23); -} + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(34.0175371, -84.3272339), {0., 0.}, + mercator::FromLatLon(34.0298011, -84.3182477), 1609.76); + } -// https://github.com/organicmaps/organicmaps/issues/4110 -UNIT_TEST(Slovenia_Croatia_CrossBorderPenalty) -{ - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(46.038579, 14.469414), {0., 0.}, - FromLatLon(45.22718, 13.596334), 156285); -} + UNIT_TEST(Russia_UseDonMotorway) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(54.5775321, 38.2206224), {0., 0.}, + mercator::FromLatLon(49.9315563, 40.5529881), 608031); + } -UNIT_TEST(USA_Birmingham_AL_KeyWest_FL_NoMotorway) -{ - RoutingOptionSetter optionsGuard(RoutingOptions::Road::Motorway); - - CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), - FromLatLon(33.5209837, -86.807945), {0., 0.}, - FromLatLon(24.5534713, -81.7932587), 1562980); -} + UNIT_TEST(Germany_Italy_Malcesine) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(48.4101446, 11.5892265), {0., 0.}, + mercator::FromLatLon(45.7662964, 10.8111554), 427135); + } + // https://github.com/organicmaps/organicmaps/issues/3363 + UNIT_TEST(Belarus_UseP27_PastawyBraslaw) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(55.1187744, 26.8460319), {0., 0.}, + mercator::FromLatLon(55.6190911, 27.0938092), 86239.8); + } } // namespace route_test diff --git a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp b/routing/routing_integration_tests/speed_camera_notifications_tests.cpp index bae1233ba9..a192243e85 100644 --- a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp +++ b/routing/routing_integration_tests/speed_camera_notifications_tests.cpp @@ -22,12 +22,12 @@ #include #include -namespace speed_camera_notifications_tests -{ using namespace routing; using namespace routing::turns; using namespace std; +namespace +{ string const kCameraOnTheWay = "Speed camera on the way"; location::GpsInfo MoveTo(ms::LatLon const & coords, double speed = -1) @@ -483,4 +483,4 @@ UNIT_TEST(SpeedCameraNotification_CameraOnMiniRoundabout) ChangePosition({41.201998, 69.109587}, speedKmPH, routingSession); TEST(!NoCameraFound(routingSession), ()); } -} // namespace speed_camera_notifications_tests +} // namespace diff --git a/routing/routing_integration_tests/transit_route_test.cpp b/routing/routing_integration_tests/transit_route_test.cpp index ffb3351dc0..87e0995070 100644 --- a/routing/routing_integration_tests/transit_route_test.cpp +++ b/routing/routing_integration_tests/transit_route_test.cpp @@ -61,44 +61,29 @@ UNIT_TEST(Transit_Piter_FrunzenskyaToPlochadVosstaniya) /// @todo Check https://github.com/organicmaps/organicmaps/issues/1669 for details. integration::TestRouteLength(*routeResult.first, 5593.96); - TEST(routeResult.first, ()); + CHECK(routeResult.first, ()); integration::CheckSubwayExistence(*routeResult.first); } UNIT_TEST(Transit_Piter_TooLongPedestrian) { - TRouteResult const routeResult = + TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit), mercator::FromLatLon(59.90511, 30.31425), {0.0, 0.0}, mercator::FromLatLon(59.78014, 30.50036)); - /// @todo Returns valid route now with long pedestrian part in the end, I don't see problems here. - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - auto const & route = *routeResult.first; - - integration::CheckSubwayExistence(route); - integration::TestRouteLength(route, 22556.1); - TEST_LESS(route.GetTotalTimeSec(), 3600 * 3, ()); + TEST_EQUAL(routeResult.second, RouterResultCode::TransitRouteNotFoundTooLongPedestrian, ()); } UNIT_TEST(Transit_Vatikan_NotEnoughGraphDataAtThenEnd) { - TRouteResult const routeResult = + TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit), mercator::FromLatLon(41.89543, 12.41481), {0.0, 0.0}, mercator::FromLatLon(41.89203, 12.46263)); /// @todo Returns valid route now with long pedestrian part in the end, I don't see problems here. - TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ()); - - TEST(routeResult.first, ()); - auto const & route = *routeResult.first; - - integration::CheckSubwayExistence(route); - integration::TestRouteLength(route, 7622.54); - TEST_LESS(route.GetTotalTimeSec(), 4000, ()); + TEST_EQUAL(routeResult.second, RouterResultCode::TransitRouteNotFoundTooLongPedestrian, ()); } UNIT_TEST(Transit_Vatikan_CorneliaToOttaviano) diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp index db5225a370..18f5ded3fd 100644 --- a/routing/routing_integration_tests/turn_test.cpp +++ b/routing/routing_integration_tests/turn_test.cpp @@ -5,8 +5,6 @@ #include "routing/route.hpp" #include "routing/routing_callbacks.hpp" -#include "platform/location.hpp" - #include namespace turn_test @@ -180,8 +178,7 @@ UNIT_TEST(Russia_Moscow_NoTurnsOnMKAD_TurnTest) integration::TestTurnCount(route, 2 /* expectedTurnCount */); integration::GetNthTurn(route, 1) .TestValid() - /// @todo Update with actual point later. Looks like there is a construction on that junction now. - //.TestPoint({37.68276, 67.14062}) + .TestPoint({37.68276, 67.14062}) .TestDirection(CarDirection::ExitHighwayToRight); integration::TestRouteLength(route, 43233.7); @@ -609,6 +606,7 @@ UNIT_TEST(Germany_FrankfurtAirport_TurnTest) integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight); } + UNIT_TEST(Germany_FrankfurtAirport2_TurnTest) { TRouteResult const routeResult = @@ -620,11 +618,13 @@ UNIT_TEST(Germany_FrankfurtAirport2_TurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 1 /* expectedTurnCount */); + integration::TestTurnCount(route, 2 /* expectedTurnCount */); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::ExitHighwayToRight); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft); } + // Test on absence of unnecessary turn which may appear between two turns in the test. UNIT_TEST(Russia_Kubinka_TurnTest) { @@ -745,12 +745,10 @@ UNIT_TEST(Netherlands_Barneveld_TurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - /// @todo Probably, reasonable solution from GraphHopper with NO turns: + /// @todo Reasonable solution from GraphHopper: // https://www.openstreetmap.org/directions?engine=graphhopper_car&route=52.15866%2C5.56538%3B52.17042%2C5.55834 - // Even if there is no other options, I think that we should show left-turn here https://www.openstreetmap.org/node/286040021 - integration::TestTurnCount(route, 1); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::GoStraight); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightLeft); } UNIT_TEST(Belarus_Minsk_TurnTest) @@ -1218,32 +1216,19 @@ UNIT_TEST(USA_California_Cupertino_TurnTestNextRoad) { TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), - mercator::FromLatLon(37.5028702, -122.3314908), {0., 0.}, + mercator::FromLatLon(37.5031583, -122.3317724), {0., 0.}, mercator::FromLatLon(37.5110368, -122.3317238)); - Route & route = *routeResult.first; + Route const & route = *routeResult.first; RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 2); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::ExitHighwayToRight); - integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight); double d; TurnItem turn; route.GetNearestTurn(d, turn); - + TEST_EQUAL(turn.m_turn, CarDirection::TurnSlightRight, ()); RouteSegment::RoadNameInfo ri; - route.GetNextTurnStreetName(ri); - TEST_EQUAL(ri.m_destination, "Half Moon Bay; San Mateo; Hayward; Ralston Avenue; Belmont", ()); - TEST_EQUAL(ri.m_destination_ref, "CA 92", ()); - - location::GpsInfo info; - info.m_latitude = 37.5037636; - info.m_longitude = -122.332678; - info.m_horizontalAccuracy = 2; - route.MoveIterator(info); - route.GetNextTurnStreetName(ri); TEST_EQUAL(ri.m_destination, "San Mateo; Hayward; Belmont", ()); TEST_EQUAL(ri.m_destination_ref, "CA 92 East", ()); diff --git a/routing/routing_options.cpp b/routing/routing_options.cpp index fe0adee309..3868981d62 100644 --- a/routing/routing_options.cpp +++ b/routing/routing_options.cpp @@ -77,8 +77,6 @@ RoutingOptionsClassifier::RoutingOptionsClassifier() optional RoutingOptionsClassifier::Get(uint32_t type) const { - ftype::TruncValue(type, 2); // in case of highway-motorway-bridge - auto const * res = m_data.Find(type); if (res) return *res; diff --git a/routing/routing_quality/api/mapbox/mapbox_api.cpp b/routing/routing_quality/api/mapbox/mapbox_api.cpp index edaf8509ab..85f74afd8c 100644 --- a/routing/routing_quality/api/mapbox/mapbox_api.cpp +++ b/routing/routing_quality/api/mapbox/mapbox_api.cpp @@ -17,25 +17,27 @@ #include +using namespace std; +using namespace string_literals; + namespace { -std::string const kBaseURL = "https://api.mapbox.com/"; -std::string const kDirectionsApiVersion = "v5"; -std::string const kCarType = "mapbox/driving"; +string const kBaseURL = "https://api.mapbox.com/"; +string const kDirectionsApiVersion = "v5"; -std::string VehicleTypeToMapboxType(routing_quality::api::VehicleType type) +string VehicleTypeToMapboxType(routing_quality::api::VehicleType type) { switch (type) { - case routing_quality::api::VehicleType::Car: return kCarType; + case routing_quality::api::VehicleType::Car: return "mapbox/driving"s; } UNREACHABLE(); } -std::string LatLonsToString(std::vector const & coords) +string LatLonsToString(vector const & coords) { - std::ostringstream oss; + ostringstream oss; auto const size = coords.size(); for (size_t i = 0; i < size; ++i) { @@ -50,12 +52,16 @@ std::string LatLonsToString(std::vector const & coords) } } // namespace -namespace routing_quality::api::mapbox +namespace routing_quality +{ +namespace api +{ +namespace mapbox { // static -std::string const MapboxApi::kApiName = "mapbox"; +string const MapboxApi::kApiName = "mapbox"; -MapboxApi::MapboxApi(std::string const & token) +MapboxApi::MapboxApi(string const & token) : RoutingApi(kApiName, token, kMaxRPS) {} @@ -80,7 +86,7 @@ Response MapboxApi::CalculateRoute(Params const & params, int32_t /* startTimeZo apiRoute.m_waypoints.emplace_back(lat, lon); } - response.m_routes.emplace_back(std::move(apiRoute)); + response.m_routes.emplace_back(move(apiRoute)); } return response; @@ -110,16 +116,16 @@ MapboxResponse MapboxApi::MakeRequest(Params const & params) const return mapboxResponse; } -std::string MapboxApi::GetDirectionsURL(Params const & params) const +string MapboxApi::GetDirectionsURL(Params const & params) const { CHECK(!GetAccessToken().empty(), ()); - std::vector coords; + vector coords; coords.reserve(params.m_waypoints.GetPoints().size()); for (auto const & point : params.m_waypoints.GetPoints()) coords.emplace_back(mercator::ToLatLon(point)); - std::ostringstream oss; + ostringstream oss; oss << kBaseURL << "directions/" << kDirectionsApiVersion << "/" << VehicleTypeToMapboxType(params.m_type) << "/"; oss << LatLonsToString(coords) << "?"; @@ -130,4 +136,6 @@ std::string MapboxApi::GetDirectionsURL(Params const & params) const return oss.str(); } -} // namespace mapbox::api::routing_quality +} // namespace mapbox +} // namespace api +} // namespace routing_quality diff --git a/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp b/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp index 28b920d653..746c11e1f8 100644 --- a/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp +++ b/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp @@ -7,12 +7,12 @@ #include #include -namespace leaps_postprocessing_tests -{ using namespace routing; using namespace routing_quality; using namespace std; +namespace +{ UNIT_TEST(RoutingQuality_NoLoop_Canada) { TEST(!CheckCarRoute({53.53540, -113.50798} /* start */, {69.44402, -133.03189} /* finish */, @@ -96,4 +96,4 @@ UNIT_TEST(RoutingQuality_NoLoop_SkopjeMontenegro) {{{42.68296, 20.18158}}} /* reference point */), ()); } -} // namespace leaps_postprocessing_tests +} // namespace diff --git a/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp b/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp index 0545bb3ea2..bef15d2e6a 100644 --- a/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp +++ b/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp @@ -7,12 +7,12 @@ #include #include -namespace waypoins_tests -{ using namespace routing; using namespace routing_quality; using namespace std; +namespace +{ UNIT_TEST(RoutingQuality_CompareSmoke) { // From office to Aseeva 6. @@ -36,4 +36,4 @@ UNIT_TEST(RoutingQuality_Sokol2Mayakovskaya) TEST_EQUAL(CheckWaypoints(params, move(waypoints)), 0.0, ()); } -} // namespace waypoins_tests +} // namespace diff --git a/routing/routing_quality/routing_quality_tool/utils.cpp b/routing/routing_quality/routing_quality_tool/utils.cpp index c784923de9..d676535062 100644 --- a/routing/routing_quality/routing_quality_tool/utils.cpp +++ b/routing/routing_quality/routing_quality_tool/utils.cpp @@ -78,11 +78,7 @@ void SaveKmlFileDataTo(RoutesBuilder::Result const & mapsmeResult, kml::FileData kml; size_t colorNumber = 0; - auto const addTrack = [&](kml::MultiGeometry::LineT && line) - { - kml::TrackData track; - track.m_geometry.m_lines.push_back(std::move(line)); - + auto const addTrack = [&](kml::TrackData && track) { CHECK_LESS(colorNumber, kColors.size(), ()); track.m_layers = {{5.0 /* lineWidth */, {kml::PredefinedColor::None, kColors[colorNumber++]}}}; kml.m_tracksData.emplace_back(std::move(track)); @@ -94,17 +90,21 @@ void SaveKmlFileDataTo(RoutesBuilder::Result const & mapsmeResult, kml.m_bookmarksData.emplace_back(CreateBookmark(start, true /* isStart */)); kml.m_bookmarksData.emplace_back(CreateBookmark(finish, false /* isStart */)); - auto const & resultPoints = mapsmeResult.GetRoutes().back().m_followedPolyline.GetPolyline().GetPoints(); - - kml::MultiGeometry::LineT mmTrack; - mmTrack.reserve(resultPoints.size()); + auto & resultPoints = + mapsmeResult.GetRoutes().back().m_followedPolyline.GetPolyline().GetPoints(); + kml::TrackData mapsmeTrack; + mapsmeTrack.m_pointsWithAltitudes.reserve(resultPoints.size()); for (auto const & pt : resultPoints) - mmTrack.emplace_back(pt, geometry::kDefaultAltitudeMeters); + mapsmeTrack.m_pointsWithAltitudes.emplace_back(pt, geometry::kDefaultAltitudeMeters); - addTrack(std::move(mmTrack)); + addTrack(std::move(mapsmeTrack)); for (auto const & route : apiResult.GetRoutes()) - addTrack(ConvertToPointsWithAltitudes(route.GetWaypoints())); + { + kml::TrackData apiTrack; + apiTrack.m_pointsWithAltitudes = ConvertToPointsWithAltitudes(route.GetWaypoints()); + addTrack(std::move(apiTrack)); + } kml::SerializerKml ser(kml); FileWriter sink(kmlFile); diff --git a/routing/routing_quality/waypoints.cpp b/routing/routing_quality/waypoints.cpp index 02539954f2..3d83abe3b2 100644 --- a/routing/routing_quality/waypoints.cpp +++ b/routing/routing_quality/waypoints.cpp @@ -11,6 +11,8 @@ #include #include +using namespace std; + namespace routing_quality { namespace metrics @@ -52,7 +54,7 @@ Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline const & p for (size_t j = 0; j < candidates.size(); ++j) { auto const result = CompareByNumberOfMatchedWaypoints(polyline, candidates[j]); - bestResult = std::max(bestResult, result); + bestResult = max(bestResult, result); } LOG(LDEBUG, ("Best result:", bestResult)); @@ -66,18 +68,18 @@ Similarity CheckWaypoints(Params const & params, ReferenceRoutes && referenceRou auto result = builder.ProcessTask(params); return metrics::CompareByNumberOfMatchedWaypoints(result.GetRoutes().back().m_followedPolyline, - std::move(referenceRoutes)); + move(referenceRoutes)); } bool CheckRoute(Params const & params, ReferenceRoutes && referenceRoutes) { - return CheckWaypoints(params, std::move(referenceRoutes)) == 1.0; + return CheckWaypoints(params, move(referenceRoutes)) == 1.0; } bool CheckCarRoute(ms::LatLon const & start, ms::LatLon const & finish, ReferenceRoutes && referenceTracks) { Params const params(routing::VehicleType::Car, start, finish); - return CheckRoute(params, std::move(referenceTracks)); + return CheckRoute(params, move(referenceTracks)); } } // namespace routing_quality diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index 993967d9fc..f40db8425a 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -14,8 +14,13 @@ #include +using namespace location; +using namespace std; +using namespace traffic; + namespace { + int constexpr kOnRouteMissedCount = 10; double constexpr kShowLanesMinDistInMeters = 500.0; @@ -32,23 +37,20 @@ double constexpr kMinimumETASec = 60.0; namespace routing { -using namespace location; -using namespace traffic; - -void FormatDistance(double dist, std::string & value, std::string & suffix) +void FormatDistance(double dist, string & value, string & suffix) { /// @todo Make better formatting of distance and units. value = measurement_utils::FormatDistance(dist); size_t const delim = value.find(' '); - ASSERT(delim != std::string::npos, ()); + ASSERT(delim != string::npos, ()); suffix = value.substr(delim + 1); value.erase(delim); } RoutingSession::RoutingSession() : m_router(nullptr) - , m_route(std::make_shared(std::string{} /* router */, 0 /* route id */)) + , m_route(make_shared(string() /* router */, 0 /* route id */)) , m_state(SessionState::NoValidRoute) , m_isFollowing(false) , m_speedCameraManager(m_turnNotificationsMgr) @@ -65,7 +67,7 @@ void RoutingSession::Init(PointCheckCallback const & pointCheckCallback) { CHECK_THREAD_CHECKER(m_threadChecker, ()); CHECK(!m_router, ()); - m_router = std::make_unique(pointCheckCallback); + m_router = make_unique(pointCheckCallback); } void RoutingSession::BuildRoute(Checkpoints const & checkpoints, uint32_t timeoutSec) @@ -119,7 +121,7 @@ m2::PointD RoutingSession::GetEndPoint() const return m_checkpoints.GetFinish(); } -void RoutingSession::DoReadyCallback::operator()(std::shared_ptr const & route, RouterResultCode e) +void RoutingSession::DoReadyCallback::operator()(shared_ptr const & route, RouterResultCode e) { ASSERT(m_rs.m_route, ()); m_rs.AssignRoute(route, e); @@ -134,7 +136,7 @@ void RoutingSession::RemoveRoute() m_moveAwayCounter = 0; m_turnNotificationsMgr.Reset(); - m_route = std::make_shared(std::string{} /* router */, 0 /* route id */); + m_route = make_shared(string() /* router */, 0 /* route id */); m_speedCameraManager.Reset(); m_speedCameraManager.SetRoute(m_route); } @@ -343,7 +345,7 @@ SessionState RoutingSession::OnLocationPositionChanged(GpsInfo const & info) // If no |target| - it will be replaced by |name| of next street. // If no |target:ref| - it will be replaced by |ref| of next road. // So if link has no info at all, "[ref] name" of next will be returned (as for next street). -void GetFullRoadName(RouteSegment::RoadNameInfo & road, std::string & name) +void GetFullRoadName(RouteSegment::RoadNameInfo & road, string & name) { if (auto const & sh = ftypes::GetRoadShields(road.m_ref); !sh.empty()) road.m_ref = sh[0].m_name; @@ -357,12 +359,12 @@ void GetFullRoadName(RouteSegment::RoadNameInfo & road, std::string & name) name = "[" + road.m_junction_ref + "]"; if (!road.m_destination_ref.empty()) - name += std::string(name.empty() ? "" : ": ") + "[" + road.m_destination_ref + "]"; + name += string(name.empty() ? "" : ": ") + "[" + road.m_destination_ref + "]"; if (!road.m_destination.empty()) - name += std::string(name.empty() ? "" : " ") + "> " + road.m_destination; + name += string(name.empty() ? "" : " ") + "> " + road.m_destination; else if (!road.m_name.empty()) - name += (road.m_destination_ref.empty() ? std::string(name.empty() ? "" : " ") : ": ") + road.m_name; + name += (road.m_destination_ref.empty() ? string(name.empty() ? "" : " ") : ": ") + road.m_name; } else { @@ -390,7 +392,7 @@ void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const { info = FollowingInfo(); FormatDistance(m_route->GetTotalDistanceMeters(), info.m_distToTarget, info.m_targetUnitsSuffix); - info.m_time = static_cast(std::max(kMinimumETASec, m_route->GetCurrentTimeToEndSec())); + info.m_time = static_cast(max(kMinimumETASec, m_route->GetCurrentTimeToEndSec())); return; } @@ -418,7 +420,7 @@ void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const info.m_nextTurn = routing::turns::CarDirection::None; info.m_exitNum = turn.m_exitNum; - info.m_time = static_cast(std::max(kMinimumETASec, m_route->GetCurrentTimeToEndSec())); + info.m_time = static_cast(max(kMinimumETASec, m_route->GetCurrentTimeToEndSec())); RouteSegment::RoadNameInfo sourceRoadNameInfo, targetRoadNameInfo; m_route->GetCurrentStreetName(sourceRoadNameInfo); GetFullRoadName(sourceRoadNameInfo, info.m_sourceName); @@ -485,7 +487,7 @@ void RoutingSession::PassCheckpoints() } } -void RoutingSession::GenerateNotifications(std::vector & notifications) +void RoutingSession::GenerateNotifications(vector & notifications) { CHECK_THREAD_CHECKER(m_threadChecker, ()); notifications.clear(); @@ -500,14 +502,14 @@ void RoutingSession::GenerateNotifications(std::vector & notificati return; // Generate turns notifications. - std::vector turns; + vector turns; if (m_route->GetNextTurns(turns)) m_turnNotificationsMgr.GenerateTurnNotifications(turns, notifications); m_speedCameraManager.GenerateNotifications(notifications); } -void RoutingSession::AssignRoute(std::shared_ptr const & route, RouterResultCode e) +void RoutingSession::AssignRoute(shared_ptr const & route, RouterResultCode e) { CHECK_THREAD_CHECKER(m_threadChecker, ()); @@ -533,8 +535,8 @@ void RoutingSession::AssignRoute(std::shared_ptr const & route, RouterRes m_speedCameraManager.SetRoute(m_route); } -void RoutingSession::SetRouter(std::unique_ptr && router, - std::unique_ptr && finder) +void RoutingSession::SetRouter(unique_ptr && router, + unique_ptr && finder) { CHECK_THREAD_CHECKER(m_threadChecker, ()); ASSERT(m_router != nullptr, ()); @@ -737,14 +739,14 @@ void RoutingSession::SetTurnNotificationsUnits(measurement_utils::Units const un m_turnNotificationsMgr.SetLengthUnits(units); } -void RoutingSession::SetTurnNotificationsLocale(std::string const & locale) +void RoutingSession::SetTurnNotificationsLocale(string const & locale) { CHECK_THREAD_CHECKER(m_threadChecker, ()); LOG(LINFO, ("The language for turn notifications is", locale)); m_turnNotificationsMgr.SetLocale(locale); } -std::string RoutingSession::GetTurnNotificationsLocale() const +string RoutingSession::GetTurnNotificationsLocale() const { CHECK_THREAD_CHECKER(m_threadChecker, ()); return m_turnNotificationsMgr.GetLocale(); @@ -788,7 +790,7 @@ bool RoutingSession::IsRouteValid() const return m_route && m_route->IsValid(); } -bool RoutingSession::GetRouteAltitudesAndDistancesM(std::vector & routeSegDistanceM, +bool RoutingSession::GetRouteAltitudesAndDistancesM(vector & routeSegDistanceM, geometry::Altitudes & routeAltitudesM) const { CHECK_THREAD_CHECKER(m_threadChecker, ()); @@ -818,7 +820,7 @@ void RoutingSession::OnTrafficInfoClear() void RoutingSession::OnTrafficInfoAdded(TrafficInfo && info) { TrafficInfo::Coloring const & fullColoring = info.GetColoring(); - auto coloring = std::make_shared(); + auto coloring = make_shared(); for (auto const & kv : fullColoring) { ASSERT_NOT_EQUAL(kv.second, SpeedGroup::Unknown, ()); @@ -853,7 +855,7 @@ void RoutingSession::SetLocaleWithJsonForTesting(std::string const & json, std:: m_turnNotificationsMgr.SetLocaleWithJsonForTesting(json, locale); } -std::string DebugPrint(SessionState state) +string DebugPrint(SessionState state) { switch (state) { diff --git a/routing/routing_tests/applying_traffic_test.cpp b/routing/routing_tests/applying_traffic_test.cpp index 004e1d38da..94126ec29c 100644 --- a/routing/routing_tests/applying_traffic_test.cpp +++ b/routing/routing_tests/applying_traffic_test.cpp @@ -22,7 +22,7 @@ #include #include -namespace applying_traffic_test +namespace { using namespace routing; using namespace routing_test; @@ -253,4 +253,4 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_ChangingTraffic) TestRouteGeometry(*starter, Algorithm::Result::OK, noTrafficGeom); } } -} // namespace applying_traffic_test +} // namespace diff --git a/routing/routing_tests/checkpoint_predictor_test.cpp b/routing/routing_tests/checkpoint_predictor_test.cpp index ba911cc73d..e5cd8a8417 100644 --- a/routing/routing_tests/checkpoint_predictor_test.cpp +++ b/routing/routing_tests/checkpoint_predictor_test.cpp @@ -8,16 +8,19 @@ #include #include -namespace checkpoint_predictor_test +using namespace std; + +namespace { void TestAlmostEqual(double v1, double v2) { double constexpr kEpsMeters = 1.0; TEST(base::AlmostEqualAbs(v1, v2, kEpsMeters), (v1, v2)); } +} // namespace -using routing::CheckpointPredictor; - +namespace routing +{ class CheckpointPredictorTest { public: @@ -44,7 +47,7 @@ UNIT_CLASS_TEST(CheckpointPredictorTest, CalculateDeltaMetersTest) // Zero intermediate point test. UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest1) { - std::vector const intermediatePoints = {}; + vector const intermediatePoints = {}; TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(-0.5, 0.5)), 0, ()); TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(1.5, -0.5)), 0, ()); @@ -56,7 +59,7 @@ UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest1) // One intermediate point test. UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest2) { - std::vector const intermediatePoints = {{2.0, 0.0}}; + vector const intermediatePoints = {{2.0, 0.0}}; TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(-0.5, 0.5)), 0, ()); TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(1.5, -0.5)), 0, ()); @@ -67,7 +70,7 @@ UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest2) // Three intermediate points test. UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest3) { - std::vector const intermediatePoints = {{1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}}; + vector const intermediatePoints = {{1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}}; TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(-0.5, 0.5)), 0, ()); TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(0.5, 0.5)), 0, ()); @@ -76,4 +79,4 @@ UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest3) TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(3.5, 0.7)), 3, ()); TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(5.0, 0.0)), 3, ()); } -} // namespace checkpoint_predictor_test +} // namespace routing diff --git a/routing/routing_tests/cumulative_restriction_test.cpp b/routing/routing_tests/cumulative_restriction_test.cpp index e41a459522..858b43799a 100644 --- a/routing/routing_tests/cumulative_restriction_test.cpp +++ b/routing/routing_tests/cumulative_restriction_test.cpp @@ -18,7 +18,7 @@ #include #include -namespace cumulative_restriction_test +namespace { using namespace routing; using namespace routing_test; @@ -394,4 +394,4 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_CheckOnlyRestriction) test({start, {2, 0}, {1, 1}, {2, 2}, {3, 1}, finish}, move(restrictionsNo)); test({start, {2, 0}, {3, 0}, finish}, RestrictionVec()); } -} // namespace cumulative_restriction_test +} // namespace diff --git a/routing/routing_tests/fake_graph_test.cpp b/routing/routing_tests/fake_graph_test.cpp index 921ab26ff7..61435549d6 100644 --- a/routing/routing_tests/fake_graph_test.cpp +++ b/routing/routing_tests/fake_graph_test.cpp @@ -11,11 +11,11 @@ #include #include -namespace fake_graph_test -{ using namespace routing; using namespace std; +namespace +{ Segment GetSegment(uint32_t segmentIdx, bool isReal = false) { static NumMwmId constexpr kFakeNumMwmId = std::numeric_limits::max(); @@ -94,7 +94,10 @@ FakeGraph ConstructFakeGraph(uint32_t numerationStart, uint32_t numFake, uint32_ } return fakeGraph; } +} // namespace +namespace routing +{ // Test constructs two fake graphs, performs checks during construction, merges graphs // Calls FakeGraph::Append and checks topology of the merged graph. UNIT_TEST(FakeGraphTest) @@ -140,4 +143,4 @@ UNIT_TEST(FakeGraphTest) } } } -} // namespace fake_graph_test +} // namespace routing diff --git a/routing/routing_tests/index_graph_test.cpp b/routing/routing_tests/index_graph_test.cpp index fb9834aab4..13e0389a0d 100644 --- a/routing/routing_tests/index_graph_test.cpp +++ b/routing/routing_tests/index_graph_test.cpp @@ -32,11 +32,12 @@ #include #include -namespace index_graph_test +using namespace std; + +namespace { using namespace routing; using namespace routing_test; -using namespace std; using measurement_utils::KmphToMps; @@ -112,7 +113,10 @@ void TestIngoingEdges(IndexGraph & graph, Segment const & segment, } uint32_t AbsDelta(uint32_t v0, uint32_t v1) { return v0 > v1 ? v0 - v1 : v1 - v0; } +} // namespace +namespace routing_test +{ // R4 (one way down) // // R1 J2--------J3 -1 @@ -850,4 +854,4 @@ UNIT_TEST(FinishNearZeroEdge) {1.0 /* x */, 0.0 /* y */}, {2.0, 0.0}, {4.0, 0.0}, {5.0, 0.0}}; TestRouteGeometry(*starter, AlgorithmForIndexGraphStarter::Result::OK, expectedGeom); } -} // namespace index_graph_test +} // namespace routing_test diff --git a/routing/routing_tests/maxspeeds_tests.cpp b/routing/routing_tests/maxspeeds_tests.cpp index e8448c2710..268393b47d 100644 --- a/routing/routing_tests/maxspeeds_tests.cpp +++ b/routing/routing_tests/maxspeeds_tests.cpp @@ -16,7 +16,7 @@ #include #include -namespace maxspeeds_test +namespace { using namespace measurement_utils; using namespace routing; @@ -235,4 +235,4 @@ UNIT_TEST(Maxspeed_Smoke) TEST_EQUAL(maxspeed.GetSpeedKmPH(false /* forward */), 40, ()); } } -} // namespace maxspeeds_test +} // namespace diff --git a/routing/routing_tests/nearest_edge_finder_tests.cpp b/routing/routing_tests/nearest_edge_finder_tests.cpp index 2936d81a4a..7bc4e68905 100644 --- a/routing/routing_tests/nearest_edge_finder_tests.cpp +++ b/routing/routing_tests/nearest_edge_finder_tests.cpp @@ -11,8 +11,6 @@ #include "base/checked_cast.hpp" -namespace nearest_edge_finder_tests -{ using namespace routing; using namespace routing_test; using namespace std; @@ -72,4 +70,3 @@ UNIT_TEST(MiddleSegmentTest_Mock1Graph) geometry::MakePointWithAltitudeForTesting(m2::PointD(12.5, 0)))}; TestNearestOnMock1(m2::PointD(12.5, 2.5), 2, expected); } -} // namespace nearest_edge_finder_tests \ No newline at end of file diff --git a/routing/routing_tests/road_access_test.cpp b/routing/routing_tests/road_access_test.cpp index 6dbc6e93ae..c713646bb7 100644 --- a/routing/routing_tests/road_access_test.cpp +++ b/routing/routing_tests/road_access_test.cpp @@ -15,14 +15,14 @@ #include "3party/opening_hours/opening_hours.hpp" -namespace road_access_test -{ using namespace routing; using namespace routing_test; using namespace std; using TestEdge = TestIndexGraphTopology::Edge; +namespace +{ void FillRoadAccessBySample_1(RoadAccess & roadAccess) { RoadAccess::WayToAccess wayToAccess = { @@ -739,4 +739,4 @@ UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach) TestTopologyGraph(graph, 0 /* from */, 5 /* to */, false /* pathFound */, expectedWeight, expectedEdges); } -} // namespace namespace road_access_test +} // namespace diff --git a/routing/routing_tests/road_graph_builder.cpp b/routing/routing_tests/road_graph_builder.cpp index 041e7b1a7d..9365c55383 100644 --- a/routing/routing_tests/road_graph_builder.cpp +++ b/routing/routing_tests/road_graph_builder.cpp @@ -13,9 +13,11 @@ #include #include -namespace routing_test +using namespace routing; +using namespace std; + +namespace { -using std::move; auto constexpr kMaxSpeedKMpH = 5.0; @@ -27,7 +29,7 @@ public: { UNUSED_VALUE(Register(platform::LocalCountryFile::MakeForTesting("0"))); - std::vector> mwmsInfoList; + vector> mwmsInfoList; GetMwmsInfo(mwmsInfoList); m_mwmInfo = mwmsInfoList[0]; @@ -41,23 +43,28 @@ public: private: /// @name MwmSet overrides //@{ - std::unique_ptr CreateInfo(platform::LocalCountryFile const &) const override + unique_ptr CreateInfo(platform::LocalCountryFile const &) const override { - std::unique_ptr info(new MwmInfo()); + unique_ptr info(new MwmInfo()); info->m_maxScale = 1; info->m_bordersRect = m2::RectD(0, 0, 1, 1); info->m_version.SetFormat(version::Format::lastFormat); return info; } - std::unique_ptr CreateValue(MwmInfo & info) const override + unique_ptr CreateValue(MwmInfo & info) const override { - return std::make_unique(info.GetLocalFile()); + return make_unique(info.GetLocalFile()); } //@} - std::shared_ptr m_mwmInfo; + shared_ptr m_mwmInfo; }; +} // namespace + +namespace routing_test +{ + void RoadGraphMockSource::AddRoad(RoadInfo && ri) { CHECK_GREATER_OR_EQUAL(ri.m_junctions.size(), 2, ("Empty road")); diff --git a/routing/routing_tests/routing_algorithm.cpp b/routing/routing_tests/routing_algorithm.cpp index 12fcf2229a..3b467fec27 100644 --- a/routing/routing_tests/routing_algorithm.cpp +++ b/routing/routing_tests/routing_algorithm.cpp @@ -69,6 +69,8 @@ void DirectedGraph::GetEdgesList(Vertex const & v, bool isOutgoing, EdgeListT & adj = isOutgoing ? m_outgoing[v] : m_ingoing[v]; } +using namespace std; + namespace { inline double TimeBetweenSec(geometry::PointWithAltitude const & j1, @@ -81,7 +83,7 @@ inline double TimeBetweenSec(geometry::PointWithAltitude const & j1, double const distanceM = mercator::DistanceOnEarth(j1.GetPoint(), j2.GetPoint()); double const altitudeDiffM = static_cast(j2.GetAltitude()) - static_cast(j1.GetAltitude()); - return std::sqrt(distanceM * distanceM + altitudeDiffM * altitudeDiffM) / speedMPS; + return sqrt(distanceM * distanceM + altitudeDiffM * altitudeDiffM) / speedMPS; } /// A class which represents an weighted edge used by RoadGraph. @@ -177,7 +179,7 @@ TestAStarBidirectionalAlgo::Result Convert(Algorithm::Result value) } } // namespace -std::string DebugPrint(TestAStarBidirectionalAlgo::Result const & value) +string DebugPrint(TestAStarBidirectionalAlgo::Result const & value) { switch (value) { @@ -190,7 +192,7 @@ std::string DebugPrint(TestAStarBidirectionalAlgo::Result const & value) } UNREACHABLE(); - return std::string(); + return string(); } // *************************** AStar-bidirectional routing algorithm implementation *********************** diff --git a/routing/routing_tests/turns_sound_test.cpp b/routing/routing_tests/turns_sound_test.cpp index 764200f36b..d362d9c146 100644 --- a/routing/routing_tests/turns_sound_test.cpp +++ b/routing/routing_tests/turns_sound_test.cpp @@ -3,10 +3,13 @@ #include "routing/turns_notification_manager.hpp" #include "routing/turns_sound_settings.hpp" +#include "platform/location.hpp" + #include namespace turns_sound_test { +using namespace location; using namespace std; using routing::turns::CarDirection; using routing::turns::TurnItemDist; @@ -16,7 +19,7 @@ using routing::turns::sound::Settings; // An error to compare two double after conversion feet to meters. double const kEps = 1.; -UNIT_TEST(TurnNotificationSettings_MetersTest) +UNIT_TEST(TurnNotificationSettingsMetersTest) { Settings const settings(20 /* notificationTimeSeconds */, 200 /* minNotificationDistanceUnits */, 700 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */, @@ -47,7 +50,7 @@ UNIT_TEST(TurnNotificationSettings_MetersTest) TEST_EQUAL(settings.ComputeDistToPronounceDistM(200. /* speedMetersPerSecond */), 150., ()); } -UNIT_TEST(TurnNotificationSettings_FeetTest) +UNIT_TEST(TurnNotificationSettingsFeetTest) { Settings const settings(20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */, 2000 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */, @@ -66,7 +69,7 @@ UNIT_TEST(TurnNotificationSettings_FeetTest) TEST_EQUAL(settings.RoundByPresetSoundedDistancesUnits(0 /* distanceInUnits */), 200, ()); } -UNIT_TEST(TurnNotificationSettings_NotValidTest) +UNIT_TEST(TurnNotificationSettingsNotValidTest) { Settings settings1(20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */, 2000 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */, @@ -85,7 +88,7 @@ UNIT_TEST(TurnNotificationSettings_NotValidTest) TEST(!settings2.IsValid(), ()); } -UNIT_TEST(TurnsSound_MetersTest) +UNIT_TEST(TurnsSoundMetersTest) { string const engShortJson = "\ @@ -177,7 +180,7 @@ UNIT_TEST(TurnsSound_MetersTest) // - Two turns; // - They are close to each other; // So the first notification of the second turn shall be skipped. -UNIT_TEST(TurnsSound_MetersTwoTurnsTest) +UNIT_TEST(TurnsSoundMetersTwoTurnsTest) { string const engShortJson = "\ @@ -248,7 +251,7 @@ UNIT_TEST(TurnsSound_MetersTwoTurnsTest) TEST(notificationManager.IsEnabled(), ()); } -UNIT_TEST(TurnsSound_FeetTest) +UNIT_TEST(TurnsSoundFeetTest) { string const engShortJson = "\ @@ -325,13 +328,12 @@ UNIT_TEST(TurnsSound_FeetTest) TEST(notificationManager.IsEnabled(), ()); } -UNIT_TEST(TurnsSound_ComposedTurnTest) +UNIT_TEST(TurnsSoundComposedTurnTest) { string const engShortJson = "\ {\ \"in_600_meters\":\"In 600 meters.\",\ - \"in_200_meters\":\"In 200 meters.\",\ \"make_a_right_turn\":\"Turn right.\",\ \"enter_the_roundabout\":\"Enter the roundabout.\",\ \"then\":\"Then.\",\ @@ -355,7 +357,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest) // 620 meters till the first turn. turnNotifications.clear(); vector const turns2 = {{{5 /* idx */, CarDirection::TurnRight}, 620. /* m_distMeters */}, - {{10 /* idx */, CarDirection::EnterRoundAbout}, 665. /* m_distMeters */}}; + {{10 /* idx */, CarDirection::EnterRoundAbout}, 820. /* m_distMeters */}}; vector const expectedNotification2 = {{"In 600 meters. Turn right."}, {"Then. Enter the roundabout."}}; notificationManager.GenerateTurnNotifications(turns2, turnNotifications); @@ -375,7 +377,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest) vector const turns4 = {{{5 /* idx */, CarDirection::TurnRight}, 20. /* m_distMeters */}, {{10 /* idx */, CarDirection::EnterRoundAbout}, 220. /* m_distMeters */}}; vector const expectedNotification4 = {{"Turn right."}, - {"Then. In 200 meters. Enter the roundabout."}}; + {"Then. Enter the roundabout."}}; notificationManager.GenerateTurnNotifications(turns4, turnNotifications); TEST_EQUAL(turnNotifications, expectedNotification4, ()); TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::EnterRoundAbout, ()); @@ -398,7 +400,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest) TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ()); } -UNIT_TEST(TurnsSound_RoundaboutTurnTest) +UNIT_TEST(TurnsSoundRoundaboutTurnTest) { string const engShortJson = "\ @@ -409,7 +411,6 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest) \"take_the_2_exit\":\"Take the second exit.\",\ \"take_the_4_exit\":\"Take the fourth exit.\",\ \"in_600_meters\":\"In 600 meters.\",\ - \"in_1_kilometer\":\"In 1 kilometer.\",\ \"then\":\"Then.\"\ }"; auto notificationManager = NotificationManager::CreateNotificationManagerForTesting( @@ -435,7 +436,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest) {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 1620. /* m_distMeters */}}; vector const expectedNotification2 = {{"In 600 meters. Enter the roundabout."}, - {"Then. In 1 kilometer. Take the second exit."}}; + {"Then. Take the second exit."}}; notificationManager.GenerateTurnNotifications(turns2, turnNotifications); TEST_EQUAL(turnNotifications, expectedNotification2, ()); TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ()); @@ -446,7 +447,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest) {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 1003. /* m_distMeters */}}; vector const expectedNotification3 = {{"Enter the roundabout."}, - {"Then. In 1 kilometer. Take the second exit."}}; + {"Then. Take the second exit."}}; notificationManager.GenerateTurnNotifications(turns3, turnNotifications); TEST_EQUAL(turnNotifications, expectedNotification3, ()); TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ()); @@ -485,7 +486,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest) {{20 /* idx */, CarDirection::LeaveRoundAbout, 1 /* m_exitNum */}, 1005. /* m_distMeters */}}; vector const expectedNotification7 = {{"Enter the roundabout."}, - {"Then. In 1 kilometer. Take the first exit."}}; + {"Then. Take the first exit."}}; notificationManager.GenerateTurnNotifications( turns7, turnNotifications); // The first notification fast forwarding. notificationManager.GenerateTurnNotifications(turns7, turnNotifications); @@ -506,7 +507,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest) vector const turns9 = {{{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */}, 620. /* m_distMeters */}, {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */}, - 665. /* m_distMeters */}}; + 920. /* m_distMeters */}}; vector const expectedNotification9 = {{"In 600 meters. Enter the roundabout."}, {"Then. Take the fourth exit."}}; notificationManager.GenerateTurnNotifications(turns9, turnNotifications); diff --git a/routing/routing_tests/turns_tts_text_tests.cpp b/routing/routing_tests/turns_tts_text_tests.cpp index 236da541b8..8ebe9c5255 100644 --- a/routing/routing_tests/turns_tts_text_tests.cpp +++ b/routing/routing_tests/turns_tts_text_tests.cpp @@ -6,7 +6,7 @@ #include #include -namespace turns_tts_text_tests +namespace { using namespace routing::turns; using namespace routing::turns::sound; @@ -24,9 +24,9 @@ UNIT_TEST(GetDistanceTextIdMetersTest) Notification const notification1(500, 0, false, CarDirection::TurnRight, measurement_utils::Units::Metric); TEST_EQUAL(GetDistanceTextId(notification1), "in_500_meters", ()); -// Notification const notification2(500, 0, true, CarDirection::TurnRight, -// measurement_utils::Units::Metric); -// TEST_EQUAL(GetDistanceTextId(notification2), "then", ()); + Notification const notification2(500, 0, true, CarDirection::TurnRight, + measurement_utils::Units::Metric); + TEST_EQUAL(GetDistanceTextId(notification2), "then", ()); Notification const notification3(200, 0, false, CarDirection::TurnRight, measurement_utils::Units::Metric); TEST_EQUAL(GetDistanceTextId(notification3), "in_200_meters", ()); @@ -42,9 +42,9 @@ UNIT_TEST(GetDistanceTextIdFeetTest) Notification const notification1(500, 0, false, CarDirection::TurnRight, measurement_utils::Units::Imperial); TEST_EQUAL(GetDistanceTextId(notification1), "in_500_feet", ()); -// Notification const notification2(500, 0, true, CarDirection::TurnRight, -// measurement_utils::Units::Imperial); -// TEST_EQUAL(GetDistanceTextId(notification2), "then", ()); + Notification const notification2(500, 0, true, CarDirection::TurnRight, + measurement_utils::Units::Imperial); + TEST_EQUAL(GetDistanceTextId(notification2), "then", ()); Notification const notification3(800, 0, false, CarDirection::TurnRight, measurement_utils::Units::Imperial); TEST_EQUAL(GetDistanceTextId(notification3), "in_800_feet", ()); @@ -232,4 +232,4 @@ UNIT_TEST(GetSoundedDistFeet) TEST_EQUAL(soundedDistFeet[7], 2000, ()); TEST_EQUAL(soundedDistFeet[10], 5000, ()); } -} // namespace turns_tts_text_tests +} // namespace diff --git a/routing/segment.hpp b/routing/segment.hpp index 81e6e716c7..a9468c90bd 100644 --- a/routing/segment.hpp +++ b/routing/segment.hpp @@ -47,7 +47,7 @@ public: bool operator!=(Segment const & seg) const; bool IsInverse(Segment const & seg) const; - Segment GetReversed() const { return { m_mwmId, m_featureId, m_segmentIdx, !m_forward }; } + void Inverse() { m_forward = !m_forward; } /// @todo Logically, these functions should be equal, but keep existing logic, /// and investigate possible enhancements in future. diff --git a/routing/single_vehicle_world_graph.cpp b/routing/single_vehicle_world_graph.cpp index 059814738c..d978fa08e8 100644 --- a/routing/single_vehicle_world_graph.cpp +++ b/routing/single_vehicle_world_graph.cpp @@ -1,8 +1,11 @@ #include "routing/single_vehicle_world_graph.hpp" -#include "base/assert.hpp" +#include "routing/base/astar_algorithm.hpp" #include +#include + +#include "base/assert.hpp" namespace routing { @@ -20,9 +23,9 @@ SingleVehicleWorldGraph::SingleVehicleWorldGraph(unique_ptr cross unique_ptr loader, shared_ptr estimator, MwmHierarchyHandler && hierarchyHandler) - : m_crossMwmGraph(std::move(crossMwmGraph)) - , m_loader(std::move(loader)) - , m_estimator(std::move(estimator)) + : m_crossMwmGraph(move(crossMwmGraph)) + , m_loader(move(loader)) + , m_estimator(move(estimator)) , m_hierarchyHandler(std::move(hierarchyHandler)) { CHECK(m_loader, ()); @@ -68,6 +71,7 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par { newCrossMwmEdges.emplace_back(*edge); newCrossMwmEdges.back().GetTarget().AssignID(twin); + newCrossMwmEdges.back().GetWeight() += m_hierarchyHandler.GetCrossBorderPenalty(mwmId, twinMwmId); parentWeights.push_back(parentWeights[i]); } @@ -211,11 +215,6 @@ void SingleVehicleWorldGraph::GetTwinsInner(Segment const & segment, bool isOutg m_crossMwmGraph->GetTwins(segment, isOutgoing, twins); } -RouteWeight SingleVehicleWorldGraph::GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2) -{ - return m_hierarchyHandler.GetCrossBorderPenalty(mwmId1, mwmId2); -} - bool SingleVehicleWorldGraph::IsRoutingOptionsGood(Segment const & segment) { auto const & geometry = GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()); diff --git a/routing/single_vehicle_world_graph.hpp b/routing/single_vehicle_world_graph.hpp index 157ef96508..e819ffca80 100644 --- a/routing/single_vehicle_world_graph.hpp +++ b/routing/single_vehicle_world_graph.hpp @@ -9,10 +9,15 @@ #include "routing/mwm_hierarchy_handler.hpp" #include "routing/route.hpp" #include "routing/segment.hpp" +#include "routing/transit_info.hpp" #include "routing/world_graph.hpp" #include "routing_common/num_mwm_id.hpp" +#include "geometry/point2d.hpp" +#include "geometry/point_with_altitude.hpp" + +#include #include #include #include @@ -114,11 +119,8 @@ private: JointEdgeListT & jointEdges, WeightListT & parentWeights, bool isOutgoing); - /// @name WorldGraph overrides. - /// @{ + // WorldGraph overrides: void GetTwinsInner(Segment const & s, bool isOutgoing, std::vector & twins) override; - RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2) override; - /// @} RoadGeometry const & GetRoadGeometry(NumMwmId mwmId, uint32_t featureId); diff --git a/routing/transit_graph.cpp b/routing/transit_graph.cpp index 24ed349553..751283838f 100644 --- a/routing/transit_graph.cpp +++ b/routing/transit_graph.cpp @@ -3,8 +3,9 @@ #include "routing/fake_feature_ids.hpp" #include "routing/index_graph.hpp" -#include "geometry/mercator.hpp" +#include "indexer/feature_altitude.hpp" +#include "geometry/mercator.hpp" namespace routing { @@ -15,6 +16,12 @@ using namespace std; // gtfs converter step. size_t constexpr kDefaultIntervalS = 60 * 60; // 1 hour. +Segment GetReverseSegment(Segment const & segment) +{ + return Segment(segment.GetMwmId(), segment.GetFeatureId(), segment.GetSegmentIdx(), + !segment.IsForward()); +} + LatLonWithAltitude const & GetStopJunction( map const & stopCoords, transit::StopId stopId) { @@ -27,7 +34,7 @@ LatLonWithAltitude const & GetStopJunction( // static bool TransitGraph::IsTransitFeature(uint32_t featureId) { - return FakeFeatureIds::IsTransitFeature(featureId); + return FakeFeatureIds::IsTransitFeature(featureId); } // static @@ -422,7 +429,7 @@ void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending auto const fakeBackwardSegment = GetNewTransitSegment(); m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, !isEnter /* isOutgoing */, true /* isPartOfReal */, - projection.m_segment.GetReversed()); + GetReverseSegment(projection.m_segment)); } // Connect gate to stops @@ -479,7 +486,7 @@ void TransitGraph::AddGate(::transit::experimental::Gate const & gate, FakeEndin auto const fakeBackwardSegment = GetNewTransitSegment(); m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, !isEnter /* isOutgoing */, true /* isPartOfReal */, - projection.m_segment.GetReversed()); + GetReverseSegment(projection.m_segment)); } // Connect gate to stops @@ -540,7 +547,7 @@ void TransitGraph::AddStop(::transit::experimental::Stop const & stop, FakeEndin auto const fakeBackwardSegment = GetNewTransitSegment(); m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, !isEnter /* isOutgoing */, true /* isPartOfReal */, - projection.m_segment.GetReversed()); + GetReverseSegment(projection.m_segment)); } // Connect stop to graph. diff --git a/routing/transit_graph_loader.cpp b/routing/transit_graph_loader.cpp index 7a6e057009..b12d386f5e 100644 --- a/routing/transit_graph_loader.cpp +++ b/routing/transit_graph_loader.cpp @@ -20,12 +20,14 @@ #include #include +using namespace std; + namespace routing { class TransitGraphLoaderImpl : public TransitGraphLoader { public: - TransitGraphLoaderImpl(MwmDataSource & dataSource, std::shared_ptr estimator) + TransitGraphLoaderImpl(MwmDataSource & dataSource, shared_ptr estimator) : m_dataSource(dataSource), m_estimator(estimator) { } @@ -44,7 +46,7 @@ public: void Clear() override { m_graphs.clear(); } private: - std::unique_ptr CreateTransitGraph(NumMwmId numMwmId, IndexGraph & indexGraph) const + unique_ptr CreateTransitGraph(NumMwmId numMwmId, IndexGraph & indexGraph) const { base::Timer timer; @@ -52,17 +54,17 @@ private: // By default we return empty transit graph with version OnlySubway. if (!mwmValue.m_cont.IsExist(TRANSIT_FILE_TAG)) - return std::make_unique(::transit::TransitVersion::OnlySubway, numMwmId, m_estimator); + return make_unique(::transit::TransitVersion::OnlySubway, numMwmId, m_estimator); try { FilesContainerR::TReader reader(mwmValue.m_cont.GetReader(TRANSIT_FILE_TAG)); auto const transitHeaderVersion = ::transit::GetVersion(*reader.GetPtr()); - std::unique_ptr graph; + unique_ptr graph; if (transitHeaderVersion == ::transit::TransitVersion::OnlySubway) { - graph = std::make_unique(::transit::TransitVersion::OnlySubway, numMwmId, m_estimator); + graph = make_unique(::transit::TransitVersion::OnlySubway, numMwmId, m_estimator); transit::GraphData transitData; transitData.DeserializeForRouting(*reader.GetPtr()); @@ -74,7 +76,7 @@ private: } else if (transitHeaderVersion == ::transit::TransitVersion::AllPublicTransport) { - graph = std::make_unique(::transit::TransitVersion::AllPublicTransport, numMwmId, m_estimator); + graph = make_unique(::transit::TransitVersion::AllPublicTransport, numMwmId, m_estimator); ::transit::experimental::TransitData transitData; transitData.DeserializeForRouting(*reader.GetPtr()); @@ -105,14 +107,14 @@ private: } MwmDataSource & m_dataSource; - std::shared_ptr m_estimator; - std::unordered_map> m_graphs; + shared_ptr m_estimator; + unordered_map> m_graphs; }; // static -std::unique_ptr TransitGraphLoader::Create(MwmDataSource & dataSource, std::shared_ptr estimator) +unique_ptr TransitGraphLoader::Create(MwmDataSource & dataSource, shared_ptr estimator) { - return std::make_unique(dataSource, estimator); + return make_unique(dataSource, estimator); } } // namespace routing diff --git a/routing/turns_notification_manager.cpp b/routing/turns_notification_manager.cpp index d33d2cd11a..70c830ea34 100644 --- a/routing/turns_notification_manager.cpp +++ b/routing/turns_notification_manager.cpp @@ -1,26 +1,20 @@ #include "routing/turns_notification_manager.hpp" +#include "platform/location.hpp" + #include "base/assert.hpp" #include #include -namespace routing -{ -namespace turns -{ -namespace sound -{ +using namespace std; namespace { -// If the distance between two sequential turns is less than kSecondTurnThresholdDistM -// the information about the second turn will be shown or pronounced -// when the user is approaching to the first one with "Then.". -double constexpr kSecondTurnThresholdDistM = 400.0; -// If the distance between two sequential turns is less than kDistanceNotifyThresholdM -// the notification will *not* append second distance, (like "In 500 meters. Turn left. Then. Turn right.") -double constexpr kDistanceNotifyThresholdM = 50.0; +// If the distance between two sequential turns is less than kMaxTurnDistM +// the information about the second turn will be shown or pronounced when the user is +// approaching to the first one. +double constexpr kMaxTurnDistM = 400.0; // Returns true if the closest turn is an entrance to a roundabout and the second is // an exit form a roundabout. @@ -35,6 +29,12 @@ bool IsClassicEntranceToRoundabout(routing::turns::TurnItemDist const & firstTur } } // namespace +namespace routing +{ +namespace turns +{ +namespace sound +{ NotificationManager::NotificationManager() : m_enabled(false) , m_speedMetersPerSecond(0.0) @@ -54,7 +54,7 @@ NotificationManager::NotificationManager() NotificationManager NotificationManager::CreateNotificationManagerForTesting( uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters, uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits, - std::string const & engShortJson, uint32_t notificationTimeSecond, double speedMeterPerSecond) + string const & engShortJson, uint32_t notificationTimeSecond, double speedMeterPerSecond) { NotificationManager notificationManager; notificationManager.m_settings = Settings(startBeforeSeconds, minStartBeforeMeters, @@ -71,8 +71,9 @@ NotificationManager NotificationManager::CreateNotificationManagerForTesting( return notificationManager; } -std::string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_t exitNum, - bool useThenInsteadOfDistance, TurnItem const & turn, measurement_utils::Units lengthUnits) const +string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_t exitNum, + bool useThenInsteadOfDistance, TurnItem const & turn, + measurement_utils::Units lengthUnits) const { if (turn.m_turn != CarDirection::None) { @@ -86,13 +87,13 @@ std::string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_ return m_getTtsText.GetTurnNotification(notification); } -std::string NotificationManager::GenerateSpeedCameraText() const +string NotificationManager::GenerateSpeedCameraText() const { return m_getTtsText.GetSpeedCameraNotification(); } -void NotificationManager::GenerateTurnNotifications(std::vector const & turns, - std::vector & turnNotifications) +void NotificationManager::GenerateTurnNotifications(vector const & turns, + vector & turnNotifications) { m_secondTurnNotification = GenerateSecondTurnNotification(turns); @@ -101,48 +102,37 @@ void NotificationManager::GenerateTurnNotifications(std::vector co return; TurnItemDist const & firstTurn = turns.front(); - std::string firstNotification = GenerateFirstTurnSound(firstTurn.m_turnItem, firstTurn.m_distMeters); + string firstNotification = GenerateFirstTurnSound(firstTurn.m_turnItem, firstTurn.m_distMeters); if (m_nextTurnNotificationProgress == PronouncedNotification::Nothing) return; if (firstNotification.empty()) return; - turnNotifications.emplace_back(std::move(firstNotification)); + turnNotifications.emplace_back(move(firstNotification)); // Generating notifications like "Then turn left" if necessary. if (turns.size() < 2) return; TurnItemDist const & secondTurn = turns[1]; ASSERT_LESS_OR_EQUAL(firstTurn.m_distMeters, secondTurn.m_distMeters, ()); - - double distBetweenTurnsMeters = secondTurn.m_distMeters - firstTurn.m_distMeters; - ASSERT_GREATER_OR_EQUAL(distBetweenTurnsMeters, 0, ()); - if (distBetweenTurnsMeters > kSecondTurnThresholdDistM && + if (secondTurn.m_distMeters - firstTurn.m_distMeters > kMaxTurnDistM && !IsClassicEntranceToRoundabout(firstTurn, secondTurn)) { return; } - - if (distBetweenTurnsMeters < kDistanceNotifyThresholdM) - { - // distanceUnits is not used because of "Then" is used - distBetweenTurnsMeters = 0; - } - - std::string secondNotification = GenerateTurnText( - distBetweenTurnsMeters, secondTurn.m_turnItem.m_exitNum, + string secondNotification = GenerateTurnText( + 0 /* distanceUnits is not used because of "Then" is used */, secondTurn.m_turnItem.m_exitNum, true, secondTurn.m_turnItem, m_settings.GetLengthUnits()); if (secondNotification.empty()) return; - turnNotifications.emplace_back(std::move(secondNotification)); - + turnNotifications.emplace_back(move(secondNotification)); // Turn notification with word "Then" (about the second turn) will be pronounced. // When this second turn become the first one the first notification about the turn // shall be skipped. m_turnNotificationWithThen = true; } -std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, - double distanceToTurnMeters) +string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, + double distanceToTurnMeters) { if (m_nextTurnIndex != turn.m_index) { @@ -174,8 +164,8 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, if (distToPronounceMeters < 0) { FastForwardFirstTurnNotification(); - return std::string{}; // The current position is too close to the turn for the first - // notification. + return string(); // The current position is too close to the turn for the first + // notification. } // Pronouncing first turn sound notification. @@ -197,7 +187,7 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, m_nextTurnNotificationProgress = PronouncedNotification::First; FastForwardFirstTurnNotification(); } - return std::string{}; + return string(); } if (m_nextTurnNotificationProgress == PronouncedNotification::First && @@ -209,7 +199,7 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, false /* useThenInsteadOfDistance */, turn, m_settings.GetLengthUnits()); } - return std::string{}; + return string(); } void NotificationManager::Enable(bool enable) @@ -244,7 +234,7 @@ void NotificationManager::SetSpeedMetersPerSecond(double speed) // When the quality of GPS data is bad the current speed may be less then zero. // It's easy to reproduce at an office with Nexus 5. // In that case zero meters per second is used. - m_speedMetersPerSecond = std::max(0., speed); + m_speedMetersPerSecond = max(0., speed); } void NotificationManager::Reset() @@ -263,7 +253,7 @@ void NotificationManager::FastForwardFirstTurnNotification() m_nextTurnNotificationProgress = PronouncedNotification::First; } -CarDirection NotificationManager::GenerateSecondTurnNotification(std::vector const & turns) +CarDirection NotificationManager::GenerateSecondTurnNotification(vector const & turns) { if (turns.size() < 2) { @@ -282,7 +272,7 @@ CarDirection NotificationManager::GenerateSecondTurnNotification(std::vector kSecondTurnThresholdDistM) + if (distBetweenTurnsMeters > kMaxTurnDistM) return CarDirection::None; uint32_t const startPronounceDistMeters = @@ -298,12 +288,12 @@ CarDirection NotificationManager::GenerateSecondTurnNotification(std::vector +using namespace std; +using namespace measurement_utils; + namespace routing { namespace turns { namespace sound { -using namespace std; -using namespace measurement_utils; - void Settings::SetState(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits, uint32_t maxNotificationDistanceUnits, vector const & soundedDistancesUnits, diff --git a/routing/turns_tts_text.cpp b/routing/turns_tts_text.cpp index c720f58e9e..46ff9f873e 100644 --- a/routing/turns_tts_text.cpp +++ b/routing/turns_tts_text.cpp @@ -6,21 +6,17 @@ #include #include #include +#include -namespace routing -{ -namespace turns -{ -namespace sound -{ +using namespace std; namespace { using namespace routing::turns::sound; -template std::string DistToTextId(TIter begin, TIter end, uint32_t dist) +template string DistToTextId(TIter begin, TIter end, uint32_t dist) { - using TValue = typename std::iterator_traits::value_type; + using TValue = typename iterator_traits::value_type; TIter distToSound = lower_bound(begin, end, dist, [](TValue const & p1, uint32_t p2) { @@ -29,23 +25,29 @@ template std::string DistToTextId(TIter begin, TIter end, uint32_t if (distToSound == end) { ASSERT(false, ("notification.m_distanceUnits is not correct.")); - return std::string{}; + return string(); } return distToSound->second; } } // namespace -void GetTtsText::SetLocale(std::string const & locale) +namespace routing +{ +namespace turns +{ +namespace sound +{ +void GetTtsText::SetLocale(string const & locale) { m_getCurLang = platform::GetTextByIdFactory(platform::TextSource::TtsSound, locale); } -void GetTtsText::ForTestingSetLocaleWithJson(std::string const & jsonBuffer, std::string const & locale) +void GetTtsText::ForTestingSetLocaleWithJson(string const & jsonBuffer, string const & locale) { m_getCurLang = platform::ForTestingGetTextByIdFactory(jsonBuffer, locale); } -std::string GetTtsText::GetTurnNotification(Notification const & notification) const +string GetTtsText::GetTurnNotification(Notification const & notification) const { if (notification.m_distanceUnits == 0 && !notification.m_useThenInsteadOfDistance) return GetTextById(GetDirectionTextId(notification)); @@ -54,59 +56,51 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c { if (notification.m_useThenInsteadOfDistance && notification.m_turnDirPedestrian == PedestrianDirection::None) - return {}; + return string(); } if (notification.m_useThenInsteadOfDistance && notification.m_turnDir == CarDirection::None) - return {}; + return string(); - std::string const dirStr = GetTextById(GetDirectionTextId(notification)); + string const dirStr = GetTextById(GetDirectionTextId(notification)); if (dirStr.empty()) - return {}; + return string(); - std::string distStr; - if (notification.m_useThenInsteadOfDistance) - { - distStr = GetTextById("then"); - if (notification.m_distanceUnits > 0) - distStr = distStr + " " + GetTextById(GetDistanceTextId(notification)); - } - else - distStr = GetTextById(GetDistanceTextId(notification)); + string const distStr = GetTextById(GetDistanceTextId(notification)); return distStr + " " + dirStr; } -std::string GetTtsText::GetSpeedCameraNotification() const +string GetTtsText::GetSpeedCameraNotification() const { return GetTextById("unknown_camera"); } -std::string GetTtsText::GetLocale() const +string GetTtsText::GetLocale() const { if (m_getCurLang == nullptr) { ASSERT(false, ()); - return {}; + return string(); } return m_getCurLang->GetLocale(); } -std::string GetTtsText::GetTextById(std::string const & textId) const +string GetTtsText::GetTextById(string const & textId) const { ASSERT(!textId.empty(), ()); if (m_getCurLang == nullptr) { ASSERT(false, ()); - return {}; + return string(); } return (*m_getCurLang)(textId); } -std::string GetDistanceTextId(Notification const & notification) +string GetDistanceTextId(Notification const & notification) { -// if (notification.m_useThenInsteadOfDistance) -// return "then"; + if (notification.m_useThenInsteadOfDistance) + return "then"; switch (notification.m_lengthUnits) { @@ -118,15 +112,15 @@ std::string GetDistanceTextId(Notification const & notification) notification.m_distanceUnits); } ASSERT(false, ()); - return {}; + return string(); } -std::string GetRoundaboutTextId(Notification const & notification) +string GetRoundaboutTextId(Notification const & notification) { if (notification.m_turnDir != CarDirection::LeaveRoundAbout) { ASSERT(false, ()); - return std::string{}; + return string(); } if (!notification.m_useThenInsteadOfDistance) return "leave_the_roundabout"; // Notification just before leaving a roundabout. @@ -138,20 +132,20 @@ std::string GetRoundaboutTextId(Notification const & notification) return "take_the_" + strings::to_string(static_cast(notification.m_exitNum)) + "_exit"; } -std::string GetYouArriveTextId(Notification const & notification) +string GetYouArriveTextId(Notification const & notification) { if (!notification.IsPedestrianNotification() && notification.m_turnDir != CarDirection::ReachedYourDestination) { ASSERT(false, ()); - return std::string{}; + return string(); } if (notification.IsPedestrianNotification() && notification.m_turnDirPedestrian != PedestrianDirection::ReachedYourDestination) { ASSERT(false, ()); - return std::string{}; + return string(); } if (notification.m_distanceUnits != 0 || notification.m_useThenInsteadOfDistance) @@ -159,7 +153,7 @@ std::string GetYouArriveTextId(Notification const & notification) return "you_have_reached_the_destination"; } -std::string GetDirectionTextId(Notification const & notification) +string GetDirectionTextId(Notification const & notification) { if (notification.IsPedestrianNotification()) { @@ -170,7 +164,7 @@ std::string GetDirectionTextId(Notification const & notification) case PedestrianDirection::TurnLeft: return "make_a_left_turn"; case PedestrianDirection::ReachedYourDestination: return GetYouArriveTextId(notification); case PedestrianDirection::None: - case PedestrianDirection::Count: ASSERT(false, (notification)); return std::string{}; + case PedestrianDirection::Count: ASSERT(false, (notification)); return string(); } } @@ -207,10 +201,10 @@ std::string GetDirectionTextId(Notification const & notification) case CarDirection::None: case CarDirection::Count: ASSERT(false, ()); - return std::string{}; + return string(); } ASSERT(false, ()); - return std::string{}; + return string(); } } // namespace sound } // namespace turns diff --git a/routing/vehicle_mask.cpp b/routing/vehicle_mask.cpp index dfadb30fe7..92f720baff 100644 --- a/routing/vehicle_mask.cpp +++ b/routing/vehicle_mask.cpp @@ -5,9 +5,11 @@ #include "base/assert.hpp" +using namespace std; + namespace routing { -std::string DebugPrint(VehicleType vehicleType) +string DebugPrint(VehicleType vehicleType) { switch (vehicleType) { @@ -20,9 +22,9 @@ std::string DebugPrint(VehicleType vehicleType) UNREACHABLE(); } -std::string ToString(VehicleType vehicleType) { return DebugPrint(vehicleType); } +string ToString(VehicleType vehicleType) { return DebugPrint(vehicleType); } -void FromString(std::string_view s, VehicleType & vehicleType) +void FromString(string_view s, VehicleType & vehicleType) { if (s == "Pedestrian") vehicleType = VehicleType::Pedestrian; @@ -39,9 +41,9 @@ void FromString(std::string_view s, VehicleType & vehicleType) } } -std::string DebugPrint(VehicleMask vehicleMask) +string DebugPrint(VehicleMask vehicleMask) { - std::ostringstream oss; + ostringstream oss; oss << "VehicleMask ["; bool first = true; for (size_t i = 0; i < static_cast(VehicleType::Count); ++i) diff --git a/routing/world_graph.cpp b/routing/world_graph.cpp index bfa741b519..9d98deb816 100644 --- a/routing/world_graph.cpp +++ b/routing/world_graph.cpp @@ -1,5 +1,6 @@ #include "routing/world_graph.hpp" +#include namespace routing { @@ -80,11 +81,6 @@ CrossMwmGraph & WorldGraph::GetCrossMwmGraph() UNREACHABLE(); } -RouteWeight WorldGraph::GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2) -{ - return RouteWeight(0); -} - std::string DebugPrint(WorldGraphMode mode) { switch (mode) diff --git a/routing/world_graph.hpp b/routing/world_graph.hpp index 98604e66d5..169c49dba1 100644 --- a/routing/world_graph.hpp +++ b/routing/world_graph.hpp @@ -13,8 +13,12 @@ #include "routing_common/num_mwm_id.hpp" +#include "geometry/point2d.hpp" +#include "geometry/point_with_altitude.hpp" + #include #include +#include #include #include @@ -122,8 +126,6 @@ public: virtual void GetTwinsInner(Segment const & segment, bool isOutgoing, std::vector & twins) = 0; - virtual RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2); - protected: void GetTwins(Segment const & segment, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges); diff --git a/routing_common/bicycle_model.cpp b/routing_common/bicycle_model.cpp index 45db54340f..ea365210b8 100644 --- a/routing_common/bicycle_model.cpp +++ b/routing_common/bicycle_model.cpp @@ -39,18 +39,14 @@ HighwayBasedSpeeds const kDefaultSpeeds = { {HighwayType::HighwaySecondaryLink, InOutCitySpeedKMpH(SpeedKMpH(15.0, 18.0), SpeedKMpH(20.0, 18.0))}, {HighwayType::HighwayTertiary, InOutCitySpeedKMpH(SpeedKMpH(15.0, 18.0), SpeedKMpH(20.0, 18.0))}, {HighwayType::HighwayTertiaryLink, InOutCitySpeedKMpH(SpeedKMpH(15.0, 18.0), SpeedKMpH(20.0, 18.0))}, + {HighwayType::HighwayService, InOutCitySpeedKMpH(SpeedKMpH(12.0, 18.0))}, {HighwayType::HighwayUnclassified, InOutCitySpeedKMpH(SpeedKMpH(12.0, 18.0))}, - - // https://github.com/organicmaps/organicmaps/issues/3881 - // Set equal speeds here to avoid useless detours via service roads (Batumi_AvoidServiceDetour test). - {HighwayType::HighwayService, InOutCitySpeedKMpH(SpeedKMpH(10.0, 14.0))}, - {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(10.0, 14.0))}, - {HighwayType::HighwayRoad, InOutCitySpeedKMpH(SpeedKMpH(10.0, 12.0))}, {HighwayType::HighwayTrack, InOutCitySpeedKMpH(SpeedKMpH(8.0, 12.0))}, {HighwayType::HighwayPath, InOutCitySpeedKMpH(SpeedKMpH(6.0, 12.0))}, {HighwayType::HighwayBridleway, InOutCitySpeedKMpH(SpeedKMpH(4.0, 12.0))}, {HighwayType::HighwayCycleway, InOutCitySpeedKMpH(SpeedKMpH(30.0, 20.0))}, + {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(8.0, 10.0))}, {HighwayType::HighwayLivingStreet, InOutCitySpeedKMpH(SpeedKMpH(7.0, 8.0))}, // Steps have obvious inconvenience of a bike in hands. {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(1.0, 1.0))}, @@ -205,12 +201,6 @@ BicycleModel::BicycleModel(VehicleModel::LimitsInitList const & limits, HighwayB // Assign 90% of max cycleway speed for bicycle=yes to keep choosing most preferred cycleway. auto const yesSpeed = kDefaultSpeeds.Get(HighwayType::HighwayCycleway).m_inCity * 0.9; AddAdditionalRoadTypes(cl, {{ std::move(hwtagYesBicycle), InOutCitySpeedKMpH(yesSpeed) }}); - - // Update max speed with possible ferry transfer and bicycle speed downhill. - // See EdgeEstimator::CalcHeuristic, GetBicycleClimbPenalty. - SpeedKMpH constexpr kMaxBicycleSpeedKMpH(100.0); - CHECK_LESS(m_maxModelSpeed, kMaxBicycleSpeedKMpH, ()); - m_maxModelSpeed = kMaxBicycleSpeedKMpH; } bool BicycleModel::IsBicycleBidir(feature::TypesHolder const & types) const diff --git a/routing_common/pedestrian_model.cpp b/routing_common/pedestrian_model.cpp index 5863135fbe..424d3b79e8 100644 --- a/routing_common/pedestrian_model.cpp +++ b/routing_common/pedestrian_model.cpp @@ -1,7 +1,7 @@ #include "routing_common/pedestrian_model.hpp" #include "indexer/classificator.hpp" - +#include "indexer/feature.hpp" namespace pedestrian_model { @@ -35,25 +35,19 @@ HighwayBasedSpeeds const kDefaultSpeeds = { {HighwayType::HighwaySecondaryLink, InOutCitySpeedKMpH(SpeedKMpH(3.0, 5.0))}, {HighwayType::HighwayTertiary, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))}, {HighwayType::HighwayTertiaryLink, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))}, - {HighwayType::HighwayRoad, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))}, - - {HighwayType::HighwayService, InOutCitySpeedKMpH(SpeedKMpH(4.5, 5.0))}, + {HighwayType::HighwayService, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, {HighwayType::HighwayUnclassified, InOutCitySpeedKMpH(SpeedKMpH(4.5, 5.0))}, - {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(4.5, 5.0))}, - - {HighwayType::HighwayBridleway, InOutCitySpeedKMpH(SpeedKMpH(1.0, 5.0))}, - {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(3.0))}, - {HighwayType::HighwayCycleway, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))}, - + {HighwayType::HighwayRoad, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))}, {HighwayType::HighwayTrack, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, {HighwayType::HighwayPath, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, + {HighwayType::HighwayBridleway, InOutCitySpeedKMpH(SpeedKMpH(1.0, 5.0))}, + {HighwayType::HighwayCycleway, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))}, + {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(4.5, 5.0))}, {HighwayType::HighwayLivingStreet, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, + {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(3.0))}, + {HighwayType::HighwayPedestrian, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, + {HighwayType::HighwayFootway, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, {HighwayType::ManMadePier, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, - - // Set 10% higher weight (than default 5) for foot designated ways. - {HighwayType::HighwayPedestrian, InOutCitySpeedKMpH(SpeedKMpH(5.5, 5.0))}, - {HighwayType::HighwayFootway, InOutCitySpeedKMpH(SpeedKMpH(5.5, 5.0))}, - /// @todo A car ferry has {10, 10}. Weight = 3 is 60% from reasonable 5 max speed. {HighwayType::RouteFerry, InOutCitySpeedKMpH(SpeedKMpH(3.0, 20.0))}, }; @@ -152,7 +146,7 @@ PedestrianModel::PedestrianModel(VehicleModel::LimitsInitList const & speedLimit m_noType = cl.GetTypeByPath({ "hwtag", "nofoot" }); m_yesType = cl.GetTypeByPath(hwtagYesFoot); - AddAdditionalRoadTypes(cl, {{ std::move(hwtagYesFoot), kDefaultSpeeds.Get(HighwayType::HighwayLivingStreet) }}); + AddAdditionalRoadTypes(cl, {{ std::move(hwtagYesFoot), kDefaultSpeeds.Get(HighwayType::HighwayFootway) }}); // Update max pedestrian speed with possible ferry transfer. See EdgeEstimator::CalcHeuristic. SpeedKMpH constexpr kMaxPedestrianSpeedKMpH(25.0); diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp index ae34bd47f5..818fd15eba 100644 --- a/routing_common/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -385,7 +385,6 @@ string DebugPrint(HighwayType type) case HighwayType::HighwaySecondaryLink: return "highway-secondary_link"; case HighwayType::RouteFerry: return "route-ferry"; case HighwayType::HighwayTertiaryLink: return "highway-tertiary_link"; - case HighwayType::HighwayBusway: return "highway-busway"; case HighwayType::RailwayRailMotorVehicle: return "railway-rail-motor_vehicle"; case HighwayType::RouteShuttleTrain: return "route-shuttle_train"; } diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp index 33ab35a295..0c36741e2c 100644 --- a/routing_common/vehicle_model.hpp +++ b/routing_common/vehicle_model.hpp @@ -54,7 +54,6 @@ enum class HighwayType : uint16_t HighwaySecondaryLink = 176, RouteFerry = 259, HighwayTertiaryLink = 272, - HighwayBusway = 858, // reserve type here, but this type is not used for any routing by default RailwayRailMotorVehicle = 994, RouteShuttleTrain = 1054, }; diff --git a/search/categories_cache.cpp b/search/categories_cache.cpp index aaa54e1044..905e0a640e 100644 --- a/search/categories_cache.cpp +++ b/search/categories_cache.cpp @@ -1,6 +1,7 @@ #include "search/categories_cache.hpp" #include "search/mwm_context.hpp" +#include "search/query_params.hpp" #include "search/retrieval.hpp" #include "indexer/classificator.hpp" @@ -8,12 +9,12 @@ #include "indexer/search_string_utils.hpp" #include "base/assert.hpp" +#include "base/levenshtein_dfa.hpp" +using namespace std; namespace search { -using namespace std; - // CategoriesCache --------------------------------------------------------------------------------- CBV CategoriesCache::Get(MwmContext const & context) { diff --git a/search/categories_cache.hpp b/search/categories_cache.hpp index fa2b5745fa..b2d6f699c3 100644 --- a/search/categories_cache.hpp +++ b/search/categories_cache.hpp @@ -7,6 +7,7 @@ #include "base/cancellable.hpp" +#include #include #include diff --git a/search/geocoder.cpp b/search/geocoder.cpp index 5d190a4064..5316b95306 100644 --- a/search/geocoder.cpp +++ b/search/geocoder.cpp @@ -290,7 +290,7 @@ unique_ptr GetWorldContext(DataSource const & dataSource) dataSource.GetMwmsInfo(infos); MwmSet::MwmHandle handle = indexer::FindWorld(dataSource, infos); if (handle.IsAlive()) - return make_unique(std::move(handle)); + return make_unique(move(handle)); return {}; } @@ -356,14 +356,6 @@ void Geocoder::SetParams(Params const & params) m_params = params; - auto const MakeRequest = [this](size_t i, auto & request) - { - FillRequestFromToken(m_params.GetToken(i), request); - for (auto const & index : m_params.GetTypeIndices(i)) - request.m_categories.emplace_back(FeatureTypeToString(index)); - request.SetLangs(m_params.GetLangs()); - }; - m_tokenRequests.clear(); m_prefixTokenRequest.Clear(); for (size_t i = 0; i < m_params.GetNumTokens(); ++i) @@ -371,11 +363,19 @@ void Geocoder::SetParams(Params const & params) if (!m_params.IsPrefixToken(i)) { m_tokenRequests.emplace_back(); - MakeRequest(i, m_tokenRequests.back()); + auto & request = m_tokenRequests.back(); + FillRequestFromToken(m_params.GetToken(i), request); + for (auto const & index : m_params.GetTypeIndices(i)) + request.m_categories.emplace_back(FeatureTypeToString(index)); + request.SetLangs(m_params.GetLangs()); } else { - MakeRequest(i, m_prefixTokenRequest); + auto & request = m_prefixTokenRequest; + FillRequestFromToken(m_params.GetToken(i), request); + for (auto const & index : m_params.GetTypeIndices(i)) + request.m_categories.emplace_back(FeatureTypeToString(index)); + request.SetLangs(m_params.GetLangs()); } } @@ -554,7 +554,7 @@ void Geocoder::GoImpl(vector const & infos, bool inViewport) // All MwmIds are unique during the application lifetime, so // it's ok to save MwmId. m_worldId = handle.GetId(); - m_context = make_unique(std::move(handle)); + m_context = make_unique(move(handle)); if (value.HasSearchIndex()) { @@ -584,7 +584,7 @@ void Geocoder::GoImpl(vector const & infos, bool inViewport) // intersecting with position and viewport. auto processCountry = [&](unique_ptr context, bool updatePreranker) { ASSERT(context, ()); - m_context = std::move(context); + m_context = move(context); SCOPE_GUARD(cleanup, [&]() { LOG(LDEBUG, (m_context->GetName(), "geocoding complete.")); @@ -907,7 +907,7 @@ void Geocoder::ForEachCountry(ExtendedMwmInfos const & extendedInfos, Fn && fn) continue; bool const updatePreranker = i + 1 >= extendedInfos.m_firstBatchSize; auto const & mwmType = extendedInfos.m_infos[i].m_type; - if (fn(make_unique(std::move(handle), mwmType), updatePreranker) == + if (fn(make_unique(move(handle), mwmType), updatePreranker) == base::ControlFlow::Break) { break; @@ -1188,7 +1188,7 @@ void Geocoder::WithPostcodes(BaseContext & ctx, Fn && fn) } m_postcodes.m_tokenRange = tokenRange; - m_postcodes.m_countryFeatures = std::move(postcodes); + m_postcodes.m_countryFeatures = move(postcodes); if (ctx.AllTokensUsed() && CityHasPostcode(ctx)) { @@ -1205,23 +1205,16 @@ void Geocoder::GreedilyMatchStreets(BaseContext & ctx, CentersFilter const & cen { TRACE(GreedilyMatchStreets); - ProcessStreets(ctx, centers, ctx.m_streets); + // Match streets without suburbs. + vector predictions; + StreetsMatcher::Go(ctx, ctx.m_streets, *m_filter, m_params, predictions); + + for (auto const & prediction : predictions) + CreateStreetsLayerAndMatchLowerLayers(ctx, prediction, centers); GreedilyMatchStreetsWithSuburbs(ctx, centers); } -void Geocoder::ProcessStreets(BaseContext & ctx, CentersFilter const & centers, CBV const & streets) -{ - using PredictionT = StreetsMatcher::Prediction; - vector predictions; - StreetsMatcher::Go(ctx, streets, *m_filter, m_params, predictions); - - // Iterating from best to worst predictions here. Make "Relaxed" results for the best prediction only - // to avoid dummy streets results, matched by very _common_ tokens. - for (size_t i = 0; i < predictions.size(); ++i) - CreateStreetsLayerAndMatchLowerLayers(ctx, predictions[i], centers, i == 0 /* makeRelaxed */); -} - void Geocoder::GreedilyMatchStreetsWithSuburbs(BaseContext & ctx, CentersFilter const & centers) { TRACE(GreedilyMatchStreetsWithSuburbs); @@ -1263,7 +1256,11 @@ void Geocoder::GreedilyMatchStreetsWithSuburbs(BaseContext & ctx, CentersFilter auto const suburbCBV = RetrieveGeometryFeatures(*m_context, rect, RectId::Suburb); auto const suburbStreets = ctx.m_streets.Intersect(suburbCBV); - ProcessStreets(ctx, centers, suburbStreets); + vector predictions; + StreetsMatcher::Go(ctx, suburbStreets, *m_filter, m_params, predictions); + + for (auto const & prediction : predictions) + CreateStreetsLayerAndMatchLowerLayers(ctx, prediction, centers); MatchPOIsAndBuildings(ctx, 0 /* curToken */, suburbCBV); }); @@ -1345,7 +1342,7 @@ void Geocoder::CentersFilter::ProcessStreets(std::vector & streets, Ge void Geocoder::CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx, StreetsMatcher::Prediction const & prediction, - CentersFilter const & centers, bool makeRelaxed) + CentersFilter const & centers) { auto & layers = ctx.m_layers; @@ -1370,7 +1367,7 @@ void Geocoder::CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx, MatchPOIsAndBuildings(ctx, 0 /* curToken */, CBV::GetFull()); // A relaxed best effort parse: at least show the street if we can find one. - if (makeRelaxed && numEmitted == ctx.m_numEmitted && ctx.SkipUsedTokens(0) != ctx.m_numTokens) + if (numEmitted == ctx.m_numEmitted && ctx.SkipUsedTokens(0) != ctx.m_numTokens) { TRACE(Relaxed); FindPaths(ctx); diff --git a/search/geocoder.hpp b/search/geocoder.hpp index 32828046cf..9d597f378d 100644 --- a/search/geocoder.hpp +++ b/search/geocoder.hpp @@ -254,9 +254,7 @@ private: void CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx, StreetsMatcher::Prediction const & prediction, - CentersFilter const & centers, bool makeRelaxed); - - void ProcessStreets(BaseContext & ctx, CentersFilter const & centers, CBV const & streets); + CentersFilter const & centers); // Tries to find all paths in a search tree, where each edge is // marked with some substring of the query tokens. These paths are diff --git a/search/house_numbers_matcher.cpp b/search/house_numbers_matcher.cpp index 0967fc017b..a9e7b7a567 100644 --- a/search/house_numbers_matcher.cpp +++ b/search/house_numbers_matcher.cpp @@ -2,6 +2,8 @@ #include "indexer/string_set.hpp" +#include "base/logging.hpp" + #include #include #include @@ -9,15 +11,15 @@ #include +using namespace std; +using namespace strings; + using boost::make_transform_iterator; namespace search { namespace house_numbers { -using namespace std; -using namespace strings; - namespace { // Common strings in house numbers. @@ -231,8 +233,7 @@ public: case Token::TYPE_NUMBER: // fallthrough case Token::TYPE_BUILDING_PART: // fallthrough case Token::TYPE_BUILDING_PART_OR_LETTER: - parse[i] = std::move(parse[j]); - ASSERT(!parse[i].m_value.empty(), ()); + parse[i] = move(parse[j]); ++i; } } diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp index 4ae9e1b8f3..9a16534511 100644 --- a/search/intermediate_result.cpp +++ b/search/intermediate_result.cpp @@ -150,8 +150,6 @@ std::string DebugPrint(PreRankerResult const & r) ostringstream os; os << "PreRankerResult " << "{ FID: " << r.GetId().m_index // index is enough here for debug purpose - << "; m_matchedTokensNumber: " << r.m_matchedTokensNumber - << "; m_isRelaxed: " << r.m_isRelaxed << "; " << DebugPrint(r.m_info) << " }"; return os.str(); diff --git a/search/intermediate_result.hpp b/search/intermediate_result.hpp index b6d16c4d24..85e9b6626d 100644 --- a/search/intermediate_result.hpp +++ b/search/intermediate_result.hpp @@ -62,15 +62,10 @@ public: std::vector const & GetProvenance() const { return m_provenance; } #endif - //size_t GetInnermostTokensNumber() const { return m_info.InnermostTokenRange().Size(); } - //size_t GetMatchedTokensNumber() const { return m_matchedTokensNumber; } +// size_t GetInnermostTokensNumber() const { return m_info.InnermostTokenRange().Size(); } + size_t GetMatchedTokensNumber() const { return m_matchedTokensNumber; } bool IsNotRelaxed() const { return !m_isRelaxed; } - bool SkipForViewportSearch(size_t queryTokensNumber) const - { - return m_isRelaxed || m_matchedTokensNumber + 1 < queryTokensNumber; - } - void SetRank(uint8_t rank) { m_info.m_rank = rank; } void SetPopularity(uint8_t popularity) { m_info.m_popularity = popularity; } void SetDistanceToPivot(double distance) { m_info.m_distanceToPivot = distance; } diff --git a/search/pre_ranker.cpp b/search/pre_ranker.cpp index cbb1179629..ab1bb79465 100644 --- a/search/pre_ranker.cpp +++ b/search/pre_ranker.cpp @@ -248,9 +248,8 @@ void PreRanker::FilterForViewportSearch() if (!m_params.m_viewport.IsPointInside(info.m_center)) return true; - // Better criteria than previous (at first glance). - /// @todo Probably, should show say 20-30 first results with honest ranking, but need to refactor a lot .. - return result.SkipForViewportSearch(m_params.m_numQueryTokens); + /// @todo Make some upper bound like for regular search, but not to erase partially matched results? + return result.GetMatchedTokensNumber() + 1 < m_params.m_numQueryTokens; }); // By VNG: Comment next statements to discard viewport filtering (displacement) for Debug purpose. @@ -265,7 +264,6 @@ void PreRanker::FilterRelaxedResults(bool lastUpdate) auto const iEnd = m_results.end(); if (lastUpdate) { - LOG(LDEBUG, ("Flush relaxed results number:", m_relaxedResults.size())); m_results.insert(iEnd, make_move_iterator(m_relaxedResults.begin()), make_move_iterator(m_relaxedResults.end())); m_relaxedResults.clear(); } diff --git a/search/processor.cpp b/search/processor.cpp index ac9204062d..d10e05b2f5 100644 --- a/search/processor.cpp +++ b/search/processor.cpp @@ -494,13 +494,14 @@ Locales Processor::GetCategoryLocales() const template void Processor::ForEachCategoryType(StringSliceBase const & slice, ToDo && toDo) const { - ::search::ForEachCategoryType(slice, GetCategoryLocales(), m_categories, toDo); + ::search::ForEachCategoryType(slice, GetCategoryLocales(), m_categories, forward(toDo)); } template void Processor::ForEachCategoryTypeFuzzy(StringSliceBase const & slice, ToDo && toDo) const { - ::search::ForEachCategoryTypeFuzzy(slice, GetCategoryLocales(), m_categories, toDo); + ::search::ForEachCategoryTypeFuzzy(slice, GetCategoryLocales(), m_categories, + forward(toDo)); } void Processor::Search(SearchParams params) @@ -755,6 +756,7 @@ void Processor::InitParams(QueryParams & params) const } else { + // todo(@m, @y). Shall we match prefix tokens for categories? ForEachCategoryTypeFuzzy(tokenSlice, [&c, ¶ms](size_t i, uint32_t t) { uint32_t const index = c.GetIndexForType(t); diff --git a/search/pysearch/CMakeLists.txt b/search/pysearch/CMakeLists.txt index afa2e0d0f7..cc460b7f21 100644 --- a/search/pysearch/CMakeLists.txt +++ b/search/pysearch/CMakeLists.txt @@ -25,7 +25,7 @@ omim_link_libraries( base bsdiff ICU::i18n - cppjansson + jansson oauthcpp opening_hours protobuf diff --git a/search/query_params.cpp b/search/query_params.cpp index 70cdd8f4fd..9b64eb00aa 100644 --- a/search/query_params.cpp +++ b/search/query_params.cpp @@ -3,18 +3,22 @@ #include "search/ranking_utils.hpp" #include "search/token_range.hpp" +#include "indexer/feature_impl.hpp" + #include #include namespace search { using namespace std; +using namespace strings; namespace { // All synonyms should be lowercase. -/// @todo These should check the map language and use only the corresponding translation. +// @todo These should check the map language and use +// only the corresponding translation. map> const kSynonyms = { {"n", {"north"}}, {"w", {"west"}}, @@ -25,46 +29,21 @@ map> const kSynonyms = { {"sw", {"southwest"}}, {"se", {"southeast"}}, {"st", {"saint", "street"}}, - - {"al", {"allee", "alle"}}, - {"ave", {"avenue"}}, - /// @todo Should process synonyms with errors like "blvrd" -> "blvd". - /// @see HouseOnStreetSynonymsWithMisprints test. - {"blvd", {"boulevard"}}, - {"blvrd", {"boulevard"}}, - {"cir", {"circle"}}, - {"ct", {"court"}}, - {"hwy", {"highway"}}, - {"pl", {"place", "platz"}}, - {"rt", {"route"}}, - {"sq", {"square"}}, - - {"ал", {"аллея", "алея"}}, - {"бул", {"бульвар"}}, - {"зав", {"завулак"}}, - {"кв", {"квартал"}}, - {"наб", {"набережная", "набярэжная", "набережна"}}, - {"пер", {"переулок"}}, - {"пл", {"площадь", "площа"}}, - {"пр", {"проспект", "праспект", "провулок", "проезд", "праезд", "проїзд"}}, - {"туп", {"тупик", "тупік"}}, - {"ш", {"шоссе", "шаша", "шосе"}}, - + {"blvd", {"boulevard"}}, + {"cir", {"circle"}}, + {"ct", {"court"}}, + {"rt", {"route"}}, {"св", {"святой", "святого", "святая", "святые", "святых", "свято"}}, {"б", {"большая", "большой"}}, {"бол", {"большая", "большой"}}, {"м", {"малая", "малый"}}, {"мал", {"малая", "малый"}}, {"нов", {"новая", "новый"}}, - {"стар", {"старая", "старый"}}, -}; + {"стар", {"старая", "старый"}}}; } // namespace // QueryParams::Token ------------------------------------------------------------------------------ -void QueryParams::Token::AddSynonym(string const & s) -{ - AddSynonym(strings::MakeUniString(s)); -} +void QueryParams::Token::AddSynonym(string const & s) { AddSynonym(MakeUniString(s)); } void QueryParams::Token::AddSynonym(String const & s) { diff --git a/search/region_info_getter.cpp b/search/region_info_getter.cpp index cdad7e7e76..f6ca7e72eb 100644 --- a/search/region_info_getter.cpp +++ b/search/region_info_getter.cpp @@ -3,22 +3,25 @@ #include "storage/country_decl.hpp" #include "base/logging.hpp" +#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" +#include + +using namespace std; +using namespace storage; namespace search { -using namespace std; - namespace { // Calls |fn| on each node name on the way from |id| to the root of // the |countries| tree, except the root. Does nothing if there are -// multiple ways from |id| to the |root| (disputed territory). +// multiple ways from |id| to the |root|. template void GetPathToRoot(storage::CountryId const & id, storage::CountryTree const & countries, Fn && fn) { - storage::CountryTree::NodesBufferT nodes; + vector nodes; countries.Find(id, nodes); if (nodes.empty()) @@ -38,13 +41,12 @@ void GetPathToRoot(storage::CountryId const & id, storage::CountryTree const & c void RegionInfoGetter::LoadCountriesTree() { - using namespace storage; - Affiliations affiliations; - CountryNameSynonyms countryNameSynonyms; - MwmTopCityGeoIds mwmTopCityGeoIds; - MwmTopCountryGeoIds mwmTopCountryGeoIds; - LoadCountriesFromFile(COUNTRIES_FILE, m_countries, affiliations, countryNameSynonyms, - mwmTopCityGeoIds, mwmTopCountryGeoIds); + storage::Affiliations affiliations; + storage::CountryNameSynonyms countryNameSynonyms; + storage::MwmTopCityGeoIds mwmTopCityGeoIds; + storage::MwmTopCountryGeoIds mwmTopCountryGeoIds; + storage::LoadCountriesFromFile(COUNTRIES_FILE, m_countries, affiliations, countryNameSynonyms, + mwmTopCityGeoIds, mwmTopCountryGeoIds); } void RegionInfoGetter::SetLocale(string const & locale) @@ -52,53 +54,42 @@ void RegionInfoGetter::SetLocale(string const & locale) m_nameGetter = platform::GetTextByIdFactory(platform::TextSource::Countries, locale); } -void RegionInfoGetter::GetLocalizedFullName(storage::CountryId const & id, NameBufferT & nameParts) const +void RegionInfoGetter::GetLocalizedFullName(storage::CountryId const & id, + vector & nameParts) const { - buffer_vector ids; - GetPathToRoot(id, m_countries, [&ids](storage::CountryId const & id) - { - ids.push_back(&id); + size_t const kMaxNumParts = 2; + + GetPathToRoot(id, m_countries, [&](storage::CountryId const & id) { + nameParts.push_back(GetLocalizedCountryName(id)); }); - if (!ids.empty()) - { - // Avoid City in region info because it will be calculated correctly by cities boundary info. - // We need only State / Region / Область + Country only. - // https://github.com/organicmaps/organicmaps/issues/857 - /// @todo Need to invent some common solution, not this Australia hack. - size_t const numParts = (*ids.back() == "Australia" ? 1 : 2); + if (nameParts.size() > kMaxNumParts) + nameParts.erase(nameParts.begin(), nameParts.end() - kMaxNumParts); - size_t const count = ids.size(); - for (size_t i = (count >= numParts ? count - numParts : 0); i < count; ++i) - { - auto name = GetLocalizedCountryName(*ids[i]); - if (!name.empty()) - nameParts.push_back(std::move(name)); - } + base::EraseIf(nameParts, [&](string const & s) { return s.empty(); }); - // At least one country translation should exist! - ASSERT(!nameParts.empty(), (id)); + if (!nameParts.empty()) return; - } - // Try to get at least localized name for |id|, if it is a disputed territory. + // Tries to get at least localized name for |id|, if |id| is a + // disputed territory. auto name = GetLocalizedCountryName(id); if (!name.empty()) { - nameParts.push_back(std::move(name)); + nameParts.push_back(name); return; } - // Try to transform map name to the full name. + // Tries to transform map name to the full name. name = id; storage::CountryInfo::FileName2FullName(name); if (!name.empty()) - nameParts.push_back(std::move(name)); + nameParts.push_back(name); } string RegionInfoGetter::GetLocalizedFullName(storage::CountryId const & id) const { - NameBufferT parts; + vector parts; GetLocalizedFullName(id, parts); return strings::JoinStrings(parts, ", "); @@ -109,11 +100,11 @@ string RegionInfoGetter::GetLocalizedCountryName(storage::CountryId const & id) if (!m_nameGetter) return {}; - auto shortName = (*m_nameGetter)(id + " Short"); + auto const shortName = (*m_nameGetter)(id + " Short"); if (!shortName.empty()) return shortName; - auto officialName = (*m_nameGetter)(id); + auto const officialName = (*m_nameGetter)(id); if (!officialName.empty()) return officialName; diff --git a/search/region_info_getter.hpp b/search/region_info_getter.hpp index 310c96cb09..739984eb3f 100644 --- a/search/region_info_getter.hpp +++ b/search/region_info_getter.hpp @@ -7,6 +7,7 @@ #include #include +#include namespace search { @@ -17,10 +18,8 @@ public: void SetLocale(std::string const & locale); std::string GetLocalizedFullName(storage::CountryId const & id) const; - - using NameBufferT = buffer_vector; - void GetLocalizedFullName(storage::CountryId const & id, NameBufferT & nameParts) const; - + void GetLocalizedFullName(storage::CountryId const & id, + std::vector & nameParts) const; std::string GetLocalizedCountryName(storage::CountryId const & id) const; private: diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp index f213413252..e50de7047e 100644 --- a/search/reverse_geocoder.cpp +++ b/search/reverse_geocoder.cpp @@ -70,7 +70,7 @@ string Join(string const & s) template string Join(string const & s, Args &&... args) { - auto tail = Join(forward(args)...); + auto const tail = Join(forward(args)...); if (s.empty()) return tail; if (tail.empty()) @@ -350,7 +350,7 @@ string ReverseGeocoder::GetLocalizedRegionAddress(RegionAddress const & addr, auto const countryName = addr.GetCountryName(); if (!countryName.empty()) { - RegionInfoGetter::NameBufferT nameParts; + vector nameParts; nameGetter.GetLocalizedFullName(countryName, nameParts); nameParts.insert(nameParts.begin(), std::move(addrStr)); nameParts.erase(unique(nameParts.begin(), nameParts.end()), nameParts.end()); diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp index 71e182876e..ba093401e2 100644 --- a/search/search_integration_tests/processor_test.cpp +++ b/search/search_integration_tests/processor_test.cpp @@ -144,8 +144,7 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke) TestPOI lantern1({10.0005, 10.0005}, "lantern 1", "en"); TestPOI lantern2({10.0006, 10.0005}, "lantern 2", "en"); - // Was "Strada drive". - TestStreet stradaDrive({{-10.001, -10.001}, {-10, -10}, {-9.999, -9.999}}, "Boulevard drive", "en"); + TestStreet stradaDrive({{-10.001, -10.001}, {-10, -10}, {-9.999, -9.999}}, "Strada drive", "en"); TestBuilding terranceHouse({-10, -10}, "", "155", stradaDrive.GetName("en"), "en"); auto const worldId = BuildWorld([&](TestMwmBuilder & builder) @@ -210,7 +209,7 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke) TEST(ResultsMatch(" ", Rules()), ()); } { - Rules rules = {ExactMatch(wonderlandId, quantumTeleport2)}; + Rules rules = {ExactMatch(wonderlandId, quantumTeleport2), ExactMatch(wonderlandId, feynmanStreet)}; TEST(ResultsMatch("teleport feynman street", rules), ()); } { @@ -221,14 +220,16 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke) // Here we expect to find feynmanHouse (building next to Feynman street with housenumber '1 unit 1') // but not lantern1 (building next to Feynman street with name 'lantern 1') because '1' // looks like housenumber. - Rules rules = {ExactMatch(wonderlandId, feynmanHouse)}; + Rules rules = {ExactMatch(wonderlandId, feynmanHouse), + ExactMatch(wonderlandId, firstAprilStreet)}; TEST(ResultsMatch("feynman street 1", rules), ()); } { // Here we expect to find bohrHouse (building next to Bohr street with housenumber '1 unit 1') // but not lantern1 (building next to Bohr street with name 'lantern 1') because '1' looks like // housenumber. - Rules rules = {ExactMatch(wonderlandId, bohrHouse), ExactMatch(wonderlandId, hilbertHouse)}; + Rules rules = {ExactMatch(wonderlandId, bohrHouse), ExactMatch(wonderlandId, hilbertHouse), + ExactMatch(wonderlandId, firstAprilStreet)}; TEST(ResultsMatch("bohr street 1", rules), ()); } { @@ -263,7 +264,7 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke) { Rules rules = {ExactMatch(wonderlandId, terranceHouse), ExactMatch(wonderlandId, stradaDrive)}; - TEST(ResultsMatch("Toronto boulevard dr 155", rules), ()); + TEST(ResultsMatch("Toronto strada drive 155", rules), ()); } } @@ -599,19 +600,19 @@ UNIT_CLASS_TEST(ProcessorTest, TestHouseNumbers) { Rules rules{ExactMatch(countryId, building100), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград генералова к100 ", rules, "ru"), ()); + TEST(ResultsMatch("Зеленоград генералова к100 ", rules, "ru"), ()); } { Rules rules{ExactMatch(countryId, building200), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград генералова к200 ", rules, "ru"), ()); + TEST(ResultsMatch("Зеленоград генералова к200 ", rules, "ru"), ()); } { Rules rules{ExactMatch(countryId, building200), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград к200 генералова ", rules, "ru"), ()); + TEST(ResultsMatch("Зеленоград к200 генералова ", rules, "ru"), ()); } { Rules rules{ExactMatch(countryId, building300), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград 300 строение 400 генералова ", rules, "ru"), ()); + TEST(ResultsMatch("Зеленоград 300 строение 400 генералова ", rules, "ru"), ()); } { Rules rules{ExactMatch(countryId, street)}; @@ -619,25 +620,35 @@ UNIT_CLASS_TEST(ProcessorTest, TestHouseNumbers) } { Rules rules{ExactMatch(countryId, building300), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград генералова 300 строе", rules, "ru"), ()); + TEST(ResultsMatch("Зеленоград генералова 300 строе", rules, "ru"), ()); } { + auto request = MakeRequest("Зеленоград Генерала Генералова 115 ", "ru"); + + // Test exact matching result ranked first. + auto const & results = request->Results(); + TEST_GREATER(results.size(), 0, (results)); + TEST(IsResultMatches(results[0], ExactMatch(countryId, building115)), (results)); + Rules rules{ExactMatch(countryId, building115), ExactMatch(countryId, building115k1), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград Генерала Генералова 115 ", rules, "ru"), ()); + TEST(ResultsMatch(results, rules), ()); } { + auto request = MakeRequest("Зеленоград Генерала Генералова 115к1 ", "ru"); + + // Test exact matching result ranked first. + auto const & results = request->Results(); + TEST_GREATER(results.size(), 0, (results)); + TEST(IsResultMatches(results[0], ExactMatch(countryId, building115k1)), (results)); + Rules rules{ExactMatch(countryId, building115k1), ExactMatch(countryId, building115), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград Генерала Генералова 115к1 ", rules, "ru"), ()); + TEST(ResultsMatch(results, rules), ()); } { Rules rules{ExactMatch(countryId, building115), ExactMatch(countryId, street)}; - TEST(OrderedResultsMatch("Зеленоград Генерала Генералова 115к2 ", rules, "ru"), ()); - } - { - Rules rules{ExactMatch(countryId, street)}; - TEST(ResultsMatch("Генералова 666", rules, "ru"), ()); + TEST(ResultsMatch("Зеленоград Генерала Генералова 115к2 ", rules, "ru"), ()); } } @@ -906,9 +917,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestCategorialSearch) } { - /// @todo We updated fuzzy match for categories: hote -> hotel is not matched now (4 letters input token). - /// Or reconsider prefix category matching. - Rules const rules = {/*ExactMatch(wonderlandId, hotel1),*/ ExactMatch(wonderlandId, hotel2), + Rules const rules = {ExactMatch(wonderlandId, hotel1), ExactMatch(wonderlandId, hotel2), ExactMatch(wonderlandId, hotelCafe), ExactMatch(testWorldId, homel), ExactMatch(wonderlandId, hotelDeVille)}; // A prefix token. @@ -926,16 +935,24 @@ UNIT_CLASS_TEST(ProcessorTest, TestCategorialSearch) } { - Rules const rules = {/*ExactMatch(wonderlandId, hotel1),*/ ExactMatch(wonderlandId, hotel2), + Rules const rules = {ExactMatch(wonderlandId, hotel1), ExactMatch(wonderlandId, hotel2), ExactMatch(wonderlandId, hotelCafe), ExactMatch(testWorldId, homel), ExactMatch(wonderlandId, hotelDeVille)}; // Homel matches exactly, other features are matched by fuzzy names. TEST(ResultsMatch("homel ", rules), ()); + } + + { + Rules const rules = {ExactMatch(wonderlandId, hotel1), ExactMatch(wonderlandId, hotel2), + ExactMatch(wonderlandId, hotelCafe), ExactMatch(testWorldId, homel), + ExactMatch(wonderlandId, hotelDeVille)}; + // A typo in search: all features fit. TEST(ResultsMatch("hofel ", rules), ()); } { Rules const rules = {ExactMatch(wonderlandId, hotelDeVille)}; + TEST(ResultsMatch("hotel de ville ", rules), ()); } } @@ -1075,7 +1092,7 @@ UNIT_CLASS_TEST(ProcessorTest, FuzzyMatch) TEST(ResultsMatch("моксва ленинргадский черчиль", rules, "ru"), ()); TEST(ResultsMatch("food", rulesWithoutStreet, "ru"), ()); - //TEST(ResultsMatch("foood", rulesWithoutStreet, "ru"), ()); + TEST(ResultsMatch("foood", rulesWithoutStreet, "ru"), ()); TEST(ResultsMatch("fod", {}, "ru"), ()); Rules rulesMetro = {ExactMatch(id, metro)}; @@ -1150,13 +1167,12 @@ UNIT_CLASS_TEST(ProcessorTest, StopWords) { Rules rules = {ExactMatch(id, bakery)}; - TEST(ResultsMatch("la boulangerie ", rules, "fr"), ()); - TEST(ResultsMatch("la motviderie ", {}, "fr"), ()); + TEST(ResultsMatch("la boulangerie ", rules, "fr"), ()); } { - /// @todo I don't see any reason, why token/prefix results should differ here? + TEST(ResultsMatch("la motviderie ", {}, "fr"), ()); TEST(ResultsMatch("la la le la la la ", {ExactMatch(id, street)}, "fr"), ()); TEST(ResultsMatch("la la le la la la", {}, "fr"), ()); } @@ -1454,9 +1470,9 @@ UNIT_CLASS_TEST(ProcessorTest, PathsThroughLayers) TEST(ResultsMatch("computing street 0 supervised cafe ", {ruleSubpoi}), ()); // SUBPOI-BUILDING-STREET / COMPLEX_POI-BUILDING-STREET - TEST(ResultsMatch("computing street statistical learning cafe ", {ruleSubpoi}), ()); + TEST(ResultsMatch("computing street statistical learning cafe ", {ruleSubpoi, ruleStreet}), ()); TEST(ResultsMatch("computing street 0 cafe ", {ruleSubpoi}), ()); - TEST(ResultsMatch("computing street statistical learning office ", {rulePoi}), ()); + TEST(ResultsMatch("computing street statistical learning office ", {rulePoi, ruleStreet}), ()); TEST(ResultsMatch("computing street 0 office ", {rulePoi}), ()); // COMPLEX_POI-BUILDING / SUBPOI-BUILDING is not supported @@ -1466,11 +1482,11 @@ UNIT_CLASS_TEST(ProcessorTest, PathsThroughLayers) TEST(ResultsMatch("0 office ", {}), ()); // COMPLEX_POI-STREET / SUBPOI - STREET - TEST(ResultsMatch("computing street cafe ", {ruleSubpoi}), ()); - TEST(ResultsMatch("computing street office ", {rulePoi}), ()); + TEST(ResultsMatch("computing street cafe ", {ruleSubpoi, ruleStreet}), ()); + TEST(ResultsMatch("computing street office ", {rulePoi, ruleStreet}), ()); // BUILDING-STREET - TEST(ResultsMatch("computing street statistical learning ", {ruleBuilding}), ()); + TEST(ResultsMatch("computing street statistical learning ", {ruleBuilding, ruleStreet}), ()); TEST(ResultsMatch("computing street 0 ", {ruleBuilding}), ()); // COMPLEX_POI / SUBPOI @@ -1732,11 +1748,9 @@ UNIT_CLASS_TEST(ProcessorTest, SquareAsStreetTest) }); SetViewport(m2::RectD(0.0, 0.0, 1.0, 2.0)); - { - Rules const rules = { ExactMatch(countryId, nonameHouse) }; - TEST(OrderedResultsMatch("revolution square 3", rules), ()); - TEST(OrderedResultsMatch("revolution sq 3", rules), ()); + Rules rules = {ExactMatch(countryId, nonameHouse)}; + TEST(ResultsMatch("revolution square 3", rules), ()); } } @@ -2010,7 +2024,7 @@ UNIT_CLASS_TEST(ProcessorTest, StreetSynonymPrefix) SetViewport(m2::RectD(0.0, 0.0, 1.0, 2.0)); { - Rules rules = {ExactMatch(countryId, house)}; + Rules rules = {ExactMatch(countryId, house), ExactMatch(countryId, street)}; TEST(ResultsMatch("3 Boulevard Maloney Est", rules), ()); } } @@ -2074,45 +2088,31 @@ UNIT_CLASS_TEST(ProcessorTest, Strasse) UNIT_CLASS_TEST(ProcessorTest, StreetSynonymsWithMisprints) { TestStreet leninsky({{0.0, -1.0}, {0.0, 1.0}}, "Ленинский проспект", "ru"); - TestStreet leningradsky({{0.0, -1.0}, {0.0, 1.0}}, "Ленинградский проспект", "ru"); TestStreet nabrezhnaya({{1.0, -1.0}, {1.0, 1.0}}, "улица набрежная", "ru"); TestStreet naberezhnaya({{2.0, -1.0}, {2.0, 1.0}}, "улица набережная", "ru"); auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(leninsky); - builder.Add(leningradsky); builder.Add(nabrezhnaya); builder.Add(naberezhnaya); }); SetViewport(m2::RectD(0.0, -1.0, 2.0, 1.0)); { - Rules const rules = {ExactMatch(countryId, leninsky)}; - TEST(ResultsMatch("ленинский", rules), ()); + Rules rules = {ExactMatch(countryId, leninsky)}; TEST(ResultsMatch("ленинский проспект", rules), ()); TEST(ResultsMatch("ленинский пропект", rules), ()); - - // 2 errors + common _street_ token - TEST(ResultsMatch("ленинская улица", rules, "ru"), ()); - - TEST(ResultsMatch("ленинский street", rules, "en"), ()); - TEST(ResultsMatch("ленинский gatvė", rules, "lt"), ()); - - TEST(ResultsMatch("ленинский gade", rules, "da"), ()); - TEST(ResultsMatch("ленинский straat", rules, "nl"), ()); + TEST(ResultsMatch("ленинский", rules), ()); } { Rules rules = {ExactMatch(countryId, nabrezhnaya), ExactMatch(countryId, naberezhnaya)}; TEST(ResultsMatch("улица набрежная", rules), ()); TEST(ResultsMatch("набрежная", rules), ()); + } + { + Rules rules = {ExactMatch(countryId, naberezhnaya)}; TEST(ResultsMatch("улица набережная", rules), ()); - - TEST(ResultsMatch("набрежная street", rules, "en"), ()); - TEST(ResultsMatch("набрежная gatvė", rules, "lt"), ()); - - TEST(ResultsMatch("набрежная gade", rules, "da"), ()); - TEST(ResultsMatch("набрежная straat", rules, "nl"), ()); } } @@ -2195,6 +2195,11 @@ UNIT_CLASS_TEST(ProcessorTest, StreetSynonymPrefixMatch) TEST(ResultsMatch("Yesenina cafe ", rules), ()); TEST(ResultsMatch("Cafe Yesenina ", rules), ()); TEST(ResultsMatch("Cafe Yesenina", rules), ()); + } + { + Rules rules = {ExactMatch(countryId, cafe), ExactMatch(countryId, yesenina)}; + // Prefix match with misprints to street synonym gives street as additional result + // but we still can find the cafe. TEST(ResultsMatch("Yesenina cafe", rules), ()); } } @@ -2216,10 +2221,8 @@ UNIT_CLASS_TEST(ProcessorTest, SynonymMisprintsTest) { Rules rules = {ExactMatch(wonderlandId, bolshaya), ExactMatch(wonderlandId, bolnaya)}; - TEST(OrderedResultsMatch("большая дмитровка", - { ExactMatch(wonderlandId, bolshaya), ExactMatch(wonderlandId, bolnaya) }), ()); - TEST(OrderedResultsMatch("больная дмировка", - { ExactMatch(wonderlandId, bolnaya), ExactMatch(wonderlandId, bolshaya) }), ()); + TEST(ResultsMatch("большая дмитровка", rules), ()); + TEST(ResultsMatch("больная дмитровка", rules), ()); } { Rules rules = {ExactMatch(wonderlandId, bolshaya)}; @@ -2227,12 +2230,10 @@ UNIT_CLASS_TEST(ProcessorTest, SynonymMisprintsTest) TEST(ResultsMatch("б дмитровка", rules), ()); } { - /// @todo Results are controversial here, despite 2-errors matching. // "southeast" and "southwest" len is 9 and Levenstein distance is 2. - TEST(OrderedResultsMatch("southeast street", - { ExactMatch(wonderlandId, se), ExactMatch(wonderlandId, sw) }), ()); - TEST(OrderedResultsMatch("southwest street", - { ExactMatch(wonderlandId, sw), ExactMatch(wonderlandId, se) }), ()); + Rules rules = {ExactMatch(wonderlandId, sw), ExactMatch(wonderlandId, se)}; + TEST(ResultsMatch("southeast street", rules), ()); + TEST(ResultsMatch("southwest street", rules), ()); } { Rules rules = {ExactMatch(wonderlandId, sw)}; @@ -2246,38 +2247,6 @@ UNIT_CLASS_TEST(ProcessorTest, SynonymMisprintsTest) } } -UNIT_CLASS_TEST(ProcessorTest, StreetsFallback) -{ - TestStreet st1({{-0.5, -0.5}, {0.5, -0.5}}, "1st north street", "en"); - TestStreet st2({{-0.5, 0.5}, {0.5, 0.5}}, "2nd north street", "en"); - TestStreet rue1({{-1.5, -1.5}, {1.5, -1.5}}, "rue la foo", "fr"); - TestStreet rue2({{-1.5, 1.5}, {1.5, 1.5}}, "avenue la bar", "fr"); - - auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) - { - builder.Add(st1); - builder.Add(st2); - builder.Add(rue1); - builder.Add(rue2); - }); - - { - TEST(ResultsMatch("1st street", { ExactMatch(wonderlandId, st1) }), ()); - TEST(ResultsMatch("2nd street", { ExactMatch(wonderlandId, st2) }), ()); - - TEST(ResultsMatch("rue foo", { ExactMatch(wonderlandId, rue1) }, "fr"), ()); - TEST(ResultsMatch("rue bar", { ExactMatch(wonderlandId, rue2) }, "fr"), ()); - - TEST(ResultsMatch("avenue la foo", { ExactMatch(wonderlandId, rue1) }, "fr"), ()); - TEST(ResultsMatch("av la bar", { ExactMatch(wonderlandId, rue2) }, "fr"), ()); - } - - { - TEST(OrderedResultsMatch("1st north street", { ExactMatch(wonderlandId, st1) }), ()); - TEST(OrderedResultsMatch("2nd north street", { ExactMatch(wonderlandId, st2) }), ()); - } -} - UNIT_CLASS_TEST(ProcessorTest, VillagePostcodes) { TestVillage marckolsheim({0, 0}, "Marckolsheim", "en", 10 /* rank */); @@ -2557,17 +2526,13 @@ UNIT_CLASS_TEST(ProcessorTest, ViewportFilter) params.m_viewport = m2::RectD(-1.0, -1.0, 1.0, 1.0); params.m_mode = Mode::Viewport; - /// @todo If we gonna show "relaxed" street result, will be a lot of dummies: - /// https://github.com/organicmaps/organicmaps/issues/4190 - // |street23| should not appear in viewport search because it has 2 unmatched tokens. // |street8| has 1 unmatched token. - //Rules const rules = {ExactMatch(countryId, street8)}; - Rules const rules; + Rules const rulesViewport = {ExactMatch(countryId, street8)}; TestSearchRequest request(m_engine, params); request.Run(); - TEST(ResultsMatch(request.Results(), rules), ()); + TEST(ResultsMatch(request.Results(), rulesViewport), ()); } { @@ -2577,13 +2542,13 @@ UNIT_CLASS_TEST(ProcessorTest, ViewportFilter) params.m_viewport = m2::RectD(-1.0, -1.0, 1.0, 1.0); params.m_mode = Mode::Everywhere; - /// @todo |street23| should be in everywhere search results because everywhere search mode does not - /// have matched tokens number restriction. Or not? - Rules const rules = {ExactMatch(countryId, street8)/*, ExactMatch(countryId, street23) */ }; + // |street23| should be in everywhere search results because everywhere search mode does not + // have matched tokens number restriction. + Rules const rulesViewport = {ExactMatch(countryId, street23), ExactMatch(countryId, street8)}; TestSearchRequest request(m_engine, params); request.Run(); - TEST(ResultsMatch(request.Results(), rules), ()); + TEST(ResultsMatch(request.Results(), rulesViewport), ()); } } @@ -3220,11 +3185,13 @@ UNIT_CLASS_TEST(ProcessorTest, ComplexPoi_Rank) SetViewport({-0.5, -0.5, 0.5, 0.5}); - Rules const rules = { - ExactMatch(countryId, telekom), - ExactMatch(countryId, poiInMall) - }; - TEST(OrderedResultsMatch("Telekom shop", rules), ()); + auto request = MakeRequest("Telekom shop"); + auto const & results = request->Results(); + + TEST_EQUAL(results.size(), 2, ()); + + TEST(ResultsMatch({results[0]}, {ExactMatch(countryId, telekom)}), ()); + TEST(ResultsMatch({results[1]}, {ExactMatch(countryId, poiInMall)}), ()); } UNIT_CLASS_TEST(ProcessorTest, Place_Region) @@ -3240,93 +3207,4 @@ UNIT_CLASS_TEST(ProcessorTest, Place_Region) TEST(ResultsMatch("carth", rules, "en"), ()); } -UNIT_CLASS_TEST(ProcessorTest, FuzzyCategories) -{ - TestPOI cafe({0, 0.01}, "xxx", "en"); - cafe.SetTypes({{"amenity", "cafe"}}); - - TestPOI cosmetics({0, 0.02}, "yyy", "en"); - cosmetics.SetTypes({{"shop", "cosmetics"}}); - - TestPOI shoes({0, 0.03}, "ecco", "en"); - shoes.SetTypes({{"shop", "shoes"}}); - - TestPOI organic({0, 0.04}, "zzz", "en"); - organic.SetTypes({{"shop", "grocery"}, {"organic", "yes"}}); - - auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) - { - builder.Add(cafe); - builder.Add(cosmetics); - builder.Add(shoes); - builder.Add(organic); - }); - - SetViewport(m2::RectD(-0.5, -0.5, 0.5, 0.5)); - - { - Rules const rules = {ExactMatch(wonderlandId, cafe)}; - TEST(ResultsMatch("cafe", rules), ()); - } - - { - Rules const rules = {ExactMatch(wonderlandId, shoes)}; - TEST(ResultsMatch("shoe", rules), ()); - TEST(ResultsMatch("shoes", rules), ()); - } - - { - Rules const rules = {ExactMatch(wonderlandId, shoes)}; - TEST(ResultsMatch("ecco", rules), ()); - } -} - -UNIT_CLASS_TEST(ProcessorTest, StreetCategories) -{ - std::string const lang = "en"; - - TestStreet street({{-1, -1}, {1, 1}}, "Avenida Santa Fe", lang); - street.SetType({"highway", "secondary"}); - - TestPOI bus({0, 0}, "Avenida Santa Fe", lang); - bus.SetTypes({{"highway", "bus_stop"}}); - - TestPOI shop({-0.5, -0.5}, "Galerías Bond Street", lang); - shop.SetTypes({{"shop", "department_store"}}); - - auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) - { - builder.Add(street); - builder.Add(bus); - builder.Add(shop); - }); - - SetViewport(m2::RectD(-0.5, -0.5, 0.5, 0.5)); - - { - Rules const rules = { - ExactMatch(wonderlandId, bus), - ExactMatch(wonderlandId, street) - }; - TEST(OrderedResultsMatch("avenida santa fe ", rules), ()); - } - - { - Rules const rules = { - ExactMatch(wonderlandId, street), - ExactMatch(wonderlandId, bus), - ExactMatch(wonderlandId, shop), - }; - TEST(OrderedResultsMatch("avenida santa fe street ", rules), ()); - } - - { - Rules const rules = { - ExactMatch(wonderlandId, street), - ExactMatch(wonderlandId, bus), - }; - TEST(OrderedResultsMatch(MakeRequest("avenida santa fe улица ", "ru")->Results(), rules), ()); - } -} - } // namespace processor_test diff --git a/search/search_quality/assessment_tool/assessment_tool.cpp b/search/search_quality/assessment_tool/assessment_tool.cpp index 8684441afc..05edc9ad87 100644 --- a/search/search_quality/assessment_tool/assessment_tool.cpp +++ b/search/search_quality/assessment_tool/assessment_tool.cpp @@ -34,8 +34,6 @@ int main(int argc, char ** argv) Q_INIT_RESOURCE(resources_common); QApplication app(argc, argv); - // Pretty icons on HDPI displays. - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); FrameworkParams params; CHECK_GREATER(FLAGS_num_threads, 0, ()); diff --git a/search/search_quality/helpers.cpp b/search/search_quality/helpers.cpp index 8e84ac45ec..c5ec664248 100644 --- a/search/search_quality/helpers.cpp +++ b/search/search_quality/helpers.cpp @@ -20,7 +20,7 @@ #include "defines.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace search { diff --git a/search/search_quality/helpers_json.hpp b/search/search_quality/helpers_json.hpp index 16f906bab8..6c69bcfbde 100644 --- a/search/search_quality/helpers_json.hpp +++ b/search/search_quality/helpers_json.hpp @@ -6,7 +6,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace m2 { diff --git a/search/search_quality/sample.hpp b/search/search_quality/sample.hpp index 8803075f83..faffcbb010 100644 --- a/search/search_quality/sample.hpp +++ b/search/search_quality/sample.hpp @@ -5,7 +5,7 @@ #include "base/string_utils.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp index f45b3d126b..82cf149bf3 100644 --- a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp +++ b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp @@ -10,6 +10,7 @@ #include "indexer/data_source.hpp" #include "indexer/feature_algo.hpp" #include "indexer/ftypes_matcher.hpp" +#include "indexer/search_string_utils.hpp" #include "platform/platform_tests_support/helpers.hpp" @@ -18,11 +19,16 @@ #include "geometry/mercator.hpp" #include "base/file_name_utils.hpp" +#include "base/macros.hpp" #include "base/string_utils.hpp" #include -#include // strlen +#include +#include +#include +#include #include +#include #include #include #include @@ -43,8 +49,8 @@ size_t constexpr kMaxSamplesPerMwm = 20; DEFINE_string(data_path, "", "Path to data directory (resources dir)."); DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)."); -DEFINE_string(out_buildings_path, "buildings.json", "Path to output file for buildings samples."); -DEFINE_string(out_cafes_path, "cafes.json", "Path to output file for cafes samples."); +DEFINE_string(out_buildings_path, "buildings.jsonl", "Path to output file for buildings samples."); +DEFINE_string(out_cafes_path, "cafes.jsonl", "Path to output file for cafes samples."); DEFINE_double(max_distance_to_object, kMaxDistanceToObjectM, "Maximal distance from user position to object (meters)."); DEFINE_double(min_viewport_size, kMinViewportSizeM, "Minimal size of viewport (meters)."); @@ -430,7 +436,7 @@ int main(int argc, char * argv[]) if (!value.HasSearchIndex()) continue; - MwmContext const mwmContext(std::move(handle)); + MwmContext const mwmContext(move(handle)); base::Cancellable const cancellable; FeaturesLoaderGuard g(dataSource, mwmId); diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/search/search_quality/search_quality_tests/real_mwm_tests.cpp index 28b79aa806..f739647272 100644 --- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp +++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp @@ -227,8 +227,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, NY_Subway) auto const & results = request->Results(); TEST_GREATER(results.size(), kPopularPoiResultsCount, ()); - // Fast food "Subways" should be the first despite of some "metro" subways are a bit closer .. - Range const range(results, 0, 2); + Range const range(results, 0, 3); EqualClassifType(range, GetClassifTypes({{"amenity", "fast_food"}})); double const dist = SortedByDistance(range, center); TEST_LESS(dist, 1000, ()); diff --git a/search/search_tests/feature_offset_match_tests.cpp b/search/search_tests/feature_offset_match_tests.cpp index 35309f1417..f68bf4ecbb 100644 --- a/search/search_tests/feature_offset_match_tests.cpp +++ b/search/search_tests/feature_offset_match_tests.cpp @@ -3,8 +3,8 @@ #include "search/feature_offset_match.hpp" #include "indexer/trie.hpp" -#include "indexer/search_string_utils.hpp" +#include "base/dfa_helpers.hpp" #include "base/mem_trie.hpp" #include "base/string_utils.hpp" @@ -14,15 +14,15 @@ namespace feature_offset_match_tests { -using namespace strings; +using namespace base; using namespace std; -using Key = UniString; +using Key = strings::UniString; using Value = uint32_t; -using ValueList = base::VectorValues; -using Trie = base::MemTrie; -using DFA = LevenshteinDFA; -using PrefixDFA = PrefixDFAModifier; +using ValueList = VectorValues; +using Trie = MemTrie; +using DFA = strings::LevenshteinDFA; +using PrefixDFA = strings::PrefixDFAModifier; UNIT_TEST(MatchInTrieTest) { @@ -31,7 +31,7 @@ UNIT_TEST(MatchInTrieTest) vector> const data = {{"hotel", 1}, {"homel", 2}, {"hotel", 3}}; for (auto const & kv : data) - trie.Add(MakeUniString(kv.first), kv.second); + trie.Add(strings::MakeUniString(kv.first), kv.second); trie::MemTrieIterator const rootIterator(trie.GetRootIterator()); map vals; @@ -49,12 +49,6 @@ UNIT_TEST(MatchInTrieTest) TEST(vals.at(2), (vals)); TEST(!vals.at(1), (vals)); TEST(!vals.at(3), (vals)); - - vals.clear(); - auto const hoDFA = search::BuildLevenshteinDFA(MakeUniString("ho")); - // If somebody cares about return value - it indicates existing of node in trie, but not the actual values. - TEST(search::impl::MatchInTrie(rootIterator, nullptr, 0 /* prefixSize */, hoDFA, saveResult), ()); - TEST(vals.empty(), (vals)); } UNIT_TEST(MatchPrefixInTrieTest) @@ -64,7 +58,7 @@ UNIT_TEST(MatchPrefixInTrieTest) vector> const data = {{"лермонтовъ", 1}, {"лермонтово", 2}}; for (auto const & kv : data) - trie.Add(MakeUniString(kv.first), kv.second); + trie.Add(strings::MakeUniString(kv.first), kv.second); trie::MemTrieIterator const rootIterator(trie.GetRootIterator()); map vals; diff --git a/search/search_tests/house_numbers_matcher_test.cpp b/search/search_tests/house_numbers_matcher_test.cpp index e29e569334..29dea8d741 100644 --- a/search/search_tests/house_numbers_matcher_test.cpp +++ b/search/search_tests/house_numbers_matcher_test.cpp @@ -190,10 +190,4 @@ UNIT_TEST(LooksLikeHouseNumber_Smoke) TEST(LooksLikeHouseNumber("д 16", false /* isPrefix */), ()); TEST(LooksLikeHouseNumber("дом 16", false /* isPrefix */), ()); TEST(LooksLikeHouseNumber("дом 14 д 1", false /* isPrefix */), ()); - - TEST(!LooksLikeHouseNumber("улица", false /* isPrefix */), ()); - /// @todo By VNG: Don't know is it supposed or not, but next tokens are _looks like house numbers_! - /// @see g_strings in house_numbers_matching.cpp - TEST(LooksLikeHouseNumber("avenida", false /* isPrefix */), ()); - TEST(LooksLikeHouseNumber("street", false /* isPrefix */), ()); } diff --git a/search/search_tests_support/helpers.cpp b/search/search_tests_support/helpers.cpp index 72b036e30c..fedf400045 100644 --- a/search/search_tests_support/helpers.cpp +++ b/search/search_tests_support/helpers.cpp @@ -27,8 +27,7 @@ void SearchTestBase::SetViewport(ms::LatLon const & ll, double radiusM) SetViewport(mercator::MetersToXY(ll.m_lon, ll.m_lat, radiusM)); } -bool SearchTestBase::CategoryMatch(std::string const & query, Rules const & rules, - string const & locale /* = "en" */) +bool SearchTestBase::CategoryMatch(std::string const & query, Rules const & rules, string const & locale) { TestSearchRequest request(m_engine, query, locale, Mode::Everywhere, m_viewport); request.SetCategorial(); @@ -38,44 +37,19 @@ bool SearchTestBase::CategoryMatch(std::string const & query, Rules const & rule } bool SearchTestBase::ResultsMatch(std::string const & query, Rules const & rules, - std::string const & locale /* = "en" */, - Mode mode /* = Mode::Everywhere */) + std::string const & locale /* = "en" */, + Mode mode /* = Mode::Everywhere */) { TestSearchRequest request(m_engine, query, locale, mode, m_viewport); request.Run(); return MatchResults(m_dataSource, rules, request.Results()); } -bool SearchTestBase::OrderedResultsMatch(std::string const & query, Rules const & rules, - std::string const & locale /* = "en" */, - Mode mode /* = Mode::Everywhere */) -{ - TestSearchRequest request(m_engine, query, locale, mode, m_viewport); - request.Run(); - return OrderedResultsMatch(request.Results(), rules); -} - bool SearchTestBase::ResultsMatch(vector const & results, Rules const & rules) { return MatchResults(m_dataSource, rules, results); } -bool SearchTestBase::OrderedResultsMatch(std::vector const & results, Rules const & rules) -{ - if (results.size() != rules.size()) - return false; - - for (size_t i = 0; i < results.size(); ++i) - { - if (!ResultMatches(m_dataSource, rules[i], results[i])) - { - LOG(LWARNING, ("Not matched:", rules[i], results[i])); - return false; - } - } - return true; -} - bool SearchTestBase::ResultsMatch(SearchParams const & params, Rules const & rules) { TestSearchRequest request(m_engine, params); diff --git a/search/search_tests_support/helpers.hpp b/search/search_tests_support/helpers.hpp index 2e24fba2ab..2c7378a9e6 100644 --- a/search/search_tests_support/helpers.hpp +++ b/search/search_tests_support/helpers.hpp @@ -35,14 +35,7 @@ public: bool ResultsMatch(std::string const & query, Rules const & rules, std::string const & locale = "en", Mode mode = Mode::Everywhere); - - bool OrderedResultsMatch(std::string const & query, Rules const & rules, - std::string const & locale = "en", - Mode mode = Mode::Everywhere); - bool ResultsMatch(std::vector const & results, Rules const & rules); - bool OrderedResultsMatch(std::vector const & results, Rules const & rules); - bool ResultsMatch(SearchParams const & params, Rules const & rules); bool IsResultMatches(Result const & result, Rule const & rule); diff --git a/search/search_tests_support/test_results_matching.cpp b/search/search_tests_support/test_results_matching.cpp index 0f1496619c..541a661103 100644 --- a/search/search_tests_support/test_results_matching.cpp +++ b/search/search_tests_support/test_results_matching.cpp @@ -67,7 +67,6 @@ bool MatchResults(DataSource const & dataSource, vector vector const & actual) { vector resultIds; - resultIds.reserve(actual.size()); for (auto const & a : actual) resultIds.push_back(a.GetFeatureID()); sort(resultIds.begin(), resultIds.end()); diff --git a/search/streets_matcher.cpp b/search/streets_matcher.cpp index 1a643d8c85..99e7bf0c30 100644 --- a/search/streets_matcher.cpp +++ b/search/streets_matcher.cpp @@ -5,6 +5,7 @@ #include "indexer/search_string_utils.hpp" +#include "base/logging.hpp" #include "base/stl_helpers.hpp" #include @@ -68,9 +69,12 @@ void FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter // When true, no bit vectors were intersected with |streets| at all. bool emptyIntersection = true; - auto emit = [&]() - { - if (streets.IsEmpty() || emptyIntersection || lastToken == curToken) + // When true, |streets| is in the incomplete state and can't be + // used for creation of street layers. + bool incomplete = false; + + auto emit = [&]() { + if (streets.IsEmpty() || emptyIntersection || incomplete || lastToken == curToken) return; CBV fs(streets); @@ -97,27 +101,41 @@ void FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter ASSERT_LESS_OR_EQUAL(fs.PopCount(), fa.PopCount(), ()); prediction.m_prob = static_cast(fs.PopCount()) / static_cast(fa.PopCount()); - prediction.m_features = std::move(fs); + prediction.m_features = move(fs); prediction.m_hash = prediction.m_features.Hash(); prediction.m_withMisprints = withMisprints; }; - StreetTokensFilter streetsFilter([&](strings::UniString const &, size_t tag) - { - auto buffer = streets.Intersect(ctx.m_features[tag].m_features); - ASSERT_EQUAL(tag, curToken, ()); + StreetTokensFilter streetsFilter( + [&](strings::UniString const & /* token */, size_t tag) { + auto buffer = streets.Intersect(ctx.m_features[tag].m_features); + if (tag < curToken) + { + // This is the case for delayed + // street synonym. Therefore, + // |streets| is temporarily in the + // incomplete state. + streets = buffer; + all = all.Intersect(ctx.m_features[tag].m_features); + emptyIntersection = false; - // |streets| will become empty after - // the intersection. Therefore we need - // to create streets layer right now. - if (buffer.IsEmpty()) - emit(); + incomplete = true; + return; + } + ASSERT_EQUAL(tag, curToken, ()); - streets = buffer; - all = all.Intersect(ctx.m_features[tag].m_features); - emptyIntersection = false; + // |streets| will become empty after + // the intersection. Therefore we need + // to create streets layer right now. + if (buffer.IsEmpty()) + emit(); - }, withMisprints); + streets = buffer; + all = all.Intersect(ctx.m_features[tag].m_features); + emptyIntersection = false; + incomplete = false; + }, + withMisprints); for (; curToken < ctx.m_numTokens && !ctx.IsTokenUsed(curToken) && !streets.IsEmpty(); ++curToken) { diff --git a/search/utils.hpp b/search/utils.hpp index bf4b9fb283..a7421a24c0 100644 --- a/search/utils.hpp +++ b/search/utils.hpp @@ -6,14 +6,19 @@ #include "indexer/categories_holder.hpp" #include "indexer/feature_decl.hpp" +#include "indexer/mwm_set.hpp" +#include "indexer/search_delimiters.hpp" #include "indexer/search_string_utils.hpp" #include "indexer/trie.hpp" #include "geometry/rect2d.hpp" #include "base/levenshtein_dfa.hpp" +#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" +#include +#include #include #include #include @@ -31,14 +36,14 @@ void ForEachCategoryType(StringSliceBase const & slice, Locales const & locales, { auto const & token = slice.Get(i); for (int8_t const locale : locales) - categories.ForEachTypeByName(locale, token, [&todo, i](uint32_t type) { todo(i, type); }); + categories.ForEachTypeByName(locale, token, std::bind(todo, i, std::placeholders::_1)); // Special case processing of 2 codepoints emoji (e.g. black guy on a bike). // Only emoji synonyms can have one codepoint. if (token.size() > 1) { categories.ForEachTypeByName(CategoriesHolder::kEnglishCode, strings::UniString(1, token[0]), - [&todo, i](uint32_t type) { todo(i, type); }); + std::bind(todo, i, std::placeholders::_1)); } } } @@ -59,18 +64,15 @@ void ForEachCategoryTypeFuzzy(StringSliceBase const & slice, Locales const & loc for (size_t i = 0; i < slice.Size(); ++i) { - /// @todo We build dfa twice for each token: here and in geocoder.cpp. - /// A possible optimization is to build each dfa once and save it. Note that - /// dfas for the prefix tokens differ, i.e. we ignore slice.IsPrefix(i) here. - + // todo(@m, @y). We build dfa twice for each token: here and in geocoder.cpp. + // A possible optimization is to build each dfa once and save it. Note that + // dfas for the prefix tokens differ, i.e. we ignore slice.IsPrefix(i) here. SearchTrieRequest request; - /// @todo Shall we match prefix tokens for categories? - request.m_names.push_back(BuildLevenshteinDFA_Category(slice.Get(i))); + request.m_names.push_back(BuildLevenshteinDFA(slice.Get(i))); request.SetLangs(locales); - MatchFeaturesInTrie(request, iterator, - [](uint32_t) { return true; } /* filter */, - [&todo, i](uint32_t type, bool) { todo(i, type); } /* todo */); + MatchFeaturesInTrie(request, iterator, [&](uint32_t /* type */) { return true; } /* filter */, + std::bind(todo, i, std::placeholders::_1)); } } diff --git a/skin_generator/main.cpp b/skin_generator/main.cpp index 1dab8802d2..396e39b571 100644 --- a/skin_generator/main.cpp +++ b/skin_generator/main.cpp @@ -36,8 +36,6 @@ int main(int argc, char *argv[]) { gflags::ParseCommandLineFlags(&argc, &argv, true); QApplication app(argc, argv); - // Pretty icons on HDPI displays. - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); tools::SkinGenerator gen; diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 35a6a527b6..0ce66d4e03 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -67,7 +67,7 @@ target_link_libraries(${PROJECT_NAME} platform coding mwm_diff - cppjansson + jansson ) omim_add_test_subdirectory(storage_tests) diff --git a/storage/country_decl.cpp b/storage/country_decl.cpp index 9c23f94ebd..72edc18be7 100644 --- a/storage/country_decl.cpp +++ b/storage/country_decl.cpp @@ -21,7 +21,7 @@ void CountryInfo::FileName2FullName(string & fName) // static void CountryInfo::FullName2GroupAndMap(string const & fName, string & group, string & map) { - size_t pos = fName.find(','); + size_t pos = fName.find(","); if (pos == string::npos) { map = fName; diff --git a/storage/country_name_getter.cpp b/storage/country_name_getter.cpp index 7820360bc5..19d77ce525 100644 --- a/storage/country_name_getter.cpp +++ b/storage/country_name_getter.cpp @@ -26,7 +26,7 @@ std::string CountryNameGetter::Get(std::string const & key) const std::string CountryNameGetter::operator()(CountryId const & countryId) const { - std::string name = Get(countryId); + std::string const name = Get(countryId); if (name.empty()) return countryId; diff --git a/storage/country_tree.cpp b/storage/country_tree.cpp index 6b496e8cd5..556ed1f6cd 100644 --- a/storage/country_tree.cpp +++ b/storage/country_tree.cpp @@ -1,5 +1,6 @@ #include "storage/country_tree.hpp" +#include "platform/mwm_version.hpp" #include "platform/platform.hpp" #include "coding/reader.hpp" @@ -8,15 +9,17 @@ #include "base/logging.hpp" #include "base/stl_helpers.hpp" -#include "cppjansson/cppjansson.hpp" - #include +#include +#include +#include "3party/jansson/myjansson.hpp" + +using namespace std; +using platform::CountryFile; namespace storage { -using namespace std; - // Mwm subtree attributes. They can be calculated based on information contained in countries.txt. // The first in the pair is number of mwms in a subtree. The second is sum of sizes of // all mwms in a subtree. @@ -74,7 +77,7 @@ public: { Country country(id, parent); if (mapSize) - country.SetFile(platform::CountryFile{id, mapSize, mapSha1}); + country.SetFile(CountryFile{id, mapSize, mapSha1}); return &m_countries.AddAtDepth(depth, std::move(country)); } @@ -290,7 +293,7 @@ void CountryTree::Clear() m_countryTreeMap.clear(); } -void CountryTree::Find(CountryId const & key, NodesBufferT & found) const +void CountryTree::Find(CountryId const & key, vector & found) const { found.clear(); if (IsEmpty()) @@ -309,7 +312,7 @@ CountryTree::Node const * CountryTree::FindFirst(CountryId const & key) const if (IsEmpty()) return nullptr; - NodesBufferT found; + vector found; Find(key, found); if (found.empty()) return nullptr; @@ -321,7 +324,7 @@ CountryTree::Node const * CountryTree::FindFirstLeaf(CountryId const & key) cons if (IsEmpty()) return nullptr; - NodesBufferT found; + vector found; Find(key, found); for (auto node : found) diff --git a/storage/country_tree.hpp b/storage/country_tree.hpp index d68d1b1f8d..87e43b8db6 100644 --- a/storage/country_tree.hpp +++ b/storage/country_tree.hpp @@ -3,8 +3,6 @@ #include "storage/country.hpp" #include "storage/storage_defines.hpp" -#include "base/buffer_vector.hpp" - #include #include #include @@ -98,11 +96,10 @@ public: /// Deletes all children and makes tree empty void Clear(); - using NodesBufferT = buffer_vector; /// \brief Checks all nodes in tree to find an equal one. If there're several equal nodes /// returns the first found. /// \returns a poiter item in the tree if found and nullptr otherwise. - void Find(CountryId const & key, NodesBufferT & found) const; + void Find(CountryId const & key, std::vector & found) const; Node const * FindFirst(CountryId const & key) const; diff --git a/storage/country_tree_helpers.cpp b/storage/country_tree_helpers.cpp index 70e1438a43..6d8fcdd0a4 100644 --- a/storage/country_tree_helpers.cpp +++ b/storage/country_tree_helpers.cpp @@ -9,7 +9,7 @@ namespace storage { CountryId GetTopmostParentFor(CountryTree const & countries, CountryId const & countryId) { - CountryTree::NodesBufferT nodes; + std::vector nodes; countries.Find(countryId, nodes); if (nodes.empty()) { diff --git a/storage/diff_scheme/diff_scheme_loader.cpp b/storage/diff_scheme/diff_scheme_loader.cpp index 6b04e7d88a..fdb11c3296 100644 --- a/storage/diff_scheme/diff_scheme_loader.cpp +++ b/storage/diff_scheme/diff_scheme_loader.cpp @@ -11,7 +11,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include "private.h" diff --git a/storage/storage.cpp b/storage/storage.cpp index 032d3c381e..f5e14dc9cd 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -27,7 +27,7 @@ #include "defines.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include @@ -1339,7 +1339,7 @@ StatusAndError Storage::GetNodeStatus(CountryTree::Node const & node) const bool Storage::IsDisputed(CountryTree::Node const & node) const { - CountryTree::NodesBufferT found; + vector found; m_countries.Find(node.Value().Name(), found); return found.size() > 1; } @@ -1605,7 +1605,7 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c { CHECK_THREAD_CHECKER(m_threadChecker, ()); - CountryTree::NodesBufferT nodes; + vector nodes; m_countries.Find(countryId, nodes); CHECK(!nodes.empty(), (countryId)); // If nodes.size() > 1 countryId corresponds to a disputed territories. @@ -1892,7 +1892,7 @@ void Storage::GetGroupNodePathToRoot(CountryId const & groupNode, CountriesVec & { path.clear(); - CountryTree::NodesBufferT nodes; + vector nodes; m_countries.Find(groupNode, nodes); if (nodes.empty()) { @@ -1922,7 +1922,7 @@ void Storage::GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nod { nodes.clear(); - CountryTree::NodesBufferT treeNodes; + vector treeNodes; m_countries.Find(countryId, treeNodes); if (treeNodes.empty()) { @@ -1945,7 +1945,7 @@ void Storage::GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nod CountryId const Storage::GetParentIdFor(CountryId const & countryId) const { - CountryTree::NodesBufferT nodes; + vector nodes; m_countries.Find(countryId, nodes); if (nodes.empty()) { diff --git a/storage/storage.hpp b/storage/storage.hpp index cbf57aa86a..92c97747fb 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -639,7 +639,8 @@ private: downloader::Progress CalculateProgress(CountriesVec const & descendants) const; template - void ForEachAncestorExceptForTheRoot(CountryTree::NodesBufferT const & nodes, ToDo && toDo) const; + void ForEachAncestorExceptForTheRoot(std::vector const & nodes, + ToDo && toDo) const; /// @return true if |node.Value().Name()| is a disputed territory and false otherwise. bool IsDisputed(CountryTree::Node const & node) const; @@ -689,7 +690,7 @@ void Storage::ForEachInSubtree(CountryId const & root, ToDo && toDo) const template void Storage::ForEachAncestorExceptForTheRoot(CountryId const & countryId, ToDo && toDo) const { - CountryTree::NodesBufferT nodes; + std::vector nodes; m_countries.Find(countryId, nodes); if (nodes.empty()) { @@ -701,7 +702,8 @@ void Storage::ForEachAncestorExceptForTheRoot(CountryId const & countryId, ToDo } template -void Storage::ForEachAncestorExceptForTheRoot(CountryTree::NodesBufferT const & nodes, ToDo && toDo) const +void Storage::ForEachAncestorExceptForTheRoot(std::vector const & nodes, + ToDo && toDo) const { std::set visitedAncestors; // In most cases nodes.size() == 1. In case of disputable territories nodes.size() diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index e8c6a7d078..3233d526f3 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -23,5 +23,4 @@ target_link_libraries(${PROJECT_NAME} platform_tests_support generator_tests_support storage - cppjansson ) diff --git a/testing/testingmain.cpp b/testing/testingmain.cpp index 0057a91a04..8d32817eae 100644 --- a/testing/testingmain.cpp +++ b/testing/testingmain.cpp @@ -159,8 +159,6 @@ int main(int argc, char * argv[]) { #if defined(OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP) && !defined(OMIM_OS_IPHONE) QAPP theApp(argc, argv); - // Pretty icons on HDPI displays. - QAPP::setAttribute(Qt::AA_UseHighDpiPixmaps); UNUSED_VALUE(theApp); #else UNUSED_VALUE(argc); diff --git a/tools/android/set_up_android.py b/tools/android/set_up_android.py index ba81ddca4c..ed5dc34931 100755 --- a/tools/android/set_up_android.py +++ b/tools/android/set_up_android.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python import os, sys, shutil, collections from optparse import OptionParser diff --git a/tools/kothic b/tools/kothic index 5b160e185f..d6a507cfc0 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit 5b160e185faf5bc4f6c85e197e45ce520709cf94 +Subproject commit d6a507cfc09638d489588f2cbd32569f34004318 diff --git a/tools/python/check_store_metadata.py b/tools/python/check_store_metadata.py index 9f2428e0ac..c5a001ebf9 100755 --- a/tools/python/check_store_metadata.py +++ b/tools/python/check_store_metadata.py @@ -6,7 +6,6 @@ import os import sys import glob -import shutil from urllib.parse import urlparse os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..")) @@ -134,14 +133,12 @@ def check_raw(path, max_length): ok = error(path, "too long: got={}, expected={}", cur_length, max_length) return ok, text -def check_text(path, max, optional=False): +def check_text(path, max): try: return done(path, check_raw(path, max)[0]) except FileNotFoundError as e: - if optional: - return True, print("🚫", path) - return False, + return True, def check_url(path,): (ok, url) = check_raw(path, 500) @@ -161,51 +158,26 @@ def check_exact(path, expected): ok = error(path, "invalid value: got={}, expected={}", value, expected) return done(path, ok) - def check_android(): ok = True - flavor = 'android/src/fdroid/play/' - ok = check_url(flavor + 'contact-website.txt') and ok - ok = check_email(flavor + 'contact-email.txt') and ok - ok = check_exact(flavor + 'default-language.txt', 'en-US') and ok - for locale in glob.glob(flavor + 'listings/*/'): - if locale.split('/')[-2] not in GPLAY_LOCALES: - ok = error(locale, 'unsupported locale') and ok - continue - ok = check_text(locale + 'title.txt', 50) and ok - ok = check_text(locale + 'title-google.txt', 30) and ok - ok = check_text(locale + 'short-description.txt', 80) and ok - ok = check_text(locale + 'short-description-google.txt', 80, True) and ok - ok = check_text(locale + 'full-description.txt', 4000) and ok - ok = check_text(locale + 'full-description-google.txt', 4000, True) and ok - ok = check_text(locale + 'release-notes.txt', 499) and ok - for locale in glob.glob(flavor + 'release-notes/*/'): - if locale.split('/')[-2] not in GPLAY_LOCALES: - ok = error(locale, 'unsupported locale') and ok - continue - ok = check_text(locale + 'default.txt', 499) and ok + for flavor in glob.glob('android/src/*/play/'): + ok = check_url(flavor + "contact-website.txt") and ok + ok = check_email(flavor + "contact-email.txt") and ok + ok = check_exact(flavor + "default-language.txt", "en-US") and ok + maxTitle = 30 if 'google' in flavor else 50 + for locale in glob.glob(flavor + 'listings/*/'): + if locale.split('/')[-2] not in GPLAY_LOCALES: + ok = error(locale, "unsupported locale") and ok + continue + ok = check_text(locale + "title.txt", maxTitle) and ok + ok = check_text(locale + "short-description.txt", 80) and ok + ok = check_text(locale + "full-description.txt", 4000) and ok + for locale in glob.glob(flavor + 'release-notes/??-??/'): + ok = check_text(locale + "default.txt", 500) and ok return ok - def check_ios(): ok = True - for locale in APPSTORE_LOCALES: - locale_dir = os.path.join('iphone', 'metadata', locale) - english_dir = os.path.join('iphone', 'metadata', 'en-US') - overlay_dir = os.path.join('keywords', 'ios', locale) - if not os.path.isdir(locale_dir): - os.mkdir(locale_dir) - for name in ["name.txt", "subtitle.txt", "promotional_text.txt", - "description.txt", "release_notes.txt", "keywords.txt", - "support_url.txt", "marketing_url.txt", "privacy_url.txt"]: - overlay_path = os.path.join(overlay_dir, name) - english_path = os.path.join(english_dir, name) - target_path = os.path.join(locale_dir, name) - if os.path.exists(overlay_path): - shutil.copy(overlay_path, target_path) - elif os.path.exists(english_path) and not os.path.exists(target_path): - shutil.copy(english_path, target_path) - for locale in glob.glob('iphone/metadata/*/'): if locale.split('/')[-2] not in APPSTORE_LOCALES: ok = error(locale, "unsupported locale") and ok @@ -215,14 +187,10 @@ def check_ios(): ok = check_text(locale + "promotional_text.txt", 170) and ok ok = check_text(locale + "description.txt", 4000) and ok ok = check_text(locale + "release_notes.txt", 4000) and ok - ok = check_text(locale + "keywords.txt", 100, True) and ok + ok = check_text(locale + "keywords.txt", 100) and ok ok = check_url(locale + "support_url.txt") and ok ok = check_url(locale + "marketing_url.txt") and ok ok = check_url(locale + "privacy_url.txt") and ok - for locale in glob.glob('keywords/ios/*/'): - if locale.split('/')[-2] not in APPSTORE_LOCALES: - ok = error(locale, "unsupported locale") and ok - continue return ok if __name__ == "__main__": diff --git a/tools/python/clean_strings_txt.py b/tools/python/clean_strings_txt.py index a030d12bca..7d183f22c5 100755 --- a/tools/python/clean_strings_txt.py +++ b/tools/python/clean_strings_txt.py @@ -40,7 +40,7 @@ HARDCODED_STRINGS = [ "cyan", "teal", "lime", "deep_orange", "gray", "blue_gray", # Used in About in iphone/Maps/UI/Help/AboutController.swift "news", "faq", "report_a_bug", "how_to_support_us", "rate_the_app", - "telegram", "github", "website", "email", "matrix", "mastodon", "facebook", "twitter", "instagram", "openstreetmap", + "telegram", "github", "website", "email", "facebook", "twitter", "instagram", "matrix", "openstreetmap", "privacy_policy", "terms_of_use", "copyright", ] diff --git a/tools/python/maps_generator/README.md b/tools/python/maps_generator/README.md index 192fb19567..8813ffef44 100644 --- a/tools/python/maps_generator/README.md +++ b/tools/python/maps_generator/README.md @@ -1,20 +1,23 @@ # maps_generator -`maps_generator` is the Python CLI for generating .mwm maps for the Organic Maps application. This tool functions as the driver for the `generator_tool` C++ executable. +It's tool for generation maps for the Organic Maps application. -**Use the `generator_tool` and application from the same release. The application does not support -maps built by a generator_tool newer than the app.** +Note: **Use generator_tool and application from the same release. Application does not support +maps built by generator_tool newer than app.** ## What are maps? -Maps are .mwm binary files with special meta-information for rendering, searching, routing, and other use cases. -Files from [data/borders](https://github.com/organicmaps/organicmaps/tree/master/data/borders) define map boundaries for each individual file. The world is segmented into separate files by these boundaries, with the intent of having managebly small files to download. These files are referred to as *maps* or *countries*. A country is referring to one of these files, not necesarily a geographic country. Also note that there are two special countries called *World* and *WorldCoasts*. These are small simplified maps of the world and coastlines used when other maps have not yet been downloaded. +Maps are data with special meta information for drawing, quick searching and routing and for other. +Files from [data/borders](https://github.com/organicmaps/organicmaps/tree/master/data/borders) define map boundaries. +Further we will call it countries or simply maps. +But there are two special maps: World and WorldCoasts. They are used when other maps have not been downloaded. +Further we will call them world and coastlines. ## Setup -You must have Python version >= 3.6 and complete the following steps: +You must have Python version not lower than 3.6 and complete the following steps: -1. Switch to the branch of your app's version (see the note of #maps_generator section). +0. Switch to the branch of your app's version (see the note of #maps_generator section). For example, if you use OMaps 9.2.3 you should do: ```sh @@ -23,43 +26,35 @@ git checkout release-92 The app version can be found in the "About" section in the settings menu of OMaps. -2. Build and install the generator_tool. - -```sh -./tools/unix/build_omim.sh -r generator_tool -./tools/unix/build_omim.sh -r world_roads_builder_tool -``` - -3. Change directory: +1. [Build and install generator_tool.](https://github.com/organicmaps/organicmaps/blob/master/docs/INSTALL.md#desktop-app) +2. Change directory: ```sh $ cd omim/tools/python/maps_generator ``` -4. Install dependencies: +3. Install dependencies: ```sh maps_generator$ pip3 install -r requirements_dev.txt ``` -5. 1 Make the ini configuration file: +4. Make ini file: ```sh maps_generator$ cp var/etc/map_generator.ini.default var/etc/map_generator.ini ``` -6. Edit the ini file: +5. Edit ini file: ```sh maps_generator$ vim var/etc/map_generator.ini ``` -Here is a sample ini that will download an OSM PBF file for the Yukon Territories, Canada from [GEOFABRIK](https://www.geofabrik.de/). You can replace the *osm.pbf* and *osm.pbf.md5* with other areas instead. Note that an entire planet file currently takes 40+ hours on a server with 256GB of RAM. Unless you have a machine this large, it is recommended to use a smaller extract. - ```ini [Main] # If the flag DEBUG is set a special small planet file will be downloaded. -DEBUG: 0 +DEBUG: 1 # The path where the planet will be downloaded and the maps are generated. MAIN_OUT_PATH: ~/maps_build # The path where caches for nodes, ways, relations are stored. @@ -68,15 +63,17 @@ MAIN_OUT_PATH: ~/maps_build [Developer] # The path where the generator_tool will be searched. -# Usually this is in the same parent directory of the organicmaps repo. BUILD_PATH: ~/omim-build-release -# The path to the organicmaps repo -OMIM_PATH: ~/code/organicmaps +# The path to the project directory omim. +OMIM_PATH: ~/omim [Generator tool] -# The path to the data folder in the repository. +# The path to the omim/data. USER_RESOURCE_PATH: ${Developer:OMIM_PATH}/data +# Do not change it. This is determined automatically. +# NODE_STORAGE: map + [Osm tools] # The path to the osmctools sources. @@ -87,46 +84,34 @@ OSM_TOOLS_PATH: ~/osmctools [Stages] # Run osmupdate tool for planet. -# You can set this to 1 if you would like osmupdate to apply updates to an out-of-date osm.pbf NEED_PLANET_UPDATE: 0 # Auto detection. THREADS_COUNT_FEATURES_STAGE: 0 -# If you want to calculate diffs, you need to specify, where old maps are. +# If you want to calculate diffs, you need to specify, where old maps are DATA_ARCHIVE_DIR: ${Generator tool:USER_RESOURCE_PATH} -# How many versions in the archive to use for diff calculation. +# You may specify, how many versions in the archive to use for diff calculation DIFF_VERSION_DEPTH: 2 [Logging] # The path where maps_generator log will be saved. -# Defaults to $MAIN_OUT_PATH/generation.log # LOG_FILE_PATH: generation.log [External] -# Note: If you want to set a directory name you have to add "/" to the end of url. -# In each field where you need to specify a URL, you can specify the path to the file system using file:///path/to/file -# It is recommended to start with an https:// path to an osm.pbf and osm.pbf.mdf file. - # The url to the planet file. -PLANET_URL: https://download.geofabrik.de/north-america/canada/yukon-latest.osm.pbf +# PLANET_URL: # The url to the file with md5 sum of the planet. -PLANET_MD5_URL: https://download.geofabrik.de/north-america/canada/yukon-latest.osm.pbf.md5 +# PLANET_MD5_URL: # The base url to WorldCoasts.geom and WorldCoasts.rawgeom (without file name). # Files latest_coasts.geom and latest_coasts.rawgeom must be at this URL. # For example, if PLANET_COASTS_URL = https://somesite.com/download/ # 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. # PLANET_COASTS_URL: -# Set to 'true' to build special routing section in World.mwm for alerting about absent regions without which the -# route can't be built. This should be true for any non-planet build. -NEED_BUILD_WORLD_ROADS: true # The url to the subway file. SUBWAY_URL: https://cdn.organicmaps.app/subway.json -# The url of the location with the transit files extracted from GTFS. -# TRANSIT_URL: - # Urls for production maps generation. # UGC_URL: # HOTELS_URL: @@ -139,34 +124,26 @@ SUBWAY_URL: https://cdn.organicmaps.app/subway.json # UK_POSTCODES_URL: # US_POSTCODES_URL: + [Common] # 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 ``` -### Notes +##### Note 1: In each field where you need to specify a URL, you can specify the path to the file system using file:///path/to/file -In each field where you need to specify a URL, you can specify the path to the file system using `file:///path/to/file`. +##### Note 2: You can manually generate subway layer file for SUBWAY_URL parameter. See [instructions](https://github.com/organicmaps/organicmaps/tree/master/docs/SUBWAY_GENERATION.md). -You can manually generate a subway layer file with the SUBWAY_URL parameter. See [instructions](https://github.com/organicmaps/organicmaps/tree/master/docs/SUBWAY_GENERATION.md). - -## Basic Usage - -Make sure you are in the `tools/python` directory when running the CLI. Unless you have URLs for coastline files, skip the coastline. +## Usage ```sh -cd tools/python -python -m maps_generator --countries="Canada_Yukon_North, Canada_Yukon_Whitehorse" --skip="Coastline" -``` - -## Help - -```sh -python$ python -m maps_generator -h +$ cd omim/tools/python +python$ python3.6 -m maps_generator -h ``` ``` @@ -218,19 +195,22 @@ optional arguments: --order ORDER Mwm generation order. ``` -If you are not from the Organic Maps team, then you do not need the option --production when generating maps. +If you are not from the maps.me team, then you do not need the option --production when generating maps. -It is recommended to have 1TB of hard disk space with 256+GB of RAM to generate the entire planet. Expect the job to take about 40 hours. +To generate maps for the whole planet you need 400 GB of hard disk space and a computer with more than 64 GB RAM. -Because different maps take varying amounts of time to generate, you can provide an ordered list of maps. -This way, you can choose which maps you would like to see completed first in a long build. -The default is `var/etc/mwm_generation_order.txt`, and you can override this behavior with the option -`--order=/path/to/mwm_generation_order.txt`. +If you want to generate a lot of maps, then it may be important for you to order the generation of maps. +Because different maps take different amounts of time to generate. +Using a list with maps order can reduce build time on a multi-core computer. +The order from: var/etc/mwm_generation_order.txt is used by default. +You can override this behavior with the option --order=/path/to/mwm_generation_order.txt You can calculate this list yourself from the statistics, which is calculated with each generation. -## More Examples +### Examples -### Japan with coastlines +#### Non-standard planet with coastlines + +If you want to generate maps for Japan you must complete the following steps: 1. Open https://download.geofabrik.de/asia/japan.html and copy url of osm.pbf and md5sum files. 2. Edit ini file: @@ -250,26 +230,24 @@ PLANET_MD5_URL: https://download.geofabrik.de/asia/japan-latest.osm.pbf.md5 ... ``` -To build an entire country with coastlines, you need to download the *latest_coasts.geom* and *latest_coasts.rawgeom* files and specify their path in the config. You don't need to download these files if the whole planet is built. They are generated in the process of building the whole planet. - 3. Run ```sh -python$ python -m maps_generator --countries="World, WorldCoasts, Japan_*" +python$ python3.6 -m maps_generator --countries="World, WorldCoasts, Japan_*" ``` -### Rebuild stages +#### Rebuild stages: -For example, you changed routing code in the project and want to regenerate maps. +For example, you changed routing code in omim project and want to regenerate maps. You must have previous generation. You may regenerate from stage routing only for two mwms: ```sh -python$ python -m maps_generator -c --from_stage="Routing" --countries="Japan_Kinki Region_Osaka_Osaka, Japan_Chugoku Region_Tottori" +python$ python3.6 -m maps_generator -c --from_stage="Routing" --countries="Japan_Kinki Region_Osaka_Osaka, Japan_Chugoku Region_Tottori" ``` -To generate maps with the coastline, you need more time and you need the planet to contain a continuous coastline. +##### Note: To generate maps with the coastline, you need more time and you need the planet to contain a continuous coastline. -### Extract without coastlines +#### Non-standard planet without coastlines If you want to generate maps for Moscow you must complete the following steps: @@ -294,12 +272,12 @@ PLANET_MD5_URL: https://download.geofabrik.de/russia/central-fed-district-latest 3. Run ```sh -python$ python -m maps_generator --countries="Japan_Chugoku Region_Tottori" --skip="Coastline" +python$ python3.6 -m maps_generator --countries="Russia_Moscow" --skip="Coastline" ``` -### Custom maps from GeoJSON +#### Generate all possible mwms from .osm.pbf file -If you have an OSM PBF file and want to cut custom map regions, you can use a polygon feature in a GeoJSON file. This is a useful alternative if you want a custom area, or you do not want to figure out which countrie(s) apply to the area you need. +If you have some .osm.pbf file, want to cut some area from it and generate maps from this area, but don't want to think what mwms got into this .osm.pbf file, you may follow the steps: 1. If you don't already have the .osm.pbf file, download applicable area of the world in .osm.pbf format, for example from [Geofabrik](http://download.geofabrik.de/index.html). 2. Generate area in geojson format of the territory in which you are interested. You can do it via [geojson.io](http://geojson.io/). Select the area on the map and copy corresponding part of the resulting geojson. You need to copy the contents of the `features: [ { ... } ]`, without features array, but with inner braces: `{...}`. For example, here is the full geojson of the rectangle area around Melbourne: @@ -359,7 +337,7 @@ osmium extract -p borders.geojson germany-latest.osm.pbf -o germany_part.osm.pbf 5. Run the `maps_generator` tool: ```sh -python$ python -m maps_generator --skip="Coastline" --without_countries="World*" +python$ python3.6 -m maps_generator --skip="Coastline" --without_countries="World*" ``` In this example we skipped generation of the World\* files because they are ones of the most time- and resources-consuming mwms. diff --git a/tools/twine b/tools/twine index 36ceac404a..ccf5f38d6f 160000 --- a/tools/twine +++ b/tools/twine @@ -1 +1 @@ -Subproject commit 36ceac404aad5620662a84f2c4ebafe15bac769c +Subproject commit ccf5f38d6f38b0b961b79a1166f2ae462985c890 diff --git a/tools/unix/clone_en_release_notes.sh b/tools/unix/clone_en_release_notes.sh deleted file mode 100755 index 0bdb562beb..0000000000 --- a/tools/unix/clone_en_release_notes.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -ANDROID_LISTINGS=android/src/fdroid/play/listings -ANDROID_NOTES=$ANDROID_LISTINGS/en-US/release-notes.txt -IOS_METADATA=iphone/metadata -IOS_NOTES=$IOS_METADATA/en-US/release_notes.txt - -find $ANDROID_LISTINGS -name release-notes.txt -exec rsync -a $ANDROID_NOTES {} \; -find $IOS_METADATA -name release_notes.txt -exec rsync -a $IOS_NOTES {} \; diff --git a/tools/unix/generate_localizations.sh b/tools/unix/generate_localizations.sh index 32dcca1283..ec86b22409 100755 --- a/tools/unix/generate_localizations.sh +++ b/tools/unix/generate_localizations.sh @@ -1,16 +1,16 @@ #!/bin/bash -set -euxo pipefail +set -e -u -x # Use ruby from brew on Mac OS X, because system ruby is outdated/broken/will be removed in future releases. case $OSTYPE in darwin*) if [ -x /usr/local/opt/ruby/bin/ruby ]; then PATH="/usr/local/opt/ruby/bin:$PATH" - elif [ -x "${HOMEBREW_PREFIX:-/opt/homebrew}/opt/ruby/bin/ruby" ]; then - PATH="${HOMEBREW_PREFIX:-/opt/homebrew}/opt/ruby/bin:$PATH" + elif [ -x /opt/homebrew/opt/ruby/bin/ruby ]; then + PATH="/opt/homebrew/opt/ruby/bin:$PATH" else echo 'Please install Homebrew ruby by running "brew install ruby"' - exit 1 + exit -1 fi ;; *) if [ ! -x "$(which ruby)" ]; then @@ -35,10 +35,10 @@ TWINE_GEM="twine-$TWINE_COMMIT.gem" if [ ! -f "$TWINE_PATH/$TWINE_GEM" ] || ! gem list -i twine; then echo "Building & installing twine gem..." ( - cd "$TWINE_PATH" \ - && rm -f ./*.gem \ - && gem build --output "$TWINE_GEM" \ - && gem install --user-install "$TWINE_GEM" + cd $TWINE_PATH \ + && rm -f *.gem \ + && gem build --output $TWINE_GEM \ + && gem install --user-install $TWINE_GEM ) fi @@ -66,12 +66,4 @@ cat "$STRINGS_PATH"/{strings,types_strings}.txt> "$MERGED_FILE" "$TWINE" generate-all-localization-files --format jquery "$OMIM_PATH/data/countries_names.txt" "$OMIM_PATH/data/countries-strings/" "$TWINE" generate-all-localization-files --format jquery "$OMIM_PATH/data/strings/sound.txt" "$OMIM_PATH/data/sound-strings/" -# Generate list of languages and add list in gradle.properties to be used in build.gradle in resConfig -SUPPORTED_LOCALIZATIONS="supportedLocalizations="$(sed -nEe "s/ +([a-zA-Z]{2}(-[a-zA-Z]{2,})?) = .*$/\1/p" "data/strings/strings.txt" | sort -u | tr '\n' ',' | sed -e 's/-/_/g' -e 's/,$//') -GRADLE_PROPERTIES="$OMIM_PATH/android/gradle.properties" -if [ "$SUPPORTED_LOCALIZATIONS" != "$(grep supportedLocalizations "$GRADLE_PROPERTIES")" ]; then - sed -i .bak 's/supportedLocalizations.*/'"$SUPPORTED_LOCALIZATIONS"'/' "$GRADLE_PROPERTIES" - rm "$GRADLE_PROPERTIES.bak" -fi - -rm "$MERGED_FILE" +rm $MERGED_FILE diff --git a/track_generator/utils.cpp b/track_generator/utils.cpp index 5653407ac2..92236a0f5c 100644 --- a/track_generator/utils.cpp +++ b/track_generator/utils.cpp @@ -21,10 +21,10 @@ #include "base/file_name_utils.hpp" #include "base/logging.hpp" +#include +#include #include -namespace track_generator_tool -{ using namespace std; namespace @@ -85,6 +85,8 @@ vector GetTrackPoints(std::vector const } } // namespace +namespace track_generator_tool +{ void GenerateTracks(string const & inputDir, string const & outputDir, routing::VehicleType type) { CHECK(!inputDir.empty(), ()); @@ -127,25 +129,23 @@ void GenerateTracks(string const & inputDir, string const & outputDir, routing:: numberOfTracks += data.m_tracksData.size(); for (auto & track : data.m_tracksData) { - for (auto & line : track.m_geometry.m_lines) + std::vector waypoints; + waypoints.reserve(track.m_pointsWithAltitudes.size()); + for (auto const & pt : track.m_pointsWithAltitudes) + waypoints.push_back(pt.GetPoint()); + + routing::routes_builder::RoutesBuilder::Params params(type, move(waypoints)); + + auto result = routesBuilder.ProcessTask(params); + if (result.m_code != routing::RouterResultCode::NoError) { - std::vector waypoints; - waypoints.reserve(line.size()); - for (auto const & pt : line) - waypoints.push_back(pt.GetPoint()); - - routing::routes_builder::RoutesBuilder::Params params(type, std::move(waypoints)); - - auto result = routesBuilder.ProcessTask(params); - if (result.m_code != routing::RouterResultCode::NoError) - { - LOG(LINFO, ("Can't convert track", track.m_id, "from file:", file, "Error:", result.m_code)); - ++numberOfNotConverted; - continue; - } - - line = GetTrackPoints(result.GetRoutes().back().m_followedPolyline.GetPolyline().GetPoints()); + LOG(LINFO, ("Can't convert track", track.m_id, "from file:", file, "Error:", result.m_code)); + ++numberOfNotConverted; + continue; } + + track.m_pointsWithAltitudes = + GetTrackPoints(result.GetRoutes().back().m_followedPolyline.GetPolyline().GetPoints()); } try diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt index c51e2d52aa..cab110c81a 100644 --- a/traffic/pytraffic/CMakeLists.txt +++ b/traffic/pytraffic/CMakeLists.txt @@ -36,7 +36,7 @@ omim_link_libraries( geometry coding base - cppjansson + jansson oauthcpp protobuf pugixml diff --git a/transit/experimental/transit_data.cpp b/transit/experimental/transit_data.cpp index 364f9c4ae4..a94c1ae53a 100644 --- a/transit/experimental/transit_data.cpp +++ b/transit/experimental/transit_data.cpp @@ -182,7 +182,6 @@ TimeTable GetTimeTableFromJson(json_t * obj) std::vector timeIntervals; auto const & rawValues = GetVectorFromJson(item, "intervals"); - timeIntervals.reserve(rawValues.size()); for (auto const & rawValue : rawValues) timeIntervals.push_back(TimeInterval(rawValue)); diff --git a/transit/experimental/transit_data.hpp b/transit/experimental/transit_data.hpp index 97cca18e17..d691a08b01 100644 --- a/transit/experimental/transit_data.hpp +++ b/transit/experimental/transit_data.hpp @@ -20,7 +20,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace transit { diff --git a/transit/transit_graph_data.cpp b/transit/transit_graph_data.cpp index 853b92a16b..a965bc162a 100644 --- a/transit/transit_graph_data.cpp +++ b/transit/transit_graph_data.cpp @@ -134,7 +134,6 @@ template void UpdateItems(set const & ids, vector & items) { vector itemsToFill; - itemsToFill.reserve(ids.size()); for (auto const id : ids) itemsToFill.push_back(FindById(items, id)); diff --git a/transit/transit_graph_data.hpp b/transit/transit_graph_data.hpp index ad943b9071..7a36dbe125 100644 --- a/transit/transit_graph_data.hpp +++ b/transit/transit_graph_data.hpp @@ -12,7 +12,7 @@ #include "base/geo_object_id.hpp" #include "base/visitor.hpp" -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" #include #include diff --git a/transit/world_feed/date_time_helpers.cpp b/transit/world_feed/date_time_helpers.cpp index 9a7b60f07d..7055e47317 100644 --- a/transit/world_feed/date_time_helpers.cpp +++ b/transit/world_feed/date_time_helpers.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include "3party/boost/boost/date_time/gregorian/gregorian.hpp" namespace transit { diff --git a/transit/world_feed/world_feed.cpp b/transit/world_feed/world_feed.cpp index 524f9109f1..37903da7da 100644 --- a/transit/world_feed/world_feed.cpp +++ b/transit/world_feed/world_feed.cpp @@ -20,7 +20,7 @@ #include #include -#include "cppjansson/cppjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace { diff --git a/transit/world_feed/world_feed_tests/world_feed_tests.cpp b/transit/world_feed/world_feed_tests/world_feed_tests.cpp index f96a56a0a2..7cd5d1e3cd 100644 --- a/transit/world_feed/world_feed_tests/world_feed_tests.cpp +++ b/transit/world_feed/world_feed_tests/world_feed_tests.cpp @@ -8,10 +8,12 @@ #include "platform/platform.hpp" #include "base/assert.hpp" +#include "base/math.hpp" #include #include #include +#include #include #include "3party/just_gtfs/just_gtfs.h" @@ -70,6 +72,12 @@ void TestExceptionIntervals(gtfs::CalendarDates const & dates, size_t intervalsC TEST_EQUAL(openingHours, resOpeningHoursStr, ()); } +void TestPlanFact(size_t planIndex, bool planInsert, std::pair const & factRes) +{ + TEST_EQUAL(factRes.first, planIndex, ()); + TEST_EQUAL(factRes.second, planInsert, ()); +} + void TestStopsRange(IdList const & stopsOnLine, IdSet const & stopsInRegion, size_t firstIdxPlan, size_t lastIdxPlan) { @@ -193,9 +201,6 @@ UNIT_TEST(Transit_GTFS_FindStopTimesByTransitId2) // UNIT_TEST(Transit_GTFS_ProjectStopToLine_Simple) { - // index, was inserted - using ResT = std::pair; - double const y = 0.0002; std::vector shape{{0.001, y}, {0.0015, y}, {0.004, y}, {0.005, y}}; @@ -205,9 +210,9 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_Simple) // Test that point_A is projected between two existing polyline points and the new point is // added in the place of its projection. - TEST_EQUAL(ResT(1, true), + TestPlanFact(1 /* planIndex */, true /* planInsert */, PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); TEST_EQUAL(shape.size(), 5, ()); TEST_EQUAL(shape[1 /* expectedIndex */], m2::PointD(point_A.x, y), ()); @@ -215,36 +220,36 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_Simple) // Test that repeated point_A projection to the polyline doesn't lead to the second insertion. // Expected point projection index is the same. // But this projection is not inserted (it is already present). - TEST_EQUAL(ResT(1, false), + TestPlanFact(1 /* planIndex */, false /* planInsert */, PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); // So the shape size remains the same. TEST_EQUAL(shape.size(), 5, ()); // Test that point_B insertion leads to addition of the new projection to the shape. - TEST_EQUAL(ResT(4, true), + TestPlanFact(4, true, PrepareNearestPointOnTrack(point_B, std::nullopt, 1 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); // Test that point_C insertion does not lead to the addition of the new projection. - TEST_EQUAL(ResT(5, false), + TestPlanFact(5, false, PrepareNearestPointOnTrack(point_C, std::nullopt, 4 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); // Test point_C projection in backward direction. - TEST_EQUAL(ResT(5, false), + TestPlanFact(5 /* planIndex */, false /* planInsert */, PrepareNearestPointOnTrack(point_C, std::nullopt, shape.size() /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); // Test point_B projection in backward direction. - TEST_EQUAL(ResT(4, false), + TestPlanFact(4 /* planIndex */, false /* planInsert */, PrepareNearestPointOnTrack(point_B, std::nullopt, 5 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); // Test point_A projection in backward direction. - TEST_EQUAL(ResT(1, false), + TestPlanFact(1 /* planIndex */, false /* planInsert */, PrepareNearestPointOnTrack(point_A, std::nullopt, 4 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); } // Stop is on approximately the same distance from the segment (0, 1) and segment (1, 2). @@ -258,18 +263,15 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_Simple) // UNIT_TEST(Transit_GTFS_ProjectStopToLine_DifferentStartIndexes) { - // index, was inserted - using ResT = std::pair; - std::vector const referenceShape{{0.001, 0.001}, {0.001, 0.002}, {0.003, 0.002}}; m2::PointD const point_A{0.0015, 0.0015}; // Test for |startIndex| = 0. { auto shape = referenceShape; - TEST_EQUAL(ResT(1, true), + TestPlanFact(1, true, PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); TEST_EQUAL(shape.size(), 4, ()); TEST_EQUAL(shape[1 /* expectedIndex */], m2::PointD(0.001, point_A.y), ()); } @@ -277,9 +279,9 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_DifferentStartIndexes) // Test for |startIndex| = 1. { auto shape = referenceShape; - TEST_EQUAL(ResT(2, true), + TestPlanFact(2, true, PrepareNearestPointOnTrack(point_A, std::nullopt, 1 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); TEST_EQUAL(shape.size(), 4, ()); TEST_EQUAL(shape[2 /* expectedIndex */], m2::PointD(point_A.x, 0.002), ()); } @@ -300,15 +302,12 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_DifferentStartIndexes) // UNIT_TEST(Transit_GTFS_ProjectStopToLine_MaxDistance) { - // index, was inserted - using ResT = std::pair; - std::vector shape{{0.002, 0.001}, {0.003, 0.003}, {0.010, 0.003}, {0.010, 0.0031}, {0.005, 0.0031}, {0.001, 0.0031}}; m2::PointD const point_A{0.0028, 0.0029}; - TEST_EQUAL(ResT(1, true), + TestPlanFact(1, true, PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); } // Complex shape with multiple points on it and multiple stops for projection. @@ -332,9 +331,6 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_MaxDistance) // UNIT_TEST(Transit_GTFS_ProjectStopToLine_NearCircle) { - // index, was inserted - using ResT = std::pair; - double constexpr kEps = 1e-5; std::vector const initialShape{ {0.003, 0.001}, {0.003, 0.0015}, {0.0025, 0.002}, {0.002, 0.0025}, {0.001, 0.0025}, @@ -351,67 +347,67 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_NearCircle) // Forward auto shape = initialShape; - TEST_EQUAL(ResT(2, true), + TestPlanFact(2, true, PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); auto const coordA = shape[2]; - TEST_EQUAL(ResT(3, false), + TestPlanFact(3, false, PrepareNearestPointOnTrack(point_B, std::nullopt, 2 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); auto const coordB = shape[3]; - TEST_EQUAL(ResT(10, true), + TestPlanFact(10, true, PrepareNearestPointOnTrack(point_C, std::nullopt, 3 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); auto const coordC = shape[10]; - TEST_EQUAL(ResT(12, false), + TestPlanFact(12, false, PrepareNearestPointOnTrack(point_D, std::nullopt, 10 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); auto const coordD = shape[12]; - TEST_EQUAL(ResT(14, true), + TestPlanFact(14, true, PrepareNearestPointOnTrack(point_E, std::nullopt, 12 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); auto const coordE = shape[14]; - TEST_EQUAL(ResT(20, true), + TestPlanFact(20, true, PrepareNearestPointOnTrack(point_F, std::nullopt, 14 /* prevIndex */, - Direction::Forward, shape), ()); + Direction::Forward, shape)); // Backward processing of reversed shape shape = initialShape; reverse(shape.begin(), shape.end()); - TEST_EQUAL(ResT(17, true), + TestPlanFact(17, true, PrepareNearestPointOnTrack(point_A, std::nullopt, shape.size() /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); TEST(base::AlmostEqualAbs(coordA, shape[17], kEps), (coordA, shape[17])); - TEST_EQUAL(ResT(16, false), + TestPlanFact(16, false, PrepareNearestPointOnTrack(point_B, std::nullopt, 17 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); TEST(base::AlmostEqualAbs(coordB, shape[16], kEps), (coordA, shape[17])); - TEST_EQUAL(ResT(10, true), + TestPlanFact(10, true, PrepareNearestPointOnTrack(point_C, std::nullopt, 16 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); TEST(base::AlmostEqualAbs(coordC, shape[10], kEps), (coordA, shape[17])); - TEST_EQUAL(ResT(8, false), + TestPlanFact(8, false, PrepareNearestPointOnTrack(point_D, std::nullopt, 10 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); TEST(base::AlmostEqualAbs(coordD, shape[8], kEps), (coordA, shape[17])); - TEST_EQUAL(ResT(7, true), + TestPlanFact(7, true, PrepareNearestPointOnTrack(point_E, std::nullopt, 8 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); TEST(base::AlmostEqualAbs(coordE, shape[7], kEps), (coordA, shape[17])); // point_F has different position because we do not insert before point 0. - TEST_EQUAL(ResT(2, true), + TestPlanFact(2, true, PrepareNearestPointOnTrack(point_F, std::nullopt, 7 /* prevIndex */, - Direction::Backward, shape), ()); + Direction::Backward, shape)); } UNIT_TEST(Transit_ColorPicker) diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index d3b45e2197..ed81ae1f1c 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -800,6 +800,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Debug; }; @@ -807,6 +808,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Release; }; @@ -814,10 +816,6 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/fast_double_parser/include", - ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -826,10 +824,6 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/fast_double_parser/include", - ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 5beadd6487..5e61d40f6d 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -140,7 +140,7 @@ F6C269FE1F176FFE00EB6519 /* csv_reader_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6C269FD1F176FFE00EB6519 /* csv_reader_test.cpp */; }; FACB76A926B89C2200810C9C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76A826B89C2200810C9C /* libbase.a */; }; FACB76AB26B89C3000810C9C /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AA26B89C3000810C9C /* minizip.framework */; }; - FACB76AD26B89C3F00810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AC26B89C3F00810C9C /* libcppjansson.a */; }; + FACB76AD26B89C3F00810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AC26B89C3F00810C9C /* libjansson.a */; }; FACB76AF26B89CFB00810C9C /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76AE26B89CFB00810C9C /* libz.tbd */; }; FACB76B326B89D3A00810C9C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76B226B89D3A00810C9C /* libsuccinct.a */; }; FAF23E22274E406400684735 /* huffman.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 394917231BAC3C2F002A8C4F /* huffman.hpp */; }; @@ -313,7 +313,7 @@ F6C269FD1F176FFE00EB6519 /* csv_reader_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csv_reader_test.cpp; sourceTree = ""; }; FACB76A826B89C2200810C9C /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76AA26B89C3000810C9C /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB76AC26B89C3F00810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB76AC26B89C3F00810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76AE26B89CFB00810C9C /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; FACB76B026B89D0700810C9C /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76B226B89D3A00810C9C /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -336,7 +336,7 @@ FAF23E27274E425000684735 /* libexpat.a in Frameworks */, FACB76B326B89D3A00810C9C /* libsuccinct.a in Frameworks */, FACB76AF26B89CFB00810C9C /* libz.tbd in Frameworks */, - FACB76AD26B89C3F00810C9C /* libcppjansson.a in Frameworks */, + FACB76AD26B89C3F00810C9C /* libjansson.a in Frameworks */, FACB76AB26B89C3000810C9C /* minizip.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -360,7 +360,7 @@ FACB76B226B89D3A00810C9C /* libsuccinct.a */, FACB76B026B89D0700810C9C /* libplatform.a */, FACB76AE26B89CFB00810C9C /* libz.tbd */, - FACB76AC26B89C3F00810C9C /* libcppjansson.a */, + FACB76AC26B89C3F00810C9C /* libjansson.a */, FACB76AA26B89C3000810C9C /* minizip.framework */, FACB76A826B89C2200810C9C /* libbase.a */, ); @@ -835,6 +835,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -843,6 +844,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 96a9cc8bb9..27f893d48f 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -81,6 +81,7 @@ GCC_FAST_MATH = YES // -fvisibility-inlines-hidden GCC_INLINES_ARE_PRIVATE_EXTERN = YES GCC_NO_COMMON_BLOCKS = YES +GCC_PRECOMPILE_PREFIX_HEADER = YES // Preprocessor definitions shared in all configurations and projects. // Silence "Migrate from OpenGL to Metal" warnings. GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COREVIDEO_SILENCE_GL_DEPRECATION GLES_SILENCE_DEPRECATION diff --git a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj deleted file mode 100644 index 6e171ae332..0000000000 --- a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj +++ /dev/null @@ -1,220 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 55; - objects = { - -/* Begin PBXBuildFile section */ - 7168E91A294CBB91005BA468 /* jansson_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7168E917294CBB91005BA468 /* jansson_handle.cpp */; }; - 7168E91B294CBB91005BA468 /* cppjansson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7168E919294CBB91005BA468 /* cppjansson.cpp */; }; - 71D730FE294CCAA000F3EEC2 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71D730FD294CCAA000F3EEC2 /* libjansson.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 71407E77294CB3E800FBD9A4 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 71407E71294CB35000FBD9A4 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; - 71407E74294CB37700FBD9A4 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; - 71407E79294CB3E800FBD9A4 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 7168E916294CBB91005BA468 /* cppjansson.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cppjansson.hpp; sourceTree = ""; }; - 7168E917294CBB91005BA468 /* jansson_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jansson_handle.cpp; sourceTree = ""; }; - 7168E918294CBB91005BA468 /* jansson_handle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jansson_handle.hpp; sourceTree = ""; }; - 7168E919294CBB91005BA468 /* cppjansson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cppjansson.cpp; sourceTree = ""; }; - 71D730FD294CCAA000F3EEC2 /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 71407E76294CB3E800FBD9A4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 71D730FE294CCAA000F3EEC2 /* libjansson.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 71407E4A294C9FCE00FBD9A4 = { - isa = PBXGroup; - children = ( - 71D730FC294CC4B400F3EEC2 /* Frameworks */, - 71407E74294CB37700FBD9A4 /* common-release.xcconfig */, - 71407E71294CB35000FBD9A4 /* common-debug.xcconfig */, - 71407E7A294CB3E800FBD9A4 /* cppjansson */, - 71407E58294C9FD000FBD9A4 /* Products */, - ); - sourceTree = ""; - }; - 71407E58294C9FD000FBD9A4 /* Products */ = { - isa = PBXGroup; - children = ( - 71407E79294CB3E800FBD9A4 /* libcppjansson.a */, - ); - name = Products; - sourceTree = ""; - }; - 71407E7A294CB3E800FBD9A4 /* cppjansson */ = { - isa = PBXGroup; - children = ( - 7168E917294CBB91005BA468 /* jansson_handle.cpp */, - 7168E918294CBB91005BA468 /* jansson_handle.hpp */, - 7168E919294CBB91005BA468 /* cppjansson.cpp */, - 7168E916294CBB91005BA468 /* cppjansson.hpp */, - ); - name = cppjansson; - path = ../../cppjansson; - sourceTree = ""; - }; - 71D730FC294CC4B400F3EEC2 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 71D730FD294CCAA000F3EEC2 /* libjansson.a */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 71407E78294CB3E800FBD9A4 /* cppjansson */ = { - isa = PBXNativeTarget; - buildConfigurationList = 71407E7D294CB3E800FBD9A4 /* Build configuration list for PBXNativeTarget "cppjansson" */; - buildPhases = ( - 71407E75294CB3E800FBD9A4 /* Sources */, - 71407E76294CB3E800FBD9A4 /* Frameworks */, - 71407E77294CB3E800FBD9A4 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = cppjansson; - productName = cppjansson; - productReference = 71407E79294CB3E800FBD9A4 /* libcppjansson.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 71407E4B294C9FCE00FBD9A4 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - DefaultBuildSystemTypeForWorkspace = Latest; - LastSwiftUpdateCheck = 1330; - LastUpgradeCheck = 1330; - TargetAttributes = { - 71407E78294CB3E800FBD9A4 = { - CreatedOnToolsVersion = 13.3; - }; - }; - }; - buildConfigurationList = 71407E4E294C9FCE00FBD9A4 /* Build configuration list for PBXProject "cppjansson" */; - compatibilityVersion = "Xcode 13.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 71407E4A294C9FCE00FBD9A4; - productRefGroup = 71407E58294C9FD000FBD9A4 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 71407E78294CB3E800FBD9A4 /* cppjansson */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 71407E75294CB3E800FBD9A4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7168E91B294CBB91005BA468 /* cppjansson.cpp in Sources */, - 7168E91A294CBB91005BA468 /* jansson_handle.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 71407E66294C9FD000FBD9A4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 71407E71294CB35000FBD9A4 /* common-debug.xcconfig */; - buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../", - "$(PROJECT_DIR)/../../3party/jansson", - "$(PROJECT_DIR)/../../3party/jansson/jansson/src", - ); - }; - name = Debug; - }; - 71407E67294C9FD000FBD9A4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 71407E74294CB37700FBD9A4 /* common-release.xcconfig */; - buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../", - "$(PROJECT_DIR)/../../3party/jansson", - "$(PROJECT_DIR)/../../3party/jansson/jansson/src", - ); - }; - name = Release; - }; - 71407E7E294CB3E800FBD9A4 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 71407E7F294CB3E800FBD9A4 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 71407E4E294C9FCE00FBD9A4 /* Build configuration list for PBXProject "cppjansson" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 71407E66294C9FD000FBD9A4 /* Debug */, - 71407E67294C9FD000FBD9A4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 71407E7D294CB3E800FBD9A4 /* Build configuration list for PBXNativeTarget "cppjansson" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 71407E7E294CB3E800FBD9A4 /* Debug */, - 71407E7F294CB3E800FBD9A4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 71407E4B294C9FCE00FBD9A4 /* Project object */; -} diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index 1acf0eeacd..379f30c4a7 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -768,6 +768,7 @@ buildSettings = { EXCLUDED_SOURCE_FILE_NAMES = ""; EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -777,6 +778,7 @@ buildSettings = { EXCLUDED_SOURCE_FILE_NAMES = ""; EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 3b1323b6fd..9a1edfe63c 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -968,7 +968,6 @@ "$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/protobuf/protobuf/src", "$(OMIM_ROOT)/3party/protobuf", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); }; name = Debug; @@ -986,7 +985,6 @@ "$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/protobuf/protobuf/src", "$(OMIM_ROOT)/3party/protobuf", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); }; name = Release; @@ -995,6 +993,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1003,6 +1002,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index bde1498e4f..9b7a4816aa 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -67,7 +67,7 @@ FACB76D326B8A13700810C9C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D226B8A13700810C9C /* libgenerator.a */; }; FACB76D526B8A15100810C9C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D426B8A15100810C9C /* libstorage.a */; }; FACB76D726B8A18F00810C9C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D626B8A18F00810C9C /* libsuccinct.a */; }; - FACB76D926B8A22000810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D826B8A22000810C9C /* libcppjansson.a */; }; + FACB76D926B8A22000810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76D826B8A22000810C9C /* libjansson.a */; }; FACB76DA26B8A23E00810C9C /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76CC26B8A0DC00810C9C /* libgenerator_tests_support.a */; }; FACB76DE26B8A27000810C9C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76DD26B8A27000810C9C /* libsearch.a */; }; FACB76E026B8A28600810C9C /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB76DF26B8A28600810C9C /* librouting_common.a */; }; @@ -142,7 +142,7 @@ FACB76D226B8A13700810C9C /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76D426B8A15100810C9C /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76D626B8A18F00810C9C /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB76D826B8A22000810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB76D826B8A22000810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76DB26B8A25100810C9C /* librouting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76DD26B8A27000810C9C /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB76DF26B8A28600810C9C /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -165,7 +165,7 @@ FACB76E026B8A28600810C9C /* librouting_common.a in Frameworks */, FACB76DE26B8A27000810C9C /* libsearch.a in Frameworks */, FACB76DA26B8A23E00810C9C /* libgenerator_tests_support.a in Frameworks */, - FACB76D926B8A22000810C9C /* libcppjansson.a in Frameworks */, + FACB76D926B8A22000810C9C /* libjansson.a in Frameworks */, FACB76BB26B89FFE00810C9C /* libbase.a in Frameworks */, FACB76C326B8A03600810C9C /* libcoding.a in Frameworks */, FACB76BF26B8A00B00810C9C /* liboauthcpp.a in Frameworks */, @@ -286,7 +286,7 @@ FACB76DF26B8A28600810C9C /* librouting_common.a */, FACB76DD26B8A27000810C9C /* libsearch.a */, FACB76DB26B8A25100810C9C /* librouting.a */, - FACB76D826B8A22000810C9C /* libcppjansson.a */, + FACB76D826B8A22000810C9C /* libjansson.a */, FACB76D626B8A18F00810C9C /* libsuccinct.a */, FACB76D426B8A15100810C9C /* libstorage.a */, FACB76D226B8A13700810C9C /* libgenerator.a */, @@ -510,10 +510,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586E1DBF49B200A4FC11 /* common-debug.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Debug; }; @@ -521,10 +517,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Release; }; @@ -532,6 +524,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -540,6 +533,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -550,10 +544,6 @@ CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.editor_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Debug; }; @@ -563,10 +553,6 @@ CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.editor_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Release; }; diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 35ef699455..f9f4f90d69 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -28,7 +28,7 @@ FACB776D26B90CA800810C9C /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB776C26B90CA800810C9C /* libicu.a */; }; FACB776F26B90CAD00810C9C /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB776E26B90CAD00810C9C /* libgflags.a */; }; FACB777126B90CC300810C9C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777026B90CC300810C9C /* libexpat.a */; }; - FACB777326B90CCF00810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777226B90CCF00810C9C /* libcppjansson.a */; }; + FACB777326B90CCF00810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777226B90CCF00810C9C /* libjansson.a */; }; FACB777526B90CEE00810C9C /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777426B90CEE00810C9C /* libdescriptions.a */; }; FACB777726B90CF200810C9C /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777626B90CF200810C9C /* minizip.framework */; }; FACB777926B90CFB00810C9C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB777826B90CFB00810C9C /* libprotobuf.a */; }; @@ -326,7 +326,7 @@ FACB776C26B90CA800810C9C /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB776E26B90CAD00810C9C /* libgflags.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgflags.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777026B90CC300810C9C /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB777226B90CCF00810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB777226B90CCF00810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777426B90CEE00810C9C /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777626B90CF200810C9C /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FACB777826B90CFB00810C9C /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -614,7 +614,7 @@ FACB777D26B90E5B00810C9C /* liboauthcpp.a in Frameworks */, FACB777926B90CFB00810C9C /* libprotobuf.a in Frameworks */, FACB777726B90CF200810C9C /* minizip.framework in Frameworks */, - FACB777326B90CCF00810C9C /* libcppjansson.a in Frameworks */, + FACB777326B90CCF00810C9C /* libjansson.a in Frameworks */, FACB777126B90CC300810C9C /* libexpat.a in Frameworks */, FACB776F26B90CAD00810C9C /* libgflags.a in Frameworks */, FACB776D26B90CA800810C9C /* libicu.a in Frameworks */, @@ -709,7 +709,7 @@ FACB777826B90CFB00810C9C /* libprotobuf.a */, FACB777626B90CF200810C9C /* minizip.framework */, FACB777426B90CEE00810C9C /* libdescriptions.a */, - FACB777226B90CCF00810C9C /* libcppjansson.a */, + FACB777226B90CCF00810C9C /* libjansson.a */, FACB777026B90CC300810C9C /* libexpat.a */, FACB776E26B90CAD00810C9C /* libgflags.a */, FACB776C26B90CA800810C9C /* libicu.a */, @@ -1384,6 +1384,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1392,6 +1393,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 024b91f580..00cab3d567 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -672,6 +672,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -680,6 +681,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 8e49ae17e1..f626e347fa 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -203,7 +203,7 @@ FACB7C2D26B919FD00810C9C /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C2C26B919FD00810C9C /* libpugixml.a */; }; FACB7C2F26B91A1100810C9C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C2E26B91A1100810C9C /* libopening_hours.a */; }; FACB7C3126B91A3600810C9C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3026B91A3600810C9C /* libgenerator.a */; }; - FACB7C3326B91A4500810C9C /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3226B91A4500810C9C /* libcppjansson.a */; }; + FACB7C3326B91A4500810C9C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3226B91A4500810C9C /* libjansson.a */; }; FACB7C3526B91A4B00810C9C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3426B91A4B00810C9C /* libsearch.a */; }; FACB7C3726B91A5A00810C9C /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3626B91A5A00810C9C /* librouting_common.a */; }; FACB7C3926B91AE600810C9C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FACB7C3826B91AE600810C9C /* librouting.a */; }; @@ -428,7 +428,7 @@ FACB7C2C26B919FD00810C9C /* libpugixml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libpugixml.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C2E26B91A1100810C9C /* libopening_hours.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopening_hours.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3026B91A3600810C9C /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FACB7C3226B91A4500810C9C /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FACB7C3226B91A4500810C9C /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3426B91A4B00810C9C /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3626B91A5A00810C9C /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; FACB7C3826B91AE600810C9C /* librouting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -463,7 +463,7 @@ FACB7C4526B947C400810C9C /* libz.tbd in Frameworks */, FACB7C2726B919D300810C9C /* libprotobuf.a in Frameworks */, FACB7C2126B919AD00810C9C /* libplatform.a in Frameworks */, - FACB7C3326B91A4500810C9C /* libcppjansson.a in Frameworks */, + FACB7C3326B91A4500810C9C /* libjansson.a in Frameworks */, FACB7C2D26B919FD00810C9C /* libpugixml.a in Frameworks */, 670C61401AB066CD00C38A8C /* libindexer.a in Frameworks */, FACB7C3926B91AE600810C9C /* librouting.a in Frameworks */, @@ -514,7 +514,7 @@ FACB7C3826B91AE600810C9C /* librouting.a */, FACB7C3626B91A5A00810C9C /* librouting_common.a */, FACB7C3426B91A4B00810C9C /* libsearch.a */, - FACB7C3226B91A4500810C9C /* libcppjansson.a */, + FACB7C3226B91A4500810C9C /* libjansson.a */, FACB7C3026B91A3600810C9C /* libgenerator.a */, FACB7C2E26B91A1100810C9C /* libopening_hours.a */, FACB7C2C26B919FD00810C9C /* libpugixml.a */, @@ -1085,6 +1085,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1093,6 +1094,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/jansson/jansson.xcodeproj/project.pbxproj b/xcode/jansson/jansson.xcodeproj/project.pbxproj index 3fa67d2d38..045120bcf8 100644 --- a/xcode/jansson/jansson.xcodeproj/project.pbxproj +++ b/xcode/jansson/jansson.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 345C55F81C93143B00B6783F /* myjansson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 345C55F71C93143B00B6783F /* myjansson.cpp */; }; + 6753445F1A3F666300A0A8C3 /* jansson_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */; }; + 675344601A3F666300A0A8C3 /* jansson_handle.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */; }; + 675344611A3F666300A0A8C3 /* myjansson.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753445D1A3F666300A0A8C3 /* myjansson.hpp */; }; FAA6D8CD29205A2200E8D50D /* jansson_config.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA6D8CC29205A2200E8D50D /* jansson_config.h */; }; FAA8867929214906004FA014 /* pack_unpack.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA8866429214906004FA014 /* pack_unpack.c */; }; FAA8867A29214906004FA014 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA8866629214906004FA014 /* memory.c */; }; @@ -30,9 +34,13 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 345C55F71C93143B00B6783F /* myjansson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = myjansson.cpp; sourceTree = ""; }; 34F558681DBF483000A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34F558691DBF483000A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 6753444D1A3F664300A0A8C3 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jansson_handle.cpp; sourceTree = ""; }; + 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jansson_handle.hpp; sourceTree = ""; }; + 6753445D1A3F666300A0A8C3 /* myjansson.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = myjansson.hpp; sourceTree = ""; }; FAA6D8CC29205A2200E8D50D /* jansson_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jansson_config.h; sourceTree = ""; }; FAA8866429214906004FA014 /* pack_unpack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pack_unpack.c; sourceTree = ""; }; FAA8866529214906004FA014 /* jansson_config.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = jansson_config.h.in; sourceTree = ""; }; @@ -91,7 +99,11 @@ isa = PBXGroup; children = ( FAA6D8CC29205A2200E8D50D /* jansson_config.h */, + 6753445B1A3F666300A0A8C3 /* jansson_handle.cpp */, + 6753445C1A3F666300A0A8C3 /* jansson_handle.hpp */, FAA8868B29214A0D004FA014 /* jansson_private_config.h */, + 345C55F71C93143B00B6783F /* myjansson.cpp */, + 6753445D1A3F666300A0A8C3 /* myjansson.hpp */, FAA8866329214906004FA014 /* src */, ); name = jansson; @@ -136,11 +148,13 @@ files = ( FAA8867E29214906004FA014 /* utf.h in Headers */, FAA8868029214906004FA014 /* lookup3.h in Headers */, + 675344601A3F666300A0A8C3 /* jansson_handle.hpp in Headers */, FAA8868729214906004FA014 /* jansson.h in Headers */, FAA8867C29214906004FA014 /* jansson_private.h in Headers */, FAA8867D29214906004FA014 /* hashtable.h in Headers */, FAA8868A29214906004FA014 /* strbuffer.h in Headers */, FAA8868C29214A0E004FA014 /* jansson_private_config.h in Headers */, + 675344611A3F666300A0A8C3 /* myjansson.hpp in Headers */, FAA6D8CD29205A2200E8D50D /* jansson_config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -202,12 +216,14 @@ buildActionMask = 2147483647; files = ( FAA8868829214906004FA014 /* load.c in Sources */, + 345C55F81C93143B00B6783F /* myjansson.cpp in Sources */, FAA8867929214906004FA014 /* pack_unpack.c in Sources */, FAA8868429214906004FA014 /* hashtable.c in Sources */, FAA8867A29214906004FA014 /* memory.c in Sources */, FAA8868529214906004FA014 /* version.c in Sources */, FAA8868329214906004FA014 /* error.c in Sources */, FAA8867F29214906004FA014 /* strbuffer.c in Sources */, + 6753445F1A3F666300A0A8C3 /* jansson_handle.cpp in Sources */, FAA8868229214906004FA014 /* hashtable_seed.c in Sources */, FAA8868629214906004FA014 /* utf.c in Sources */, FAA8868129214906004FA014 /* dump.c in Sources */, diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index 0b85753cde..70417d448f 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -304,12 +304,14 @@ 45E45587205849A600D9F45E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Debug; }; 45E45588205849A600D9F45E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Release; }; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index c9d2efd6bc..3cf2116551 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -111,7 +111,7 @@ FAA8387E26BB3C92002E54C6 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8387D26BB3C92002E54C6 /* libindexer.a */; }; FAA8388026BB3C92002E54C6 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8387F26BB3C92002E54C6 /* libplatform.a */; }; FAA8388226BB3C92002E54C6 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388126BB3C92002E54C6 /* libprotobuf.a */; }; - FAA8388426BB3CBE002E54C6 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388326BB3CBE002E54C6 /* libcppjansson.a */; }; + FAA8388426BB3CBE002E54C6 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388326BB3CBE002E54C6 /* libjansson.a */; }; FAA8388626BB3CC3002E54C6 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388526BB3CC3002E54C6 /* libexpat.a */; }; FAA8388826BB3CDB002E54C6 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388726BB3CDB002E54C6 /* liboauthcpp.a */; }; FAA8388A26BB3CE4002E54C6 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8388926BB3CE4002E54C6 /* libdrape.a */; }; @@ -255,7 +255,7 @@ FAA8387D26BB3C92002E54C6 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8387F26BB3C92002E54C6 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388126BB3C92002E54C6 /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; - FAA8388326BB3CBE002E54C6 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FAA8388326BB3CBE002E54C6 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388526BB3CC3002E54C6 /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388726BB3CDB002E54C6 /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8388926BB3CE4002E54C6 /* libdrape.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdrape.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -277,7 +277,7 @@ FAA8388A26BB3CE4002E54C6 /* libdrape.a in Frameworks */, FAA8388826BB3CDB002E54C6 /* liboauthcpp.a in Frameworks */, FAA8388626BB3CC3002E54C6 /* libexpat.a in Frameworks */, - FAA8388426BB3CBE002E54C6 /* libcppjansson.a in Frameworks */, + FAA8388426BB3CBE002E54C6 /* libjansson.a in Frameworks */, FAA8387826BB3C92002E54C6 /* libbase.a in Frameworks */, FAA8387A26BB3C92002E54C6 /* libcoding.a in Frameworks */, FAA8387C26BB3C92002E54C6 /* libgeometry.a in Frameworks */, @@ -304,7 +304,7 @@ FAA8388926BB3CE4002E54C6 /* libdrape.a */, FAA8388726BB3CDB002E54C6 /* liboauthcpp.a */, FAA8388526BB3CC3002E54C6 /* libexpat.a */, - FAA8388326BB3CBE002E54C6 /* libcppjansson.a */, + FAA8388326BB3CBE002E54C6 /* libjansson.a */, FAA8387726BB3C92002E54C6 /* libbase.a */, FAA8387926BB3C92002E54C6 /* libcoding.a */, FAA8387B26BB3C92002E54C6 /* libgeometry.a */, @@ -763,7 +763,6 @@ "$(OMIM_ROOT)/3party/expat/lib", "$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/protobuf/protobuf/src", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); }; name = Debug; @@ -778,7 +777,6 @@ "$(OMIM_ROOT)/3party/expat/lib", "$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/protobuf/protobuf/src", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); }; name = Release; @@ -787,6 +785,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = "-Wno-deprecated-register "; }; @@ -796,6 +795,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = "-Wno-deprecated-register "; }; diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj index cbdde31d89..2c0906935a 100644 --- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj +++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj @@ -151,6 +151,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -159,6 +160,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 168c39cefa..58cf61847f 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -97,9 +97,6 @@ - - diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj index ed03ed5811..ffb317d94c 100644 --- a/xcode/openlr/openlr.xcodeproj/project.pbxproj +++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj @@ -257,10 +257,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 671E791F1E6A503F00B2859B /* common-debug.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Debug; }; @@ -268,10 +264,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 671E79201E6A503F00B2859B /* common-release.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Release; }; @@ -279,6 +271,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -287,6 +280,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 45592a03e3..de240fdeca 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -116,7 +116,7 @@ FAA8388D26BB4841002E54C6 /* test_socket.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E889F1DB7B0F200F8EBDA /* test_socket.hpp */; }; FAA8388E26BB4849002E54C6 /* writable_dir_changer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FFB1C60BD6500EDE56A /* writable_dir_changer.cpp */; }; FAA8388F26BB484C002E54C6 /* writable_dir_changer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */; }; - FAA8389126BB48E9002E54C6 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389026BB48E9002E54C6 /* libcppjansson.a */; }; + FAA8389126BB48E9002E54C6 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389026BB48E9002E54C6 /* libjansson.a */; }; FAA8389326BB48EF002E54C6 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389226BB48EF002E54C6 /* libbase.a */; }; FAA8389526BB48F4002E54C6 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389426BB48F4002E54C6 /* libcoding.a */; }; FAA8389726BB4906002E54C6 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAA8389626BB4906002E54C6 /* minizip.framework */; }; @@ -241,7 +241,7 @@ EB60B4DD204C175700E4953B /* network_policy_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = network_policy_ios.h; sourceTree = ""; }; F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_storage_base.cpp; sourceTree = ""; }; F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_storage_base.hpp; sourceTree = ""; }; - FAA8389026BB48E9002E54C6 /* libcppjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcppjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + FAA8389026BB48E9002E54C6 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8389226BB48EF002E54C6 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8389426BB48F4002E54C6 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAA8389626BB4906002E54C6 /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -276,7 +276,7 @@ FAA8389726BB4906002E54C6 /* minizip.framework in Frameworks */, FAA8389526BB48F4002E54C6 /* libcoding.a in Frameworks */, FAA8389326BB48EF002E54C6 /* libbase.a in Frameworks */, - FAA8389126BB48E9002E54C6 /* libcppjansson.a in Frameworks */, + FAA8389126BB48E9002E54C6 /* libjansson.a in Frameworks */, 678338A81C6DE5E300FD6263 /* libplatform.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -292,7 +292,7 @@ FAA8389626BB4906002E54C6 /* minizip.framework */, FAA8389426BB48F4002E54C6 /* libcoding.a */, FAA8389226BB48EF002E54C6 /* libbase.a */, - FAA8389026BB48E9002E54C6 /* libcppjansson.a */, + FAA8389026BB48E9002E54C6 /* libjansson.a */, ); name = Frameworks; sourceTree = ""; @@ -754,20 +754,32 @@ platform_ios.mm, secure_storage_ios.mm, ); - "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = "$(inherited)"; - "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited)"; + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + ); "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( "$(inherited)", "$(QT_PATH)/lib", ); - "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = "$(inherited)"; - "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited)"; + "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + ); + "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + ); "HEADER_SEARCH_PATHS[sdk=macosx*]" = ( "$(inherited)", "$(QT_PATH)/include", ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(inherited)"; - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited)"; + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + ); "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = ( "$(inherited)", "$(QT_PATH)/lib", @@ -843,6 +855,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -857,6 +870,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index f1812c4916..8d7e771757 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -1365,6 +1365,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1373,6 +1374,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index 484e1270f4..6b17e6052f 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -270,6 +270,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -278,6 +279,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 47c99f78c7..07e40d664d 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ 34EEAD721E55AE5C00E95575 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34EEAD711E55AE5C00E95575 /* utils.cpp */; }; 34F5583D1DBF2E2700A4FC11 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583C1DBF2E2700A4FC11 /* libeditor.a */; }; 34F5583F1DBF2E3400A4FC11 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */; }; - 34F558411DBF2E4F00A4FC11 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */; }; + 34F558411DBF2E4F00A4FC11 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libjansson.a */; }; 34F558431DBF2E6500A4FC11 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */; }; 34F558451DBF2E7600A4FC11 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558441DBF2E7600A4FC11 /* libopening_hours.a */; }; 34F558471DBF2E8100A4FC11 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558461DBF2E8100A4FC11 /* libsuccinct.a */; }; @@ -105,7 +105,7 @@ 39AEF86E1FB45E1600943FC9 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558461DBF2E8100A4FC11 /* libsuccinct.a */; }; 39AEF86F1FB45E1600943FC9 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558441DBF2E7600A4FC11 /* libopening_hours.a */; }; 39AEF8701FB45E1600943FC9 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */; }; - 39AEF8711FB45E1600943FC9 /* libcppjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */; }; + 39AEF8711FB45E1600943FC9 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558401DBF2E4F00A4FC11 /* libjansson.a */; }; 39AEF8721FB45E1600943FC9 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */; }; 39AEF8731FB45E1600943FC9 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F5583C1DBF2E2700A4FC11 /* libeditor.a */; }; 39AEF87B1FB45E1600943FC9 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675346B01A4055CF00A0A8C3 /* libsearch.a */; }; @@ -344,7 +344,7 @@ 34F558381DBF2C8B00A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 34F5583C1DBF2E2700A4FC11 /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = ""; }; 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = ""; }; - 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcppjansson.a; path = "../../../omim-xcode-build/Debug/libcppjansson.a"; sourceTree = ""; }; + 34F558401DBF2E4F00A4FC11 /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = ""; }; 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-xcode-build/Debug/liboauthcpp.a"; sourceTree = ""; }; 34F558441DBF2E7600A4FC11 /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = ""; }; 34F558461DBF2E8100A4FC11 /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = ""; }; @@ -539,7 +539,7 @@ 39AEF86F1FB45E1600943FC9 /* libopening_hours.a in Frameworks */, 39AEF8721FB45E1600943FC9 /* libpugixml.a in Frameworks */, 39AEF86E1FB45E1600943FC9 /* libsuccinct.a in Frameworks */, - 39AEF8711FB45E1600943FC9 /* libcppjansson.a in Frameworks */, + 39AEF8711FB45E1600943FC9 /* libjansson.a in Frameworks */, 39B2B96C1FB4633200AB85A1 /* libtess2.a in Frameworks */, 39AEF8701FB45E1600943FC9 /* liboauthcpp.a in Frameworks */, 39B2B96A1FB4631400AB85A1 /* libbsdiff.a in Frameworks */, @@ -570,7 +570,7 @@ 34F558471DBF2E8100A4FC11 /* libsuccinct.a in Frameworks */, 34F558451DBF2E7600A4FC11 /* libopening_hours.a in Frameworks */, 34F558431DBF2E6500A4FC11 /* liboauthcpp.a in Frameworks */, - 34F558411DBF2E4F00A4FC11 /* libcppjansson.a in Frameworks */, + 34F558411DBF2E4F00A4FC11 /* libjansson.a in Frameworks */, 34F5583F1DBF2E3400A4FC11 /* libpugixml.a in Frameworks */, 34F5583D1DBF2E2700A4FC11 /* libeditor.a in Frameworks */, 671C62261AE9232900076BD0 /* libsearch.a in Frameworks */, @@ -646,7 +646,7 @@ 34F558461DBF2E8100A4FC11 /* libsuccinct.a */, 34F558441DBF2E7600A4FC11 /* libopening_hours.a */, 34F558421DBF2E6500A4FC11 /* liboauthcpp.a */, - 34F558401DBF2E4F00A4FC11 /* libcppjansson.a */, + 34F558401DBF2E4F00A4FC11 /* libjansson.a */, 34F5583E1DBF2E3400A4FC11 /* libpugixml.a */, 34F5583C1DBF2E2700A4FC11 /* libeditor.a */, ); @@ -1322,10 +1322,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F558371DBF2C8B00A4FC11 /* common-debug.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Debug; }; @@ -1333,10 +1329,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F558381DBF2C8B00A4FC11 /* common-release.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/pugixml/pugixml/src", - ); }; name = Release; }; @@ -1344,6 +1336,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1352,6 +1345,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj index a57f890661..ec7f248643 100644 --- a/xcode/shaders/shaders.xcodeproj/project.pbxproj +++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj @@ -176,7 +176,7 @@ 45789EE321353CA3009955CC /* program_manager_metal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = program_manager_metal.mm; sourceTree = ""; }; 45789EE52135464D009955CC /* metal_program_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_program_params.hpp; sourceTree = ""; }; 45789EE62135464D009955CC /* metal_program_params.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_program_params.mm; sourceTree = ""; }; - 4598437C21394BE000F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "archive.metal-library"; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; + 4598437C21394BE000F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; explicitFileType = "archive.metal-library"; includeInIndex = 0; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; 56DAC3652399214F000BC50D /* libvulkan_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libvulkan_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; }; BBF7916F2146D8EC00D27BD8 /* system.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = system.metal; sourceTree = ""; }; BBF7917221493AFC00D27BD8 /* arrow3d.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = arrow3d.metal; sourceTree = ""; }; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 813e27ee9e..b660f64881 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -697,6 +697,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -705,6 +706,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj index 0d6b8e71b2..64b5e09e86 100644 --- a/xcode/tracking/tracking.xcodeproj/project.pbxproj +++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj @@ -325,6 +325,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -333,6 +334,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj index d1007f85d3..0f7d05a1fd 100644 --- a/xcode/traffic/traffic.xcodeproj/project.pbxproj +++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj @@ -301,6 +301,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -309,6 +310,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj index d2e940dabb..3360869d4f 100644 --- a/xcode/transit/transit.xcodeproj/project.pbxproj +++ b/xcode/transit/transit.xcodeproj/project.pbxproj @@ -211,6 +211,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -219,6 +220,7 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release;