mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-18 00:45:45 +00:00
Compare commits
6 Commits
jb_bp_grad
...
zy-docker-
| Author | SHA1 | Date | |
|---|---|---|---|
|
dd336a3138 | ||
|
|
5cc1eae4e9 | ||
|
5c7fbec47f | ||
|
|
8a7dcb7ef4 | ||
|
|
3b34e2cd5c | ||
|
|
dd11bc763b |
@@ -34,19 +34,63 @@ on:
|
||||
- track_generator/**
|
||||
- xcode/**
|
||||
|
||||
env:
|
||||
SUBMODULE_CACHE_PATHS: |
|
||||
.git/modules
|
||||
3party/CMake-MetalShaderSupport
|
||||
3party/Vulkan-Headers
|
||||
3party/boost
|
||||
3party/expat
|
||||
3party/fast_double_parser
|
||||
3party/fast_obj
|
||||
3party/freetype/freetype
|
||||
3party/gflags
|
||||
3party/glaze
|
||||
3party/glfw
|
||||
3party/glm
|
||||
3party/googletest
|
||||
3party/harfbuzz/harfbuzz
|
||||
3party/icu/icu
|
||||
3party/imgui/imgui
|
||||
3party/jansson/jansson
|
||||
3party/just_gtfs
|
||||
3party/protobuf/protobuf
|
||||
3party/pugixml/pugixml
|
||||
3party/utfcpp
|
||||
tools/kothic
|
||||
tools/osmctools
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Android Lint
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
|
||||
options: --user root
|
||||
steps:
|
||||
- name: Checkout sources
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Parallel submodules checkout
|
||||
- name: Cache world map
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: data/world_mwm
|
||||
key: world-mwm
|
||||
|
||||
- uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.SUBMODULE_CACHE_PATHS }}
|
||||
key: submodules-${{ hashFiles('.gitmodules') }}
|
||||
restore-keys: |
|
||||
submodules-
|
||||
|
||||
- name: Sync and update submodules
|
||||
shell: bash
|
||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||
run: |
|
||||
git submodule sync --recursive
|
||||
git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||
|
||||
- name: Lint
|
||||
shell: bash
|
||||
@@ -56,6 +100,9 @@ jobs:
|
||||
android-check:
|
||||
name: Build Android Debug
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
|
||||
options: --user root
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
@@ -71,23 +118,32 @@ jobs:
|
||||
cancel-in-progress: true
|
||||
|
||||
steps:
|
||||
- name: Install build tools and dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y ninja-build
|
||||
|
||||
- name: Checkout sources
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 200 # enough to get all commits for the current day
|
||||
|
||||
- name: Parallel submodules checkout
|
||||
- name: Cache world map
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: data/world_mwm
|
||||
key: world-mwm
|
||||
|
||||
- uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.SUBMODULE_CACHE_PATHS }}
|
||||
key: submodules-${{ hashFiles('.gitmodules') }}
|
||||
restore-keys: |
|
||||
submodules-
|
||||
|
||||
- name: Sync and update submodules
|
||||
shell: bash
|
||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||
run: |
|
||||
git submodule sync --recursive
|
||||
git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||
|
||||
- name: Configure ccache
|
||||
uses: hendrikmuhs/ccache-action@v1.2
|
||||
uses: https://github.com/hendrikmuhs/ccache-action@v1.2
|
||||
with:
|
||||
key: ${{ github.workflow }}-${{ matrix.flavor }}
|
||||
|
||||
@@ -97,14 +153,11 @@ jobs:
|
||||
env:
|
||||
CMAKE_C_COMPILER_LAUNCHER: ccache
|
||||
CMAKE_CXX_COMPILER_LAUNCHER: ccache
|
||||
run: |
|
||||
cmake --version
|
||||
ninja --version
|
||||
./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
|
||||
run: ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
|
||||
|
||||
- name: Upload ${{ matrix.flavor }} apk
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: android-${{ matrix.flavor }}
|
||||
path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
|
||||
path: android/app/build/outputs/apk/**/*.apk
|
||||
if-no-files-found: error
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
|
||||
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
|
||||
|
||||
@@ -153,7 +153,7 @@ project.afterEvaluate {
|
||||
|
||||
final taskName = gradle.startParameter.taskNames
|
||||
|
||||
if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
|
||||
if (['assemble', 'bundle', 'compile', 'install', 'lint', 'publish', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
|
||||
exec {
|
||||
workingDir '../..'
|
||||
|
||||
|
||||
@@ -117,6 +117,7 @@
|
||||
<string name="type.amenity.public_bookcase">Boekekas</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Herwinningsentrum</string>
|
||||
<string name="type.amenity.recycling">Herwinningshouer</string>
|
||||
<string name="type.amenity.recycling.container">Herwinningshouer</string>
|
||||
<string name="type.recycling.batteries">Batterye</string>
|
||||
<string name="type.recycling.clothes">Klere</string>
|
||||
|
||||
@@ -130,6 +130,7 @@
|
||||
<string name="type.amenity.public_bookcase">مكتبة، تبادل كتب</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">مركز إعادة تدوير</string>
|
||||
<string name="type.amenity.recycling">حاوية لإعادة التدوير</string>
|
||||
<string name="type.amenity.recycling.container">حاوية لإعادة التدوير</string>
|
||||
<string name="type.recycling.batteries">بطاريات</string>
|
||||
<string name="type.recycling.clothes">ملابس</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Kitab mübadiləsi</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Təkrar Emal Mərkəzi</string>
|
||||
<string name="type.amenity.recycling">Təkrar emal konteyneri</string>
|
||||
<string name="type.amenity.recycling.container">Təkrar emal konteyneri</string>
|
||||
<string name="type.recycling.batteries">Batareyalar</string>
|
||||
<string name="type.recycling.clothes">Geyim</string>
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
<string name="type.amenity.prison">Турма</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Прыём другсыравіны</string>
|
||||
<string name="type.amenity.recycling">Кантэйнер для другаснай сыравіны</string>
|
||||
<string name="type.amenity.recycling.container">Кантэйнер для другаснай сыравіны</string>
|
||||
<string name="type.recycling.batteries">Батарэйкі</string>
|
||||
<string name="type.recycling.clothes">Адзенне</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Intercanvi de llibres</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Centre de reciclatge</string>
|
||||
<string name="type.amenity.recycling">Contenidor de reciclatge</string>
|
||||
<string name="type.amenity.recycling.container">Contenidor de reciclatge</string>
|
||||
<string name="type.recycling.batteries">Bateries</string>
|
||||
<string name="type.recycling.clothes">Roba</string>
|
||||
|
||||
@@ -115,6 +115,7 @@
|
||||
<string name="type.amenity.public_bookcase">Výměna knih</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Recyklační středisko</string>
|
||||
<string name="type.amenity.recycling">Recyklační nádoba</string>
|
||||
<string name="type.amenity.recycling.container">Recyklační nádoba</string>
|
||||
<string name="type.recycling.batteries">Baterie</string>
|
||||
<string name="type.recycling.clothes">Staré oblečení</string>
|
||||
|
||||
@@ -114,6 +114,7 @@
|
||||
<string name="type.amenity.public_bookcase">Bogbytteskab</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Genbrugsplads</string>
|
||||
<string name="type.amenity.recycling">Genbrugscontainer</string>
|
||||
<string name="type.amenity.recycling.container">Genbrugscontainer</string>
|
||||
<string name="type.recycling.batteries">Batterier</string>
|
||||
<string name="type.recycling.clothes">Tekstil</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Bücherschrank</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Recyclinghof</string>
|
||||
<string name="type.amenity.recycling">Wertstoffcontainer</string>
|
||||
<string name="type.amenity.recycling.container">Wertstoffcontainer</string>
|
||||
<string name="type.recycling.batteries">Batterien</string>
|
||||
<string name="type.recycling.clothes">Altkleider</string>
|
||||
|
||||
@@ -122,6 +122,7 @@
|
||||
<string name="type.amenity.public_bookcase">Ανταλλαγή βιβλίων</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Κέντρο ανακύκλωσης</string>
|
||||
<string name="type.amenity.recycling">Κάδος ανακύκλωσης</string>
|
||||
<string name="type.amenity.recycling.container">Κάδος ανακύκλωσης</string>
|
||||
<string name="type.recycling.batteries">Μπαταρίες</string>
|
||||
<string name="type.recycling.clothes">Ρούχα</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Avalik raamaturiiul</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Jäätmejaam</string>
|
||||
<string name="type.amenity.recycling">Taaskasutuskonteiner</string>
|
||||
<string name="type.amenity.recycling.container">Taaskasutuskonteiner</string>
|
||||
<string name="type.recycling.batteries">Patareid</string>
|
||||
<string name="type.recycling.clothes">Rõivad</string>
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
<string name="type.amenity.public_bookcase">Liburu trukea</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Birziklapen zentroa</string>
|
||||
<string name="type.amenity.recycling">Birziklatzeko edukiontzia</string>
|
||||
<string name="type.amenity.recycling.container">Birziklatzeko edukiontzia</string>
|
||||
<string name="type.recycling.batteries">Bateriak</string>
|
||||
<string name="type.recycling.clothes">Arropa</string>
|
||||
|
||||
@@ -115,6 +115,7 @@
|
||||
<string name="type.amenity.pub">میکده</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">مرکز بازیافت</string>
|
||||
<string name="type.amenity.recycling">ظرف بازیافت</string>
|
||||
<string name="type.amenity.recycling.container">ظرف بازیافت</string>
|
||||
<string name="type.recycling.batteries">ﺎﻫ ﯼﺮﺗﺎﺑ</string>
|
||||
<string name="type.recycling.clothes">لباسهای قدیمی</string>
|
||||
|
||||
@@ -128,6 +128,7 @@
|
||||
<string name="type.amenity.public_bookcase">Kirjahylly</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Kierrätyskeskus</string>
|
||||
<string name="type.amenity.recycling">Kierrätysjäteastia</string>
|
||||
<string name="type.amenity.recycling.container">Kierrätysjäteastia</string>
|
||||
<string name="type.recycling.batteries">Paristot</string>
|
||||
<string name="type.recycling.clothes">Vaatteet</string>
|
||||
|
||||
@@ -138,6 +138,7 @@
|
||||
<string name="type.amenity.pub">Pub</string>
|
||||
<string name="type.amenity.public_bookcase">Intercambio de libros</string>
|
||||
<string name="type.amenity.recycling.centre">Centro de reciclaxe</string>
|
||||
<string name="type.amenity.recycling">Contedora de reciclaxe</string>
|
||||
<string name="type.amenity.recycling.container">Contedora de reciclaxe</string>
|
||||
<string name="type.recycling.batteries">Baterías</string>
|
||||
<string name="type.recycling.clothes">Roupa</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.pub">Beiz</string>
|
||||
<string name="type.amenity.public_bookcase">Büecherschrank</string>
|
||||
<string name="type.amenity.recycling.centre">Recyclinghof</string>
|
||||
<string name="type.amenity.recycling">Recyclingcontainer</string>
|
||||
<string name="type.amenity.recycling.container">Recyclingcontainer</string>
|
||||
<string name="type.recycling.batteries">Batterie</string>
|
||||
<string name="type.recycling.clothes">Altchleider</string>
|
||||
|
||||
@@ -97,6 +97,7 @@
|
||||
<string name="type.amenity.public_bookcase">सार्वजनिक किताबों की अलमारी</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">रीसाइक्लिंग सेंटर</string>
|
||||
<string name="type.amenity.recycling">रीसाइक्लिंग कंटेनर</string>
|
||||
<string name="type.amenity.recycling.container">रीसाइक्लिंग कंटेनर</string>
|
||||
<string name="type.amenity.restaurant">रेस्तरां</string>
|
||||
<string name="type.amenity.sanitary_dump_station">सेनेटरी डंप स्टेशन</string>
|
||||
|
||||
@@ -117,6 +117,7 @@
|
||||
<string name="type.amenity.public_bookcase">Nyilvános könyvespolc</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Hulladékudvar</string>
|
||||
<string name="type.amenity.recycling">Szelektív hulladékgyűjtés</string>
|
||||
<string name="type.amenity.recycling.container">Szelektív hulladékgyűjtő konténer</string>
|
||||
<string name="type.recycling.batteries">Elem, akkumulátor</string>
|
||||
<string name="type.recycling.clothes">Ruha</string>
|
||||
|
||||
@@ -112,6 +112,7 @@
|
||||
<string name="type.amenity.public_bookcase">Rak Buku</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">TPA</string>
|
||||
<string name="type.amenity.recycling">Wadah daur ulang</string>
|
||||
<string name="type.amenity.recycling.container">Wadah daur ulang</string>
|
||||
<string name="type.recycling.batteries">Baterai</string>
|
||||
<string name="type.recycling.clothes">Pakaian lama</string>
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
<string name="type.amenity.pub">Krá</string>
|
||||
<string name="type.amenity.public_bookcase">Bókaskipti</string>
|
||||
<string name="type.amenity.recycling.centre">Endurvinnslustöð</string>
|
||||
<string name="type.amenity.recycling">Endurvinnslugámur</string>
|
||||
<string name="type.recycling.plastic_bottles">Plastflöskur</string>
|
||||
<string name="type.recycling.scrap_metal">Brotajárn</string>
|
||||
<string name="type.amenity.school">Skóli</string>
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
<string name="type.amenity.public_bookcase">כוננית ספרים ציבורית</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">מרכז מיחזור</string>
|
||||
<string name="type.amenity.recycling">מיכל מיחזור</string>
|
||||
<string name="type.amenity.recycling.container">מיכל מיחזור</string>
|
||||
<string name="type.recycling.batteries">סוללות</string>
|
||||
<string name="type.recycling.clothes">בגדים</string>
|
||||
|
||||
@@ -117,6 +117,7 @@
|
||||
<string name="type.amenity.public_bookcase">도서 교환</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">재활용센터</string>
|
||||
<string name="type.amenity.recycling">재활용 쓰레기통</string>
|
||||
<string name="type.amenity.recycling.container">재활용 쓰레기통</string>
|
||||
<string name="type.recycling.batteries">배터리</string>
|
||||
<string name="type.recycling.clothes">낡은 옷</string>
|
||||
|
||||
@@ -112,6 +112,7 @@
|
||||
<string name="type.amenity.pub">पब</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">भंगार केंद्र</string>
|
||||
<string name="type.amenity.recycling">रीसायकलिंग कंटेनर</string>
|
||||
<string name="type.amenity.recycling.container">रीसायकलिंग कंटेनर</string>
|
||||
<string name="type.recycling.batteries">घरगुती बॅटरी</string>
|
||||
<string name="type.recycling.clothes">कपडे</string>
|
||||
|
||||
@@ -130,6 +130,7 @@
|
||||
<string name="type.amenity.public_bookcase">Boekenkast</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Milieustraat</string>
|
||||
<string name="type.amenity.recycling">Recycling container</string>
|
||||
<string name="type.amenity.recycling.container">Recycling container</string>
|
||||
<string name="type.recycling.batteries">Batterijen</string>
|
||||
<string name="type.recycling.clothes">Oude kleding</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Wymiana książek</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Centrum przetwórstwa odpadów</string>
|
||||
<string name="type.amenity.recycling">Pojemnik do recyklingu</string>
|
||||
<string name="type.amenity.recycling.container">Pojemnik do recyklingu</string>
|
||||
<string name="type.recycling.batteries">Baterie</string>
|
||||
<string name="type.recycling.clothes">Stare ubrania</string>
|
||||
|
||||
@@ -110,6 +110,7 @@
|
||||
<string name="type.amenity.public_bookcase">Biblioteca livre</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Centro de reciclagem</string>
|
||||
<string name="type.amenity.recycling">Contêiner de reciclagem</string>
|
||||
<string name="type.amenity.recycling.container">Contêiner de reciclagem</string>
|
||||
<string name="type.recycling.batteries">Baterias</string>
|
||||
<string name="type.recycling.clothes">Roupas velhas</string>
|
||||
|
||||
@@ -110,6 +110,7 @@
|
||||
<string name="type.amenity.public_bookcase">Bibliotecă</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Centru de reciclare</string>
|
||||
<string name="type.amenity.recycling">Containere pentru reciclare</string>
|
||||
<string name="type.amenity.recycling.container">Containere pentru reciclare</string>
|
||||
<string name="type.recycling.batteries">Baterii</string>
|
||||
<string name="type.recycling.clothes">Haine vechi</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Книгообмен</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Приём вторсырья</string>
|
||||
<string name="type.amenity.recycling">Контейнер для вторсырья</string>
|
||||
<string name="type.amenity.recycling.container">Контейнер для вторсырья</string>
|
||||
<string name="type.recycling.batteries">Батарейки</string>
|
||||
<string name="type.recycling.clothes">Одежда</string>
|
||||
|
||||
@@ -125,6 +125,7 @@
|
||||
<string name="type.amenity.public_bookcase">Knižná búdka</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Zberné suroviny</string>
|
||||
<string name="type.amenity.recycling">Recyklačný kontajner</string>
|
||||
<string name="type.amenity.recycling.container">Recyklačný kontajner</string>
|
||||
<string name="type.recycling.batteries">Batérie</string>
|
||||
<string name="type.recycling.clothes">Staré oblečenie</string>
|
||||
|
||||
@@ -130,6 +130,7 @@
|
||||
<string name="type.amenity.public_bookcase">Размена књига</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Центар за рециклажу</string>
|
||||
<string name="type.amenity.recycling">Контејнер за рециклажу</string>
|
||||
<string name="type.amenity.recycling.container">Контејнер за рециклажу</string>
|
||||
<string name="type.recycling.batteries">Бетерије</string>
|
||||
<string name="type.recycling.clothes">Стара одећа</string>
|
||||
|
||||
@@ -115,6 +115,7 @@
|
||||
<string name="type.amenity.public_bookcase">Bokskåp</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Återvinningscentral</string>
|
||||
<string name="type.amenity.recycling">Behållare för återvinningsbart avfall</string>
|
||||
<string name="type.amenity.recycling.container">Behållare för återvinningsbart avfall</string>
|
||||
<string name="type.recycling.batteries">Batterier</string>
|
||||
<string name="type.recycling.clothes">Gamla kläder</string>
|
||||
|
||||
@@ -146,6 +146,7 @@
|
||||
<string name="type.amenity.pub">பப்</string>
|
||||
<string name="type.amenity.public_bookcase">புத்தக பரிமாற்றம்</string>
|
||||
<string name="type.amenity.recycling.centre">மறுசுழற்சி நடுவண்</string>
|
||||
<string name="type.amenity.recycling">மறுசுழற்சி கொள்கலன்</string>
|
||||
<string name="type.amenity.recycling.container">மறுசுழற்சி கொள்கலன்</string>
|
||||
<string name="type.recycling.batteries">பேட்டரிகள்</string>
|
||||
<string name="type.recycling.clothes">ஆடைகள்</string>
|
||||
|
||||
@@ -118,6 +118,7 @@
|
||||
<string name="type.amenity.public_bookcase">ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">ศูนย์รีไซเคิล</string>
|
||||
<string name="type.amenity.recycling">บรรจุภัณฑ์รีไซเคิล</string>
|
||||
<string name="type.amenity.recycling.container">บรรจุภัณฑ์รีไซเคิล</string>
|
||||
<string name="type.recycling.batteries">แบตเตอรี่</string>
|
||||
<string name="type.recycling.clothes">เสื้อผ้าเก่า</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Kitap Değişimi</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Geri Dönüşüm Merkezi</string>
|
||||
<string name="type.amenity.recycling">Atık Toplama Merkezi</string>
|
||||
<string name="type.amenity.recycling.container">Atık Toplama Merkezi</string>
|
||||
<string name="type.recycling.batteries">Piller</string>
|
||||
<string name="type.recycling.clothes">Kıyafet</string>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
<string name="type.amenity.public_bookcase">Книгообмін</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Прийом вторсировини</string>
|
||||
<string name="type.amenity.recycling">Контейнер для вторсировини</string>
|
||||
<string name="type.amenity.recycling.container">Контейнер для вторсировини</string>
|
||||
<string name="type.recycling.batteries">Батарейки</string>
|
||||
<string name="type.recycling.clothes">Одяг</string>
|
||||
|
||||
@@ -117,6 +117,7 @@
|
||||
<string name="type.amenity.public_bookcase">Kệ sách</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Trung tâm tái sinh</string>
|
||||
<string name="type.amenity.recycling">Thùng rác</string>
|
||||
<string name="type.amenity.recycling.container">Thùng rác</string>
|
||||
<string name="type.recycling.batteries">Ắc quy</string>
|
||||
<string name="type.recycling.clothes">Quần áo cũ</string>
|
||||
|
||||
@@ -154,7 +154,8 @@
|
||||
<string name="type.amenity.pub">Pub</string>
|
||||
<string name="type.amenity.public_bookcase">Book Exchange</string>
|
||||
<!-- SECTION: Types: Recycling -->
|
||||
<string name="type.amenity.recycling.centre">Recycling Centre</string>
|
||||
<string name="type.amenity.recycling.centre">Recycling Center</string>
|
||||
<string name="type.amenity.recycling">Recycling Container</string>
|
||||
<string name="type.amenity.recycling.container">Recycling Container</string>
|
||||
<string name="type.recycling.batteries">Batteries</string>
|
||||
<string name="type.recycling.clothes">Clothes</string>
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
"amenity-vehicle_inspection": "فحص المركبة",
|
||||
"amenity-waste_disposal": "قمامة|مهملات|سلة مهملات|صندوق قمامة",
|
||||
"amenity-recycling-centre|@category_recycling": "مركز إعادة تدوير",
|
||||
"amenity-recycling-container|@category_recycling": "حاوية لإعادة التدوير",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "حاوية لإعادة التدوير",
|
||||
"recycling-batteries|@category_recycling": "ﺕﺎﻳﺭﺎﻄﺑ|بطاريات",
|
||||
"recycling-clothes|@category_recycling": "إعادة تدوير الملابس القديم|ملابس قديمة|ملابس",
|
||||
"recycling-glass_bottles|@category_recycling": "زجاجات زجاجية",
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
"amenity-post_office|post_office-post_partner|@category_post": "3Паштовае аддзяленне",
|
||||
"amenity-vehicle_inspection": "Тэхагляд аўтамабіля",
|
||||
"amenity-recycling-centre|@category_recycling": "5Пункт прыёму другаснай сыравіны",
|
||||
"amenity-recycling-container|@category_recycling": "Кантэйнер для другаснай сыравіны",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Кантэйнер для другаснай сыравіны",
|
||||
"recycling-batteries|@category_recycling": "5Прыём батарэек|Утылізацыя батарэек|5Перапрацоўка батарэек|5Здаць батарэйкі|4Збор батарэек|5Батарэйкі",
|
||||
"recycling-clothes|@category_recycling": "5Прыём адзення|Старае адзенне|Здаць непатрэбныя рэчы|Здаць рэчы|5Здаць адзенне",
|
||||
"recycling-glass_bottles|@category_recycling": "5Прыём шклатары|Прыём шкла|5Перапрацоўка шкла|5Здаць шклатару|Здаць бутэлькі|4Збор шклотары|5Шклатара|Шклабало|Шкляныя бутэлькі",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Проверка на автомобила",
|
||||
"amenity-waste_disposal": "Боклук|кош|контейнер|отпадък|бунище",
|
||||
"amenity-recycling-centre|@category_recycling": "Рециклиране|разделно събиране|Преработвателно средище",
|
||||
"amenity-recycling-container|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
|
||||
"recycling-batteries|@category_recycling": "Батерии",
|
||||
"recycling-clothes|@category_recycling": "Стари дрехи|рециклиране|",
|
||||
"recycling-glass_bottles|@category_recycling": "Стъкло|шише|рециклиране",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Kontrola vozidla",
|
||||
"amenity-waste_disposal": "Odpadky|koš|popelnice|uložiště odpadu",
|
||||
"amenity-recycling-centre|@category_recycling": "Recyklační středisko",
|
||||
"amenity-recycling-container|@category_recycling": "Recyklační nádoba",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklační nádoba",
|
||||
"recycling-batteries|@category_recycling": "Baterie",
|
||||
"recycling-clothes|@category_recycling": "Staré oblečení|Recyklujte staré oblečení",
|
||||
"recycling-glass_bottles|@category_recycling": "Skleněné lahve",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Bilsyn",
|
||||
"amenity-waste_disposal": "Bortskaffelse af affald|skraldespand|skrald",
|
||||
"amenity-recycling-centre|@category_recycling": "Genbrugsplads",
|
||||
"amenity-recycling-container|@category_recycling": "Genbrugscontainer",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Genbrugscontainer",
|
||||
"recycling-batteries|@category_recycling": "Batterier",
|
||||
"recycling-clothes|@category_recycling": "Gammelt tøj|Genbrug gammelt tøj|Tekstil",
|
||||
"recycling-glass_bottles|@category_recycling": "Glasflasker",
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
"amenity-vehicle_inspection": "Fahrzeuginspektion",
|
||||
"amenity-waste_disposal": "4Müllcontainer|Mülltonne|Abfälle|Müll|Müllentsorgung",
|
||||
"amenity-recycling-centre|@category_recycling": "3Recyclinghof|3Recyclingzentrum|3Wertstoffhof|U+1F6AE|U+267B",
|
||||
"amenity-recycling-container|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
|
||||
"recycling-batteries|@category_recycling": "Batterien",
|
||||
"recycling-clothes|@category_recycling": "3Altkleider|3Alte Kleidung|3Kleiderspende|3Altkleidercontainer",
|
||||
"recycling-glass_bottles|@category_recycling": "4Glas-Container|3Glasflaschen|3Altglas",
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
"amenity-vehicle_inspection": "Έλεγχος οχήματος",
|
||||
"amenity-waste_disposal": "Διαχείριση απορριμμάτων|σκουπίδια",
|
||||
"amenity-recycling-centre|@category_recycling": "Κέντρο ανακύκλωσης",
|
||||
"amenity-recycling-container|@category_recycling": "Κάδος ανακύκλωσης",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Κάδος ανακύκλωσης",
|
||||
"recycling-batteries|@category_recycling": "Μπαταρίες",
|
||||
"recycling-clothes|@category_recycling": "Παλιά ρούχα|Ανακύκλωση παλαιών ρούχων",
|
||||
"recycling-glass_bottles|@category_recycling": "Γυάλινα μπουκάλια",
|
||||
|
||||
@@ -182,7 +182,7 @@
|
||||
"amenity-vehicle_inspection": "Vehicle Inspection",
|
||||
"amenity-waste_disposal": "4Dumpster|4Trash bin|4garbage bin|waste disposal|U+1F6AE",
|
||||
"amenity-recycling-centre|@category_recycling": "4Recycling Centre|Tip|Dump|U+1F6AE|U+267B",
|
||||
"amenity-recycling-container|@category_recycling": "4Recycling Container|U+1F6AE|U+267B",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "4Recycling Container|U+1F6AE|U+267B",
|
||||
"recycling-batteries|@category_recycling": "4Recycling of Batteries|Household Batteries Disposal|Household Battery Disposal|4Batteries Disposal|Battery Disposal|Batteries Recycling|Battery Recycling|Batteries",
|
||||
"recycling-clothes|@category_recycling": "4Recycling of Clothes|Clothes Recycling|Textile Recycling|Donate Clothes|Clothes Collection Bin|Clothes",
|
||||
"recycling-glass_bottles|@category_recycling": "4Recycling of Glass Bottles|4Glass Bottles Recycling|Glass Waste",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"@category_recycling": "Reciclaje|Reciclaje de desechos|Eliminación de desechos|Materiales reciclables|Recogida separada de basura|Clasificación de desechos|Reutilización",
|
||||
"shop-houseware|@shop": "Enseres domésticos|Tienda de artículos para el hogar",
|
||||
"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje",
|
||||
"recycling-clothes|@category_recycling": "Ropa vieja|Reciclaje de cosas innecesarias|Ropa",
|
||||
"recycling-glass_bottles|@category_recycling": "Envase de vidrio",
|
||||
"recycling-paper|@category_recycling": "Desechos de papel|Papel",
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
"amenity-vehicle_inspection": "Inspección de vehículos|inspección vehicular|ITV",
|
||||
"amenity-waste_disposal": "Basura|Basurero|Cubo de basura|Contenedor de basura",
|
||||
"amenity-recycling-centre|@category_recycling": "Centro de reciclaje|punto limpio|punto verde|5Punto de reciclaje|ecoparque",
|
||||
"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje",
|
||||
"recycling-batteries|@category_recycling": "Baterías|Pilas|Reciclaje de baterías|10Reciclaje de pilas",
|
||||
"recycling-clothes|@category_recycling": "10Reciclaje de ropa|Reciclaje textil",
|
||||
"recycling-glass_bottles|@category_recycling": "Cascos de botellas|10Reciclaje de vidrio|Vidrio",
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
"amenity-vehicle_inspection": "Sõiduki ülevaatus",
|
||||
"amenity-waste_disposal": "Prügikast",
|
||||
"amenity-recycling-centre|@category_recycling": "Taaskasutuskeskus|Jäätmejaam",
|
||||
"amenity-recycling-container|@category_recycling": "Prügikonteiner",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Prügikonteiner",
|
||||
"recycling-batteries|@category_recycling": "Patareid",
|
||||
"recycling-clothes|@category_recycling": "Rõivaste taaskasutus|Rõivad",
|
||||
"recycling-glass_bottles|@category_recycling": "Taarapunkt",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Ibilgailuen Ikuskapena",
|
||||
"amenity-waste_disposal": "Zaborrontzia",
|
||||
"amenity-recycling-centre|@category_recycling": "Birziklatze zentroa|garbigune|Birziklapen zentroa",
|
||||
"amenity-recycling-container|@category_recycling": "Birziklatzeko edukiontzia",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Birziklatzeko edukiontzia",
|
||||
"recycling-batteries|@category_recycling": "Bateriak",
|
||||
"recycling-clothes|@category_recycling": "Arropa zaharra|Alferrikako gauzak birziklatzea|Arropa",
|
||||
"recycling-glass_bottles|@category_recycling": "Botila kaskoak",
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
"amenity-vehicle_inspection": "بازرسی وسایل نقلیه",
|
||||
"amenity-waste_disposal": "زباله دانی",
|
||||
"amenity-recycling-centre|@category_recycling": "مرکز بازیافت",
|
||||
"amenity-recycling-container|@category_recycling": "ظرف بازیافت",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "ظرف بازیافت",
|
||||
"recycling-batteries|@category_recycling": "ﺎﻫ ﯼﺮﺗﺎﺑ",
|
||||
"recycling-clothes|@category_recycling": "بازیافت لباسهای قدیمی|لباسهای قدیمی",
|
||||
"recycling-glass_bottles|@category_recycling": "بطریهای شیشهای",
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
"amenity-vehicle_inspection": "Ajoneuvon tarkastus",
|
||||
"amenity-waste_disposal": "Roska",
|
||||
"amenity-recycling-centre|@category_recycling": "Kierrätyskeskus",
|
||||
"amenity-recycling-container|@category_recycling": "Kierrätysjäteastia",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Kierrätysjäteastia",
|
||||
"recycling-batteries|@category_recycling": "Paristot",
|
||||
"recycling-clothes|@category_recycling": "Vanhat vaatteet|Jätä tarpeettomat tavarat tähän|Vaatteet",
|
||||
"recycling-glass_bottles|@category_recycling": "Lasipullot",
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
"amenity-vehicle_inspection": "Inspection de véhicule|Contrôle technique",
|
||||
"amenity-waste_disposal": "Déchets|poubelle|déchet",
|
||||
"amenity-recycling-centre|@category_recycling": "Centre de recyclage|Déchetterie|Déchèterie",
|
||||
"amenity-recycling-container|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire",
|
||||
"recycling-batteries|@category_recycling": "Batteries",
|
||||
"recycling-clothes|@category_recycling": "Vêtements usagés",
|
||||
"recycling-glass_bottles|@category_recycling": "Verre|bouteille|bocaux",
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
"amenity-post_office|post_office-post_partner|@category_post": "3डाकघर",
|
||||
"amenity-waste_disposal": "3कचरे के डिब्बे",
|
||||
"amenity-recycling-centre|@category_recycling": "4रीसाइक्लिंग सेंटर",
|
||||
"amenity-recycling-container|@category_recycling": "रीसाइक्लिंग कंटेनर",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसाइक्लिंग कंटेनर",
|
||||
"amenity-school": "4विदयालय|विद्यालय",
|
||||
"amenity-shelter": "4आश्रय",
|
||||
"amenity-shelter-basic_hut": "द्विवार्षिक झोपड़ी",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Gépjármű átvizsgálás",
|
||||
"amenity-waste_disposal": "Szemeteskonténer|Kuka|Hulladék|Szemét",
|
||||
"amenity-recycling-centre|@category_recycling": "Hulladékudvar|Újrahasznosító központ|hulladékgyűjtő központ",
|
||||
"amenity-recycling-container|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer",
|
||||
"recycling-batteries|@category_recycling": "Elemek|Elem, akkumulátor",
|
||||
"recycling-clothes|@category_recycling": "Régi ruhák|Régi ruhák újrahasznosítása|Ruha",
|
||||
"recycling-glass_bottles|@category_recycling": "Üveg palackok",
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
"amenity-vehicle_inspection": "Pemeriksaan kendaraan",
|
||||
"amenity-waste_disposal": "Sampah",
|
||||
"amenity-recycling-centre|@category_recycling": "TPA",
|
||||
"amenity-recycling-container|@category_recycling": "Wadah daur ulang",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Wadah daur ulang",
|
||||
"recycling-batteries|@category_recycling": "Baterai",
|
||||
"recycling-clothes|@category_recycling": "Pakaian lama|Mendaur ulang pakaian lama",
|
||||
"recycling-glass_bottles|@category_recycling": "Botol kaca",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Ispezione del veicolo",
|
||||
"amenity-waste_disposal": "Spazzatura",
|
||||
"amenity-recycling-centre|@category_recycling": "Centro di riciclaggio",
|
||||
"amenity-recycling-container|@category_recycling": "Contenitore per materiali riciclabili",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenitore per materiali riciclabili",
|
||||
"recycling-batteries|@category_recycling": "Batterie",
|
||||
"recycling-clothes|@category_recycling": "Vestiti usati|Riciclare vestiti usati|Raccolta indumenti",
|
||||
"recycling-glass_bottles|@category_recycling": "Contenitori in vetro",
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
"amenity-vehicle_inspection": "車検",
|
||||
"amenity-waste_disposal": "ゴミ|ごみ|リサイクル|再利用|ダストボックス",
|
||||
"amenity-recycling-centre|@category_recycling": "リサクルセンター",
|
||||
"amenity-recycling-container|@category_recycling": "リサイクルボックス",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "リサイクルボックス",
|
||||
"recycling-batteries|@category_recycling": "バッテリー",
|
||||
"recycling-clothes|@category_recycling": "古着|古着のリサイクル",
|
||||
"recycling-glass_bottles|@category_recycling": "ガラス瓶",
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
"amenity-vehicle_inspection": "차량검사",
|
||||
"amenity-waste_disposal": "쓰레기|휴지통",
|
||||
"amenity-recycling-centre|@category_recycling": "재활용센터|재활용 센터",
|
||||
"amenity-recycling-container|@category_recycling": "재활용 쓰레기통|재활용품통",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "재활용 쓰레기통|재활용품통",
|
||||
"recycling-batteries|@category_recycling": "배터리",
|
||||
"recycling-clothes|@category_recycling": "낡은 옷|낡은 옷 재활|낡은 옷 재활용",
|
||||
"recycling-glass_bottles|@category_recycling": "유리병",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Transportlīdzekļu tehniskā apskate|tehniskā apskate|4CSDD",
|
||||
"amenity-waste_disposal": "Atkritumu tvertne|atkritumu konteiners|miskaste|U+1F6AE",
|
||||
"amenity-recycling-centre|@category_recycling": "Atkritumu pārstrādes centrs|pārstrādes centrs|izgāztuve|U+1F6AE|U+267B",
|
||||
"amenity-recycling-container|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B",
|
||||
"recycling-batteries|@category_recycling": "Bateriju utilizācija|bateriju pārstrāde|bateriju nodošana",
|
||||
"recycling-clothes|@category_recycling": "Tekstila konteiners|apģērba pārstrāde|drēbju pārsrāde|apģērba nodošana|drēbju nodošana|apģērba ziedošana",
|
||||
"recycling-glass_bottles|@category_recycling": "Stikla pārstrāde|stikla nodošana|stikla atkritumi",
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
"amenity-vehicle_inspection": "वाहन तपासणी",
|
||||
"amenity-waste_disposal": "कचरापेटी",
|
||||
"amenity-recycling-centre|@category_recycling": "भंगारवाला|पुनर्वापर केंद्र|रिसायकल सेंटर|भंगार केंद्र",
|
||||
"amenity-recycling-container|@category_recycling": "रीसायकलिंग कंटेनर",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसायकलिंग कंटेनर",
|
||||
"recycling-batteries|@category_recycling": "बॅटर भंगारवाला|घरगुती बॅटरी",
|
||||
"recycling-clothes|@category_recycling": "कपडे भंगारवाला|कपडे",
|
||||
"recycling-glass_bottles|@category_recycling": "काचेच्या बाटल्यांचे पुनर्वापर",
|
||||
|
||||
@@ -156,7 +156,7 @@
|
||||
"amenity-vehicle_inspection": "Inspeksjon av kjøretøy",
|
||||
"amenity-waste_disposal": "4Søppeldunk|4søppel",
|
||||
"amenity-recycling-centre|@category_recycling": "Resirkuleringssenter|innsamlingsstasjon",
|
||||
"amenity-recycling-container|@category_recycling": "Gjenvinningsbeholder",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Gjenvinningsbeholder",
|
||||
"recycling-batteries|@category_recycling": "Batterier",
|
||||
"recycling-clothes|@category_recycling": "Gamle klær|Levere gamle klær",
|
||||
"recycling-glass_bottles|@category_recycling": "Glassemballasje",
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
"amenity-vehicle_inspection": "Voertuiginspectie",
|
||||
"amenity-waste_disposal": "4Afvalcontainer|afval|prullenbak|vuilnis",
|
||||
"amenity-recycling-centre|@category_recycling": "Milieustraat|recycling centrum|milieupark|gemeentewerf",
|
||||
"amenity-recycling-container|@category_recycling": "Recycling container",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Recycling container",
|
||||
"recycling-batteries|@category_recycling": "Batterijen",
|
||||
"recycling-clothes|@category_recycling": "Oude kleding|Oude kleding recyclen",
|
||||
"recycling-glass_bottles|@category_recycling": "4Recycling van glasflessen|4Glasrecycling|Glasafval|Glascontainer|Glasbak",
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
"amenity-vehicle_inspection": "Kontrola pojazdu",
|
||||
"amenity-waste_disposal": "Wysypisko|Śmieci|ponowne odtworzenie|odpady",
|
||||
"amenity-recycling-centre|@category_recycling": "Przetwarzanie odpadów|Centrum przetwórstwa odpadów",
|
||||
"amenity-recycling-container|@category_recycling": "Pojemnik do recyklingu",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Pojemnik do recyklingu",
|
||||
"recycling-batteries|@category_recycling": "Baterie",
|
||||
"recycling-clothes|@category_recycling": "Stare ubrania|Przekaż niepotrzebne rzeczy",
|
||||
"recycling-glass_bottles|@category_recycling": "Szkło",
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
"amenity-post_office|post_office-post_partner|@category_post": "3Correios",
|
||||
"amenity-waste_disposal": "Depósito de lixo|lixo",
|
||||
"amenity-recycling-centre|@category_recycling": "Reciclagem|descarte seletivo",
|
||||
"amenity-recycling-container|@category_recycling": "Recipiente de reciclagem",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Recipiente de reciclagem",
|
||||
"recycling-batteries|@category_recycling": "Baterias",
|
||||
"recycling-clothes|@category_recycling": "Roupas velhas|Reciclar roupas velhas",
|
||||
"recycling-glass_bottles|@category_recycling": "Garrafas de vidro",
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
"amenity-vehicle_inspection": "Inspeção veicular",
|
||||
"amenity-waste_disposal": "Contentor do lixo|Caixote do lixo|lixo",
|
||||
"amenity-recycling-centre|@category_recycling": "Centro de reciclagem|Ecocentro",
|
||||
"amenity-recycling-container|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem",
|
||||
"recycling-batteries|@category_recycling": "Baterias",
|
||||
"recycling-clothes|@category_recycling": "Reciclagem de roupas|Roupas velhas",
|
||||
"recycling-glass_bottles|@category_recycling": "Resíduos de vidro",
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
"amenity-vehicle_inspection": "Inspecția vehiculului",
|
||||
"amenity-waste_disposal": "Gunoi",
|
||||
"amenity-recycling-centre|@category_recycling": "Centru de reciclare",
|
||||
"amenity-recycling-container|@category_recycling": "Containere pentru reciclare",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Containere pentru reciclare",
|
||||
"recycling-batteries|@category_recycling": "Baterii",
|
||||
"recycling-clothes|@category_recycling": "Haine vechi|Înmânarea lucrurilor inutile",
|
||||
"recycling-glass_bottles|@category_recycling": "Deșeuri de sticlă",
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
"amenity-vehicle_inspection": "Техосмотр автомобиля",
|
||||
"amenity-waste_disposal": "4Мусорный контейнер|мусорка",
|
||||
"amenity-recycling-centre|@category_recycling": "5Пункт приёма вторсырья",
|
||||
"amenity-recycling-container|@category_recycling": "Контейнер для вторсырья",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсырья",
|
||||
"recycling-batteries|@category_recycling": "5Приём батареек|Утилизация батареек|5Переработка батареек|5Сдать батарейки|4Сбор батареек|5Батарейки",
|
||||
"recycling-clothes|@category_recycling": "5Приём одежды|Старая одежда|Сдать ненужные вещи|Сдать вещи|5Сдать одежду|Одежда",
|
||||
"recycling-glass_bottles|@category_recycling": "5Приём стеклотары|Приём стекла|5Переработка стекла|5Сдать cтеклотару|Сдать бутылки|4Сбор стеклотары|5Стеклотара|Стеклобой|Стеклянные бутылки",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
"amenity-vehicle_inspection": "Kontrola vozidla",
|
||||
"amenity-waste_disposal": "Odpadky|kôš",
|
||||
"amenity-recycling-centre|@category_recycling": "Zberné suroviny",
|
||||
"amenity-recycling-container|@category_recycling": "Recyklačný odpad|Recyklačný kontajner",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklačný odpad|Recyklačný kontajner",
|
||||
"recycling-batteries|@category_recycling": "Batérie",
|
||||
"recycling-clothes|@category_recycling": "Staré oblečenie|Recyklácia starých šiat",
|
||||
"recycling-glass_bottles|@category_recycling": "Sklenené fľaše",
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
"amenity-vehicle_inspection": "8Технички преглед возила|8Tehnički pregled vozila",
|
||||
"amenity-waste_disposal": "Контејнер за смеће|Kontejner za smeće",
|
||||
"amenity-recycling-centre|@category_recycling": "Рециклажни центар|Reciklažni centar",
|
||||
"amenity-recycling-container|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner",
|
||||
"recycling-batteries|@category_recycling": "Рециклажа батерија|Reciklaža baterija",
|
||||
"recycling-clothes|@category_recycling": "Рециклажа одеће|Reciklaža odeće",
|
||||
"recycling-glass_bottles|@category_recycling": "Рециклажа стакла|Reciklaža stakla",
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
"amenity-vehicle_inspection": "Fordonsinspektion",
|
||||
"amenity-waste_disposal": "4Avfallscontainer|Soptunna|skräp|avfall",
|
||||
"amenity-recycling-centre|@category_recycling": "Återvinningscentral",
|
||||
"amenity-recycling-container|@category_recycling": "Behållare för återvinningsbart avfall",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Behållare för återvinningsbart avfall",
|
||||
"recycling-batteries|@category_recycling": "Batterier",
|
||||
"recycling-clothes|@category_recycling": "Gamla kläder|Överlämna onödiga saker",
|
||||
"recycling-glass_bottles|@category_recycling": "Returglas",
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
"amenity-vehicle_inspection": "การตรวจสอบยานพาหนะ",
|
||||
"amenity-waste_disposal": "ขยะ|ถังขยะ",
|
||||
"amenity-recycling-centre|@category_recycling": "ศูนย์รีไซเคิล",
|
||||
"amenity-recycling-container|@category_recycling": "บรรจุภัณฑ์รีไซเคิล",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "บรรจุภัณฑ์รีไซเคิล",
|
||||
"recycling-batteries|@category_recycling": "แบตเตอรี่",
|
||||
"recycling-clothes|@category_recycling": "เสื้อผ้าเก่า|รีไซเคิลเสื้อผ้าเก่า",
|
||||
"recycling-glass_bottles|@category_recycling": "ขวดแก้ว",
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
"amenity-vehicle_inspection": "Araç muayenesi",
|
||||
"amenity-waste_disposal": "Çöplük|Çöp kutusu|çöp",
|
||||
"amenity-recycling-centre|@category_recycling": "4Geri dönüşüm merkezi",
|
||||
"amenity-recycling-container|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi",
|
||||
"recycling-batteries|@category_recycling": "3Piller|Atık Pil Toplama|Atık pil kutusu",
|
||||
"recycling-clothes|@category_recycling": "4Eski kıyafetler|Eski kıyafetler geri dönüşümü|Kıyafet toplama kutusu|giysi toplama kutusu|Kıyafet",
|
||||
"recycling-glass_bottles|@category_recycling": "4Cam şişeler Geri Dönüşümü",
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
"amenity-vehicle_inspection": "Техогляд автомобіля",
|
||||
"amenity-waste_disposal": "4Сміттєвий контейнер|сміття|смітник",
|
||||
"amenity-recycling-centre|@category_recycling": "5Пункт прийому вторинної сировини",
|
||||
"amenity-recycling-container|@category_recycling": "Контейнер для вторсировини",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсировини",
|
||||
"recycling-batteries|@category_recycling": "5Прийом батарейок|Утилізація батарей|5Переробка батарей|5Здати батареї|4Збір батарейок|5Батарейки",
|
||||
"recycling-clothes|@category_recycling": "5Прийом одягу|Старий одяг|Здати непотрібні речі|Здати речі|5Здати одяг|Одяг",
|
||||
"recycling-glass_bottles|@category_recycling": "5Прийом склотари|Прийом скла|5Переробка скла|5Здати склотару|Здати пляшки|4Збір склотари|5Склотара|Склобой|Скляні пляшки",
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
"amenity-vehicle_inspection": "Kiểm tra xe",
|
||||
"amenity-waste_disposal": "Xử lý chất thải|Rác",
|
||||
"amenity-recycling-centre|@category_recycling": "Trung tâm tái sinh",
|
||||
"amenity-recycling-container|@category_recycling": "Thùng rác",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "Thùng rác",
|
||||
"recycling-batteries|@category_recycling": "Ắc quy",
|
||||
"recycling-clothes|@category_recycling": "Quần áo cũ|Chuyển giao những thứ không cần thiết",
|
||||
"recycling-glass_bottles|@category_recycling": "Chai lọ thủy tinh",
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
"amenity-vehicle_inspection": "车辆检验",
|
||||
"amenity-waste_disposal": "垃圾",
|
||||
"amenity-recycling-centre|@category_recycling": "回收中心",
|
||||
"amenity-recycling-container|@category_recycling": "回收箱",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "回收箱",
|
||||
"recycling-batteries|@category_recycling": "电池",
|
||||
"recycling-clothes|@category_recycling": "旧衣物|回收旧衣物",
|
||||
"recycling-glass_bottles|@category_recycling": "玻璃瓶",
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
"amenity-vehicle_inspection": "車輛檢驗",
|
||||
"amenity-waste_disposal": "垃圾|回收|回收場",
|
||||
"amenity-recycling-centre|@category_recycling": "回收中心|回收站",
|
||||
"amenity-recycling-container|@category_recycling": "回收箱",
|
||||
"amenity-recycling-container|amenity-recycling|@category_recycling": "回收箱",
|
||||
"recycling-batteries|@category_recycling": "電池",
|
||||
"recycling-clothes|@category_recycling": "舊衣物|回收舊衣物|衣服",
|
||||
"recycling-glass_bottles|@category_recycling": "玻璃瓶",
|
||||
|
||||
@@ -15,11 +15,10 @@
|
||||
# a "forbidden" selector like [!oneway] matches [oneway=no] only or absence of this tag.
|
||||
# If first 2 (1 for short types like "building") components of pre-matched types are the same,
|
||||
# then leave only the longest types (there could be a few of them). Equal arity types are kept.
|
||||
# Types added to data/subtypes.csv are always kept, too.
|
||||
# - highway-primary-bridge is left while highway-primary is removed;
|
||||
# - building-garages is left while building is removed;
|
||||
# - amenity-parking-underground-fee is left while amenity-parking and amenity-parking-fee are removed;
|
||||
# - both highway-primary-bridge and highway-primary-tunnel are left;
|
||||
# - both amenity-charging_station-motorcar and amenity-charging_station-bicycle are left;
|
||||
#
|
||||
# A shorter format for the above example:
|
||||
# highway|bus_stop;22;
|
||||
@@ -198,8 +197,7 @@ landuse|cemetery;105;
|
||||
sport|soccer;106;
|
||||
moved:boundary|administrative|4:05.2024;[boundary=administrative][admin_level=4];x;;;107;boundary|administrative|4
|
||||
amenity|cafe;108;
|
||||
# Treat default type also as a container, see https://taginfo.openstreetmap.org/keys/recycling_type#values
|
||||
amenity|recycling|container;[amenity=recycling][recycling_type=container],[amenity=recycling][!recycling_type];;name;int_name;109;
|
||||
amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;int_name;109;
|
||||
leisure|garden;110;
|
||||
landuse|commercial;111;
|
||||
moved:railway|station:05.2024;112;railway|station
|
||||
@@ -343,7 +341,7 @@ amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;2
|
||||
deprecated:boundary|administrative|5:04.2024;[boundary=administrative][admin_level=5];x;name;int_name;234;
|
||||
highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235;
|
||||
amenity|recycling|centre;[amenity=recycling][recycling_type=centre];;name;int_name;236;
|
||||
deprecated:amenity|recycling:01.2026;237;amenity|recycling|container
|
||||
amenity|recycling;237;
|
||||
highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238;
|
||||
aeroway|helipad;239;
|
||||
deprecated:highway|path|permissive:12.2023;[highway=path][access=permissive];x;name;int_name;240;highway|path
|
||||
@@ -421,7 +419,6 @@ highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;
|
||||
man_made|tower|communication;[man_made=tower][tower:type=communication];;name;int_name;311;
|
||||
sport|equestrian;312;
|
||||
tourism|information|office;[tourism=information][information=office];;name;int_name;313;
|
||||
# This is needed in the generator to work around charing stations, which are only implicitly marked as for cars, but this type never will actually make it into the map data
|
||||
amenity|charging_station|carless;[amenity=charging_station][motorcar=not],[amenity=charging_station][motorcar=no];;name;int_name;314;
|
||||
aeroway|gate;315;
|
||||
# TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 7 and column 16.
|
@@ -1144,6 +1144,7 @@ leisure-sports_hall # icon z17- (also has captio
|
||||
amenity-compressed_air # icon z18- (also has caption(optional) z19-)
|
||||
amenity-parcel_locker # icon z17- (also has caption(optional) z17-)
|
||||
amenity-payment_terminal # icon z17- (also has caption(optional) z17-)
|
||||
amenity-recycling # icon z17- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-)
|
||||
amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-)
|
||||
@@ -2217,6 +2218,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
|
||||
# amenity-compressed_air # caption(optional) z19- (also has icon z18-)
|
||||
# amenity-parcel_locker # caption(optional) z17- (also has icon z17-)
|
||||
# amenity-payment_terminal # caption(optional) z17- (also has icon z17-)
|
||||
# amenity-recycling # caption(optional) z18- (also has icon z17-)
|
||||
# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-)
|
||||
# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-)
|
||||
# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-)
|
||||
|
||||
@@ -1144,6 +1144,7 @@ leisure-sports_hall # icon z17- (also has captio
|
||||
amenity-compressed_air # icon z18- (also has caption(optional) z19-)
|
||||
amenity-parcel_locker # icon z17- (also has caption(optional) z17-)
|
||||
amenity-payment_terminal # icon z17- (also has caption(optional) z17-)
|
||||
amenity-recycling # icon z17- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-)
|
||||
amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-)
|
||||
@@ -2220,6 +2221,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
|
||||
# amenity-compressed_air # caption(optional) z19- (also has icon z18-)
|
||||
# amenity-parcel_locker # caption(optional) z17- (also has icon z17-)
|
||||
# amenity-payment_terminal # caption(optional) z17- (also has icon z17-)
|
||||
# amenity-recycling # caption(optional) z18- (also has icon z17-)
|
||||
# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-)
|
||||
# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-)
|
||||
# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-)
|
||||
|
||||
@@ -1,10 +1,3 @@
|
||||
Types;Related Subtypes
|
||||
amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless
|
||||
amenity|bench;amenity|bench|backless
|
||||
buoy|lateral|port,spherical_buoy|lateral|port,beacon|lateral|port;lateral|port
|
||||
buoy|lateral|starboard,spherical_buoy|lateral|starboard,beacon|lateral|starboard;lateral|starboard
|
||||
buoy|cardinal|east,spherical_buoy|cardinal|east,beacon|cardinal|east;cardinal|east
|
||||
buoy|cardinal|west,spherical_buoy|cardinal|west,beacon|cardinal|west;cardinal|west
|
||||
buoy|cardinal|south,spherical_buoy|cardinal|south,beacon|cardinal|south;cardinal|south
|
||||
buoy|cardinal|north,spherical_buoy|cardinal|north,beacon|cardinal|north;cardinal|north
|
||||
amenity|recycling|centre,amenity|recycling|container;recycling|clothes,recycling|shoes,recycling|small_appliances,recycling|batteries,recycling|scrap_metal,recycling|green_waste,recycling|glass_bottles,recycling|plastic_bottles,recycling|cans,recycling|cartons,recycling|cardboard,recycling|paper,recycling|plastic
|
||||
amenity|bench;amenity|bench|backless
|
||||
|
@@ -31,7 +31,6 @@ There are some other files not mentioned here.
|
||||
### Map features / classificator
|
||||
|
||||
- `mapcss-mapping.csv` - mapping between OSM tags and CoMaps types.
|
||||
- `subtypes.csv` - declaring CoMaps types as having subtypes or being one.
|
||||
- `replaced_tags.txt` - merging similar OSM tags.
|
||||
- `mixed_tags.txt` - pedestrian streets of high popularity.
|
||||
|
||||
|
||||
@@ -67,13 +67,13 @@ preferably look for icons in [collections CoMaps uses already](../data/copyright
|
||||
2. If necessary merge similar tags in via `data/replaced_tags.txt`
|
||||
3. Define a priority for the new feature type in e.g. [`priorities_4_overlays.prio.txt`](../data/styles/default/include/priorities_4_overlays.prio.txt) and/or other priorities files
|
||||
4. Add a new icon (see [above](#how-to-add-a-new-icon)) and/or other styling (area, line..)
|
||||
5. If a new POI is a subtype or has subtypes, add it accordingly to `data/subtypes.csv`
|
||||
6. If a new POI should be OSM-addable/editable then add it to `data/editor.config`
|
||||
7. Add the English string (and optionally translations e.g. for your native language) into iOS (`iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings`) and Android (`android/sdk/src/main/res/values/types_strings.xml`) type strings
|
||||
8. Add search keywords into `data/categories-strings/en.json/localize.json`
|
||||
9. Add new or fix current classifier tests at `generator/generator_tests/osm_type_tests.cpp` if you can
|
||||
10. [Test](#testing-your-changes) your changes
|
||||
11. Relax and wait for the next maps update :)
|
||||
5. If a new POI should be OSM-addable/editable then add it to `data/editor.config`
|
||||
6. Add the English string (and optionally translations e.g. for your native language) into iOS and Android type strings
|
||||
e strings
|
||||
7. Add search keywords into `data/categories.txt`
|
||||
8. Add new or fix current classifier tests at `generator/generator_tests/osm_type_tests.cpp` if you can
|
||||
9. [Test](#testing-your-changes) your changes
|
||||
10. Relax and wait for the next maps update :)
|
||||
|
||||
## Testing your changes
|
||||
|
||||
|
||||
@@ -104,7 +104,8 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_operator(std::string con
|
||||
{
|
||||
using namespace ftypes;
|
||||
auto const & t = m_params.m_types;
|
||||
if (IsATMChecker::Instance()(t) || IsRecyclingChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) ||
|
||||
if (IsATMChecker::Instance()(t) || IsRecyclingCentreChecker::Instance()(t) ||
|
||||
IsRecyclingContainerChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) ||
|
||||
IsOperatorOthersPoiChecker::Instance()(t))
|
||||
{
|
||||
return v;
|
||||
|
||||
@@ -270,10 +270,6 @@ public:
|
||||
ShuttleTrain,
|
||||
DisusedBusiness,
|
||||
Building,
|
||||
ChargingStation,
|
||||
SmallChargingStation,
|
||||
MotorcarChargingStation,
|
||||
CarlessChargingStation,
|
||||
Count
|
||||
};
|
||||
|
||||
@@ -315,10 +311,6 @@ public:
|
||||
{ShuttleTrain, {"route", "shuttle_train"}},
|
||||
{DisusedBusiness, {"disusedbusiness"}},
|
||||
{Building, {"building"}},
|
||||
{ChargingStation, {"amenity", "charging_station"}},
|
||||
{SmallChargingStation, {"amenity", "charging_station", "small"}},
|
||||
{MotorcarChargingStation, {"amenity", "charging_station", "motorcar"}},
|
||||
{CarlessChargingStation, {"amenity", "charging_station", "carless"}},
|
||||
};
|
||||
|
||||
m_types.resize(static_cast<size_t>(Count));
|
||||
@@ -1346,25 +1338,6 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
|
||||
railwayDone = true;
|
||||
}
|
||||
}
|
||||
|
||||
// This is needed in the generator to work around charing stations, which are only implicitly marked as for cars
|
||||
if (params.IsTypeExist(types.Get(CachedTypes::ChargingStation)))
|
||||
{
|
||||
uint32_t const motorcarChargingStation = types.Get(CachedTypes::MotorcarChargingStation);
|
||||
uint32_t const carlessChargingStation = types.Get(CachedTypes::CarlessChargingStation);
|
||||
|
||||
if (!params.IsTypeExist(motorcarChargingStation) && !params.IsTypeExist(carlessChargingStation))
|
||||
params.AddType(motorcarChargingStation);
|
||||
|
||||
if (params.IsTypeExist(carlessChargingStation))
|
||||
{
|
||||
params.PopExactType(carlessChargingStation);
|
||||
|
||||
uint32_t const smallChargingStation = types.Get(CachedTypes::SmallChargingStation);
|
||||
if (params.IsTypeExist(smallChargingStation))
|
||||
params.PopExactType(smallChargingStation);
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Kroeg";
|
||||
"type.amenity.public_bookcase" = "Boekekas";
|
||||
"type.amenity.recycling.centre" = "Herwinningsentrum";
|
||||
"type.amenity.recycling" = "Herwinningshouer";
|
||||
"type.amenity.recycling.container" = "Herwinningshouer";
|
||||
"type.recycling.batteries" = "Batterye";
|
||||
"type.recycling.clothes" = "Klere";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "حانة";
|
||||
"type.amenity.public_bookcase" = "مكتبة، تبادل كتب";
|
||||
"type.amenity.recycling.centre" = "مركز إعادة تدوير";
|
||||
"type.amenity.recycling" = "حاوية لإعادة التدوير";
|
||||
"type.amenity.recycling.container" = "حاوية لإعادة التدوير";
|
||||
"type.recycling.batteries" = "بطاريات";
|
||||
"type.recycling.clothes" = "ملابس";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Pub";
|
||||
"type.amenity.public_bookcase" = "Kitab mübadiləsi";
|
||||
"type.amenity.recycling.centre" = "Təkrar Emal Mərkəzi";
|
||||
"type.amenity.recycling" = "Təkrar emal konteyneri";
|
||||
"type.amenity.recycling.container" = "Təkrar emal konteyneri";
|
||||
"type.recycling.batteries" = "Batareyalar";
|
||||
"type.recycling.clothes" = "Geyim";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Pub";
|
||||
"type.amenity.public_bookcase" = "Book Exchange";
|
||||
"type.amenity.recycling.centre" = "Прыём другсыравіны";
|
||||
"type.amenity.recycling" = "Кантэйнер для другаснай сыравіны";
|
||||
"type.amenity.recycling.container" = "Кантэйнер для другаснай сыравіны";
|
||||
"type.recycling.batteries" = "Батарэйкі";
|
||||
"type.recycling.clothes" = "Адзенне";
|
||||
|
||||
@@ -128,6 +128,7 @@
|
||||
"type.amenity.pub" = "Кръчма";
|
||||
"type.amenity.public_bookcase" = "Книжен обмен";
|
||||
"type.amenity.recycling.centre" = "Преработвателно средище";
|
||||
"type.amenity.recycling" = "Кофи за преработваем отпадък";
|
||||
"type.amenity.recycling.container" = "Кофи за преработваем отпадък";
|
||||
"type.recycling.batteries" = "Батерии";
|
||||
"type.recycling.clothes" = "Дрехи";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Taverna";
|
||||
"type.amenity.public_bookcase" = "Intercanvi de llibres";
|
||||
"type.amenity.recycling.centre" = "Centre de reciclatge";
|
||||
"type.amenity.recycling" = "Contenidor de reciclatge";
|
||||
"type.amenity.recycling.container" = "Contenidor de reciclatge";
|
||||
"type.recycling.batteries" = "Bateries";
|
||||
"type.recycling.clothes" = "Roba";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Hospoda";
|
||||
"type.amenity.public_bookcase" = "Výměna knih";
|
||||
"type.amenity.recycling.centre" = "Recyklační středisko";
|
||||
"type.amenity.recycling" = "Recyklační nádoba";
|
||||
"type.amenity.recycling.container" = "Recyklační nádoba";
|
||||
"type.recycling.batteries" = "Baterie";
|
||||
"type.recycling.clothes" = "Staré oblečení";
|
||||
|
||||
@@ -128,6 +128,7 @@
|
||||
"type.amenity.pub" = "Værtshus";
|
||||
"type.amenity.public_bookcase" = "Bogbytteskab";
|
||||
"type.amenity.recycling.centre" = "Genbrugsplads";
|
||||
"type.amenity.recycling" = "Genbrugscontainer";
|
||||
"type.amenity.recycling.container" = "Genbrugscontainer";
|
||||
"type.recycling.batteries" = "Batterier";
|
||||
"type.recycling.clothes" = "Tekstil";
|
||||
|
||||
@@ -134,6 +134,7 @@
|
||||
"type.amenity.pub" = "Kneipe";
|
||||
"type.amenity.public_bookcase" = "Bücherschrank";
|
||||
"type.amenity.recycling.centre" = "Recyclinghof";
|
||||
"type.amenity.recycling" = "Wertstoffcontainer";
|
||||
"type.amenity.recycling.container" = "Wertstoffcontainer";
|
||||
"type.recycling.batteries" = "Batterien";
|
||||
"type.recycling.clothes" = "Altkleider";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Παμπ";
|
||||
"type.amenity.public_bookcase" = "Ανταλλαγή βιβλίων";
|
||||
"type.amenity.recycling.centre" = "Κέντρο ανακύκλωσης";
|
||||
"type.amenity.recycling" = "Κάδος ανακύκλωσης";
|
||||
"type.amenity.recycling.container" = "Κάδος ανακύκλωσης";
|
||||
"type.recycling.batteries" = "Μπαταρίες";
|
||||
"type.recycling.clothes" = "Ρούχα";
|
||||
|
||||
@@ -145,6 +145,7 @@
|
||||
"type.amenity.pub" = "Pub";
|
||||
"type.amenity.public_bookcase" = "Book Exchange";
|
||||
"type.amenity.recycling.centre" = "Recycling Centre";
|
||||
"type.amenity.recycling" = "Recycling Container";
|
||||
"type.amenity.recycling.container" = "Recycling Container";
|
||||
"type.recycling.batteries" = "Batteries";
|
||||
"type.recycling.clothes" = "Clothes";
|
||||
|
||||
@@ -160,7 +160,8 @@
|
||||
|
||||
/********** Types: Recycling **********/
|
||||
|
||||
"type.amenity.recycling.centre" = "Recycling Centre";
|
||||
"type.amenity.recycling.centre" = "Recycling Center";
|
||||
"type.amenity.recycling" = "Recycling Container";
|
||||
"type.amenity.recycling.container" = "Recycling Container";
|
||||
"type.recycling.batteries" = "Batteries";
|
||||
"type.recycling.clothes" = "Clothes";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Pub";
|
||||
"type.amenity.public_bookcase" = "Intercambio de libros";
|
||||
"type.amenity.recycling.centre" = "Centro de reciclaje";
|
||||
"type.amenity.recycling" = "Contenedor de reciclaje";
|
||||
"type.amenity.recycling.container" = "Contenedor de reciclaje";
|
||||
"type.recycling.batteries" = "Baterías";
|
||||
"type.recycling.clothes" = "Ropa";
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
"type.amenity.pub" = "Taberna";
|
||||
"type.amenity.public_bookcase" = "Intercambio de libros";
|
||||
"type.amenity.recycling.centre" = "Centro de reciclaje";
|
||||
"type.amenity.recycling" = "Contenedor de reciclaje";
|
||||
"type.amenity.recycling.container" = "Contenedor de reciclaje";
|
||||
"type.recycling.batteries" = "Baterías";
|
||||
"type.recycling.clothes" = "Ropa";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user