[android] Adds delay to inset application on API 29 and lower

Signed-off-by: hemanggs <hemangmanhas@gmail.com>
2026-01-10 14:24:21 +00:00 · 2025-06-20 00:02:16 +07:00
203 changed files with 1431 additions and 3462 deletions
--- a/.forgejo/workflows/ios-check.yaml
+++ b/.forgejo/workflows/ios-check.yaml
@@ -74,7 +74,7 @@ jobs:
        shell: bash
        run: |
          xcodebuild test \
-            -workspace xcode/CoMaps.xcworkspace \
+            -workspace xcode/omim.xcworkspace \
            -scheme CoMaps \
            -configuration Debug \
            -sdk iphonesimulator \
@@ -97,7 +97,7 @@ jobs:
        shell: bash
        run: |
          xcodebuild build \
-            -workspace xcode/CoMaps.xcworkspace \
+            -workspace xcode/omim.xcworkspace \
            -scheme CoMaps \
            -configuration Release \
            -destination 'generic/platform=iOS' \
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -55,7 +55,7 @@ jobs:
          xcrun simctl boot "${{ env.SIMULATOR_DEVICE }}" || true
          xcrun simctl bootstatus "${{ env.SIMULATOR_DEVICE }}" -b
          xcodebuild test \
-            -workspace xcode/CoMaps.xcworkspace \
+            -workspace xcode/omim.xcworkspace \
            -scheme CoMaps \
            -configuration Debug \
            -sdk iphonesimulator \
@@ -78,7 +78,7 @@ jobs:
        shell: bash
        run: |
          xcodebuild build \
-            -workspace xcode/CoMaps.xcworkspace \
+            -workspace xcode/omim.xcworkspace \
            -scheme CoMaps \
            -configuration Release \
            -destination 'generic/platform=iOS' \
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ iphone/*/build/*
 tools/emacsmode/build
 **/DerivedData/*
 **/xcshareddata/*
-!iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme
+!iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/OMaps.xcscheme
 **/xcuserdata
 **/xcschemes
 iphone/**/*.moved-aside
--- a/android/app/src/fdroid/play/listings/cs-CZ/short-description.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/short-description.txt
@@ -1 +1 @@
-Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou
+Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,8 +1,8 @@
-• Kartenfarben aufgefrischt – heller, wärmer, freundlicher!
-• OSM-Editor: „Stockwerk“ Feld hinzugefügt
-• Symbole für Tankstellen und Ladestationen aktualisiert
-• Farben einiger UI Elemente überarbeitet
-• Funktionierende Links zum Teilen von Orten
-• Falsch angezeigte Kartengröße nach Downloadfehlern korrigiert
-• Kleine Sprünge des Standortpfeils in bestimmten Fällen behoben
-• Bugfixes für Android 5 & 6
+• OpenStreetMap Daten vom 2. Juni
+• Neue Einstellungsoption zum Ändern oder Ausblenden der "Über CoMaps" Schaltfläche ganz links
+• Routen als GPS Track speichern
+• Qingdao Metro, Gärtnereien, Leitplanken, Leitern, Studios, Tanzsäle, Feuerstellen und Stundenhotels hinzugefügt
+• transparente Navigationsleiste im Light Mode
+• Mastodon und Bluesky Kontaktoptionen für POIs und im OSM-Editor hinzugefügt
+• Anzeige der Kompassgradzahl in der Richtungspfeilansicht
+• Übersetzungen aktualisiert
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,8 +1,8 @@
-• refresh map colors - lighter, warmer, friendlier!
-• OSM editor: add a "level" field
-• update gas and charging stations icons
-• update colors of some UI elements
-• fix location sharing links
-• fix wrong displayed map size after download errors
-• fix small location arrow jumps in some cases
-• android 5&6 bugfixes
+• OpenStreetMap data as of June 2
+• add a setting to change the leftmost button or hide it
+• save built routes as tracks
+• add Qingdao metro, plant nurseries, highway guard rails, ladders, studios, dance venues, firepits, love hotels
+• transparent system navigation bar in the light mode
+• add Mastodon and Bluesky contact options to POIs and OSM editor
+• display Azimuth angle in direction arrow view
+• update translations
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,8 +0,0 @@
-• colores del mapa renovados - más claros, cálidos y amigables!
-• editor OSM: campo "nivel" agregado
-• actualización de íconos de carga de combustible y electricidad
-• actualización de colores de algunos elementos de IU
-• corrección de links para compartir ubicación
-• corrección de tamaño incorrecto del mapa luego de errores de descarga
-• corrección de pequeños saltos de flechas de posición en algunos casos
-• corrección de bugs en Android 5 y 6
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,8 +1,8 @@
-• Mise à jour des couleurs de la carte, plus claires, plus chaudes et plus conviviales
-• Editeur OSM: ajout du champ "level"
-• Mise à jour des icônes des stations-service et bornes de recharge
-• Mise à jour des couleurs de certains éléments d'interface
-• Correction de lien de partage
-• Correction de la taille d'une carte suite à une erreur de téléchargement
-• Correction de saut de la localisation dans certaines situations
-• Corrections de bug sur Android 5&6
+• Données OpenStreetMap du 02 juin
+• Ajout d'une option pour personnaliser le bouton tout à gauche sur l'écran principal
+• Ajout de la possibilité d'enregistrer un itinéraire en tant que traces GPS
+• Ajout du métro de Qingdao, et divers objets sur la carte
+• Support de la barre de navigation transparent en mode clair
+• Ajout des tags Mastodon et Bluesky sur les lieux et dans l'éditeur
+• Affichage de l'azimut
+• Mise à jour des traductions
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -0,0 +1,8 @@
+• Data di OpenStreetmap fino a giugno 2°
+• Nuova impostazione per cambiare o modificare la positione del tasto sinistra
+• Salvare i percorsi costruiti come tracce
+• È stato aggiunto: metropolitana di Qingdao, giardinaggi, guardrail, scale, studio,
+sala da ballo, focolari, love hotel
+• Barra di navigatione transparente di sisteme in moda luce
+• Aggiungi le opzioni di contatto Mastodon e Bluesky ai POI e all'editor di OSM
+• Visualizza l'angolo di azimut nella freccia di direzione
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,8 +1,8 @@
-• Atualizadas as cores do mapa - mais claras, quentes e amigáveis!
-• Editor OSM: adicionado um campo de "andar"
-• Atualizados ícones de postos de gasolina e recarga
-• Atualizadas cores de alguns elementos da interface do usuário
-• Correção de links de compartilhamento de localização
-• Correção de erros de tamanho de mapa exibidos incorretamente após download
-• Correção de pequenos saltos na seta de localização em alguns casos
-• Correções de bugs do Android 5 e 6
+• Dados do OSM de 2/06
+• Adicionada uma configuração para alterar ou ocultar o botão mais à esquerda
+• Salve rotas construídas como trilhas
+• Adicionado metrô de Qingdao, viveiros de plantas, guarda-corpos de rodovias, escadas, estúdios, casas de dança, fogueiras e motéis
+• Barra de navegação do sistema transparente no modo claro
+• Adicionadas opções de contato Mastodon e Bluesky aos POIs e ao editor OSM
+• Exibição de ângulo de azimute na visualização de seta de direção
+• Novas traduções
--- a/android/app/src/fdroid/play/listings/pt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/full-description.txt
@@ -1,55 +0,0 @@
-Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
-
-Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
-
-Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
-
-• Use o aplicativo e divulgue-o.
-
-• Envie feedback e relate problemas.
-
-• Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
-
-‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
-
-‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
-
-‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
-
-‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
-
-‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
-
-‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
-
-<b>Principais recursos</b>:
-
-• Mapas detalhados para download com locais não disponíveis no Google Maps
-
-• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
-
-• Trilhas para caminhada e ciclovias
-
-• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
-
-• Pesquise por nome, endereço ou por categoria de ponto de interesse
-
-• Navegação com anúncios de voz para caminhadas, ciclismo ou direção
-
-• Marque seus lugares favoritos com um único toque
-
-• Artigos offline da Wikipédia
-
-• Camada e direções de transporte público do metrô
-
-• Gravação de trilhas
-
-• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
-
-• Um modo escuro para usar à noite
-
-• Aprimore os dados do mapa para todos usando um editor básico integrado
-
-<b>A Liberdade Chegou</b>
-
-Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
--- a/android/app/src/fdroid/play/listings/pt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/short-description.txt
@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descobre mais sobre o teu percurso - Feito por todos
--- a/android/app/src/fdroid/play/listings/pt/title.txt
+++ b/android/app/src/fdroid/play/listings/pt/title.txt
@@ -1 +1 @@
-CoMaps - Mapas e Navegação - Offline e Privada
+CoMaps - Andar, Pedalar, Dirigir Offline com Privacidade
--- a/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
@@ -1,33 +1,26 @@
-Бесплатное и свободное картографическое приложение, основанное на данных OpenStreetMap и подкреплённое обязательствами по прозрачности, конфиденциальности и некоммерческой направленности. CoMaps — это ответвление от Organic Maps, которое, в свою очередь, является ответвлением от Maps.ME.
+Бесплатное картографическое приложение с открытым исходным кодом, основанное на данных OpenStreetMap и подкрепленное обязательствами по прозрачности, конфиденциальности и некоммерческому характеру. CoMaps - это форк/ответвление Organic Maps, который, в свою очередь, является форком Maps.ME.

-Подробнее о причинах проекта и его направлении читайте на <a href="https://codeberg.org/comaps">сайте</a>.
-
-Присоединяйтесь к сообществу и помогите создать лучшее приложение с картами
-• Используйте приложение и распространяйте информацию о нём
-• Оставляйте отзывы и сообщайте о проблемах
-• Обновляйте данные карт в приложении или на веб-сайте OpenStreetMap
-
-‣ <b>Приоритет на работу без интернета</b>: Планируйте и ориентируйтесь в путешествии за границей, не нуждаясь в сотовой связи и т.д. Всё в приложении рассчитано на работу в автономном режиме.
-‣ <b>Соблюдение конфиденциальности</b>: Приложение разработано с учётом требований конфиденциальности — оно не идентифицирует людей, не отслеживает и не собирает личную информацию. Без рекламы.
-‣ <b>Простота и отточенность</b>: Основные и простые в использовании функции, которые просто работают.
+‣ <b>Приоритет на работу без интернета</b>: Планируйте и ориентируйтесь в путешествии за границей, не нуждаясь в сотовой связи и т.д. Все функции приложения рассчитаны на работу в автономном режиме.
+‣ <b>Соблюдение конфиденциальности</b>: Приложение разработано с учетом требований конфиденциальности - оно не идентифицирует людей, не отслеживает и не собирает личную информацию. Без рекламы.
+‣ <b>Простота и Элегантность</b>: Необходимые и легкие в использовании функции, которые просто работают.
 ‣ <b>Экономия заряда батареи и места на устройстве</b>: Не разряжает аккумулятор, как другие приложения для навигации. Компактные карты экономят драгоценное место на вашем телефоне.
-‣ <b>Бесплатное и созданное сообществом</b>: Такие люди, как и вы, помогали создавать приложение, добавляя места в OpenStreetMap, протестировав и оставляя отзывы о функциях, а также вложив свои навыки и деньги в разработку.
-‣ <b>Открытое и прозрачное принятие решений, финансовая отчётность, некоммерческая организация и полностью открытый исходный код.</b>
+‣ <b>Бесплатное и созданное сообществом</b>: Люди, подобные вам, помогали создавать приложение, добавляя места в OpenStreetMap, тестируя и оставляя отзывы о функциях, а также вкладывая свои навыки и деньги в разработку..
+‣ <b>Открытое и прозрачное принятие решений, финансовая отчетность, некоммерческая организация и полностью открытый исходный код.</b>

-<b>Главные возможности</b>:
-• Скачиваемые и подробные карты с местами, которые недоступны в Google Maps
-• Уличный режим с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
+<b>Главные особенности</b>:
+• Загружаемые и подробные карты с местами, которые недоступны в Google Maps
+• Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
 • Пешеходные переходы и велодорожки
-• Интересные места, такие как: рестораны, заправочные станции, гостиницы, магазины, достопримечательности и многое другое
-• Поиск по названию или адресу или по категории достопримечательностей
+• Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое
+• Поиск по имени, адресу или категории достопримечательностей
 • Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
-• Возможность добавлять любимые места в закладки одним нажатием
-• Скачиваемые страницы Википедии
+• Возможность добавлять любимые места в закладки одним касанием
+• Загружаемые страницы Википедии
 • Слой общественного транспорта (метро)
 • Запись маршрута
 • Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
-• Тёмный режим для использования в ночное время
-• Улучшение данных карты для всех с помощью базового встроенного редактора
+• Темный режим для использования в ночное время
+• Улучшение картографических данных для всех с помощью базового встроенного редактора
+• Поддержка Android Auto и CarPlay

-<b>Свобода здесь</b>
-Откройте для себя путешествия, навигацию по миру, ставя во главе приватность и сообщество!
+<i>Свобода здесь - Открой для себя поездки, навигацию по миру, ставя приватность и сообщество во главе</i>
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,8 +1,7 @@
-• обновлены цвета карты — теперь они светлее, теплее и дружелюбнее
-• редактор OSM: добавлено поле «этаж»
-• обновлены иконки заправок и зарядных станций
-• обновлены цвета некоторых элементов интерфейса
-• исправлена ссылка на карту при попытке поделиться местоположением
-• исправлено неверное отображение размера карты после ошибок загрузки
-• исправлены мелкие скачки стрелки местоположения в некоторых случаях
-• исправления ошибок для Android 5 и 6
+• карты OpenStreetMap от 2 июня
+• настройка для изменения функции левой кнопки или её скрытия
+• сохранение построенных маршрутов в виде треков
+• добавлены: метро в Qingdao, питомники растений, отбойники на шоссе, постоянные лестницы-стремянки, студии, места для танцев, кострища, отели любви
+• прозрачная полоска с системными кнопками (в светлом режиме)
+• в объекты на карте (а также в их редактор) добавлены Mastodon и Bluesky контакты
+• к стрелке направления на выбранный объект добавлен азимут
--- a/android/app/src/fdroid/play/listings/ru-RU/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/short-description.txt
@@ -1 +0,0 @@
-Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества
--- a/android/app/src/fdroid/play/listings/ru-RU/title.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/title.txt
@@ -1 +0,0 @@
-CoMaps - Карты и путешествия с приватностью
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -1,8 +0,0 @@
-• освежене су боје мапе – светлије, топлије, пријатније!
-• у OSM едитору је додато поље „спрат“
-• ажуриране су иконице бензинских пумпи и станица за пуњење
-• ажуриране су боје неких елемената корисничког интерфејса
-• поправљени су линкови за дељење локације
-• поправљена је погрешно приказана величина мапе након грешака при преузимању
-• исправљена су мала поскакивања стрелице локације у неким случајевима
-• исправљене су грешке за Android 5 и 6
--- a/android/app/src/fdroid/play/listings/sr/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/short-description.txt
@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
+Једноставна навигација - Сазнајте више о свом путовању - Захваљујући заједници
--- a/android/app/src/fdroid/play/listings/zh-CN/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/zh-CN/release-notes.txt
@@ -1,8 +0,0 @@
-• 刷新地图颜色－更浅、更暖、更友好！
-• OSM 编辑器：添加“楼层”字段
-• 更新加油站和充电站图标
-• 更新部分用户界面组件的颜色
-• 修复位置共享的链接
-• 修复下载后错误显示地图大小的问题
-• 修复定位箭头偶尔轻微跳动的问题
-• Android 5&6 错误修复
--- a/android/app/src/fdroid/play/listings/zh-TW/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/zh-TW/release-notes.txt
@@ -1,8 +0,0 @@
-• 刷新地圖顏色－更淺、更暖、更友好！
-• OSM 編輯器：新增「樓層」欄位
-• 更新加油站和充電站圖示
-• 更新某些使用者介面元件的顏色
-• 修正位置分享的連結
-• 修正下載後錯誤顯示地圖尺寸的問題
-• 修正定位箭頭偶爾輕微跳動的問題
-• Android 5&6 錯誤修正
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.06.22-5-FDroid+25062205
+version: 2025.03.02-7-FDroid+25030207
--- a/android/app/src/google/play/listings/cs-CZ/short-description.txt
+++ b/android/app/src/google/play/listings/cs-CZ/short-description.txt
@@ -1 +1 @@
-Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou
+Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
--- a/android/app/src/google/play/listings/cs-CZ/title.txt
+++ b/android/app/src/google/play/listings/cs-CZ/title.txt
@@ -1 +1 @@
-CoMaps - Navigace se soukromím
+CoMaps – Navigace se soukromím
--- a/android/app/src/google/play/listings/it-IT/full-description.txt
+++ b/android/app/src/google/play/listings/it-IT/full-description.txt
@@ -1,4 +1,4 @@
-Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro.
+Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.

 Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 • usa l'app e consigliala
--- a/android/app/src/google/play/listings/nl-NL/short-description.txt
+++ b/android/app/src/google/play/listings/nl-NL/short-description.txt
@@ -1 +0,0 @@
-Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community
--- a/android/app/src/google/play/listings/nl-NL/title.txt
+++ b/android/app/src/google/play/listings/nl-NL/title.txt
@@ -1 +0,0 @@
-CoMaps - Navigeer met privacy
--- a/android/app/src/google/play/listings/ru-RU/full-description.txt
+++ b/android/app/src/google/play/listings/ru-RU/full-description.txt
@@ -1,38 +0,0 @@
-Бесплатное и открытое приложение с картами, созданное сообществом на основе картографических данных OpenStreetMap и подкрепленное стремлением к прозрачности, уважению конфиденциальности и некоммерческой направленностью.
-
-Подробнее о причинах проекта и его направлении читайте на <a href="https://codeberg.org/comaps">сайте</a>.
-
-Присоединяйтесь к сообществу и помогите создать лучшее приложение с картами
-• Используйте приложение и распространяйте информацию о нём
-• Оставляйте отзывы и сообщайте о проблемах
-• Обновляйте данные карт в приложении или на веб-сайте OpenStreetMap
-
-<i>Ваши отзыв и звёздочки будут для нас лучшей поддержкой!</i>
-
-‣ <b>Приоритет на работу без интернета</b>: Планируйте и ориентируйтесь в путешествии за границей, не нуждаясь в сотовой связи и т.д. Всё в приложении рассчитано на работу в автономном режиме.
-‣ <b>Соблюдение конфиденциальности</b>: Приложение разработано с учётом требований конфиденциальности — оно не идентифицирует людей, не отслеживает и не собирает личную информацию. Без рекламы.
-‣ <b>Простота и отточенность</b>: Основные и простые в использовании функции, которые просто работают.
-‣ <b>Экономия заряда батареи и места на устройстве</b>: Не разряжает аккумулятор, как другие приложения для навигации. Компактные карты экономят драгоценное место на вашем телефоне.
-‣ <b>Бесплатное и созданное сообществом</b>: Такие люди, как и вы, помогали создавать приложение, добавляя места в OpenStreetMap, протестировав и оставляя отзывы о функциях, а также вложив свои навыки и деньги в разработку.
-‣ <b>Открытое и прозрачное принятие решений, финансовая отчётность, некоммерческая организация и полностью открытый исходный код.</b>
-
-<b>Главные возможности</b>:
-• Скачиваемые и подробные карты с местами, которые недоступны в Google Maps
-• Уличный режим с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
-• Пешеходные переходы и велодорожки
-• Интересные места, такие как: рестораны, заправочные станции, гостиницы, магазины, достопримечательности и многое другое
-• Поиск по названию или адресу или по категории достопримечательностей
-• Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
-• Возможность добавлять любимые места в закладки одним нажатием
-• Скачиваемые страницы Википедии
-• Слой общественного транспорта (метро)
-• Запись маршрута
-• Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
-• Тёмный режим для использования в ночное время
-• Улучшение данных карты для всех с помощью базового встроенного редактора
-• Поддержка Андроид Авто
-
-Пожалуйста сообщайте о ошибках, предлагайте идеи и присоединяйтесь к сообществу на сайте <a href="https://comaps.app">comaps.app</a>.
-
-<b>Свобода!</b>
-Откройте для себя путешествия, навигацию по миру, ставя во главе приватность и сообщество!
--- a/android/app/src/google/play/listings/ru-RU/short-description.txt
+++ b/android/app/src/google/play/listings/ru-RU/short-description.txt
@@ -1 +0,0 @@
-Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества
--- a/android/app/src/google/play/listings/ru-RU/title.txt
+++ b/android/app/src/google/play/listings/ru-RU/title.txt
@@ -1 +0,0 @@
-CoMaps - Оффлайн навигация
--- a/android/app/src/google/play/listings/sr/full-description.txt
+++ b/android/app/src/google/play/listings/sr/full-description.txt
@@ -32,5 +32,5 @@

 Молимо Вас да пријавите проблеме са апликацијом, предложите идеје и придружите се нашој заједници на <b><i>comaps.app</i></b> страни.

-<b>Сад је слободна</b>
+<b>Сад је слободно</b>
 Откријте своје путовање, путујте светом с приватношћу и заједницом на челу!
--- a/android/app/src/google/play/listings/sr/short-description.txt
+++ b/android/app/src/google/play/listings/sr/short-description.txt
@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
+Једноставна навигација - Сазнајте више о свом путовању - Захваљујући заједници
--- a/android/app/src/google/play/listings/sr/title.txt
+++ b/android/app/src/google/play/listings/sr/title.txt
@@ -1 +1 @@
-CoMaps - Navigacija
+CoMaps - навигација
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -567,6 +567,7 @@
    <string name="type.landuse.education">Opvoedkundige fasiliteit</string>
    <string name="type.landuse.farmland">Landbougrond</string>
    <string name="type.landuse.farmyard">Plaaswerf</string>
+    <string name="type.landuse.field">Veld</string>
    <string name="type.landuse.forest">Woud</string>
    <string name="type.landuse.forest.coniferous">Naaldwoud</string>
    <string name="type.landuse.forest.deciduous">Loofwoud</string>
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -594,6 +594,7 @@
    <string name="type.landuse.construction">منطقة بناء</string>
    <string name="type.landuse.education">مؤسسة تعليمية</string>
    <string name="type.landuse.farmland">حقل</string>
+    <string name="type.landuse.field">حقل</string>
    <string name="type.landuse.flowerbed">مشتل أزهار</string>
    <string name="type.landuse.forest">غابة</string>
    <string name="type.landuse.forest.coniferous">غابة صنوبرية</string>
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -585,6 +585,7 @@
    <string name="type.landuse.construction">Struktur</string>
    <string name="type.landuse.farmland">Kənd Təsərrüfatı Torpaqları</string>
    <string name="type.landuse.farmyard">Ferma rayonu</string>
+    <string name="type.landuse.field">Ərazi</string>
    <string name="type.landuse.flowerbed">Çiçəklik</string>
    <string name="type.landuse.forest">Meşə</string>
    <string name="type.landuse.forest.coniferous">Şam meşəsi</string>
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -872,6 +872,7 @@
    <string name="type.cuisine.french">Francesa</string>
    <string name="type.cuisine.russian">Rusa</string>
    <string name="type.landuse.forest.coniferous">Bosc de coníferes</string>
+    <string name="type.landuse.field">Camp</string>
    <string name="type.man_made.works">Fàbrica</string>
    <string name="type.cuisine.georgian">Georgiana</string>
    <string name="type.cuisine.german">Alemanya</string>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -460,7 +460,7 @@
    <string name="editor_profile_changes">Oveřené změny</string>
    <string name="editor_focus_map_on_location">Přetažením mapy umístěte křížek na místo, kde se nachází místo nebo podnik.</string>
    <string name="editor_edit_place_title">Probíhají úpravy</string>
-    <string name="editor_add_place_title">Přidávání</string>
+    <string name="editor_add_place_title">Probíhá přidávání</string>
    <string name="editor_edit_place_name_hint">Název místa</string>
    <!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
    <string name="editor_default_language_hint">Jak je napsáno v místním jazyce</string>
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1212,6 +1212,7 @@
    <string name="type.internet_access">Internet</string>
    <string name="type.junction.roundabout">Kruhový objezd</string>
    <string name="type.landuse.brownfield">Brownfield</string>
+    <string name="type.landuse.field">Pole</string>
    <string name="type.landuse.greenfield">Nezastavěná plocha</string>
    <string name="type.landuse.greenhouse_horticulture">Skleník</string>
    <string name="type.landuse.industrial">Průmyslová oblast</string>
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1233,6 +1233,7 @@
    <string name="type.landuse.construction">Byggeplads</string>
    <string name="type.landuse.education">Uddannelsesområde</string>
    <string name="type.landuse.farmyard">Gårdanlæg</string>
+    <string name="type.landuse.field">Mark</string>
    <string name="type.landuse.garages">Garager</string>
    <string name="type.landuse.greenfield">Ubebygget område</string>
    <string name="type.landuse.industrial">Industriområde</string>
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -583,6 +583,7 @@
    <string name="type.landuse.education">Bildungseinrichtung</string>
    <string name="type.landuse.farmland">Agrarland</string>
    <string name="type.landuse.farmyard">Bauernhof</string>
+    <string name="type.landuse.field">Feld</string>
    <string name="type.landuse.flowerbed">Blumenbeet</string>
    <string name="type.landuse.forest">Wald</string>
    <string name="type.landuse.forest.coniferous">Nadelwald</string>
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -600,6 +600,7 @@
    <string name="type.landuse.education">Instalaciones educativas</string>
    <string name="type.landuse.farmland">Tierras agrícolas</string>
    <string name="type.landuse.farmyard">Granja</string>
+    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Cama de flores</string>
    <string name="type.landuse.forest">Bosque</string>
    <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -598,6 +598,7 @@
    <string name="type.landuse.education">Haridusasutuse maaala</string>
    <string name="type.landuse.farmland">Põllumaa</string>
    <string name="type.landuse.farmyard">Taluõu</string>
+    <string name="type.landuse.field">Põld</string>
    <string name="type.landuse.flowerbed">Lillepeenar</string>
    <string name="type.landuse.forest">Majandusmets</string>
    <string name="type.landuse.forest.coniferous">Okaspuumets</string>
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -1249,6 +1249,7 @@
    <string name="type.landuse.brownfield">Industrialde ohia</string>
    <string name="type.landuse.education">Hezkuntza-azpiegitura</string>
    <string name="type.landuse.farmyard">Eskorta</string>
+    <string name="type.landuse.field">Soroa</string>
    <string name="type.landuse.greenfield">Eraikitzeko eremua</string>
    <string name="type.landuse.greenhouse_horticulture">Negutegia</string>
    <string name="type.landuse.industrial">Industria-gunea</string>
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -588,6 +588,7 @@
    <string name="type.landuse.education">Koulutuslaitos</string>
    <string name="type.landuse.farmland">Maatalousmaa</string>
    <string name="type.landuse.farmyard">Maatila</string>
+    <string name="type.landuse.field">Kenttä</string>
    <string name="type.landuse.flowerbed">Kukkapenkki</string>
    <string name="type.landuse.forest">Metsä</string>
    <string name="type.landuse.forest.coniferous">Havumetsä</string>
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -582,6 +582,7 @@
    <string name="type.landuse.education">Établissements éducatifs</string>
    <string name="type.landuse.farmland">Terrains agricoles</string>
    <string name="type.landuse.farmyard">Ferme</string>
+    <string name="type.landuse.field">Champ</string>
    <string name="type.landuse.flowerbed">Plate-bande</string>
    <string name="type.landuse.forest">Forêt</string>
    <string name="type.landuse.forest.coniferous">Forêt de conifères</string>
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -548,6 +548,7 @@
    <string name="type.landuse.education">Instalacións educativas</string>
    <string name="type.landuse.farmland">Terras agrícolas</string>
    <string name="type.landuse.farmyard">Granja</string>
+    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Cama de flores</string>
    <string name="type.landuse.forest">Bosque</string>
    <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
--- a/android/app/src/main/res/values-hi/types_strings.xml
+++ b/android/app/src/main/res/values-hi/types_strings.xml
@@ -350,6 +350,7 @@
    <!-- 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. -->
    <string name="type.landuse.cemetery.christian">ईसाई कब्रिस्तान</string>
    <string name="type.landuse.commercial">वाणिज्य क्षेत्र</string>
+    <string name="type.landuse.field">क्षेत्र</string>
    <string name="type.landuse.forest">वन</string>
    <string name="type.landuse.forest.mixed">मिश्रित वन</string>
    <string name="type.landuse.grass">घास</string>
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1247,6 +1247,7 @@
    <string name="type.landuse.allotments">Kiskertek</string>
    <string name="type.landuse.brownfield">Barnamezős terület</string>
    <string name="type.landuse.construction">Építési terület</string>
+    <string name="type.landuse.field">Mező</string>
    <string name="type.landuse.garages">Garázssor</string>
    <string name="type.landuse.greenfield">Zöldmezős terület</string>
    <string name="type.landuse.greenhouse_horticulture">Üvegház</string>
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -1050,6 +1050,7 @@
    <string name="type.highway.footway.area">Svæði fyrir fótgangandi</string>
    <string name="type.highway.pedestrian.area">Svæði fyrir fótgangandi</string>
    <string name="type.historic.tank">Sögulegur skriðdreki</string>
+    <string name="type.landuse.field">Akur</string>
    <string name="type.place.ocean">Úthaf</string>
    <string name="type.shop.bathroom_furnishing">Baðherbergisinnréttingar</string>
    <string name="type.shop.garden_centre">Garðvöruverslun</string>
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -1331,6 +1331,7 @@
    <string name="type.public_transport.platform">Banchina</string>
    <string name="type.railway.abandoned.tunnel">Tunnel ferroviario abbandonato</string>
    <string name="type.railway.light_rail.tunnel">Tunnel metropolitana</string>
+    <string name="type.landuse.field">Campo</string>
    <string name="type.internet_access">Internet</string>
    <string name="type.landuse.greenfield">Zona selvaggia</string>
    <string name="type.railway.light_rail.bridge">Ponte metropolitana</string>
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -610,6 +610,7 @@
    <string name="type.landuse.education">קריית חינוך</string>
    <string name="type.landuse.farmland">אדמה חקלאית</string>
    <string name="type.landuse.farmyard">חצר חקלאית</string>
+    <string name="type.landuse.field">שדה</string>
    <string name="type.landuse.flowerbed">ערוגת פרחים</string>
    <string name="type.landuse.forest">יער</string>
    <string name="type.landuse.forest.coniferous">יער מחטניים</string>
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -354,7 +354,7 @@
    <string name="dialog_routing_disclaimer_priority">— 道路の状況や道路交通法、道路標識をナビゲーションよりも常に優先してください;</string>
    <string name="dialog_routing_disclaimer_precision">— マップは必ずしも正確であるとは限らず、また案内ルートが常に目的地までの最適なルートであるとは限りません。;</string>
    <string name="dialog_routing_disclaimer_recommendations">— 表示されるルートはあくまでも推奨ルートとしてご利用ください。;</string>
-    <string name="dialog_routing_disclaimer_borders">— 国境付近のルートにご注意ください。アプリの作成したルートは時々入国の許可されていない国への国境を超える場合があります。</string>
+    <string name="dialog_routing_disclaimer_borders">— 国境付近のルートにご注意ください。アプリの作成したルートは時々入国の許可されていない国への国境を超える場合があります;</string>
    <string name="dialog_routing_disclaimer_beware">よく注意して安全運転を心がけましょう！</string>
    <string name="dialog_routing_check_gps">GPS信号をご確認ください</string>
    <string name="dialog_routing_error_location_not_found">案内ルートを作成できません。現在のGPS座標が認識できません。</string>
@@ -799,7 +799,7 @@
    <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
    <string name="car_used_on_the_phone_screen">端末の画面でCoMapsを使用している</string>
    <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">あなたは今、車の画面でCoMapsを使用している</string>
+    <string name="car_used_on_the_car_screen">あなたは今、車の画面でオCoMapsを使用している</string>
    <!-- Displayed on the phone screen. Android Auto connected -->
    <string name="aa_connected_title">アンドロイド・オートに接続している</string>
    <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -824,7 +824,7 @@
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">音声合成システムの設定</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
-    <string name="pref_tts_no_system_tts">音声合成の設定が見つからなかった、お使いのデバイスがサポートしていますか？</string>
+    <string name="pref_tts_no_system_tts">音声合成の設定が見つからなかった。</string>
    <string name="drive_through">ドライブスルー</string>
    <string name="clear_the_search">検索をクリアする</string>
    <string name="zoom_in">ズームイン</string>
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -1342,60 +1342,4 @@
    <string name="type.attraction.big_wheel">観覧車</string>
    <string name="type.man_made.crane">クレーン</string>
    <string name="type.mapswithme.grid">mapswithme-グリッド</string>
-    <string name="type.barrier.chain">チェーンポール</string>
-    <string name="type.cuisine.bubble_tea">タピオカティー</string>
-    <string name="type.piste_type.downhill.area">ダウンヒルスキー場</string>
-    <string name="type.railway.subway.bridge">地下鉄路線（橋）</string>
-    <string name="type.shop.caravan">RVディーラー</string>
-    <string name="type.highway.world_level">高速道路（世界レベル）</string>
-    <string name="type.railway.subway">地下鉄路線</string>
-    <string name="type.highway.elevator">エレベーター</string>
-    <string name="type.hwtag.private">私道タグ</string>
-    <string name="type.boundary.administrative.3">行政界</string>
-    <string name="type.boundary.administrative.4">行政界</string>
-    <string name="type.building.warehouse">倉庫</string>
-    <string name="type.emergency">緊急サービス</string>
-    <string name="type.highway.world_towns_level">高速道路（町レベル）</string>
-    <string name="type.hwtag">交通特性タグ</string>
-    <string name="type.hwtag.bidir_bicycle">双方向の自転車レーンタグ</string>
-    <string name="type.hwtag.onedir_bicycle">一方通行の自転車レーンタグ</string>
-    <string name="type.hwtag.lit">道路照明タグ</string>
-    <string name="type.hwtag.nobicycle">自転車通行禁止タグ</string>
-    <string name="type.hwtag.nocar">自動車通行禁止タグ</string>
-    <string name="type.hwtag.nofoot">歩行者通行禁止タグ</string>
-    <string name="type.hwtag.oneway">一方通行の道路タグ</string>
-    <string name="type.hwtag.toll">有料道路タグ</string>
-    <string name="type.hwtag.yesbicycle">自転車通行許可タグ</string>
-    <string name="type.hwtag.yescar">自動車通行許可タグ</string>
-    <string name="type.hwtag.yesfoot">歩行者通行許可タグ</string>
-    <string name="type.man_made.storage_tank">貯蔵タンク</string>
-    <string name="type.leisure.beach_resort">ビーチリゾート</string>
-    <string name="type.aerialway.j.bar">Jバーリフト</string>
-    <string name="type.aerialway.magic_carpet">スノーエスカレーター</string>
-    <string name="type.aerialway.platter">シュレップリフト</string>
-    <string name="type.aerialway.rope_tow">ロープトウ</string>
-    <string name="type.aerialway.t.bar">Tバーリフト</string>
-    <string name="type.piste_type.nordic">ノルディックスキーコース</string>
-    <string name="type.piste_type.sled">トボガンコース</string>
-    <string name="type.psurface">路面</string>
-    <string name="type.psurface.paved_bad">舗装路面（悪い）</string>
-    <string name="type.psurface.paved_good">舗装路面（良い）</string>
-    <string name="type.psurface.unpaved_bad">未舗装路面（悪い）</string>
-    <string name="type.psurface.unpaved_good">未舗装路面（良い）</string>
-    <string name="type.railway.subway.tunnel">地下鉄路線（トンネル）</string>
-    <string name="type.piste_type.downhill">ダウンヒルスキーコース</string>
-    <string name="type.piste_type.downhill.easy.area">初級者向けのダウンヒルスキー場</string>
-    <string name="type.piste_type.downhill.intermediate">中級者向けのダウンヒルスキーコース</string>
-    <string name="type.boundary.administrative.2">国境</string>
-    <string name="type.fee.yes">￥</string>
-    <string name="type.piste_type.downhill.novice">初心者向けのダウンヒルスキーコース</string>
-    <string name="type.piste_type.downhill.novice.area">初心者向けのダウンヒルスキー場</string>
-    <string name="type.mountain_pass">峠</string>
-    <string name="type.piste_type.downhill.advanced">上級者向けのダウンヒルスキーコース</string>
-    <string name="type.piste_type.downhill.advanced.area">上級者向けのダウンヒルスキー場</string>
-    <string name="type.piste_type.downhill.easy">初級者向けのダウンヒルスキーコース</string>
-    <string name="type.piste_type.downhill.expert">エキスパート向けのダウンヒルスキーコース</string>
-    <string name="type.piste_type.downhill.expert.area">エキスパート向けのダウンヒルスキー場</string>
-    <string name="type.piste_type.downhill.freeride">フリーライド用のダウンヒルスキーコース</string>
-    <string name="type.piste_type.downhill.intermediate.area">中級者向けのダウンヒルスキー場</string>
 </resources>
--- a/android/app/src/main/res/values-mr/types_strings.xml
+++ b/android/app/src/main/res/values-mr/types_strings.xml
@@ -502,6 +502,7 @@
    <string name="type.landuse.construction">बांधकाम</string>
    <string name="type.landuse.education">शैक्षणिक सुविधा</string>
    <string name="type.landuse.farmland">शेतजमीन</string>
+    <string name="type.landuse.field">क्षेत्र</string>
    <string name="type.landuse.flowerbed">फ्लॉवरबेड</string>
    <string name="type.landuse.forest">वन</string>
    <string name="type.landuse.forest.coniferous">शंकुमंत जंगल</string>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -38,15 +38,15 @@
    <string name="try_again">Probeer opnieuw</string>
    <string name="about_menu_title">Over CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Open project, gemaakt door de community</string>
+    <string name="about_headline">Gratis voor iedereen, met liefde gemaakt</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• Gebruiksvriendelijk en gestroomlijnd</string>
+    <string name="about_proposition_1">• Geen advertenties, geen tracking, geen gegevensverzameling</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_2">• Privacygericht en vrij van advertenties</string>
+    <string name="about_proposition_2">• Geen batterijverlies, werkt offline</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Offline, snel en compact</string>
+    <string name="about_proposition_3">• Snel, minimalistisch, ontwikkeld door de gemeenschap</string>
    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiën.</string>
+    <string name="about_developed_by_enthusiasts">Open-source applicatie gemaakt door enthousiastelingen en vrijwilligers.</string>
    <!-- The button that opens system location settings -->
    <string name="location_settings">Locatie-instellingen</string>
    <string name="close">Sluit</string>
@@ -300,9 +300,9 @@
    <!-- Item in context menu. -->
    <string name="downloader_update_map">Update kaart</string>
    <!-- Preference title -->
-    <string name="google_play_services">Google Fused-locatieservices</string>
+    <string name="google_play_services">Google Play-locatieservices</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Een propriëtaire dienst die GPS, Wi-Fi, mobiele netwerken, enzovoort combineert om je locatie nauwkeuriger te bepalen. Het kan verbinding maken met Google-servers.</string>
+    <string name="pref_use_google_play">Bepaal snel je locatie bij benadering via Bluetooth, WiFi of een mobiel netwerk</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -883,12 +883,4 @@
    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
    <string name="app_site_url">https://comaps.app/</string>
    <string name="bluesky">Bluesky</string>
-    <string name="saved">Opgeslagen</string>
-    <string name="codeberg">Codeberg</string>
-    <string name="pref_left_button_disable">Schakel uit</string>
-    <string name="error_enter_correct_fediverse_page">Voer een geldige Mastodon-gebruikersnaam of webadres in</string>
-    <string name="editor_level">Verdieping (0 is begane grond)</string>
-    <string name="editor_building_levels">Verdiepingen (incl. begane grond, excl. dak)</string>
-    <string name="error_enter_correct_level">Voer een geldig verdiepingnummer in</string>
-    <string name="error_enter_correct_bluesky_page">Voer een geldige Bluesky-gebruikersnaam of webadres in</string>
 </resources>
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -594,6 +594,7 @@
    <string name="type.landuse.education">Educatieve voorzieningen</string>
    <string name="type.landuse.farmland">Landbouwgrond</string>
    <string name="type.landuse.farmyard">Boerenerf</string>
+    <string name="type.landuse.field">Veld</string>
    <string name="type.landuse.flowerbed">Bloemenbed</string>
    <string name="type.landuse.forest">Bos</string>
    <string name="type.landuse.forest.coniferous">Naaldbos</string>
@@ -1395,9 +1396,6 @@
    <string name="type.amenity.food_court">Food court</string>
    <string name="type.highway.ladder">ladder</string>
    <string name="type.leisure.firepit">vuurplaats</string>
+    <string name="type.sport.diving">duiken</string>
    <string name="type.landuse.plant_nursery">plantenkwekerij</string>
-    <string name="type.man_made.crane">Kraan</string>
-    <string name="type.barrier.guard_rail">Vangrail</string>
-    <string name="type.amenity.love_hotel">Love Hotel</string>
-    <string name="type.amenity.studio">Studio</string>
 </resources>
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -594,6 +594,7 @@
    <string name="type.landuse.education">Placówki oświatowe</string>
    <string name="type.landuse.farmland">Grunt rolny</string>
    <string name="type.landuse.farmyard">Obejście gospodarskie</string>
+    <string name="type.landuse.field">Pole</string>
    <string name="type.landuse.flowerbed">Kwietnik</string>
    <string name="type.landuse.forest">Las</string>
    <string name="type.landuse.forest.coniferous">Las iglasty</string>
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -516,6 +516,7 @@
    <string name="type.landuse.education">Instituições educacionais</string>
    <string name="type.landuse.farmland">Campo agrícola</string>
    <string name="type.landuse.farmyard">Pátio de fazenda</string>
+    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Canteiro de flores</string>
    <string name="type.landuse.forest">Floresta</string>
    <string name="type.landuse.forest.coniferous">Floresta de coníferas</string>
@@ -1210,184 +1211,4 @@
    <string name="type.barrier.guard_rail">Guarda-corpo</string>
    <string name="type.highway.ladder">Escada</string>
    <string name="type.man_made.crane">Guindaste</string>
-    <string name="type.place.locality">Localidade</string>
-    <string name="type.historic.pillory">Pelourinho</string>
-    <string name="type.railway.rail.utility">Ferrovia Utilitária</string>
-    <string name="type.natural.shingle">Telha</string>
-    <string name="type.railway.rail.highspeed">Ferrovia de alta velocidade</string>
-    <string name="type.route.shuttle_train">rota-ônibus_trem</string>
-    <string name="type.historic.memorial.plaque">Placa Comemorativa</string>
-    <string name="type.natural.saddle">Sela de montanha</string>
-    <string name="type.place.country">País</string>
-    <string name="type.sport.beachvolleyball">Vôlei de praia</string>
-    <string name="type.historic.wayside_cross">Cruz à beira da estrada</string>
-    <string name="type.leisure.outdoor_seating">Assentos ao ar livre</string>
-    <string name="type.place.island">Ilha</string>
-    <string name="type.natural.heath">Charneca</string>
-    <string name="type.natural.wetland">Zona úmida</string>
-    <string name="type.historic.memorial.sculpture">Escultura</string>
-    <string name="type.historic.memorial.statue">Estátua</string>
-    <string name="type.historic.memorial.war_memorial">Memorial de Guerra</string>
-    <string name="type.historic.monument">Monumento</string>
-    <string name="type.historic.ruins">Ruínas Históricas</string>
-    <string name="type.historic.ship">Navio</string>
-    <string name="type.historic.tomb">Túmulo</string>
-    <string name="type.historic.wayside_shrine">Santuário à beira da estrada</string>
-    <string name="type.hwtag.toll">hwtag-pedágio</string>
-    <string name="type.hwtag.yesbicycle">hwtag-simbicicleta</string>
-    <string name="type.leisure.miniature_golf">Minigolfe</string>
-    <string name="type.man_made.petroleum_well">Poço de petróleo ou gás</string>
-    <string name="type.railway.rail.branch">Ramal Ferroviário</string>
-    <string name="type.railway.rail.spur">Ramal Ferroviário</string>
-    <string name="type.mountain_pass">Passo da Montanha</string>
-    <string name="type.natural">Natureza</string>
-    <string name="type.natural.bare_rock">Apenas Rock</string>
-    <string name="type.natural.bay">Baía</string>
-    <string name="type.natural.beach">Praia</string>
-    <string name="type.natural.beach.sand">Praia de areia</string>
-    <string name="type.natural.beach.gravel">Praia de cascalho</string>
-    <string name="type.natural.cape">Cabo</string>
-    <string name="type.natural.cave_entrance">Entrada da Caverna</string>
-    <string name="type.natural.cliff">Penhasco</string>
-    <string name="type.natural.earth_bank">Banco de Terras</string>
-    <string name="type.man_made.embankment">Aterro</string>
-    <string name="type.natural.coastline">Litoral</string>
-    <string name="type.natural.desert">Deserto</string>
-    <string name="type.natural.grassland">Pastagem</string>
-    <string name="type.natural.hot_spring">Fonte termal</string>
-    <string name="type.natural.water.lake">Lago</string>
-    <string name="type.natural.water.lock">Câmara de eclusa</string>
-    <string name="type.natural.water.pond">Lago</string>
-    <string name="type.natural.water.reservoir">Reservatório</string>
-    <string name="type.natural.water.basin">Bacia</string>
-    <string name="type.natural.water.river">Rio</string>
-    <string name="type.natural.land">Terra</string>
-    <string name="type.natural.meadow">Prado</string>
-    <string name="type.natural.orchard">Pomar</string>
-    <string name="type.natural.peak">Pico</string>
-    <string name="type.natural.rock">Pedra</string>
-    <string name="type.natural.scrub">Esfregar</string>
-    <string name="type.natural.spring">Fonte Natural</string>
-    <string name="type.natural.spring.drinking_water_no">Fonte Natural</string>
-    <string name="type.natural.strait">Estreito</string>
-    <string name="type.natural.tree_row">Fileira de árvores</string>
-    <string name="type.natural.vineyard">Vinhedo</string>
-    <string name="type.natural.volcano">Vulcão</string>
-    <string name="type.natural.water">Água</string>
-    <string name="type.natural.wetland.bog">Jardim</string>
-    <string name="type.natural.wetland.marsh">Pântano</string>
-    <string name="type.place.city">Cidade</string>
-    <string name="type.place.city.capital">Capital</string>
-    <string name="type.place.city.capital.10">Cidade</string>
-    <string name="type.place.city.capital.11">Cidade</string>
-    <string name="type.place.city.capital.6">Cidade</string>
-    <string name="type.place.continent">Continente</string>
-    <string name="type.place.county">Condado</string>
-    <string name="type.place.islet">Ilhota</string>
-    <string name="type.place.isolated_dwelling">Moradia Isolada</string>
-    <string name="type.place.ocean">Oceano</string>
-    <string name="type.railway.rail.tourism">Ferrovia Turística</string>
-    <string name="type.railway.rail.main">Ferrovia</string>
-    <string name="type.railway.rail.service">Trilho de serviço</string>
-    <string name="type.railway.rail.main.bridge">Ponte Ferroviária</string>
-    <string name="type.railway.rail.tunnel">Túnel Ferroviário</string>
-    <string name="type.sport.bowls">Tigelas</string>
-    <string name="type.sport.chess">Xadrez</string>
-    <string name="type.sport.gymnastics">Ginástica</string>
-    <string name="type.sport.skiing">Esqui</string>
-    <string name="type.sport.ice_hockey">Hóquei no gelo</string>
-    <string name="type.sport.pelota">Pelota Basca</string>
-    <string name="type.barrier.ditch">Fosso</string>
-    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
-    <string name="type.tourism.chalet">Casa de férias</string>
-    <string name="type.railway.rail.main.tunnel">Túnel ferroviário</string>
-    <string name="type.tourism.attraction">Atração turística</string>
-    <string name="type.tourism.motel">Motel</string>
-    <string name="type.sport.golf">Golfe</string>
-    <string name="type.place.square">Praça ou largo</string>
-    <string name="type.sport.skateboard">Skate</string>
-    <string name="type.tourism.wilderness_hut">Cabana</string>
-    <string name="type.tourism.artwork.sculpture">Escultura</string>
-    <string name="type.psurface">psurface</string>
-    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
-    <string name="type.psurface.paved_good">psurface-paved_good</string>
-    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
-    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
-    <string name="type.hwtag.lit">hwtag-lit</string>
-    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
-    <string name="type.hwtag.nocar">hwtag-nocar</string>
-    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
-    <string name="type.hwtag.oneway">hwtag-oneway</string>
-    <string name="type.hwtag.private">hwtag-private</string>
-    <string name="type.hwtag.yescar">hwtag-yescar</string>
-    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
-    <string name="type.attraction.big_wheel">Roda-gigante</string>
-    <string name="type.attraction.carousel">Carrossel</string>
-    <string name="type.attraction.historic">Atração histórica</string>
-    <string name="type.attraction.maze">Labirinto</string>
-    <string name="type.place.city.capital.2">Capital</string>
-    <string name="type.place.city.capital.3">Cidade</string>
-    <string name="type.place.city.capital.4">Cidade</string>
-    <string name="type.place.city.capital.7">Cidade</string>
-    <string name="type.place.city.capital.8">Cidade</string>
-    <string name="type.place.city.capital.9">Cidade</string>
-    <string name="type.place.region">Região</string>
-    <string name="type.place.state">Estado</string>
-    <string name="type.place.state.USA">Estado</string>
-    <string name="type.place.town">Cidade</string>
-    <string name="type.place.village">Vila</string>
-    <string name="type.railway.rail.bridge">Ponte ferroviária</string>
-    <string name="type.railway.rail.highspeed.bridge">Ponte ferroviária</string>
-    <string name="type.railway.rail.tourism.bridge">Ponte ferroviária</string>
-    <string name="type.railway.rail.branch.bridge">Ponte ferroviária</string>
-    <string name="type.railway.rail.utility.bridge">Ponte ferroviária</string>
-    <string name="type.railway.rail.spur.bridge">Ponte ferroviária</string>
-    <string name="type.railway.rail.highspeed.tunnel">Túnel ferroviário</string>
-    <string name="type.railway.rail.tourism.tunnel">Túnel ferroviário</string>
-    <string name="type.railway.rail.branch.tunnel">Túnel ferroviário</string>
-    <string name="type.railway.rail.utility.tunnel">Túnel ferroviário</string>
-    <string name="type.railway.rail.spur.tunnel">Túnel ferroviário</string>
-    <string name="type.railway.rail.service.tunnel">Túnel ferroviário</string>
-    <string name="type.sport.cricket">Críquete</string>
-    <string name="type.sport.shooting">Tiro desportivo</string>
-    <string name="type.sport.soccer">Futebol</string>
-    <string name="type.sport.volleyball">Voleibol</string>
-    <string name="type.sport.10pin">Boliche</string>
-    <string name="type.sport.9pin">Boliche</string>
-    <string name="type.sport.field_hockey">Hóquei em campo</string>
-    <string name="type.tourism.aquarium">Aquário</string>
-    <string name="type.tourism.artwork">Obra de arte</string>
-    <string name="type.tourism.artwork.painting">Pintura</string>
-    <string name="type.tourism.artwork.statue">Estátua</string>
-    <string name="type.attraction.amusement_ride">Atração de parque de diversão</string>
-    <string name="type.attraction.animal">Recinto para animais</string>
-    <string name="type.attraction.roller_coaster">Montanha-russa</string>
-    <string name="type.tourism.attraction.specified">Atração turística</string>
-    <string name="type.tourism.gallery">Galeria de arte</string>
-    <string name="type.tourism.hostel">Hostel</string>
-    <string name="type.tourism.hotel">Hotel</string>
-    <string name="type.tourism.information.board">Painel de informações</string>
-    <string name="type.tourism.information.guidepost">Poste com direções</string>
-    <string name="type.tourism.information.map">Mapa turístico</string>
-    <string name="type.tourism.museum">Museu</string>
-    <string name="type.tourism.picnic_site">Local de piqueniques</string>
-    <string name="type.tourism.theme_park">Parque de diversão</string>
-    <string name="type.traffic_calming">Redutor de velocidade</string>
-    <string name="type.waterway">Curso de água</string>
-    <string name="type.waterway.canal.tunnel">Túnel de canal</string>
-    <string name="type.waterway.fish_pass">Escada de peixes</string>
-    <string name="type.waterway.dam">Barragem</string>
-    <string name="type.waterway.ditch.tunnel">Bueiro</string>
-    <string name="type.waterway.dock">Doca</string>
-    <string name="type.waterway.drain">Valeta de drenagem</string>
-    <string name="type.natural.water.drain">Valeta de drenagem</string>
-    <string name="type.waterway.drain.tunnel">Bueiro</string>
-    <string name="type.waterway.lock_gate">Comporta de eclusa</string>
-    <string name="type.piste_type.snow_park">Parque de neve</string>
-    <string name="type.shop.auction">Leilão</string>
-    <string name="type.place.sea">Mar</string>
-    <string name="type.place.city.capital.5">Cidade</string>
-    <string name="type.shop.pasta">Loja de massas</string>
-    <string name="type.railway.rail.service.bridge">Ponte ferroviária</string>
-    <string name="type.shop.hearing_aids">Loja de aparelhos auditivos</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -38,7 +38,7 @@
    <string name="try_again">Tentar novamente</string>
    <string name="about_menu_title">Sobre o CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Projeto aberto desenvolvido pela comunidade</string>
+    <string name="about_headline">Projeto aberto alimentado pela comunidade</string>
    <!-- Text in About screen -->
    <string name="about_proposition_1">• Fácil de usar e polido</string>
    <!-- Text in About screen -->
@@ -88,9 +88,9 @@
    <!-- Header of settings activity where user defines storage path -->
    <string name="maps_storage">Guardar mapas em</string>
    <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecione uma pasta para onde os mapas devem ser descarregados.</string>
+    <string name="maps_storage_summary">Selecione o local onde os mapas devem ser descarregados</string>
    <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-    <string name="maps_storage_downloaded">Mapas Descarregados</string>
+    <string name="maps_storage_downloaded">Mapas</string>
    <!-- Question dialog for transferring maps from one storage to another -->
    <string name="move_maps">Mover mapas?</string>
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
@@ -822,7 +822,7 @@
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">O trajeto está vazio - não há nada para guardar</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Não é possível apresentar a caixa de diálogo de seleção de pastas porque não está instalada nenhuma aplicação adequada no seu dispositivo. Instale uma aplicação de gestão de ficheiros e tente novamente.</string>
+    <string name="error_no_file_manager_app">Não é possível apresentar a caixa de diálogo de seleção de pastas porque não está instalada nenhuma aplicação adequada no seu dispositivo. Instale uma aplicação de gestão de ficheiros e tente novamente</string>
    <string name="choose_color">Escolher cor</string>
    <string name="edit_track">Editar trajeto</string>
    <string name="uri_open_location_failed">Nenhuma aplicação instalada que possa abrir a localização</string>
@@ -859,26 +859,4 @@
    <string name="delete_place_empty_comment_error">Por favor indique a razão para apagar este local</string>
    <string name="editor_building_levels">Pisos (inc. rés de chão, excl. telhado)</string>
    <string name="error_enter_correct_level">Introduza um número de piso válido</string>
-    <string name="saved">Guardado</string>
-    <string name="codeberg">Codeberg</string>
-    <string name="disk_error">Não foi possível criar a pasta e mover os ficheiros no Armazenamento Interno do dispositivo ou no Cartão SD</string>
-    <string name="enable_show_on_lock_screen_description">Quando ativado, a aplicação irá funcionar sobre o ecrã de bloqueio mesmo quando o dispositivo estiver bloqueado.</string>
-    <string name="pref_left_button_disable">Desativar</string>
-    <string name="error_enter_correct_facebook_page">Introduza um endereço web válido para uma conta ou página de Facebook</string>
-    <string name="error_enter_correct_instagram_page">Introduza um nome de utilizador ou endereço web de Instagram válido</string>
-    <string name="error_enter_correct_twitter_page">Introduza um nome de utilizador ou endereço web do Twitter válido</string>
-    <string name="error_enter_correct_vk_page">Introduza um nome de utilizador ou endereço web de VK válido</string>
-    <string name="error_enter_correct_fediverse_page">Introduza um nome de utilizador ou endereço web do Mastodon válido</string>
-    <string name="error_enter_correct_bluesky_page">Introduza um nome de utilizador ou endereço web de Bluesky válido</string>
-    <string name="disk_error_title">Erro no disco</string>
-    <string name="disconnect_usb_cable_title">Desconecte o cabo USB</string>
-    <string name="enable_show_on_lock_screen">Mostrar no ecrã de bloqueio</string>
-    <string name="change_map_locale">Idioma do mapa</string>
-    <string name="telegram_url">https://t.me/CoMapsApp/</string>
-    <string name="instagram_url">https://www.instagram.com/comapscommunity</string>
-    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
-    <string name="translated_om_site_url">https://comaps.app/</string>
-    <string name="comma_separated_pair">%1$s, %2$s</string>
-    <string name="pref_left_button_title">Configuração do botão esquerdo</string>
-    <string name="error_enter_correct_line_page">Insira um ID de linha ou endereço da web válido</string>
 </resources>
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -582,6 +582,7 @@
    <string name="type.landuse.construction">Construção</string>
    <string name="type.landuse.farmland">Campo agrícola</string>
    <string name="type.landuse.farmyard">Pátio de quinta</string>
+    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Canteiro de flores</string>
    <string name="type.landuse.forest">Floresta</string>
    <string name="type.landuse.forest.coniferous">Floresta de coníferas</string>
@@ -1341,65 +1342,4 @@
    <string name="type.amenity.dojo">Dojo</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Pavilhão desportivo</string>
-    <string name="type.cuisine.bubble_tea">Chá de bolhas</string>
-    <string name="type.man_made.crane">Guindaste</string>
-    <string name="type.power.pole">Poste de energia</string>
-    <string name="type.highway.elevator">Elevador</string>
-    <string name="type.landuse.plant_nursery">Viveiro de plantas</string>
-    <string name="type.recycling.cardboard">Cartão</string>
-    <string name="type.highway.ladder">Escada</string>
-    <string name="type.hwtag">hwtag</string>
-    <string name="type.amenity.studio">Estúdio</string>
-    <string name="type.amenity.vending_machine.sweets">Dispensador de doces</string>
-    <string name="type.psurface.unpaved_bad">psurface-não pavimentado_ruim</string>
-    <string name="type.route.shuttle_train">rota-ônibus_trem</string>
-    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicicleta</string>
-    <string name="type.recycling.cans">Latas</string>
-    <string name="type.amenity.love_hotel">Hotel do Amor</string>
-    <string name="type.recycling.shoes">Sapato</string>
-    <string name="type.recycling.green_waste">Resíduos Verdes/Orgânicos</string>
-    <string name="type.recycling.cartons">Caixas</string>
-    <string name="type.amenity.sanitary_dump_station">Estação de despejo de tanques de retenção</string>
-    <string name="type.amenity.vending_machine.coffee">Dispensador de café</string>
-    <string name="type.amenity.vending_machine.condoms">Distribuidor de preservativos</string>
-    <string name="type.amenity.vending_machine.food">Distribuidor de alimentos</string>
-    <string name="type.amenity.vending_machine.newspapers">Distribuidor de jornais</string>
-    <string name="type.amenity.vending_machine.excrement_bags">Dispensador de sacos de excrementos</string>
-    <string name="type.amenity.vending_machine.fuel">Bomba de combustível</string>
-    <string name="type.amenity.waste_transfer_station">Estação de Transferência de Resíduos</string>
-    <string name="type.barrier.chain">Corrente</string>
-    <string name="type.barrier.guard_rail">Guarda-corpo</string>
-    <string name="type.fee.yes">$</string>
-    <string name="type.highway.world_level">nível mundial de rodovias</string>
-    <string name="type.highway.world_towns_level">nível_das_cidades_do_mundo_das_rodovias</string>
-    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicicleta</string>
-    <string name="type.hwtag.lit">hwtag-lit</string>
-    <string name="type.hwtag.yesbicycle">hwtag-simbicicleta</string>
-    <string name="type.leisure.hackerspace">Hackerspace</string>
-    <string name="type.leisure.firepit">Fogueira</string>
-    <string name="type.leisure.beach_resort">Resort de praia</string>
-    <string name="type.man_made.survey_point">Ponto de Levantamento</string>
-    <string name="type.man_made.flagpole">Mastro de bandeira</string>
-    <string name="type.man_made.mast">Mastro</string>
-    <string name="type.man_made.silo">Silo</string>
-    <string name="type.man_made.storage_tank">Tanque de armazenamento</string>
-    <string name="type.mapswithme">mapascomigo</string>
-    <string name="type.mapswithme.grid">mapascom-me-grade</string>
-    <string name="type.mountain_pass">Passo da Montanha</string>
-    <string name="type.man_made.utility_pole">Poste de serviço público</string>
-    <string name="type.psurface">superfície p</string>
-    <string name="type.psurface.paved_bad">superfície pavimentada ruim</string>
-    <string name="type.psurface.paved_good">superfície pavimentada_boa</string>
-    <string name="type.shop.caravan">Concessionária de RV</string>
-    <string name="type.sport.diving">Mergulho alto</string>
-    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
-    <string name="type.hwtag.nocar">hwtag-nocar</string>
-    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
-    <string name="type.hwtag.oneway">hwtag-oneway</string>
-    <string name="type.hwtag.private">hwtag-private</string>
-    <string name="type.hwtag.toll">hwtag-toll</string>
-    <string name="type.hwtag.yescar">hwtag-yescar</string>
-    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
-    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
-    <string name="type.landuse.education">Instalação Educativa</string>
 </resources>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -898,10 +898,4 @@
    <string name="app_site_url">https://comaps.app/ru/</string>
    <string name="bluesky">Bluesky</string>
    <string name="codeberg">Codeberg</string>
-    <string name="saved">Сохранено</string>
-    <string name="pref_left_button_disable">Выключить</string>
-    <string name="pref_left_button_title">Настройки левой кнопки</string>
-    <string name="editor_building_levels">Этажей (вкл. подвалы искл. крышу)</string>
-    <string name="editor_level">Этаж (0 это первый этаж)</string>
-    <string name="error_enter_correct_level">Введите правильный номер этажа</string>
 </resources>
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -600,6 +600,7 @@
    <string name="type.landuse.education">Образовательные учреждения</string>
    <string name="type.landuse.farmland">Сельскохозяйственная земля</string>
    <string name="type.landuse.farmyard">Сельскохозяйственная земля</string>
+    <string name="type.landuse.field">Поле</string>
    <string name="type.landuse.flowerbed">Клумба</string>
    <string name="type.landuse.forest">Лес</string>
    <string name="type.landuse.forest.coniferous">Хвойный лес</string>
@@ -1390,16 +1391,6 @@
    <string name="type.amenity.studio">Студия</string>
    <string name="type.leisure.firepit">Место разведения костра</string>
    <string name="type.highway.ladder">Лестница-лаз</string>
-    <string name="type.sport.diving">Высотные прыжки в воду</string>
+    <string name="type.sport.diving">Подводное плавание</string>
    <string name="type.amenity.love_hotel">Любовный отель</string>
-    <string name="type.man_made.crane">Кран</string>
-    <string name="type.hwtag.nofoot">Не пешая</string>
-    <string name="type.hwtag.nocar">Не для машин</string>
-    <string name="type.hwtag">Дорожный знак</string>
-    <string name="type.hwtag.yesbicycle">Велосипедам можно</string>
-    <string name="type.hwtag.yescar">Машинам можно</string>
-    <string name="type.hwtag.yesfoot">Пешком можно</string>
-    <string name="type.mapswithme">mapswithme</string>
-    <string name="type.mapswithme.grid">mapswithme-сетка</string>
-    <string name="type.route.shuttle_train">Челночный поезд</string>
 </resources>
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -587,6 +587,7 @@
    <string name="type.landuse.education">Vzdelávacia inštitúcia</string>
    <string name="type.landuse.farmland">Poľnohospodárska pôda</string>
    <string name="type.landuse.farmyard">Poľnohospodárske budovy</string>
+    <string name="type.landuse.field">Pole</string>
    <string name="type.landuse.flowerbed">Záhon</string>
    <string name="type.landuse.forest">Les</string>
    <string name="type.landuse.forest.coniferous">Ihličnatý les</string>
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -599,6 +599,7 @@
    <string name="type.landuse.education">Образовна установа</string>
    <string name="type.landuse.farmland">Пољопривредно земљиште</string>
    <string name="type.landuse.farmyard">Пољопривредно земљиште</string>
+    <string name="type.landuse.field">Поље</string>
    <string name="type.landuse.flowerbed">Цветно острво</string>
    <string name="type.landuse.forest">Шума</string>
    <string name="type.landuse.forest.coniferous">Четинарска шума</string>
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1210,6 +1210,7 @@
    <string name="type.landuse">Markanvändning</string>
    <string name="type.landuse.construction">Byggarbetsplats</string>
    <string name="type.landuse.farmyard">Gård</string>
+    <string name="type.landuse.field">Åkermark</string>
    <string name="type.landuse.garages">Garage</string>
    <string name="type.landuse.greenhouse_horticulture">Växthus</string>
    <string name="type.landuse.industrial">Industriområde</string>
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -894,5 +894,4 @@
    <string name="error_enter_correct_bluesky_page">Gireceğiniz Bluesky kullanıcı adı ve adresi halihazırda mevcut olmalı</string>
    <string name="editor_building_levels">Katlar (zemin kat dahil, çatı hariç)</string>
    <string name="editor_level">Giriş (0 zemin kattır)</string>
-    <string name="error_enter_correct_level">Geçerli kat numarası girin</string>
 </resources>
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -591,6 +591,7 @@
    <string name="type.landuse.construction">Yapı</string>
    <string name="type.landuse.farmland">Tarım Arazileri</string>
    <string name="type.landuse.farmyard">Çiftlik Bölgesi</string>
+    <string name="type.landuse.field">Alan</string>
    <string name="type.landuse.flowerbed">Çiçeklik</string>
    <string name="type.landuse.forest">Orman</string>
    <string name="type.landuse.forest.coniferous">Çam Ormanı</string>
@@ -1369,9 +1370,4 @@
    <string name="type.amenity.studio">Stüdyo</string>
    <string name="type.sport.diving">Dalış Sporu</string>
    <string name="type.man_made.survey_point">Anket Noktası</string>
-    <string name="type.highway.ladder">Merdiven</string>
-    <string name="type.man_made.crane">Vinç</string>
-    <string name="type.leisure.firepit">Ateş çukuru</string>
-    <string name="type.landuse.plant_nursery">Fidanlık</string>
-    <string name="type.barrier.guard_rail">Korkuluk</string>
 </resources>
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -597,6 +597,7 @@
    <string name="type.landuse.education">Освітній заклади</string>
    <string name="type.landuse.farmland">Сільськогосподарська земля</string>
    <string name="type.landuse.farmyard">Сільськогосподарська земля</string>
+    <string name="type.landuse.field">Поле</string>
    <string name="type.landuse.flowerbed">Квітник</string>
    <string name="type.landuse.forest">Ліс</string>
    <string name="type.landuse.forest.coniferous">Хвойний ліс</string>
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -595,6 +595,7 @@
    <string name="type.landuse.education">教育設施</string>
    <string name="type.landuse.farmland">農業用地</string>
    <string name="type.landuse.farmyard">農家庭院</string>
+    <string name="type.landuse.field">田地</string>
    <string name="type.landuse.flowerbed">花壇</string>
    <string name="type.landuse.forest">樹林</string>
    <string name="type.landuse.forest.coniferous">樹林</string>
@@ -1282,17 +1283,4 @@
    <string name="type.attraction.bumper_car">碰碰車</string>
    <string name="type.leisure.track">賽道</string>
    <string name="type.mapswithme">mapswithme</string>
-    <string name="type.leisure.track.area">賽道</string>
-    <string name="type.railway">鐵路要素</string>
-    <string name="type.amenity.studio">影樓</string>
-    <string name="type.fee.yes">$</string>
-    <string name="type.amenity.love_hotel">情侶酒店</string>
-    <string name="type.recycling.cardboard">卡紙</string>
-    <string name="type.recycling.cans">金屬罐</string>
-    <string name="type.recycling.shoes">鞋</string>
-    <string name="type.recycling.green_waste">園林/有機廢物</string>
-    <string name="type.recycling.cartons">紙皮箱</string>
-    <string name="type.barrier.guard_rail">安全護欄</string>
-    <string name="type.highway.ladder">梯</string>
-    <string name="type.route.ferry">航線</string>
 </resources>
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -893,7 +893,4 @@
    <string name="bluesky">Bluesky</string>
    <string name="pref_left_button_disable">停用</string>
    <string name="pref_left_button_title">左側按鈕設定</string>
-    <string name="editor_level">樓層（0 為地面層）</string>
-    <string name="editor_building_levels">樓層（含地面層，不含屋頂）</string>
-    <string name="error_enter_correct_level">請輸入有效的樓層數</string>
 </resources>
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -121,7 +121,4 @@
    <string name="type.piste_type.nordic">北歐滑雪道</string>
    <string name="type.piste_type.sled.area">雪橇滑道區</string>
    <string name="type.piste_type.sled">雪橇滑道</string>
-    <string name="type.fee.no">免費</string>
-    <string name="type.healthcare.laboratory">醫學實驗室</string>
-    <string name="type.fee.yes">$</string>
 </resources>
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -596,6 +596,7 @@
    <string name="type.landuse.education">教育设施</string>
    <string name="type.landuse.farmland">农业用地</string>
    <string name="type.landuse.farmyard">农家庭院</string>
+    <string name="type.landuse.field">田地</string>
    <string name="type.landuse.flowerbed">花坛</string>
    <string name="type.landuse.forest">森林</string>
    <string name="type.landuse.forest.coniferous">针叶林</string>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -30,7 +30,6 @@
  <color name="black_16">#29000000</color> <!-- 16% black -->
  <color name="black_20">#33000000</color> <!-- 20% black -->
  <color name="black_24">#3D000000</color> <!-- 24% black -->
-  <color name="black_30">#4D000000</color>  <!-- 30% black -->
  <color name="black_38">#61000000</color>  <!-- 38% black -->
  <color name="black_40">#66000000</color>  <!-- 40% black -->
  <color name="black_50">#80000000</color> <!-- 50% black -->
@@ -125,8 +124,8 @@
  <!-- LanesView -->
  <color name="nav_lane_arrow_active_light">@color/white_primary</color>
  <color name="nav_lane_arrow_active_night">@color/black_primary</color>
-  <color name="nav_lane_arrow_inactive_light">@color/black_30</color>
-  <color name="nav_lane_arrow_inactive_night">@color/black_30</color>
+  <color name="nav_lane_arrow_inactive_light">@color/black_20</color>
+  <color name="nav_lane_arrow_inactive_night">@color/black_20</color>

  <!-- Editor -->
  <color name="bg_editor_light">#FFF2F6F6</color>
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -620,6 +620,7 @@
    <string name="type.landuse.education">Educational Facility</string>
    <string name="type.landuse.farmland">Farmland</string>
    <string name="type.landuse.farmyard">Farmyard</string>
+    <string name="type.landuse.field">Field</string>
    <string name="type.landuse.flowerbed">Flowerbed</string>
    <string name="type.landuse.forest">Forest</string>
    <string name="type.landuse.forest.coniferous">Coniferous Forest</string>
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -627,6 +627,7 @@ world  +
        education  -
        farmland  -
        farmyard  -
+        field  -
        flowerbed  -
        forest  +
            coniferous  -
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -200,15 +200,11 @@
 9211020
 9326109
 9404166
-9482692
-9614535
 9682745
 9718290
-9746121
 9815480
 9868939
 9868950
-9877964
 10066329
 10167040
 10167474
@@ -219,6 +215,7 @@
 10395294
 10426903
 10592406
+10597310
 10790054
 11053224
 11057133
@@ -279,7 +276,6 @@
 15263452
 15263939
 15265772
-15524822
 15592411
 15592899
 15656370
@@ -338,11 +334,7 @@
 16775925
 16776958
 16777215
-221978645
-222898459
 223300167
-233867264
-234004016
 234881023
 436602368
 437326080
@@ -376,12 +368,12 @@
 654706176
 655629312
 658186261
-659106075
 659244611
+660157219
 666290539
 670074880
-670211632
 670398976
+670414670
 671088382
 671088639
 856032768
@@ -443,10 +435,6 @@
 872414974
 872415231
 1074136576
-1077616661
-1078536475
-1089642032
-1089829376
 1090519039
 1216522952
 1291845632
@@ -491,6 +479,7 @@
 1297305067
 1297438037
 1297563187
+1297691427
 1297898577
 1297898588
 1298019613
@@ -536,6 +525,7 @@
 1307504366
 1307744024
 1307747648
+1307948878
 1307961558
 1307962074
 1307964388
--- a/data/conf/isolines/add_missing_countries.py
+++ b/data/conf/isolines/add_missing_countries.py
@@ -19,7 +19,7 @@ with open('countries-to-generate.json') as f1:
      entry = {
            "key": c,
            "value": {
-                "profileName": "poor",
+                "profileName": "normal",
                "tileCoordsSubset": list(),
                "tilesAreBanned": False
            }
--- a/data/conf/isolines/countries-to-generate.json
+++ b/data/conf/isolines/countries-to-generate.json
@@ -9691,262 +9691,6 @@
                "tileCoordsSubset": [],
                "tilesAreBanned": false
            }
-        },
-        {
-            "key": "Angola",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Australia_Northern Territory",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Australia_Queensland",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Australia_Western Australia",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Brazil_Mato Grosso",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Brazil_North Region_East",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Brazil_North Region_West",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Cameroon_Central",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Canada_Nunavut_North",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Canada_Nunavut_South",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "China_Gansu",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "China_Sichuan",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Colombia_East",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Congo-Kinshasa_West",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Indonesia_Central",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Indonesia_West",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Iran_East",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Kenya",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Libya",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Madagascar",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Malaysia",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Mali",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Mongolia",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Mozambique",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Myanmar",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Vietnam",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Nigeria_South",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Russia_Krasnoyarsk Krai_North",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Russia_Sakha Republic",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Tanzania",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Zambia",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
-        },
-        {
-            "key": "Zimbabwe",
-            "value": {
-                "profileName": "poor",
-                "tileCoordsSubset": [],
-                "tilesAreBanned": false
-            }
        }
    ]
-}
+}
--- a/data/conf/isolines/isolines-profiles.json
+++ b/data/conf/isolines/isolines-profiles.json
@@ -63,10 +63,22 @@
        {
            "key": "poor",
            "value": {
-                "alitudesStep": 100,
+                "alitudesStep": 500,
                "gaussianFilterRFactor": 1.0,
                "gaussianFilterStDev": 2.0,
-                "latLonStepFactor": 4,
+                "latLonStepFactor": 2,
+                "maxIsolinesLength": 500,
+                "medianFilterR": 1,
+                "simplificationZoom": 14
+            }
+        },
+        {
+            "key": "extra_poor",
+            "value": {
+                "alitudesStep": 1000,
+                "gaussianFilterRFactor": 1.0,
+                "gaussianFilterStDev": 2.0,
+                "latLonStepFactor": 2,
                "maxIsolinesLength": 500,
                "medianFilterR": 1,
                "simplificationZoom": 14
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
--- a/data/drules_proto_default_dark.bin
+++ b/data/drules_proto_default_dark.bin
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -9672,10 +9672,6 @@ cont {
  name: "amenity-place_of_worship"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-s"
      priority: 4150
@@ -9693,10 +9689,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-m"
      priority: 4150
@@ -9822,10 +9814,6 @@ cont {
  name: "amenity-place_of_worship-buddhist"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "buddhist-s"
      priority: 4200
@@ -9843,10 +9831,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "buddhist-m"
      priority: 4200
@@ -9972,10 +9956,6 @@ cont {
  name: "amenity-place_of_worship-christian"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "christian-s"
      priority: 4200
@@ -9993,10 +9973,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "christian-m"
      priority: 4200
@@ -10122,10 +10098,6 @@ cont {
  name: "amenity-place_of_worship-christian-jehovahs_witness"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-s"
      priority: 4200
@@ -10143,10 +10115,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-m"
      priority: 4200
@@ -10272,10 +10240,6 @@ cont {
  name: "amenity-place_of_worship-christian-mormon"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "mormon-s"
      priority: 4200
@@ -10293,10 +10257,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "mormon-m"
      priority: 4200
@@ -10422,10 +10382,6 @@ cont {
  name: "amenity-place_of_worship-hindu"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "hindu-s"
      priority: 4200
@@ -10443,10 +10399,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "hindu-m"
      priority: 4200
@@ -10572,10 +10524,6 @@ cont {
  name: "amenity-place_of_worship-jewish"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "jewish-s"
      priority: 4200
@@ -10593,10 +10541,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "jewish-m"
      priority: 4200
@@ -10722,10 +10666,6 @@ cont {
  name: "amenity-place_of_worship-muslim"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "muslim-s"
      priority: 4200
@@ -10743,10 +10683,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "muslim-m"
      priority: 4200
@@ -10872,10 +10808,6 @@ cont {
  name: "amenity-place_of_worship-shinto"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "shinto-s"
      priority: 4200
@@ -10893,10 +10825,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "shinto-m"
      priority: 4200
@@ -11022,10 +10950,6 @@ cont {
  name: "amenity-place_of_worship-taoist"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "taoist-s"
      priority: 4200
@@ -11043,10 +10967,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "taoist-m"
      priority: 4200
@@ -11170,19 +11090,8 @@ cont {
 }
 cont {
  name: "amenity-police"
-  element {
-    scale: 16
-    area {
-      color: 2499106
-      priority: -1830
-    }
-  }
  element {
    scale: 17
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -11199,10 +11108,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -11219,10 +11124,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -11239,10 +11140,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -25949,7 +25846,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -25974,7 +25871,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -25999,7 +25896,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -26024,7 +25921,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 1077616661
+      color: 1297691427
      priority: 228
      cap: BUTTCAP
    }
@@ -26048,7 +25945,7 @@ cont {
    scale: 14
    lines {
      width: 2.7
-      color: 658186261
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -26072,7 +25969,7 @@ cont {
    scale: 15
    lines {
      width: 3.7
-      color: 658186261
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -26096,7 +25993,7 @@ cont {
    scale: 16
    lines {
      width: 5.1
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26119,7 +26016,7 @@ cont {
    scale: 17
    lines {
      width: 6.7
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26142,7 +26039,7 @@ cont {
    scale: 18
    lines {
      width: 9.5
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26165,7 +26062,7 @@ cont {
    scale: 19
    lines {
      width: 11.7
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26188,7 +26085,7 @@ cont {
    scale: 20
    lines {
      width: 11.7
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26214,7 +26111,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -26239,7 +26136,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -26264,7 +26161,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -26289,7 +26186,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 1077616661
+      color: 1297691427
      priority: 228
      cap: BUTTCAP
    }
@@ -26325,7 +26222,7 @@ cont {
    }
    lines {
      width: 2.7
-      color: 658186261
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -26361,7 +26258,7 @@ cont {
    }
    lines {
      width: 3.7
-      color: 658186261
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -26397,7 +26294,7 @@ cont {
    }
    lines {
      width: 5.1
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26432,7 +26329,7 @@ cont {
    }
    lines {
      width: 6.7
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26467,7 +26364,7 @@ cont {
    }
    lines {
      width: 9.5
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26502,7 +26399,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26537,7 +26434,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 221978645
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -26563,7 +26460,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -26588,7 +26485,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -26613,7 +26510,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 1077616661
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -37905,7 +37802,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -37930,7 +37827,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -37955,7 +37852,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -37980,7 +37877,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 1078536475
+      color: 1297691427
      priority: 228
      cap: BUTTCAP
    }
@@ -38004,7 +37901,7 @@ cont {
    scale: 14
    lines {
      width: 2.7
-      color: 659106075
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -38028,7 +37925,7 @@ cont {
    scale: 15
    lines {
      width: 3.7
-      color: 659106075
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -38052,7 +37949,7 @@ cont {
    scale: 16
    lines {
      width: 5.1
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38075,7 +37972,7 @@ cont {
    scale: 17
    lines {
      width: 6.7
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38098,7 +37995,7 @@ cont {
    scale: 18
    lines {
      width: 9.5
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38121,7 +38018,7 @@ cont {
    scale: 19
    lines {
      width: 11.7
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38144,7 +38041,7 @@ cont {
    scale: 20
    lines {
      width: 11.7
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38170,7 +38067,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -38195,7 +38092,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -38220,7 +38117,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -38245,7 +38142,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 1078536475
+      color: 1297691427
      priority: 228
      cap: BUTTCAP
    }
@@ -38281,7 +38178,7 @@ cont {
    }
    lines {
      width: 2.7
-      color: 659106075
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -38317,7 +38214,7 @@ cont {
    }
    lines {
      width: 3.7
-      color: 659106075
+      color: 660157219
      priority: 228
      cap: BUTTCAP
    }
@@ -38353,7 +38250,7 @@ cont {
    }
    lines {
      width: 5.1
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38388,7 +38285,7 @@ cont {
    }
    lines {
      width: 6.7
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38423,7 +38320,7 @@ cont {
    }
    lines {
      width: 9.5
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38458,7 +38355,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38493,7 +38390,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 222898459
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -38519,7 +38416,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -38544,7 +38441,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -38569,7 +38466,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 1078536475
+      color: 1297691427
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -45767,6 +45664,72 @@ cont {
    }
  }
 }
+cont {
+  name: "landuse-field"
+  element {
+    scale: 12
+    area {
+      color: 988160
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 988160
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+}
 cont {
  name: "landuse-flowerbed"
  element {
@@ -47084,13 +47047,6 @@ cont {
 }
 cont {
  name: "landuse-grass"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1880
-    }
-  }
  element {
    scale: 12
    area {
@@ -47490,13 +47446,6 @@ cont {
 }
 cont {
  name: "landuse-meadow"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1920
-    }
-  }
  element {
    scale: 12
    area {
@@ -52053,13 +52002,6 @@ cont {
 }
 cont {
  name: "leisure-playground"
-  element {
-    scale: 15
-    area {
-      color: 2763300
-      priority: -1800
-    }
-  }
  element {
    scale: 16
    area {
@@ -52201,19 +52143,8 @@ cont {
 }
 cont {
  name: "leisure-resort"
-  element {
-    scale: 15
-    area {
-      color: 2499106
-      priority: -1830
-    }
-  }
  element {
    scale: 16
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -52231,10 +52162,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -52252,10 +52179,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -52273,10 +52196,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -52294,10 +52213,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -55278,13 +55193,6 @@ cont {
 }
 cont {
  name: "natural-bare_rock"
-  element {
-    scale: 11
-    area {
-      color: 3156522
-      priority: -1920
-    }
-  }
  element {
    scale: 12
    area {
@@ -56871,13 +56779,6 @@ cont {
 }
 cont {
  name: "natural-grassland"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1880
-    }
-  }
  element {
    scale: 12
    area {
@@ -56944,13 +56845,6 @@ cont {
 }
 cont {
  name: "natural-heath"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1880
-    }
-  }
  element {
    scale: 12
    area {
@@ -57663,13 +57557,6 @@ cont {
 }
 cont {
  name: "natural-scrub"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1870
-    }
-  }
  element {
    scale: 12
    area {
@@ -124428,19 +124315,8 @@ cont {
 }
 cont {
  name: "tourism-camp_site"
-  element {
-    scale: 15
-    area {
-      color: 2499106
-      priority: -1830
-    }
-  }
  element {
    scale: 16
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -124457,10 +124333,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -124477,10 +124349,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -124497,10 +124365,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -124517,10 +124381,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
--- a/data/drules_proto_default_light.bin
+++ b/data/drules_proto_default_light.bin
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
--- a/data/drules_proto_outdoors_dark.bin
+++ b/data/drules_proto_outdoors_dark.bin
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -9814,10 +9814,6 @@ cont {
  name: "amenity-place_of_worship"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-s"
      priority: 4150
@@ -9835,10 +9831,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-m"
      priority: 4150
@@ -9964,10 +9956,6 @@ cont {
  name: "amenity-place_of_worship-buddhist"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "buddhist-s"
      priority: 4200
@@ -9985,10 +9973,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "buddhist-m"
      priority: 4200
@@ -10114,10 +10098,6 @@ cont {
  name: "amenity-place_of_worship-christian"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "christian-s"
      priority: 4200
@@ -10135,10 +10115,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "christian-m"
      priority: 4200
@@ -10264,10 +10240,6 @@ cont {
  name: "amenity-place_of_worship-christian-jehovahs_witness"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-s"
      priority: 4200
@@ -10285,10 +10257,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "place-of-worship-m"
      priority: 4200
@@ -10414,10 +10382,6 @@ cont {
  name: "amenity-place_of_worship-christian-mormon"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "mormon-s"
      priority: 4200
@@ -10435,10 +10399,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "mormon-m"
      priority: 4200
@@ -10564,10 +10524,6 @@ cont {
  name: "amenity-place_of_worship-hindu"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "hindu-s"
      priority: 4200
@@ -10585,10 +10541,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "hindu-m"
      priority: 4200
@@ -10714,10 +10666,6 @@ cont {
  name: "amenity-place_of_worship-jewish"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "jewish-s"
      priority: 4200
@@ -10735,10 +10683,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "jewish-m"
      priority: 4200
@@ -10864,10 +10808,6 @@ cont {
  name: "amenity-place_of_worship-muslim"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "muslim-s"
      priority: 4200
@@ -10885,10 +10825,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "muslim-m"
      priority: 4200
@@ -11014,10 +10950,6 @@ cont {
  name: "amenity-place_of_worship-shinto"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "shinto-s"
      priority: 4200
@@ -11035,10 +10967,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "shinto-m"
      priority: 4200
@@ -11164,10 +11092,6 @@ cont {
  name: "amenity-place_of_worship-taoist"
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "taoist-s"
      priority: 4200
@@ -11185,10 +11109,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1760
-    }
    symbol {
      name: "taoist-m"
      priority: 4200
@@ -11312,19 +11232,8 @@ cont {
 }
 cont {
  name: "amenity-police"
-  element {
-    scale: 16
-    area {
-      color: 2499106
-      priority: -1830
-    }
-  }
  element {
    scale: 17
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -11341,10 +11250,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -11361,10 +11266,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -11381,10 +11282,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "police-m"
      priority: 500
@@ -27432,7 +27329,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -27457,7 +27354,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -27482,7 +27379,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -27507,7 +27404,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 3874837
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -27531,7 +27428,7 @@ cont {
    scale: 14
    lines {
      width: 2.7
-      color: 3874837
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -27555,7 +27452,7 @@ cont {
    scale: 15
    lines {
      width: 3.7
-      color: 3874837
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -27579,7 +27476,7 @@ cont {
    scale: 16
    lines {
      width: 5.1
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27602,7 +27499,7 @@ cont {
    scale: 17
    lines {
      width: 6.7
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27625,7 +27522,7 @@ cont {
    scale: 18
    lines {
      width: 9.5
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27648,7 +27545,7 @@ cont {
    scale: 19
    lines {
      width: 11.7
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27671,7 +27568,7 @@ cont {
    scale: 20
    lines {
      width: 11.7
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27697,7 +27594,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -27722,7 +27619,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -27747,7 +27644,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -27772,7 +27669,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 3874837
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -27808,7 +27705,7 @@ cont {
    }
    lines {
      width: 2.7
-      color: 3874837
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -27844,7 +27741,7 @@ cont {
    }
    lines {
      width: 3.7
-      color: 3874837
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -27880,7 +27777,7 @@ cont {
    }
    lines {
      width: 5.1
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27915,7 +27812,7 @@ cont {
    }
    lines {
      width: 6.7
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27950,7 +27847,7 @@ cont {
    }
    lines {
      width: 9.5
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -27985,7 +27882,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -28020,7 +27917,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 3874837
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -28046,7 +27943,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -28071,7 +27968,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -28096,7 +27993,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 3874837
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40356,7 +40253,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40381,7 +40278,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40406,7 +40303,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40431,7 +40328,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 4794651
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -40455,7 +40352,7 @@ cont {
    scale: 14
    lines {
      width: 2.7
-      color: 4794651
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -40479,7 +40376,7 @@ cont {
    scale: 15
    lines {
      width: 3.7
-      color: 4794651
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -40503,7 +40400,7 @@ cont {
    scale: 16
    lines {
      width: 5.1
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40526,7 +40423,7 @@ cont {
    scale: 17
    lines {
      width: 6.7
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40549,7 +40446,7 @@ cont {
    scale: 18
    lines {
      width: 9.5
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40572,7 +40469,7 @@ cont {
    scale: 19
    lines {
      width: 11.7
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40595,7 +40492,7 @@ cont {
    scale: 20
    lines {
      width: 11.7
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40621,7 +40518,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40646,7 +40543,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40671,7 +40568,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40696,7 +40593,7 @@ cont {
    scale: 13
    lines {
      width: 1.9
-      color: 4794651
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -40732,7 +40629,7 @@ cont {
    }
    lines {
      width: 2.7
-      color: 4794651
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -40768,7 +40665,7 @@ cont {
    }
    lines {
      width: 3.7
-      color: 4794651
+      color: 5845795
      priority: 228
      cap: BUTTCAP
    }
@@ -40804,7 +40701,7 @@ cont {
    }
    lines {
      width: 5.1
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40839,7 +40736,7 @@ cont {
    }
    lines {
      width: 6.7
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40874,7 +40771,7 @@ cont {
    }
    lines {
      width: 9.5
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40909,7 +40806,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40944,7 +40841,7 @@ cont {
    }
    lines {
      width: 11.7
-      color: 4794651
+      color: 5845795
      priority: 228
    }
    path_text {
@@ -40970,7 +40867,7 @@ cont {
    scale: 10
    lines {
      width: 0.9
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -40995,7 +40892,7 @@ cont {
    scale: 11
    lines {
      width: 1.1
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -41020,7 +40917,7 @@ cont {
    scale: 12
    lines {
      width: 1.4
-      color: 4794651
+      color: 5845795
      priority: 228
      join: BEVELJOIN
      cap: BUTTCAP
@@ -48306,6 +48203,72 @@ cont {
    }
  }
 }
+cont {
+  name: "landuse-field"
+  element {
+    scale: 12
+    area {
+      color: 988160
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 988160
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1251584
+      priority: -1920
+    }
+  }
+}
 cont {
  name: "landuse-flowerbed"
  element {
@@ -49715,13 +49678,6 @@ cont {
 }
 cont {
  name: "landuse-grass"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1880
-    }
-  }
  element {
    scale: 12
    area {
@@ -50121,13 +50077,6 @@ cont {
 }
 cont {
  name: "landuse-meadow"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1920
-    }
-  }
  element {
    scale: 12
    area {
@@ -54744,13 +54693,6 @@ cont {
 }
 cont {
  name: "leisure-playground"
-  element {
-    scale: 15
-    area {
-      color: 2763300
-      priority: -1800
-    }
-  }
  element {
    scale: 16
    area {
@@ -54892,19 +54834,8 @@ cont {
 }
 cont {
  name: "leisure-resort"
-  element {
-    scale: 15
-    area {
-      color: 2499106
-      priority: -1830
-    }
-  }
  element {
    scale: 16
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -54922,10 +54853,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -54943,10 +54870,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -54964,10 +54887,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -54985,10 +54904,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "hotel-m"
      priority: 2750
@@ -58978,13 +58893,6 @@ cont {
 }
 cont {
  name: "natural-bare_rock"
-  element {
-    scale: 11
-    area {
-      color: 3156522
-      priority: -1920
-    }
-  }
  element {
    scale: 12
    area {
@@ -60868,13 +60776,6 @@ cont {
 }
 cont {
  name: "natural-grassland"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1880
-    }
-  }
  element {
    scale: 12
    area {
@@ -60941,13 +60842,6 @@ cont {
 }
 cont {
  name: "natural-heath"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1880
-    }
-  }
  element {
    scale: 12
    area {
@@ -61779,13 +61673,6 @@ cont {
 }
 cont {
  name: "natural-scrub"
-  element {
-    scale: 11
-    area {
-      color: 988160
-      priority: -1870
-    }
-  }
  element {
    scale: 12
    area {
@@ -130419,10 +130306,6 @@ cont {
  name: "tourism-camp_site"
  element {
    scale: 13
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-s"
      priority: 3800
@@ -130440,10 +130323,6 @@ cont {
  }
  element {
    scale: 14
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -130461,10 +130340,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -130482,10 +130357,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -130502,10 +130373,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -130522,10 +130389,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -130542,10 +130405,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
@@ -130562,10 +130421,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 2499106
-      priority: -1830
-    }
    symbol {
      name: "campsite-m"
      priority: 3800
--- a/data/drules_proto_outdoors_light.bin
+++ b/data/drules_proto_outdoors_light.bin
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -27409,6 +27409,72 @@ cont {
    }
  }
 }
+cont {
+  name: "landuse-field"
+  element {
+    scale: 12
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 593674
+      priority: -1930
+    }
+  }
+}
 cont {
  name: "landuse-forest"
  element {
--- a/data/drules_proto_vehicle_light.bin
+++ b/data/drules_proto_vehicle_light.bin
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -26869,6 +26869,72 @@ cont {
    }
  }
 }
+cont {
+  name: "landuse-field"
+  element {
+    scale: 12
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13031851
+      priority: -1930
+    }
+  }
+}
 cont {
  name: "landuse-forest"
  element {
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -421,7 +421,7 @@ aeroway|gate;315;
 # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
 railway|preserved;316;
 highway|path|horse;[highway=path][horse?];;name;int_name;317;
-deprecated:landuse|field:06.2025;318;x
+landuse|field;318;
 hwtag|nocycleway;319;
 leisure|water_park;320;
 natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321;
@@ -1742,4 +1742,4 @@ railway|station|subway|shenzhen;[railway=station][transport=subway][city=shenzhe
 railway|subway_entrance|shenzhen;[railway=subway_entrance][city=shenzhen];;name;int_name;1621;
 shop|hearing_aids;1622;
 railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao],[railway=station][station=subway][city=qingdao];;name;int_name;1623;
-railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624;
+railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624;
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -67,7 +67,6 @@

@pedestrian_area: #262222;
@pedestrian_area_light: #262222;
-@railway_platform: #262222;
@university: #261F13;
@hospital: #261916;
@industrial: #191419;
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -96,21 +96,22 @@ line|z10-[boundary=administrative][admin_level=4]
 area|z10-[landuse=forest],
 area|z10-[leisure=park],
 area|z12-[leisure=garden],
-area|z11-[landuse=grass],
-area|z11-[natural=grassland],
+area|z12-[landuse=grass],
+area|z12-[natural=grassland],
 area|z12-[leisure=golf_course],
-area|z11-[natural=heath],
+area|z12-[natural=heath],
 area|z12-[landuse=allotments],
-area|z11-[natural=bare_rock],
+area|z12-[natural=bare_rock],
 area|z12-[natural=shingle],
 area|z11-[natural=scree],
 area|z12-[landuse=orchard],
 area|z12-[landuse=plant_nursery],
 area|z12-[landuse=vineyard],
-area|z11-[landuse=meadow],
+area|z12-[landuse=meadow],
 area|z12-[landuse=recreation_ground],
 area|z12-[landuse=village_green],
-area|z11-[natural=scrub],
+area|z12-[landuse=field],
+area|z12-[natural=scrub],
 area|z14-[leisure=miniature_golf],
 area|z16-[landuse=flowerbed],
 {fill-opacity: 1;}
@@ -142,6 +143,7 @@ area|z14-[landuse=vineyard],
 area|z14-15[landuse=meadow],
 area|z14-[landuse=recreation_ground],
 area|z14-[landuse=village_green],
+area|z14-[landuse=field],
 {fill-color: @green1;}
 area|z11[landuse=forest],
 area|z16-[natural=grassland],
@@ -170,19 +172,20 @@ area|z16-[leisure=garden][garden:type=residential],
 area|z17-[leisure=garden][garden:type=residential],
 {fill-color: @green2;}

-area|z11-[natural=heath],
+area|z12-[natural=heath],
 {fill-color: @heath;}
-area|z11-13[landuse=grass],
-area|z11-13[natural=grassland],
+area|z12-13[landuse=grass],
+area|z12-13[natural=grassland],
 area|z12-13[leisure=golf_course],
 area|z12-13[landuse=allotments],
 area|z12-13[landuse=orchard],
 area|z12-13[landuse=plant_nursery],
 area|z12-13[landuse=vineyard],
-area|z11-13[landuse=meadow],
+area|z12-13[landuse=meadow],
 area|z12-13[landuse=recreation_ground],
 area|z12-13[landuse=village_green],
-area|z11-13[natural=scrub],
+area|z12-13[landuse=field],
+area|z12-13[natural=scrub],
 {fill-color: @green0;}

 /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
@@ -208,7 +211,7 @@ area|z11-[natural=scree],
 area|z12-[natural=shingle],
 {fill-color: @scree;}

-area|z11-[natural=bare_rock],
+area|z12-[natural=bare_rock],
 {fill-color: @barerock;}

 /* 5.BEACH, GLACIER, DESERT, etc. */
@@ -361,8 +364,9 @@ area|z15-[amenity=college],
 area|z15-[amenity=school],
 area|z15-[landuse=education],
 area|z16-[public_transport=platform],
+area|z16-[amenity=place_of_worship],
 area|z16-[railway=platform],
-area|z15-[leisure=playground],
+area|z16-[leisure=playground],
 {fill-opacity: 1;}

 area|z15-[amenity=university],
@@ -397,7 +401,7 @@ area|z15-[leisure=pitch],
 area|z15-[leisure=track][area?],
 {fill-color: @sport2;}

-area|z15-[leisure=playground],
+area|z16-[leisure=playground],
 {fill-color: @playground;}

 area|z15-[leisure=stadium]
@@ -430,6 +434,9 @@ area|z14-[area:highway=pedestrian],
 area|z14-[highway=footway][area?],
 area|z14-[area:highway=footway],
 area|z14-[area:highway=living_street],
+area|z16-[public_transport=platform],
+area|z16-[railway=platform],
+area|z16-[amenity=place_of_worship]
 {fill-color: @pedestrian_area;}

 area|z16-[highway=pedestrian][area?],
@@ -439,18 +446,6 @@ area|z16-[area:highway=footway],
 area|z16-[area:highway=living_street],
 {fill-color: @pedestrian_area_light;}

-area|z16-[public_transport=platform],
-area|z16-[railway=platform],
-{fill-color: @railway_platform;}
-
-/* Generic amenities */
-
-area|z14-[amenity=place_of_worship],
-area|z15-[tourism=camp_site],
-area|z15-[leisure=resort],
-area|z16-[amenity=police],
-{fill-opacity: 1; fill-color: @pedestrian_area_light;}
-
 /* 7.6 Airports */

 area|z10[aeroway=aerodrome][aerodrome=international],
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -81,37 +81,25 @@ line|z7-9[highway=trunk],
 {opacity: 0.8;}

 line|z10-13[highway=motorway],
-line|z10-13[highway=motorway_link],
 {color: @motorway0; opacity: 1;}
-
 line|z10-13[highway=trunk],
-line|z10-13[highway=trunk_link],
 {color: @trunk1; opacity: 1;}
-
+line|z14-[highway=motorway],
+{color: @motorway1;}
+line|z14-[highway=trunk],
+{color: @trunk1; opacity: 0.9;}
 line|z10-[highway=motorway_link],
 line|z10-[highway=trunk_link],
-{opacity: 0.75;}
-
-line|z14-[highway=motorway],
-line|z14-[highway=motorway_link],
-{color: @motorway1;}
-
-line|z14-[highway=trunk],
-line|z14-[highway=trunk_link],
-{color: @trunk1; opacity: 0.9;}
-
+{color: @primary0; opacity: 0.7;}
 line|z13-14[highway=motorway],
 line|z14-15[highway=motorway_link],
 line|z14-15[highway=trunk_link],
 {opacity: 0.85;}
-
-line|z15-[highway=motorway],
 line|z15-[highway=trunk],
-{opacity: 1;}
-
+line|z15-[highway=motorway],
 line|z16-[highway=motorway_link],
 line|z16-[highway=trunk_link],
-{opacity: 0.95;}
+{opacity: 1;}

 line|z13-[highway=motorway][bridge?]::bridgewhite,
 line|z13-[highway=trunk][bridge?]::bridgewhite,
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -17,16 +17,16 @@
 leisure-stadium                                     # area z15- (also has icon z13-, caption(optional) z13-)
 === 250

-amenity-place_of_worship                            # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship                            # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z16- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z16- (also has icon z14-, caption(optional) z14-)
 === 240

 amenity-doctors                                     # area z14- (also has icon z17-, caption(optional) z17-)
@@ -37,7 +37,7 @@ leisure-swimming_pool-private                       # area z13- (also has icon z
 landuse-landfill                                    # area z15- (also has icon z15-, caption(optional) z15-)
 === 220

-leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-playground                                  # area z16- (also has icon z17-, caption(optional) z17-)
 === 200

 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
@@ -50,10 +50,7 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180

-amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
-tourism-camp_site                                   # area z15- (also has icon z16-, caption(optional) z16-)
 === 170

 highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
@@ -68,12 +65,12 @@ leisure-miniature_golf                              # area z14- (also has icon z
 === 140

 landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z11-
+natural-scrub                                       # area z12-
 === 130

-landuse-grass                                       # area z11-
-natural-grassland                                   # area z11-
-natural-heath                                       # area z11-
+landuse-grass                                       # area z12-
+natural-grassland                                   # area z12-
+natural-heath                                       # area z12-
 === 120

 area:highway-footway                                # area z14- (also has caption z15-)
@@ -109,13 +106,14 @@ landuse-farmyard                                    # area z10- (also has captio

 landuse-allotments                                  # area z12- (also has caption z15-)
 landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-meadow                                      # area z11-
+landuse-field                                       # area z12-
+landuse-meadow                                      # area z12-
 landuse-orchard                                     # area z12- (also has caption z15-)
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
-natural-bare_rock                                   # area z11- (also has caption z14-)
+natural-bare_rock                                   # area z12- (also has caption z14-)
 natural-scree                                       # area z11-
 natural-shingle                                     # area z12-
 === 80
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -377,18 +377,18 @@ amenity-fuel                                        # icon z14- (also has captio
 highway-services                                    # icon z14- (also has caption(optional) z14-)
 === 4250

-amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z16-)
+amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z16-)
 === 4200

-amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z16-)
 historic-memorial                                   # icon z15- (also has caption(optional) z15-)
 === 4150

@@ -414,7 +414,7 @@ tourism-wilderness_hut                              # icon z16- (also has captio
 === 3900

 highway-rest_area                                   # icon z15- (also has caption(optional) z15-)
-tourism-camp_site                                   # icon z16- (also has caption(optional) z16-, area z15-)
+tourism-camp_site                                   # icon z16- (also has caption(optional) z16-)
 tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 tourism-chalet                                      # icon z16- (also has caption(optional) z16-)
 === 3800
@@ -560,7 +560,7 @@ highway-motorway_junction                           # caption z15-
 leisure-beach_resort                                # icon z16- (also has caption(optional) z16-, area z10-)
 === 3300

-natural-bare_rock                                   # caption z14- (also has area z11-)
+natural-bare_rock                                   # caption z14- (also has area z12-)
 natural-bay                                         # caption z14-
 natural-beach                                       # caption z15- (also has area z10-)
 natural-beach-gravel                                # caption z15- (also has area z10-)
@@ -747,7 +747,7 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770

 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z15-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750

@@ -1005,7 +1005,7 @@ amenity-shelter                                     # icon z17- (also has captio
 amenity-shelter-public_transport                    # icon z17- (also has caption(optional) z17-)
 emergency-lifeguard                                 # icon z17- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
-leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z15-)
+leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 natural-cliff                                       # pathtext z16- (also has line z14-)
 === 1500

@@ -1117,7 +1117,7 @@ amenity-fire_station                                # icon z18- (also has captio
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
 amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
-amenity-police                                      # icon z17- (also has caption(optional) z17-, area z16-)
+amenity-police                                      # icon z17- (also has caption(optional) z17-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
 craft-beekeeper                                     # icon z17- (also has caption(optional) z18-)
@@ -1523,18 +1523,18 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # highway-services                                  # caption(optional) z14- (also has icon z14-)
 # === -5750

-# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z16-)
+# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z16-)
 # === -5800

-# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z16-)
 # historic-memorial                                 # caption(optional) z15- (also has icon z15-)
 # === -5850

@@ -1560,7 +1560,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -6100

 # highway-rest_area                                 # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-, area z15-)
+# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-)
 # tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # tourism-chalet                                    # caption(optional) z16- (also has icon z16-)
 # === -6200
@@ -1719,7 +1719,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150

 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
-# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z15-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250

@@ -1958,7 +1958,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shelter-public_transport                  # caption(optional) z17- (also has icon z17-)
 # emergency-lifeguard                               # caption(optional) z18- (also has icon z17-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
-# leisure-playground                                # caption(optional) z17- (also has icon z17-, area z15-)
+# leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500

 # sport-american_football                           # caption(optional) z17- (also has icon z17-)
@@ -2050,7 +2050,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
 # amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
-# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z16-)
+# amenity-police                                    # caption(optional) z17- (also has icon z17-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
 # craft-beekeeper                                   # caption(optional) z18- (also has icon z17-)
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Navegação fácil nos mapas - Descobre mais sobre o teu percurso - Feito por todos`
				`@@ -1 +0,0 @@`
				`Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества`
				`@@ -1 +0,0 @@`
				`CoMaps - Карты и путешествия с приватностью`
				`@@ -1 +0,0 @@`
				`Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community`