[fdroid] Release version 2025.11.01-7

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

CMakeLists.txt

@@ -175,10 +175,10 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
   find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)
 
   set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
-  if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
+  if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
-    message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
+    message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
   else()
-    message(STATUS "Found Qt version: ${Qt6_VERSION}")
+    message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}")
   endif()
 endif()
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.11.01-7-FDroid+25110107

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

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

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

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

android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java

@@ -32,8 +32,7 @@ public class DrivingOptionsScreen extends BaseMapScreen
                                                    new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved),
                                                    new DrivingOption(RoadType.Ferry, R.string.avoid_ferry),
                                                    new DrivingOption(RoadType.Motorway, R.string.avoid_motorways),
-                                                   new DrivingOption(RoadType.Steps, R.string.avoid_steps),
+                                                   new DrivingOption(RoadType.Steps, R.string.avoid_steps)};
-                                                   new DrivingOption(RoadType.Paved, R.string.avoid_paved)};
 
   @NonNull
   private final Map<RoadType, Boolean> mInitialDrivingOptionsState = new HashMap<>();

android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java

@@ -90,36 +90,28 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
   {
     SwitchCompat tollsBtn = root.findViewById(R.id.avoid_tolls_btn);
     tollsBtn.setChecked(RoutingOptions.hasOption(RoadType.Toll));
-    CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll, root);
+    CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll);
     tollsBtn.setOnCheckedChangeListener(tollBtnListener);
 
     SwitchCompat motorwaysBtn = root.findViewById(R.id.avoid_motorways_btn);
     motorwaysBtn.setChecked(RoutingOptions.hasOption(RoadType.Motorway));
-    CompoundButton.OnCheckedChangeListener motorwayBtnListener =
+    CompoundButton.OnCheckedChangeListener motorwayBtnListener = new ToggleRoutingOptionListener(RoadType.Motorway);
-        new ToggleRoutingOptionListener(RoadType.Motorway, root);
     motorwaysBtn.setOnCheckedChangeListener(motorwayBtnListener);
 
     SwitchCompat ferriesBtn = root.findViewById(R.id.avoid_ferries_btn);
     ferriesBtn.setChecked(RoutingOptions.hasOption(RoadType.Ferry));
-    CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry, root);
+    CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry);
     ferriesBtn.setOnCheckedChangeListener(ferryBtnListener);
 
     SwitchCompat dirtyRoadsBtn = root.findViewById(R.id.avoid_dirty_roads_btn);
     dirtyRoadsBtn.setChecked(RoutingOptions.hasOption(RoadType.Dirty));
-    dirtyRoadsBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Paved) || RoutingOptions.hasOption(RoadType.Dirty));
+    CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty);
-    CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty, root);
     dirtyRoadsBtn.setOnCheckedChangeListener(dirtyBtnListener);
 
     SwitchCompat stepsBtn = root.findViewById(R.id.avoid_steps_btn);
     stepsBtn.setChecked(RoutingOptions.hasOption(RoadType.Steps));
-    CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps, root);
+    CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps);
     stepsBtn.setOnCheckedChangeListener(stepsBtnListener);
-
-    SwitchCompat pavedBtn = root.findViewById(R.id.avoid_paved_roads_btn);
-    pavedBtn.setChecked(RoutingOptions.hasOption(RoadType.Paved));
-    pavedBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Dirty) || RoutingOptions.hasOption(RoadType.Paved));
-    CompoundButton.OnCheckedChangeListener pavedBtnListener = new ToggleRoutingOptionListener(RoadType.Paved, root);
-    pavedBtn.setOnCheckedChangeListener(pavedBtnListener);
   }
 
   private static class ToggleRoutingOptionListener implements CompoundButton.OnCheckedChangeListener
@@ -127,13 +119,9 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
     @NonNull
     private final RoadType mRoadType;
 
-    @NonNull
+    private ToggleRoutingOptionListener(@NonNull RoadType roadType)
-    private final View mRoot;
-
-    private ToggleRoutingOptionListener(@NonNull RoadType roadType, @NonNull View root)
     {
       mRoadType = roadType;
-      mRoot = root;
     }
 
     @Override
@@ -143,27 +131,6 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
         RoutingOptions.addOption(mRoadType);
       else
         RoutingOptions.removeOption(mRoadType);
-
-      SwitchCompat dirtyRoadsBtn = mRoot.findViewById(R.id.avoid_dirty_roads_btn);
-      SwitchCompat pavedBtn = mRoot.findViewById(R.id.avoid_paved_roads_btn);
-      if (mRoadType == RoadType.Dirty)
-      {
-        pavedBtn.setEnabled(!isChecked);
-        if (isChecked)
-        {
-          pavedBtn.setChecked(false);
-          dirtyRoadsBtn.setEnabled(true);
-        }
-      }
-      else if (mRoadType == RoadType.Paved)
-      {
-        dirtyRoadsBtn.setEnabled(!isChecked);
-        if (isChecked)
-        {
-          dirtyRoadsBtn.setChecked(false);
-          pavedBtn.setEnabled(true);
-        }
-      }
     }
   }
 }

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -59,28 +59,6 @@
       android:padding="@dimen/margin_half_double_plus"/>
   </LinearLayout>
   <include layout="@layout/item_divider"/>
-  <LinearLayout
-    android:orientation="horizontal"
-    android:minHeight="@dimen/height_block_base"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
-    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.textview.MaterialTextView
-      android:text="@string/avoid_paved"
-      android:textAppearance="?android:attr/textAppearanceMedium"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:textColor="?android:attr/textColorPrimary"/>
-    <androidx.appcompat.widget.SwitchCompat
-      android:id="@+id/avoid_paved_roads_btn"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:padding="@dimen/margin_half_double_plus"/>
-  </LinearLayout>
-  <include layout="@layout/item_divider"/>
   <LinearLayout
     android:orientation="horizontal"
     android:minHeight="@dimen/height_block_base"

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

@@ -889,5 +889,4 @@
     <string name="avoid_steps">Vyhnout se schodům</string>
     <string name="offline_explanation_title">Offline mapy</string>
     <string name="list_description_empty">Upravit seznam pro přidání popisu</string>
-    <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
 </resources>

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

@@ -880,5 +880,4 @@
     <string name="offline_explanation_title">Offline kort</string>
     <string name="offline_explanation_text">Der skal downloades et kort for at kunne se og navigere i området.\nDownload kort over de områder, du ønsker at rejse i.</string>
     <string name="list_description_empty">Rediger listen for at tilføje en beskrivelse</string>
-    <string name="avoid_paved">Undgå veje med fast belægning</string>
 </resources>

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

@@ -893,5 +893,4 @@
     <string name="unknown_count">unbekannt</string>
     <string name="error_invalid_number">ungültige Zahl</string>
     <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
-    <string name="avoid_paved">Befst. Straßen vermeiden</string>
 </resources>

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

@@ -898,5 +898,4 @@
     <string name="offline_explanation_title">Mapas sin conexión</string>
     <string name="offline_explanation_text">Se debe descargar un mapa para ver y navegar el área\nDescarga mapas de las áreas que quieras navegar.</string>
     <string name="editor_place_doesnt_exist_description">Describe la situación actual del lugar para enviar una nota de error a la comunidad de OpenStreetMap</string>
-    <string name="avoid_paved">Evitar caminos pavimentados</string>
 </resources>

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

@@ -889,5 +889,4 @@
     <string name="offline_explanation_title">Ilma võrguühenduseta toimivad kaardid</string>
     <string name="offline_explanation_text">Selles piirkonnas liikumiseks ja teekonna juhatamiseks pead vajaliku kaardi alla laadima.\nVali allalaaditav kaart selle piirkonna kohta.</string>
     <string name="list_description_empty">Kirjelduse lisamiseks muuda loendit</string>
-    <string name="avoid_paved">Väldi sillutatud teid</string>
 </resources>

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

@@ -898,5 +898,4 @@
     <string name="editor_place_doesnt_exist_description">Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap</string>
     <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
     <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
-    <string name="avoid_paved">Éviter les routes goudronnées</string>
 </resources>

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

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

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

@@ -844,5 +844,4 @@
     <string name="backup_interval_every_day">Ik dienu</string>
     <string name="clear">Notīrīt</string>
     <string name="closed_now">Šobrīd slēgts</string>
-    <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
 </resources>

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -870,5 +870,4 @@
     <string name="offline_explanation_title">Mapas offline</string>
     <string name="editor_place_doesnt_exist_description">Descreva com detalhes como está o local agora mesmo para enviar uma nota de erro à comunidade do OpenStreetMap</string>
     <string name="list_description_empty">Edite a lista para adicionar uma descrição</string>
-    <string name="avoid_paved">Evitar vias pavimentadas</string>
 </resources>

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

@@ -890,6 +890,4 @@
     <string name="offline_explanation_title">Офлајн мапе</string>
     <string name="editor_place_doesnt_exist_description">Опишите како место сада изгледа та бисте послали поруку о грешци OpenStreetMap заједници</string>
     <string name="avoid_steps">Избегавај степенице</string>
-    <string name="avoid_paved">Избегавај асфалтиране путеве</string>
-    <string name="list_description_empty">Промените листу да бисте додали опис</string>
 </resources>

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

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

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

@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">精度有限</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">为确保导航准确，请在设置中启用 \"精确定位\"</string>
+    <string name="precise_location_is_disabled_long_text">为确保准确导航，请在设置中启用确切位置</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">在地图上显示</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -36,13 +36,13 @@
     <string name="try_again">再试一次</string>
     <string name="about_menu_title">关于 CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">由社区驱动的开源项目</string>
+    <string name="about_headline">由社区推动的开放项目</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• 简单易用，精工细作</string>
+    <string name="about_proposition_1">• 使用方便，外观精美</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• 专注隐私，绝无广告</string>
+    <string name="about_proposition_2">•注重隐私，毫无广告</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• 离线、迅捷、轻量</string>
+    <string name="about_proposition_3">• 离线、快速、精简</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">完全开源、决策问责、财务透明的非营利应用。</string>
     <!-- The button that opens system location settings -->

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

@@ -677,7 +677,6 @@
     <string name="avoid_ferry">Avoid ferries</string>
     <string name="avoid_motorways">Avoid freeways</string>
     <string name="avoid_steps">Avoid stairs</string>
-    <string name="avoid_paved">Avoid paved roads</string>
     <string name="unable_to_calc_alert_title">Unable to calculate route</string>
     <string name="unable_to_calc_alert_subtitle">A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.</string>
     <string name="define_to_avoid_btn">Define roads to avoid</string>

android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java

@@ -7,6 +7,5 @@ public enum RoadType
   Motorway,
   Ferry,
   Dirty,
-  Steps,
+  Steps
-  Paved
 }

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

@@ -1433,10 +1433,4 @@
     <string name="type.leisure.sports_centre.sport.swimming">Plavecké centrum</string>
     <string name="type.disusedbusiness">Neobsazený prostor</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Studio jógy</string>
-    <string name="type.amenity.boat_rental">Půjčovna lodí</string>
-    <string name="type.amenity.mobile_money_agent">Mobilní peněžní agent</string>
-    <string name="type.amenity.payment_centre">Platební centrum</string>
-    <string name="type.leisure.indoor_play">Vnitřní herní centrum</string>
-    <string name="type.shop.telecommunication">Telekomunikační obchod</string>
-    <string name="type.amenity.car_pooling">Spolujízda</string>
 </resources>

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

@@ -27,7 +27,6 @@
     <string name="type.amenity.bench">Sitzbank</string>
     <string name="type.amenity.bench.backless">Sitzbank ohne Rückenlehne</string>
     <string name="type.amenity.bicycle_parking">Fahrradständer</string>
-    <string name="type.amenity.boat_rental">Bootsverleih</string>
     <string name="type.amenity.bicycle_rental">Fahrradverleih</string>
     <string name="type.amenity.bicycle_repair_station">Fahrrad-Reparaturstation</string>
     <string name="type.amenity.brothel">Bordell</string>
@@ -1438,15 +1437,4 @@
     <string name="type.power.portal">Abspannportal</string>
     <string name="type.shop.lighting">Lampenladen</string>
     <string name="type.disusedbusiness">Leerstehendes Geschäft</string>
-    <string name="type.leisure.indoor_play">Indoor-Spielplatz</string>
-    <string name="type.amenity.car_pooling">Fahrgemeinschaften</string>
-    <string name="type.shop.telecommunication">Telekommunikationsgeschäft</string>
-    <string name="type.man_made.telescope">Teleskop</string>
-    <string name="type.man_made.telescope.optical">Teleskop (Optisch)</string>
-    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
-    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
-    <string name="type.man_made.observatory">Observatorium</string>
-    <string name="type.amenity.payment_centre">Zahlungszentrum</string>
-    <string name="type.amenity.soup_kitchen">Suppenküche</string>
-    <string name="type.amenity.food_bank">Tafel</string>
 </resources>

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

@@ -1437,13 +1437,4 @@
     <string name="type.leisure.fitness_centre.sport.yoga">Estudio de yoga</string>
     <string name="type.disusedbusiness">Local comercial vacante</string>
     <string name="type.amenity.lounger">Tumbona</string>
-    <string name="type.amenity.boat_rental">Alquiler de botes</string>
-    <string name="type.man_made.telescope">Telescopio</string>
-    <string name="type.man_made.telescope.optical">Telescopio (óptico)</string>
-    <string name="type.man_made.telescope.radio">Radiotelescopio</string>
-    <string name="type.man_made.telescope.gamma">Telescopio Fermi</string>
-    <string name="type.man_made.observatory">Observatorio</string>
-    <string name="type.amenity.mobile_money_agent">Agencia de efectivo móvil</string>
-    <string name="type.amenity.car_pooling">Punto de Vehículo Compartido</string>
-    <string name="type.amenity.payment_centre">Centro de pagos</string>
 </resources>

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

@@ -1436,19 +1436,4 @@
     <string name="type.leisure.sports_centre.sport.yoga">Joogakeskus</string>
     <string name="type.disusedbusiness">Vaba äripind</string>
     <string name="type.amenity.lounger">Rannatool</string>
-    <string name="type.amenity.boat_rental">Paadirent</string>
-    <string name="type.man_made.telescope">Teleskoop</string>
-    <string name="type.man_made.telescope.optical">Optiline teleskoop</string>
-    <string name="type.man_made.telescope.radio">Raadioteleskoop</string>
-    <string name="type.man_made.telescope.gamma">Gammateleskoop</string>
-    <string name="type.man_made.observatory">Observatoorium</string>
-    <string name="type.amenity.mobile_money_agent">Nutiraha müüja</string>
-    <string name="type.amenity.car_pooling">Ühiskasutusautode peatus</string>
-    <string name="type.amenity.payment_centre">Maksekeskus</string>
-    <string name="type.leisure.indoor_play">Mängusaal/Mängutuba</string>
-    <string name="type.shop.telecommunication">Sideteenuste pood</string>
-    <string name="type.amenity.soup_kitchen">Supiköök</string>
-    <string name="type.amenity.food_bank">Toidupank</string>
-    <string name="type.amenity.food_sharing">Toidujagamine</string>
-    <string name="type.amenity.give_box">Annetuskast</string>
 </resources>

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

@@ -1434,21 +1434,6 @@
     <string name="type.leisure.sports_centre.sport.volleyball">Complexe sportif</string>
     <string name="type.leisure.sports_centre.sport.yoga">Complexe sportif</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Salle de yoga</string>
-    <string name="type.disusedbusiness">Magasin vacant</string>
+    <string name="type.disusedbusiness">Locaux commerciaux libres</string>
     <string name="type.amenity.lounger">Chaise longue</string>
-    <string name="type.amenity.boat_rental">Vente de bateau</string>
-    <string name="type.amenity.payment_centre">Centre de paiement</string>
-    <string name="type.amenity.mobile_money_agent">Agent d\'argent liquide</string>
-    <string name="type.leisure.indoor_play">Complexe de jeux intérieurs</string>
-    <string name="type.shop.telecommunication">Boutique télécom</string>
-    <string name="type.man_made.telescope.optical">Télescope (optique)</string>
-    <string name="type.man_made.telescope.radio">Télescope (radio)</string>
-    <string name="type.man_made.observatory">Observatoire</string>
-    <string name="type.amenity.food_bank">Banque alimentaire</string>
-    <string name="type.amenity.food_sharing">Repas partagé</string>
-    <string name="type.man_made.telescope.gamma">Télescope (Gamma)</string>
-    <string name="type.amenity.car_pooling">Covoiturage</string>
-    <string name="type.amenity.soup_kitchen">Soupe populaire</string>
-    <string name="type.amenity.give_box">Boîte à don</string>
-    <string name="type.man_made.telescope">Télescope</string>
 </resources>

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

@@ -1400,5 +1400,4 @@
     <string name="type.shop.lighting">Negozio di illuminazione</string>
     <string name="type.amenity.bench.backless">Panchina senza schienale</string>
     <string name="type.amenity.charging_station.motorcar.small">Colonnina di ricarica</string>
-    <string name="type.man_made.observatory">Osservatorio</string>
 </resources>

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

@@ -33,7 +33,7 @@
     <string name="type.place.sea">Jūra</string>
     <string name="type.amenity.bar">Bārs</string>
     <string name="type.amenity.bicycle_parking">Divriteņu novietne</string>
-    <string name="type.amenity.bicycle_rental">Velosipēdu noma</string>
+    <string name="type.amenity.bicycle_rental">Velosipēdu īre</string>
     <string name="type.amenity.biergarten">Alus dārzs</string>
     <string name="type.amenity.bureau_de_change">Valūtas maiņa</string>
     <string name="type.amenity.bus_station">Autoosta</string>
@@ -136,23 +136,4 @@
     <string name="type.sport.climbing">Kāpšana</string>
     <string name="type.sport.scuba_diving">Niršana</string>
     <string name="type.sport.cricket">Krikets</string>
-    <string name="type.shop.telecommunication">Tālsaziņas preču veikals</string>
-    <string name="type.shop.ticket">Biļešu tirdzniecības vieta</string>
-    <string name="type.shop.toys">Rotaļlietu veikals</string>
-    <string name="type.shop.travel_agency">Ceļojumu aģentūra</string>
-    <string name="type.shop.tyres">Riepu veikals</string>
-    <string name="type.amenity.payment_centre">Maksājumu centrs</string>
-    <string name="type.amenity.pharmacy">Aptieka</string>
-    <string name="type.amenity.place_of_worship">Pielūgsmes vieta</string>
-    <string name="type.amenity.place_of_worship.buddhist">Budistu templis</string>
-    <string name="type.amenity.place_of_worship.christian">Baznīca</string>
-    <string name="type.amenity.boat_rental">Laivu noma</string>
-    <string name="type.amenity.bicycle_repair_station">Divriteņu darbnīca</string>
-    <string name="type.man_made.telescope.gamma">Teleskops (Gamma)</string>
-    <string name="type.man_made.observatory">Observatorija</string>
-    <string name="type.man_made.telescope">Teleskops</string>
-    <string name="type.man_made.telescope.optical">Teleskops (optiskais)</string>
-    <string name="type.man_made.telescope.radio">Teleskops (radio)</string>
-    <string name="type.amenity.soup_kitchen">Zupas virtuve</string>
-    <string name="type.amenity.food_sharing">Ēdiena kopīgošana</string>
 </resources>

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

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

android/sdk/src/main/res/values-pt-rBR/types_strings.xml

@@ -1425,19 +1425,4 @@
     <string name="type.leisure.fitness_centre.sport.yoga">Academia de ioga</string>
     <string name="type.disusedbusiness">Estabelecimento vazio</string>
     <string name="type.amenity.lounger">Espreguiçadeira</string>
-    <string name="type.amenity.boat_rental">Aluguel de barco</string>
-    <string name="type.man_made.telescope">Telescópio</string>
-    <string name="type.man_made.telescope.optical">Telescópio (óptico)</string>
-    <string name="type.man_made.telescope.radio">Telescópio (rádio)</string>
-    <string name="type.man_made.telescope.gamma">Telescópio (gama)</string>
-    <string name="type.man_made.observatory">Observatório</string>
-    <string name="type.amenity.mobile_money_agent">Agente de Mobile Money</string>
-    <string name="type.amenity.car_pooling">Carona</string>
-    <string name="type.amenity.payment_centre">Centro de pagamentos</string>
-    <string name="type.leisure.indoor_play">Centro de recreação interno</string>
-    <string name="type.shop.telecommunication">Loja de Telecomunicação</string>
-    <string name="type.amenity.soup_kitchen">Restaurante popular</string>
-    <string name="type.amenity.food_bank">Banco de alimentos</string>
-    <string name="type.amenity.food_sharing">Compartilhamento de alimentos</string>
-    <string name="type.amenity.give_box">Caixa de doação</string>
 </resources>

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

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

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

@@ -652,8 +652,8 @@
     <string name="type.leisure.sauna">Сауна</string>
     <string name="type.leisure.slipway">Лодочный спуск</string>
     <string name="type.leisure.sports_centre">Спорткомплекс</string>
-    <string name="type.sport.climbing">Скалолазание</string>
+    <string name="type.sport.climbing">Скалодром</string>
-    <string name="type.sport.yoga">Йога</string>
+    <string name="type.sport.yoga">Йога-центр</string>
     <string name="type.leisure.stadium">Стадион</string>
     <string name="type.leisure.swimming_pool">Плавательный бассейн</string>
     <string name="type.leisure.swimming_pool.private">Плавательный бассейн</string>
@@ -1131,7 +1131,7 @@
     <string name="type.shop.chemist">Бытовая химия</string>
     <string name="type.shop.chocolate">Магазин шоколада</string>
     <string name="type.shop.clothes">Магазин одежды</string>
-    <string name="type.shop.coffee">Продавец кофе</string>
+    <string name="type.shop.coffee">Магазин кофе</string>
     <string name="type.shop.computer">Компьютерный магазин</string>
     <string name="type.shop.confectionery">Кондитерская</string>
     <string name="type.shop.convenience">Продуктовый магазин</string>
@@ -1248,7 +1248,7 @@
     <string name="type.sport.handball">Гандбол</string>
     <string name="type.sport.multi">Различные виды спорта</string>
     <!-- Used to tag a scuba diving site. -->
-    <string name="type.sport.scuba_diving">Подводное плавание с аквалангом</string>
+    <string name="type.sport.scuba_diving">Место для ныряния с аквалангом</string>
     <string name="type.sport.shooting">Стрельба</string>
     <string name="type.sport.skateboard">Скейтбординг</string>
     <string name="type.sport.skiing">Лыжи</string>
@@ -1383,7 +1383,7 @@
     <string name="type.fee.yes">$</string>
     <string name="type.barrier.guard_rail">Дорожное ограждение (отбойник)</string>
     <string name="type.landuse.plant_nursery">Садовый питомник</string>
-    <string name="type.amenity.studio">Медиа-студия</string>
+    <string name="type.amenity.studio">Студия</string>
     <string name="type.leisure.firepit">Кострище</string>
     <string name="type.highway.ladder">Лестница-лаз</string>
     <string name="type.sport.diving">Высотные прыжки в воду</string>
@@ -1399,57 +1399,4 @@
     <string name="type.office.security">Офис охранника</string>
     <string name="type.building.guardhouse">Будка безопасности</string>
     <string name="type.power.portal">Портальная опора</string>
-    <string name="type.amenity.boat_rental">Прокат лодок</string>
-    <string name="type.man_made.telescope">Телескоп</string>
-    <string name="type.man_made.telescope.optical">Телескоп (оптический)</string>
-    <string name="type.man_made.telescope.radio">Телескоп (радио)</string>
-    <string name="type.man_made.telescope.gamma">Телескоп (Гамма)</string>
-    <string name="type.man_made.observatory">Обсерватория</string>
-    <string name="type.amenity.charging_station.motorcar.small">Пункт зарядки автомобиля</string>
-    <string name="type.amenity.lounger">Шезлонг</string>
-    <string name="type.amenity.car_pooling">Совместное использование авто</string>
-    <string name="type.amenity.payment_centre">Платежный центр</string>
-    <string name="type.leisure.bandstand">Эстрада</string>
-    <string name="type.leisure.indoor_play">Крытый игровой центр</string>
-    <string name="type.leisure.sports_centre.sport.multi">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.archery">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.athletics">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.australian_football">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.badminton">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.baseball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.basketball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.beachvolleyball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.bowls">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.cricket">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.curling">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.equestrian">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.field_hockey">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.futsal">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.golf">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.gymnastics">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.handball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.ice_hockey">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.padel">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.pelota">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.scuba_diving">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.shooting">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.skateboard">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.skiing">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.soccer">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.swimming">Плавательный центр</string>
-    <string name="type.leisure.sports_centre.sport.table_tennis">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.tennis">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.yoga">Спортивный центр</string>
-    <string name="type.leisure.fitness_centre.sport.yoga">Студия Йоги</string>
-    <string name="type.shop.telecommunication">Телекоммуникационный магазин</string>
-    <string name="type.disusedbusiness">Вакантный бизнес</string>
-    <string name="type.amenity.soup_kitchen">Бесплатная столовая</string>
-    <string name="type.amenity.food_bank">Продовольственный банк</string>
-    <string name="type.amenity.food_sharing">Обмен едой</string>
-    <string name="type.amenity.give_box">Подарить коробку</string>
-    <string name="type.amenity.bench.backless">Скамья без спинки</string>
-    <string name="type.amenity.mobile_money_agent">Агент мобильных платежей</string>
 </resources>

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

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

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

@@ -28,7 +28,7 @@
     <string name="type.amenity.bbq">Грил</string>
     <string name="type.amenity.bench">Клупа</string>
     <string name="type.amenity.bicycle_parking">Паркинг за бицикле</string>
-    <string name="type.amenity.bicycle_rental">Изнајмљивање бицикала</string>
+    <string name="type.amenity.bicycle_rental">Рентирање бицикли</string>
     <string name="type.amenity.bicycle_repair_station">Станица за поправку бицикала</string>
     <string name="type.amenity.biergarten">Пивска башта</string>
     <string name="type.amenity.brothel">Јавна кућа</string>
@@ -648,7 +648,7 @@
     <string name="type.leisure.slipway">Навоз</string>
     <string name="type.leisure.sports_centre">Спортски центар</string>
     <string name="type.sport.climbing">Вештачка стена</string>
-    <string name="type.sport.yoga">Јога</string>
+    <string name="type.sport.yoga">Јога студио</string>
     <string name="type.leisure.stadium">Стадион</string>
     <string name="type.leisure.swimming_pool">Базен</string>
     <string name="type.leisure.swimming_pool.private">Приватни базен</string>
@@ -1161,7 +1161,7 @@
     <string name="type.shop.pet_grooming">Грумер</string>
     <string name="type.shop.photo">Фотограф</string>
     <string name="type.shop.rental">Центар за изнајмљивање</string>
-    <string name="type.shop.rental.bicycle">Центар за изнајмљивање бицикала</string>
+    <string name="type.shop.rental.bicycle">Изнајмљивање бицикала</string>
     <string name="type.shop.seafood">Рибарница</string>
     <string name="type.shop.second_hand">Половна одећа</string>
     <string name="type.shop.shoes">Обућа</string>
@@ -1375,7 +1375,7 @@
     <string name="type.leisure.firepit">Огњиште</string>
     <string name="type.landuse.plant_nursery">Расадник</string>
     <string name="type.barrier.guard_rail">Заштитна ограда</string>
-    <string name="type.amenity.studio">Медијски студио</string>
+    <string name="type.amenity.studio">Студио</string>
     <string name="type.highway.ladder">Мердевине</string>
     <string name="type.man_made.crane">Кран</string>
     <string name="type.railway.station.subway.qingdao">Метро станица</string>
@@ -1398,57 +1398,4 @@
     <string name="type.building.guardhouse">Кућица обезбеђења</string>
     <string name="type.power.portal">Носач електричних водова</string>
     <string name="type.shop.lighting">Продавница расвете</string>
-    <string name="type.amenity.give_box">Кутија за поклоне</string>
-    <string name="type.amenity.food_sharing">Дељење хране</string>
-    <string name="type.amenity.food_bank">Банка хране</string>
-    <string name="type.amenity.soup_kitchen">Народна кухиња</string>
-    <string name="type.man_made.observatory">Опсерваторија</string>
-    <string name="type.man_made.telescope">Телескоп</string>
-    <string name="type.man_made.telescope.optical">Телескоп (оптички)</string>
-    <string name="type.man_made.telescope.radio">Телескоп (радио)</string>
-    <string name="type.man_made.telescope.gamma">Телескоп (гама)</string>
-    <string name="type.amenity.car_pooling">Заједничка вожња</string>
-    <string name="type.amenity.payment_centre">Плаћање рачуна</string>
-    <string name="type.amenity.bench.backless">Клупа без наслона</string>
-    <string name="type.amenity.boat_rental">Изнајмљивање чамаца</string>
-    <string name="type.amenity.charging_station.motorcar.small">Место за пуњење аутомобила</string>
-    <string name="type.amenity.lounger">Лежаљка</string>
-    <string name="type.amenity.mobile_money_agent">Посредник за мобилно плаћање</string>
-    <string name="type.leisure.bandstand">Бина</string>
-    <string name="type.leisure.indoor_play">Играоница</string>
-    <string name="type.leisure.sports_centre.sport.multi">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.archery">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.athletics">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.australian_football">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.badminton">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.baseball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.basketball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.beachvolleyball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.bowls">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.cricket">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.curling">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.equestrian">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.field_hockey">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.futsal">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.golf">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.gymnastics">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.handball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.ice_hockey">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.padel">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.pelota">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.scuba_diving">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.shooting">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.skateboard">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.skiing">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.soccer">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.swimming">Пливачки центар</string>
-    <string name="type.leisure.sports_centre.sport.table_tennis">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.tennis">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.yoga">Спортски центар</string>
-    <string name="type.leisure.fitness_centre.sport.yoga">Јога студио</string>
-    <string name="type.shop.telecommunication">Продавница мобилног оператера</string>
-    <string name="type.disusedbusiness">Некоришћен пословни простор</string>
 </resources>

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

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

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

@@ -30,7 +30,6 @@
     <string name="type.amenity.bench.backless">Backless Bench</string>
     <string name="type.amenity.bicycle_parking">Bicycle Parking</string>
     <string name="type.amenity.bicycle_parking.covered">Covered Bicycle Parking</string>
-    <string name="type.amenity.boat_rental">Boat Rental</string>
     <string name="type.amenity.bicycle_rental">Bicycle Rental</string>
     <string name="type.amenity.bicycle_repair_station">Bicycle Repair Station</string>
     <string name="type.amenity.biergarten">Biergarten</string>
@@ -43,11 +42,6 @@
     <string name="type.amenity.motorcycle_rental">Motorcycle Rental</string>
     <string name="type.amenity.car_sharing">Car Sharing</string>
     <string name="type.amenity.car_wash">Car Wash</string>
-    <string name="type.man_made.telescope">Telescope</string>
-    <string name="type.man_made.telescope.optical">Telescope (Optical)</string>
-    <string name="type.man_made.telescope.radio">Telescope (Radio)</string>
-    <string name="type.man_made.telescope.gamma">Telescope (Gamma)</string>
-    <string name="type.man_made.observatory">Observatory</string>
     <string name="type.amenity.casino">Casino</string>
     <string name="type.amenity.gambling">Gambling</string>
     <string name="type.leisure.adult_gaming_centre">Adult Gaming Centre</string>
@@ -98,7 +92,6 @@
     <string name="type.amenity.loading_dock">Loading Dock</string>
     <string name="type.amenity.lounger">Lounger</string>
     <string name="type.amenity.luggage_locker">Luggage Locker</string>
-    <string name="type.amenity.mobile_money_agent">Mobile Money Agent</string>
     <string name="type.amenity.marketplace">Marketplace</string>
     <string name="type.amenity.motorcycle_parking">Motorcycle Parking</string>
     <string name="type.amenity.nightclub">Nightclub</string>
@@ -128,8 +121,6 @@
     <string name="type.amenity.parking_space.private">Parking Space</string>
     <string name="type.amenity.parking_space.underground">Parking Space</string>
     <string name="type.amenity.parking_space.disabled">Disabled Parking Space</string>
-    <string name="type.amenity.car_pooling">Car Pooling</string>
-    <string name="type.amenity.payment_centre">Payment Centre</string>
     <string name="type.amenity.payment_terminal">Payment Terminal</string>
     <string name="type.amenity.pharmacy">Pharmacy</string>
     <string name="type.amenity.place_of_worship">Place of Worship</string>
@@ -666,7 +657,6 @@
     <string name="type.leisure.miniature_golf">Minigolf</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.leisure.ice_rink">Ice Rink</string>
-    <string name="type.leisure.indoor_play">Indoor Play Centre</string>
     <string name="type.leisure.marina">Marina</string>
     <string name="type.leisure.nature_reserve">Nature Reserve</string>
     <string name="type.leisure.outdoor_seating">Outdoor Seating</string>
@@ -1261,7 +1251,6 @@
     <string name="type.shop.supermarket">Supermarket</string>
     <string name="type.shop.tattoo">Tattoo Parlour</string>
     <string name="type.shop.tea">Tea Shop</string>
-    <string name="type.shop.telecommunication">Telecommunication Shop</string>
     <string name="type.shop.ticket">Ticket Shop</string>
     <string name="type.shop.toys">Toy Store</string>
     <string name="type.shop.travel_agency">Travel Agency</string>
@@ -1446,10 +1435,6 @@
     <string name="type.self_service.no">No self-service</string>
     <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
     <string name="type.amenity.social_facility">Social Facility</string>
-    <string name="type.amenity.soup_kitchen">Soup Kitchen</string>
-    <string name="type.amenity.food_bank">Food Bank</string>
-    <string name="type.amenity.food_sharing">Food Sharing</string>
-    <string name="type.amenity.give_box">Give Box</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
     <string name="type.emergency.emergency_ward_entrance">Emergency Ward Entrance</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->

configure.sh

@@ -119,7 +119,7 @@ echo "Generating search categories / synonyms..."
 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
   if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
     echo "Generating symbols..."
-    bash ./tools/unix/generate_symbols.sh || (rm data/symbols_hash; exit 1)
+    bash ./tools/unix/generate_symbols.sh
   fi
 else
   echo "Skipping generate symbols..."
@@ -128,7 +128,7 @@ fi
 if [ -z "$SKIP_GENERATE_DRULES" ]; then
   if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv || [ ! -z "$DRULES_NOT_GENERATED" ]; then
     echo "Generating drules..."
-    bash ./tools/unix/generate_drules.sh || (rm data/drules_hash; exit 1)
+    bash ./tools/unix/generate_drules.sh
   fi
 else
   echo "Skipping generate drules..."

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

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

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

@@ -28,7 +28,7 @@
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bakery|3Pastry|Cake|3Cakes|U+1F35E",
 "shop|@shop": "",
 "shop-cannabis|@shop": "Cannabis",
-"shop-cosmetics|@category_shopping|@shop": "4Cosmetics|4Beauty Care|makeup|make-up",
+"shop-cosmetics|@category_shopping|@shop": "4Cosmetics|4Beauty Care|makeup",
 "shop-convenience|@category_food|@shop": "4Convenience|mini-mart|mini-market|superette",
 "shop-deli|@category_food|@shop": "4Delicatessen",
 "shop-farm|@category_food|@shop": "Farm food",
@@ -62,7 +62,6 @@
 "shop-laundry": "4Laundry|Laundrette|laundromat",
 "shop-toys|@category_children|@shop": "Toy|toyshop|kids|toys|kids toys",
 "amenity-marketplace|@category_food": "3Marketplace|market",
-"amenity-mobile_money_agent": "Mobile Money Agent|mobile money",
 "amenity-money_transfer": "Money Transfer",
 "shop-clothes|@category_shopping|@shop": "3Clothes|U+1F45A|U+1F457|U+1F456|U+1F455|clothing|wear",
 "shop-caravan|@category_rv|@shop": "2RV dealership|4Caravan dealership|Motorhome dealership",
@@ -129,7 +128,6 @@
 "leisure-garden": "3Garden",
 "leisure-firepit": "5Firepit",
 "amenity-bench|amenity-bench-backless": "Bench",
-"amenity-boat_rental": "4Boat Rental|boat|3rental",
 "amenity-bicycle_rental": "4Bicycle Rental|cycle|bike|3rental|U+1F6B2|U+1F6B4|U+1F6B5|bicycle hire|bike rental",
 "amenity-bicycle_repair_station": "4Bicycle Repair Station|cycle|bike|4repair of bicycles",
 "amenity-car_sharing": "Car Share|3carsharing|car|sharing|U+1F697|U+1F698|U+1F699|carpool|carsharing services|car sharing|4rideshare",
@@ -345,8 +343,6 @@
 "shop-dry_cleaning": "3Dry Cleaner|cleaning",
 "shop-tyres|@shop": "3Tyre|tyres",
 "amenity-car_wash": "3Car Wash",
-"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "5Telescope",
-"man_made-observatory": "4Observatory",
 "amenity-veterinary": "Veterinary Doctor|4veterinary",
 "amenity-animal_shelter": "Animal Shelter",
 "@charging_station": "4Charging Station|charging",
@@ -421,10 +417,8 @@
 "amenity-internet_cafe": "3Internet Cafe",
 "amenity-motorcycle_parking": "4Motorcycle Parking",
 "amenity-parking_space-disabled|@category_parking": "Disabled Parking Space",
-"amenity-car_pooling|@category_parking": "Car Pooling",
 "amenity-nursing_home": "4Nursing Home",
 "amenity-payment_terminal": "Payment Terminal",
-"amenity-payment_centre": "Payment Centre",
 "amenity-public_bath": "Public Bath",
 "amenity-shower": "Shower",
 "emergency-assembly_point": "Emergency Assembly Point",
@@ -456,7 +450,6 @@
 "natural-glacier|@category_tourism": "Glacier",
 "highway-ford": "Ford",
 "leisure-marina": "3Marina",
-"leisure-indoor_play": "3Indoor Play Centre|indoor play|indoor playground",
 "piste:type-downhill|piste:type-nordic": "Skiing|3Ski run|4Piste",
 "amenity-events_venue": "Events Venue",
 "shop-chocolate|@category_food|@shop": "Chocolate",
@@ -466,7 +459,6 @@
 "shop-music|@shop": "Record|vinyl|Music",
 "shop-musical_instrument|@shop": "Musical instruments",
 "shop-tea|@shop": "Tea",
-"shop-telecommunication|@shop": "Telecommunication",
 "shop-antiques|@category_shopping|@shop|@category_secondhand": "Antiques",
 "shop-art|@category_shopping|@shop": "3Artwork|Arts",
 "shop-baby_goods|@category_children|@shop": "Baby Goods",
@@ -496,10 +488,6 @@
 "man_made-cairn": "4Cairn",
 "wheelchair-yes": "5Wheelchair",
 "amenity-social_facility": "Social Facility",
-"social_facility-soup_kitchen": "4Soup Kitchen|Food",
-"social_facility-food_bank": "4Food Bank|foodbank|Food",
-"amenity-food_sharing": "Food Sharing|Food",
-"amenity-give_box": "Give Box",
 "leisure-sports_hall": "Sports hall",
 "amenity-arts_centre|@category_tourism": "Arts Center",
 "amenity-prison": "prison",

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

@@ -498,16 +498,5 @@
 "sport-9pin": "Bolos",
 "sport-10pin": "Bolos",
 "shop-bookmaker|@gambling": "Corredor de apuestas",
-"leisure-fitness_centre-sport-yoga": "Estudio de yoga",
+"leisure-fitness_centre-sport-yoga": "Estudio de yoga"
-"amenity-mobile_money_agent": "Agencia de efectivo móvil | agente de dinero móvil | agencia de dinero móvil | agente de efectivo móvil",
-"amenity-boat_rental": "4aquiler de botes|alquiler de barcos|bote|botes|barco|barcos|barca|barcas|lancha|lanchas|embarcación|embarcaciones|velero|veleros|nagegar|3alquiler",
-"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Telescopio",
-"man_made-observatory": "3Observatorio",
-"amenity-car_pooling|@category_parking": "Car pooling | Vehículo compartido | Blabla Car",
-"amenity-payment_centre": "Centro de pagos",
-"leisure-indoor_play": "Parque interior|niños",
-"shop-telecommunication|@shop": "Telecomunicaciones",
-"leisure-bandstand": "4Tarima",
-"social_facility-soup_kitchen": "4Comedor social | Comedor popular | Comedor comunitario | Comida",
-"social_facility-food_bank": "Banco de alimentos | alimento | comida | voluntariado"
 }

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

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

data/editor.config

@@ -258,10 +258,6 @@
         <include field="outdoor_seating" />
         <include field="website_menu" />
       </type>
-      <type id="amenity-boat_rental">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
       <type id="amenity-bicycle_rental">
         <include field="website" />
         <include field="opening_hours" />
@@ -386,42 +382,9 @@
         <include field="operator" />
         <include field="opening_hours" />
       </type>
-      <type id="amenity-car_pooling">
-        <include field="name" />
-        <include field="operator" />
-        <include field="opening_hours" />
-      </type>
       <type id="amenity-pharmacy" group="shop">
         <include group="poi_internet" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-buddhist" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-christian" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-hindu" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-jewish" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-muslim" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-shinto" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-taoist" can_add="no">
-        <include group="poi_internet" />
-      </type>
       <type id="amenity-place_of_worship">
         <include group="poi_internet" />
       </type>
@@ -1095,9 +1058,6 @@
       <type id="shop-tea" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-telecommunication" group="shop">
-        <include group="poi_internet" />
-      </type>
       <type id="shop-trade" group="shop">
         <include group="poi_internet" />
       </type>
@@ -1145,25 +1105,6 @@
         <include group="poi_internet" />
         <include field="self_service" />
       </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-office" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-visitor_centre" can_add="no">
-        <include group="poi_internet" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-board" can_add="no">
-        <include field="name" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-map" can_add="no">
-        <include field="name" />
-      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-guidepost" can_add="no">
-      </type>
       <type id="tourism-information">
         <include group="poi" />
       </type>
@@ -1185,7 +1126,6 @@
       <type id="amenity-bench" />
       <type id="amenity-compressed_air" />
       <type id="amenity-bbq" />
-      <type id="leisure-slipway" />
       <type id="amenity-shelter">
         <include field="name" />
       </type>
@@ -1194,14 +1134,6 @@
         <include field="opening_hours" />
         <include field="level" />
       </type>
-      <type id="amenity-food_sharing">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-give_box">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
       <type id="tourism-picnic_site" />
       <type id="leisure-picnic_table" />
       <type id="leisure-park">
@@ -1264,18 +1196,6 @@
       </type>
       <type id="amenity-social_facility">
         <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="social_facility-soup_kitchen">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="social_facility-food_bank">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-payment_centre">
-        <include group="poi_internet" />
       </type>
       <type id="amenity-payment_terminal">
         <include field="operator" />
@@ -1306,9 +1226,6 @@
       <type id="amenity-money_transfer">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-mobile_money_agent">
-        <include group="poi_internet" />
-      </type>
       <type id="amenity-vehicle_inspection">
         <include group="poi_internet" />
       </type>
@@ -1371,9 +1288,6 @@
         <include group="poi" />
         <include field="operator" />
       </type>
-      <type id="leisure-indoor_play">
-        <include group="poi_internet" />
-      </type>
       <type id="leisure-fitness_centre">
         <include group="poi_internet" />
       </type>
@@ -1542,6 +1456,19 @@
         <tag k="service" v="tyres" />
         <include group="poi_internet" />
       </type>
+      <type id="tourism-information-office">
+        <tag k="tourism" v="information" />
+        <tag k="information" v="board" />
+        <include group="poi_internet" />
+      </type>
+      <type id="tourism-information-board">
+        <tag k="tourism" v="information" />
+        <tag k="information" v="board" />
+      </type>
+      <type id="tourism-information-map">
+        <tag k="tourism" v="information" />
+        <tag k="information" v="board" />
+      </type>
       <type id="leisure-sports_centre-climbing">
         <tag k="leisure" v="sports_centre" />
         <tag k="sport" v="climbing" />

data/mapcss-mapping.csv

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

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

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

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

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#000" fill-rule="evenodd"/></g></svg>

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

@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#777" fill-rule="evenodd"/></svg>

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

@@ -1 +0,0 @@
-<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#777" fill-rule="evenodd"/></svg>

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

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

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

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

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

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585E" r="8.25"/><path d="m11.9788057 9.45701798v4.46417412h-2.48216516v-1.9344754c0-.5341906-.43304708-.9672377-.96723771-.9672377-.51282301 0-.93243211.3990962-.96518032.9036416l-.00205739.0635961v1.9344754h-2.48216512v-4.46417412zm-3.44940287-4.1392834c1.90503617 0 3.44940287 1.54436664 3.44940287 3.44940283h-6.8988057c0-1.90503619 1.54436664-3.44940283 3.44940283-3.44940283zm4.47021307-1.83773458.6985699.69856997-1.0498311 1.04983111c.2863445.33051154.5419599.68947967.7623009 1.07107475l-.8568598.49403817c-.520321-.90122443-1.2678995-1.64880299-2.169124-2.16912399l.4940382-.8568598c.3815951.22034103.7405632.47595638 1.0710748.7623009z" fill="#000"/></g></svg>

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

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#111" opacity=".6"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#20607c"/></g></svg>

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

@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#111" opacity=".6"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#20607c"/></g></svg>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-7.07695726-.61839887-.00064003-.76822841c-.79974138-.64144198-1.31177891-1.6268104-1.31177891-2.73177159h7c0 1.10496119-.5120375 2.09032961-1.3117789 2.73177159l-.00064.76822841z" fill="#000" fill-rule="evenodd"/></g></svg>

data/styles/default/dark/symbols/telescope-gamma-m.svg

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m13.1340274.00741332-8.49199134 1.21422959 1.21962985 1.21976833 6.55564899-.9357696-.9357696 6.55564895 1.2197683 1.21976832 1.2142296-8.49212981c.0725574-.50887145-.3895117-.8436881-.7815158-.78151578m-10.82601505.83814936c-2.97333242 2.97402475-2.97333242 7.79521825 0 10.76924302 2.97402475 2.9733324 7.79521825 2.9733324 10.76924305 0zm-.84645746 11.86715912v3.902594h-.69234211c-.38355753 0-.69234211.2895375-.69234211.6491399v.0864043c0 .3596025.30878458.64914.69234211.64914h8.30810528c.38355753 0 .69234211-.2895375.69234211-.64914v-.0864043c0-.3596024-.30878458-.6491399-.69234211-.6491399h-.6923421v-1.4278864c-2.47539997.1890094-5.00992596-.6352931-6.92342107-2.4747076" fill="#777" transform="translate(0 .5)"/></svg>

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

@@ -1 +0,0 @@
-<svg height="15" viewBox="0 0 14 15" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.82311911 5.67246657 3.40536139 7.66676663c.1034778.2351768 0 .507982-.244584.6208669-.2351769.1034779-.5079821 0-.620867-.2445839l-1.12884905-2.5399104h-4.40251137l-1.12884907 2.5399104c-.1128849.2445839-.38569009.3480618-.62086698.2445839-.24458397-.1128849-.3480618-.3856901-.24458397-.6208669l3.00085711-6.74487323-1.63683115.76197312-1.1946986-2.54931747 6.38740431-2.98204296 1.19469857 2.54931748zm-.79019435.54561038-1.78734435 4.01682125h3.57468871zm2.59635286-5.02337835 2.55872458-1.1946986 1.5897957 3.41476843-2.5587245 1.1946986zm-9.40707557 5.4278826 2.55872456-1.1946986.79019435 1.70268068-2.55872456 1.1946986z" fill="#777" transform="translate(0 .5)"/></svg>

data/styles/default/dark/symbols/telescope-optical-m.svg

@@ -1 +0,0 @@
-<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.6801082.00001-1.6419569 1.64195683c-.5169266-.44784856-1.0783599-.84763607-1.6751823-1.19225383l-.7726855 1.34014584c1.409533.81379244 2.5787608 1.98302024 3.3925532 3.39255325l1.3401459-.77268557c-.3446178-.59682233-.7444053-1.15825566-1.1922539-1.6751823l1.6419569-1.64195683zm-8.72593811 2.09165983c-4.26738784 0-7.72685565 3.45946781-7.72685565 7.72685565h15.45371126c0-4.26738784-3.4594678-7.72685565-7.72685561-7.72685565m-7.72685565 9.27222677v4.6361134h15.45371126v-4.6361134z" fill="#777" transform="translate(0 .5)"/></svg>

data/styles/default/dark/symbols/telescope-radio-m.svg

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.69225716.00010119c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 2.68461564 0 4.84612664 2.16151093 4.84612664 4.8461266-.0138461.93627166 1.3978998.93627166 1.3846076 0 0-3.43299608-2.7977382-6.2307342-6.23073424-6.2307342m-5.38432358.84641063c-2.9731679 2.9738602-2.9731679 7.79478695 0 10.76864718 2.97386021 2.9731679 7.79478692 2.9731679 10.76864712 0zm5.38432358 1.92280457c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 1.15517812 0 2.0769114.92159482 2.0769114 2.0769114-.01384607.93627166 1.39789984.93627166 1.38460764 0 0-1.90355853-1.55796051-3.461519-3.46151904-3.461519m-6.2307342 9.94369791v3.9023781h-.6923038c-.38353631 0-.6923038.2895214-.6923038.649104v.0863996c0 .3595826.30876749.649104.6923038.649104h8.3076456c.38353631 0 .6923038-.2895214.6923038-.649104v-.0863996c0-.3595826-.30876749-.649104-.6923038-.649104h-.6923038v-1.4278074c-2.47526301.188999-5.00964876-.6352579-6.923038-2.4745707" fill="#777" transform="translate(0 .5)"/></svg>

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

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

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

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

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

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

data/styles/default/include/Basemap.mapcss

@@ -224,13 +224,13 @@ area|z10-17[boundary=protected_area][protect_class=1],
 
 line|z10-[boundary=national_park],
 line|z10-[boundary=protected_area][protect_class=1],
-{width: 0.5; opacity: 0.3; color: @protected_nature;}
+{width: 2; color: @protected_nature;}
 
 area|z10-16[boundary=aboriginal_lands],
 {fill-opacity: 0.07; fill-color: @indigenous_lands;}
 
 line|z10-[boundary=aboriginal_lands],
-{width: 0.5; opacity: 0.3; color: @indigenous_lands;}
+{width: 2; color: @indigenous_lands;}
 
 /* ToDo: Assume that military areas already have fences? */
 
@@ -428,7 +428,6 @@ area|z14-[area:highway=living_street],
 area|z14-[amenity=grave_yard],
 area|z14-[landuse=cemetery],
 area|z15-[amenity=parking],
-area|z15-[amenity=car_pooling],
 area|z16-[public_transport=platform],
 area|z16-[railway=platform],
 {fill-opacity: 1;}
@@ -591,7 +590,6 @@ area|z10-[landuse=farmyard],
 /* Parking */
 
 area|z15-[amenity=parking],
-area|z15-[amenity=car_pooling],
 {fill-color: @parking;}
 
 area|z15-[amenity=parking][location=underground],

data/styles/default/include/Icons.mapcss

@@ -844,12 +844,9 @@ node|z17-[amenity=casino],
 node|z17-[amenity=gambling],
 node|z17-[leisure=adult_gaming_centre],
 node|z17-[leisure=amusement_arcade],
-node|z17-[leisure=indoor_play],
 node|z17-[amenity=courthouse],
 node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
-node|z17-[social_facility=food_bank],
-node|z17-[social_facility=soup_kitchen],
 node|z17-[amenity=animal_shelter],
 node|z17-[amenity=kindergarten],
 node|z17-[amenity=childcare],
@@ -868,11 +865,9 @@ node|z17-[amenity=vending_machine][vending=parking_tickets],
 node|z17-[amenity=vending_machine][vending=public_transport_tickets],
 node|z17-[amenity=payment_terminal],
 node|z17-[amenity=shower],
-node|z17-[amenity=slipway],
 node|z17-[amenity=motorcycle_rental],
 node|z17-[amenity=bicycle_rental],
 node|z17-[amenity=bicycle_repair_station],
-node|z17-[amenity=boat_rental],
 node|z17-[amenity=post_office],
 node|z17-[amenity=library],
 node|z18-[post_office=post_partner],
@@ -917,13 +912,6 @@ node|z15-[leisure=sports_centre][sport=swimming],
 node|z17-[highway=ladder],
 node|z18-[amenity=dojo],
 node|z18-[amenity=vending_machine],
-node|z18-[amenity=food_sharing],
-node|z18-[amenity=give_box],
-node|z18-[man_made=telescope],
-node|z17-[man_made=telescope][telescope:type=optical],
-node|z17-[man_made=telescope][telescope:type=radio],
-node|z17-[man_made=telescope][telescope:type=gamma],
-node|z16-[man_made=observatory],
 node|z17-[amenity=fire_station],
 node|z18-[amenity=internet_cafe],
 node|z18-[emergency=defibrillator],
@@ -933,8 +921,6 @@ node|z18-[amenity=toilets],
 node|z18-[amenity=atm],
 node|z18-[amenity=bureau_de_change],
 node|z18-[amenity=money_transfer],
-node|z18-[amenity=mobile_money_agent],
-node|z18-[amenity=payment_centre],
 node|z18-[amenity=waste_disposal],
 node|z18-[amenity=recycling],
 node|z16-[amenity=recycling][recycling_type=centre],
@@ -1322,7 +1308,7 @@ node|z15-[landuse=industrial][industrial=mine],
 {icon-image: mine-m.svg;text-offset: 1;font-size: 10;}
 
 node|z16-[leisure=water_park],
-{icon-image: swimming-centre-m.svg;icon-min-distance: 30;}
+{icon-image: swimming-m.svg;icon-min-distance: 30;}
 node|z17-[leisure=water_park],
 {icon-min-distance: 20;}
 
@@ -1433,9 +1419,6 @@ node|z17-[leisure=amusement_arcade],
 node|z18-[shop=lottery],
 {icon-image: lottery-m.svg;}
 
-node|z17-[leisure=indoor_play],
-{icon-image: indoor_play-m.svg;icon-min-distance: 20;}
-
 node|z17-[amenity=courthouse],
 {icon-image: public-building-m.svg;}
 
@@ -1445,12 +1428,6 @@ node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
 {icon-image: social_facility-m.svg;}
 
-node|z17-[social_facility=soup_kitchen],
-{icon-image: soup_kitchen-m.svg;}
-
-node|z17-[social_facility=food_bank],
-{icon-image: food_bank-m.svg;}
-
 node|z17-[amenity=cinema],
 {icon-image: cinema-m.svg;}
 node|z18-[amenity=cinema],
@@ -1475,9 +1452,6 @@ node|z16-17[building=guardhouse],
 node|z16-[building=guardhouse]::int_name,
 {text: none;}
 
-node|z17-[building=train_station],
-{icon-image: train_building-m.svg; font-size: 11; text-offset: 1;}
-
 node|z17-[amenity=prison],
 {icon-image: prison-m.svg;}
 node|z18-[amenity=prison],
@@ -1496,11 +1470,6 @@ node|z17-[amenity=motorcycle_rental],
 node|z18-[amenity=motorcycle_rental],
 {font-size: 11;}
 
-node|z17-[amenity=boat_rental],
-{icon-image: boat-rental.svg;}
-node|z18-[amenity=boat_rental],
-{font-size: 11;}
-
 node|z17-[amenity=bicycle_rental],
 {icon-image: bicycle-rental.svg;}
 node|z18-[amenity=bicycle_rental],
@@ -1569,9 +1538,6 @@ node|z15-[power=plant][plant:source=wind],
 node|z16-[power=plant][plant:source=wind],
 {text: name;text-color: @neutral_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
 
-node|z17-[leisure=slipway],
-{icon-image: slipway-m.svg;}
-
 node|z17-[amenity=shower],
 {icon-image: shower-m.svg;}
 
@@ -1591,30 +1557,11 @@ node|z17-[amenity=parcel_locker],
 node|z18-[amenity=vending_machine][vending=fuel],
 {icon-image: fuel-dispenser-m.svg;}
 
-node|z18-[amenity=food_sharing],
-{icon-image: food_sharing-m.svg;}
-node|z18-[amenity=give_box],
-{icon-image: give_box-m.svg;}
-
-node|z18-[man_made=telescope],
-{icon-image: telescope-m.svg;}
-node|z17-[man_made=telescope][telescope:type=optical],
-{icon-image: telescope-optical-m.svg;}
-node|z17-[man_made=telescope][telescope:type=radio],
-{icon-image: telescope-radio-m.svg;}
-node|z17-[man_made=telescope][telescope:type=gamma],
-{icon-image: telescope-gamma-m.svg;}
-
-node|z16-[man_made=observatory],
-{icon-image: observatory-m.svg;}
-
 node|z17-[aeroway=gate],
 {icon-image: airport_gate-m.svg;font-size: 11;}
 
 node|z17-[amenity=bureau_de_change],
 node|z17-[amenity=money_transfer],
-node|z17-[amenity=mobile_money_agent],
-node|z17-[amenity=payment_centre],
 {icon-image: banknote-m.svg;font-size: 11;}
 
 node|z16-[amenity=fire_station],
@@ -1761,7 +1708,6 @@ node|z16-[shop=laundry],
 node|z16-[shop=lighting],
 node|z16-[shop=dry_cleaning],
 node|z16-[shop=mobile_phone],
-node|z16-[shop=telecommunication],
 node|z16-[shop=optician],
 node|z16-[shop=outdoor],
 node|z16-[shop=rental],
@@ -1928,7 +1874,6 @@ node|z16[shop=laundry],
 node|z16[shop=dry_cleaning],
 {icon-image:dry_cleaning-m.svg;}
 node|z16[shop=mobile_phone],
-node|z16[shop=telecommunication],
 {icon-image: mobile_phone-m.svg;}
 node|z16[shop=optician],
 {icon-image: optician-m.svg;}
@@ -2075,7 +2020,6 @@ node|z17-[shop=laundry],
 node|z17-[shop=dry_cleaning],
 {icon-image:dry_cleaning-m.svg;icon-min-distance: 24;}
 node|z17-[shop=mobile_phone],
-node|z17-[shop=telecommunication],
 {icon-image: mobile_phone-m.svg;icon-min-distance: 24;}
 node|z17-[shop=optician],
 {icon-image: optician-m.svg;icon-min-distance: 24;}
@@ -2189,7 +2133,6 @@ node|z17-[amenity=bicycle_parking],
 node|z17-[amenity=motorcycle_parking],
 node|z17-[amenity=car_wash],
 node|z18-[amenity=parking],
-node|z18-[amenity=car_pooling],
 node|z18-[amenity=car_rental],
 node|z18-[amenity=car_sharing],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
@@ -2264,11 +2207,6 @@ node|z16-[amenity=parking],
 node|z17-[amenity=parking],
 {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}
 
-node|z16-[amenity=car_pooling],
-{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
-node|z17-[amenity=car_pooling],
-{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
-
 node|z16-[amenity=parking][location=underground],
 {icon-image:parking_underground-m.svg;}
 

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -1,7 +1,5 @@
 /* Setting the colors for all POI icons */
-/* Please add new items so that they fit in the existing alphabetical order */
 
-node[amenity=boat_rental],
 node[amenity=car_rental],
 node[amenity=car_sharing],
 node[amenity=internet_cafe],
@@ -32,8 +30,8 @@ node[shop=tyres],
 node[shop=wholesale],
 {text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-node[craft=photographer],
 node[craft=tailor],
+node[craft=photographer],
 {text-color: @shop_label}
 
 node[amenity=bar],
@@ -57,7 +55,6 @@ node[leisure=adult_gaming_centre],
 node[leisure=amusement_arcade],
 node[leisure=bowling_alley],
 node[leisure=escape_game],
-node[leisure=indoor_play],
 node[shop=bookmaker],
 node[shop=lottery],
 node[tourism=aquarium],
@@ -73,7 +70,6 @@ node[amenity=place_of_worship]
 node[amenity=social_facility],
 node[historic=ship],
 node[leisure=hackerspace],
-node[social_facility],
 node[tourism=attraction],
 node[tourism=gallery],
 node[tourism=museum],
@@ -90,7 +86,6 @@ node[tourism=motel],
 node[tourism=wilderness_hut],
 {text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
-node[amenity=dojo],
 node[leisure=dance],
 node[leisure=fitness_centre],
 node[leisure=sports_centre],
@@ -105,7 +100,6 @@ node[leisure=beach_resort],
 node[leisure=marina],
 node[leisure=sports_centre][sport=scuba_diving],
 node[leisure=sports_centre][sport=swimming],
-node[leisure=water_park],
 {text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
 area[amenity=university][name]
@@ -122,11 +116,9 @@ node[amenity=fire_station],
 node[amenity=kindergarten],
 node[amenity=language_school],
 node[amenity=library],
-node[amenity=mobile_money_agent],
 node[amenity=money_transfer],
 node[amenity=music_school],
 node[amenity=nursing_home],
-node[amenity=payment_centre],
 node[amenity=police],
 node[amenity=post_office],
 node[amenity=prison],
@@ -135,9 +127,6 @@ node[amenity=townhall],
 node[amenity=university][name],
 node[barrier=border_control],
 node[building=guardhouse],
-node[man_made=communications_tower],
-node[man_made=lighthouse],
-node[man_made=observatory],
 node[office=diplomatic],
 node[office=security],
 node[shop=money_lender],

data/styles/default/include/priorities_1_BG-by-size.prio.txt

@@ -140,7 +140,6 @@ railway-platform                                    # area z16- (also has captio
 
 amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)

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

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

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

@@ -773,7 +773,6 @@ shop-health_food                                    # icon z16- (also has captio
 === 2700
 
 amenity-bicycle_rental                              # icon z17- (also has caption(optional) z17-)
-amenity-boat_rental                                 # icon z17- (also has caption(optional) z17-)
 amenity-car_sharing                                 # icon z18- (also has caption(optional) z18-)
 amenity-taxi                                        # icon z16- (also has caption(optional) z16-)
 === 2600
@@ -867,7 +866,6 @@ shop-shoes                                          # icon z16- (also has captio
 shop-sports                                         # icon z16- (also has caption(optional) z16-)
 shop-stationery                                     # icon z16- (also has caption(optional) z16-)
 shop-tea                                            # icon z18- (also has caption(optional) z18-)
-shop-telecommunication                              # icon z16- (also has caption(optional) z16-)
 shop-toys                                           # icon z16- (also has caption(optional) z16-)
 shop-travel_agency                                  # icon z18- (also has caption(optional) z18-)
 shop-wine                                           # icon z16- (also has caption(optional) z16-)
@@ -918,7 +916,7 @@ natural-wetland-tidalflat                           # caption z16- (also has are
 tourism-picnic_site                                 # icon z16- (also has caption(optional) z16-)
 === 1800
 
-building-train_station                              # icon z17- (also has caption(optional) z17-, area z14-)
+building-train_station                              # caption z17- (also has area z14-)
 railway-level_crossing                              # icon z17-
 === 1700
 
@@ -968,10 +966,8 @@ amenity-childcare                                   # icon z17- (also has captio
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z17-)
 amenity-language_school                             # icon z17- (also has caption(optional) z17-)
-amenity-mobile_money_agent                          # icon z17- (also has caption(optional) z18-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z17-)
-amenity-payment_centre                              # icon z17- (also has caption(optional) z18-)
 amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
@@ -989,7 +985,6 @@ leisure-escape_game                                 # icon z17- (also has captio
 leisure-fitness_centre                              # icon z16- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
-man_made-observatory                                # icon z16- (also has caption(optional) z16-)
 office-estate_agent                                 # icon z18- (also has caption(optional) z18-)
 office-government                                   # icon z18- (also has caption(optional) z18-)
 office-insurance                                    # icon z18- (also has caption(optional) z18-)
@@ -1135,8 +1130,6 @@ amenity-vending_machine-public_transport_tickets    # icon z17- (also has captio
 amenity-water_point-drinking_water_no               # icon z18- (also has caption(optional) z18-)
 highway-elevator                                    # icon z17-
 leisure-picnic_table                                # icon z17- (also has caption(optional) z17-)
-man_made-telescope-gamma                            # icon z17- (also has caption(optional) z17-)
-man_made-telescope-radio                            # icon z17- (also has caption(optional) z17-)
 man_made-water_tap-drinking_water_no                # icon z18- (also has caption(optional) z18-)
 man_made-water_well-drinking_water_no               # icon z18- (also has caption(optional) z18-)
 natural-spring-drinking_water_no                    # icon z14- (also has caption(optional) z15-)
@@ -1146,10 +1139,6 @@ isoline-step_10                                     # pathtext z17- (also has li
 isoline-zero                                        # pathtext z17- (also has line z15-)
 === 1000
 
-social_facility-food_bank                           # icon z17- (also has caption(optional) z17-)
-social_facility-soup_kitchen                        # icon z17- (also has caption(optional) z17-)
-=== 851
-
 amenity-grave_yard                                  # icon z17- (also has caption(optional) z17-, area z10-)
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z10-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
@@ -1211,7 +1200,6 @@ healthcare-psychotherapist                          # icon z17- (also has captio
 healthcare-speech_therapist                         # icon z17- (also has caption(optional) z17-)
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
-leisure-indoor_play                                 # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
@@ -1262,7 +1250,6 @@ power-portal                                        # icon z19-
 power-tower                                         # icon z19-
 === 450
 
-amenity-car_pooling                                 # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking                                     # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking-fee                                 # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking-multi-storey                        # icon z16- (also has caption(optional) z18-, area z15-)
@@ -1329,7 +1316,7 @@ landuse-railway                                     # caption z15- (also has are
 landuse-residential                                 # caption z17-
 landuse-retail                                      # caption z16- (also has area z13-)
 leisure-common                                      # caption z17-
-leisure-slipway                                     # icon z17- (also has caption(optional) z17-)
+leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
@@ -1823,7 +1810,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7300
 
 # amenity-bicycle_rental                            # caption(optional) z17- (also has icon z17-)
-# amenity-boat_rental                               # caption(optional) z17- (also has icon z17-)
 # amenity-car_sharing                               # caption(optional) z18- (also has icon z18-)
 # amenity-taxi                                      # caption(optional) z16- (also has icon z16-)
 # === -7400
@@ -1913,7 +1899,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-sports                                       # caption(optional) z16- (also has icon z16-)
 # shop-stationery                                   # caption(optional) z16- (also has icon z16-)
 # shop-tea                                          # caption(optional) z18- (also has icon z18-)
-# shop-telecommunication                            # caption(optional) z16- (also has icon z16-)
 # shop-toys                                         # caption(optional) z16- (also has icon z16-)
 # shop-travel_agency                                # caption(optional) z18- (also has icon z18-)
 # shop-wine                                         # caption(optional) z16- (also has icon z16-)
@@ -1949,9 +1934,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
-# building-train_station                            # caption(optional) z17- (also has icon z17-, area z14-)
-# === -8300
-
 # leisure-sports_centre-sport-swimming              # caption(optional) z15- (also has icon z15-, area z13-)
 # === -8380
 
@@ -1995,10 +1977,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z17- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z17- (also has icon z17-)
-# amenity-mobile_money_agent                        # caption(optional) z18- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z17- (also has icon z17-)
-# amenity-payment_centre                            # caption(optional) z18- (also has icon z17-)
 # amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
@@ -2016,7 +1996,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-fitness_centre                            # caption(optional) z17- (also has icon z16-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
-# man_made-observatory                              # caption(optional) z16- (also has icon z16-)
 # office-estate_agent                               # caption(optional) z18- (also has icon z18-)
 # office-government                                 # caption(optional) z18- (also has icon z18-)
 # office-insurance                                  # caption(optional) z18- (also has icon z18-)
@@ -2157,17 +2136,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)
 # amenity-water_point-drinking_water_no             # caption(optional) z18- (also has icon z18-)
 # leisure-picnic_table                              # caption(optional) z17- (also has icon z17-)
-# man_made-telescope-gamma                          # caption(optional) z17- (also has icon z17-)
-# man_made-telescope-radio                          # caption(optional) z17- (also has icon z17-)
 # man_made-water_tap-drinking_water_no              # caption(optional) z18- (also has icon z18-)
 # man_made-water_well-drinking_water_no             # caption(optional) z18- (also has icon z18-)
 # natural-spring-drinking_water_no                  # caption(optional) z15- (also has icon z14-)
 # === -8800
 
-# social_facility-food_bank                         # caption(optional) z17- (also has icon z17-)
-# social_facility-soup_kitchen                      # caption(optional) z17- (also has icon z17-)
-# === -9149
-
 # amenity-grave_yard                                # caption(optional) z17- (also has icon z17-, area z10-)
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z10-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
@@ -2215,7 +2188,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-speech_therapist                       # caption(optional) z17- (also has icon z17-)
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
-# leisure-indoor_play                               # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
@@ -2261,7 +2233,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-water_tower                              # caption(optional) z18- (also has icon z16-)
 # === -9550
 
-# amenity-car_pooling                               # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking                                   # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking-fee                               # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking-multi-storey                      # caption(optional) z18- (also has icon z16-, area z15-)
@@ -2307,7 +2278,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
 # landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
 # landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
-# leisure-slipway                                   # caption(optional) z17- (also has icon z17-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z17-)
 # power-generator-wind                              # caption(optional) z18- (also has icon z15-, area z13-)
 # === -9880
@@ -2336,8 +2306,6 @@ amenity-telephone                                   # icon z17- (also has captio
 entrance                                            # icon z17- (also has caption(optional) z19-)
 === -9960
 
-amenity-food_sharing                                # icon z18- (also has caption(optional) z18-)
-amenity-give_box                                    # icon z18- (also has caption(optional) z18-)
 amenity-parking_space                               # caption z19-
 amenity-parking_space-disabled                      # icon z18- (also has caption(optional) z19-)
 amenity-parking_space-permissive                    # caption z19-
@@ -2353,7 +2321,6 @@ amenity-vending_machine-food                        # icon z18- (also has captio
 amenity-vending_machine-newspapers                  # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-sweets                      # icon z18- (also has caption(optional) z18-)
 building-address                                    # caption z16-
-man_made-telescope-optical                          # icon z17- (also has caption(optional) z17-)
 === -9970
 
 amenity-bench                                       # icon z18- (also has caption(optional) z19-)
@@ -2363,7 +2330,6 @@ amenity-waste_disposal                              # icon z18- (also has captio
 emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17-
-man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
@@ -2373,8 +2339,6 @@ power-substation                                    # icon z17- (also has captio
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
-# amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
-# amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
 amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
 # amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
@@ -2399,8 +2363,6 @@ entrance-exit                                       # icon z17- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
-# man_made-telescope                                # caption(optional) z18- (also has icon z18-)
-# man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)

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

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

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

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#9c6136" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#fff" fill-rule="evenodd"/></g></svg>

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

@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#747e86" fill-rule="evenodd"/></svg>

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

@@ -1 +0,0 @@
-<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#747e86" fill-rule="evenodd"/></svg>

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

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

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

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

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

@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m11.9788057 9.45701798v4.46417412h-2.48216516v-1.9344754c0-.5341906-.43304708-.9672377-.96723771-.9672377-.51282301 0-.93243211.3990962-.96518032.9036416l-.00205739.0635961v1.9344754h-2.48216512v-4.46417412zm-3.44940287-4.1392834c1.90503617 0 3.44940287 1.54436664 3.44940287 3.44940283h-6.8988057c0-1.90503619 1.54436664-3.44940283 3.44940283-3.44940283zm4.47021307-1.83773458.6985699.69856997-1.0498311 1.04983111c.2863445.33051154.5419599.68947967.7623009 1.07107475l-.8568598.49403817c-.520321-.90122443-1.2678995-1.64880299-2.169124-2.16912399l.4940382-.8568598c.3815951.22034103.7405632.47595638 1.0710748.7623009z" fill="#fff"/></g></svg>

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

@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#fff" opacity=".8"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#427bb8"/></g></svg>

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

@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#fff" opacity=".8"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#427bb8"/></g></svg>

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

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

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

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