[fdroid] Release version 2025.11.25-4

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

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

@@ -0,0 +1,33 @@
+En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME.
+
+Læs mere om grundlaget for projektet og dets udviklingsretnign på <b><i>codeberg.org/comaps</i></b>.
+Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden.
+• Brug appen og fortæl andre om den
+• Giv feedback anmeld fejl
+• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden.
+
+‣ <b>Offlinefokuseret</b>: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse.
+‣ <b>Respekt for privatlivets fred</b>: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri.
+‣ <b>Enkel og elegant</b>: de essentielle funktioner er nemme at bruge, og de virker bare.
+‣ <b>Sparer på batteriet og på lagerpladsen</b>: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug.
+‣ <b>Gratis og bygget i fællesskab</b>: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge.
+‣ <b>Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source.</b>
+
+<b>Hovedfunktioner</b>
+• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort.
+• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm.
+• Gangstier og cykelstier
+• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre.
+• Søg efter stednavn, adresse, eller type af sted.
+• Gem dine yndlingssteder som bogmærker med et enkelt tryk. 
+• iCloud synkronisering af bogmærker og optagede spor.
+• Offline artikler fra Wikipedia.
+• Metro-lag med navigation.
+• Optagelse af spor.
+• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX.
+• Mørk tilstand til brug om natten.
+• Mulighed for at forbedre kortet vha. en indbygget editor.
+• CarPlay understøttes.
+
+<b>Friheden er ankommet</b>
+Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet!

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

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

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

@@ -1,8 +1,13 @@
-• OpenStreetMap data as of November 4
-• Recategorized map icons including some new colors for entertainment, sports and other businesses
-• Display info about available sockets on charging stations
-• Added bandstands, backless benches and loungers
-• New icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
-• Multiple search improvements and crash fix
-• Improved voice guidance during navigation
-Check our Codeberg release notes for more changes!
+• Fixed voice directions pronouncing weird symbols in the beginning
+• OpenStreetMap data as of November 23
+
+Changes in the previous release:
+• Added trees
+• Made bus stop icons smaller and show up earlier
+• Reduce visibility of entrances
+• Added several other POI types
+• Show sand areas on the map
+• Add business is vacant option to the OSM editor
+• Improved road shields in Europe
+• Avoid paved roads routing option
+• Added icons to the settings page

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

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

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

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

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

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

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/ta-IN/short-description.txt

@@ -1 +1 @@
-எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது

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

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.11.25-4-FDroid+25112504

android/app/src/google/play/listings/ta-IN/short-description.txt

@@ -1 +1 @@
-எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -31,6 +31,8 @@ import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+
+import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -108,7 +110,6 @@ public class PlacePageView extends Fragment
   private static final String TRACK_SHARE_MENU_ID = "TRACK_SHARE_MENU_ID";
 
   private static final int SHORT_HORIZON_CLOSE_MIN = 60;
-
   private static final int SHORT_HORIZON_OPEN_MIN = 15;
 
   private static final List<CoordinatesFormat> visibleCoordsFormat =
@@ -831,12 +832,44 @@ public class PlacePageView extends Fragment
     final SpannableStringBuilder openStateString = new SpannableStringBuilder();
     final boolean isOpen = (poiState.state == OhState.State.Open); // False == Closed due to early exit for Unknown
     final long nextStateTime = isOpen ? poiState.nextTimeClosed : poiState.nextTimeOpen; // Unix time (seconds)
+
+    ZonedDateTime nextChangeLocal = null;
+    boolean hasFiniteNextChange = false;
+
     final long nowSec = System.currentTimeMillis() / 1000;
     final int minsToNextState = (int) ((nextStateTime - nowSec) / 60);
 
-    // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
-    final ZonedDateTime nextChangeLocal =
-      ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault());
+    // Try to resolve a finite next-change time; handle 24/7 case
+    final boolean looksLike247 = "24/7".equals(ohStr.trim());
+    final int ONE_WEEK_MIN = 7 * 24 * 60;
+    final boolean noRealNextChange = looksLike247 || minsToNextState >= ONE_WEEK_MIN;
+
+    if (!noRealNextChange)
+    {
+      try
+      {
+        if (nextStateTime > 0 && nextStateTime < Long.MAX_VALUE / 2)
+        {
+          // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
+          nextChangeLocal = ZonedDateTime.ofInstant(
+              Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault()
+          );
+          hasFiniteNextChange = true;
+        }
+      }
+      catch (Throwable ignored) {}
+    }
+
+    if (!hasFiniteNextChange) // No valid next change
+    {
+      if (isOpen)
+        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      else
+        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+      UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString);
+      return;
+    }
 
     String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes(
       nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));

android/app/src/main/res/drawable-night/ic_category_atm.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_bank.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_children.xml

@@ -4,7 +4,7 @@
       <size
           android:width="40dp"
           android:height="40dp" />
-      <solid android:color="#7F5933" />
+      <solid android:color="#802D19" />
     </shape>
   </item>
   <item>

android/app/src/main/res/drawable-night/ic_category_eat.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#BB9342" />
+            <solid android:color="#8C491C" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_entertainment.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#802D19" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_food.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_fuel.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#574469" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_hospital.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#C15746" />
+            <solid android:color="#983E44" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_hotel.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#664E42" />
+            <solid android:color="#614A43" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_nightlife.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#BB9342" />
+            <solid android:color="#8C491C" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_parking.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#2E89B0" />
+            <solid android:color="#20607C" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_pharmacy.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#C15746" />
+            <solid android:color="#983E44" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_police.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_post.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_recycling.xml

@@ -5,7 +5,7 @@
       <size
         android:width="40dp"
         android:height="40dp" />
-      <solid android:color="#717065" />
+      <solid android:color="#51585E" />
     </shape>
   </item>
   <item>

android/app/src/main/res/drawable-night/ic_category_rv.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_secondhand.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_shopping.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_toilet.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_tourism.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#6E4426" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable-night/ic_category_wifi.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable/ic_category_children.xml

@@ -4,7 +4,7 @@
       <size
           android:width="40dp"
           android:height="40dp" />
-      <solid android:color="#9C6136" />
+      <solid android:color="#EB785D" />
     </shape>
   </item>
   <item>

android/app/src/main/res/drawable/ic_category_entertainment.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="#EB785D" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable/ic_category_fuel.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="#AA96BC" />
         </shape>
     </item>
     <item>

android/app/src/main/res/drawable/ic_category_toilet.xml

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="#747E86" />
         </shape>
     </item>
     <item>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:background="?attr/cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
@@ -20,8 +21,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_tolls_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_tolls"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -41,8 +49,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_unpaved_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_unpaved"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -62,8 +77,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_paved_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_paved"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -83,8 +105,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_ferry_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_ferry"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -104,8 +133,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_motorways_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_motorways"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -125,8 +161,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_steps_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_steps"
       android:textAppearance="?android:attr/textAppearanceMedium"

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

@@ -505,8 +505,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Chcete změnu odeslat všem uživatelům?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data</string>
-    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy</string>
+    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data.</string>
+    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy.</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Záznam trasy</string>
     <!-- For the first routing -->

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

@@ -109,11 +109,11 @@
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
     <string name="category_fuel">Tankstelle</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
-    <string name="category_parking">Parkplätze|Parkplatz|Stellplatz</string>
+    <string name="category_parking">Parkplätze</string>
     <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
     <string name="category_shopping">Shopping</string>
     <!-- Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @category_secondhand! -->
-    <string name="category_secondhand">Second-hand|Gebrauchte Artikel|Gebrauchte Ware</string>
+    <string name="category_secondhand">Second-hand</string>
     <!-- Search category for places to stay; any changes should be duplicated in categories.txt @category_hotel! -->
     <string name="category_hotel">Hotel</string>
     <!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @category_tourism! -->
@@ -897,4 +897,12 @@
     <string name="opens_at">Öffnet um %s</string>
     <string name="closes_at">Schließt um %s</string>
     <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
+    <string name="closes_day_at">Schließt am %1$s um %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="editor_business_vacant_button">Geschäft ist leerstehend</string>
+    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_submit">Absenden</string>
 </resources>

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

@@ -909,4 +909,8 @@
         <item quantity="other">%d min</item>
     </plurals>
     <string name="list_description_empty">Modificar la lista para añadir una descripción</string>
+    <string name="editor_business_vacant_button">Negocio vacante</string>
+    <string name="editor_mark_business_vacant_title">Marcar negocio como vacante</string>
+    <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>

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

@@ -516,8 +516,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Kas soovid saata selle kõigile kasutajatele?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust</string>
+    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust.</string>
     <string name="navigation_stop_button">Lõpeta</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Rada on salvestamisel</string>

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

@@ -891,4 +891,8 @@
     <string name="unknown_count">sconosciuto</string>
     <string name="error_value_must_be_positive">Il valore deve essere positivo</string>
     <string name="error_invalid_number">Numero non valido</string>
+    <string name="editor_business_vacant_button">L\'attività è vacante</string>
+    <string name="editor_mark_business_vacant_title">Contrassegna l\'attività come vacante</string>
+    <string name="editor_mark_business_vacant_description">Utilizza questa opzione se l\'azienda ha traslocato e lo spazio è vuoto e pronto per un nuovo inquilino.</string>
+    <string name="editor_submit">Conferma</string>
 </resources>

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

@@ -518,8 +518,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
     <string name="navigation_stop_button">Apturēt</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Maršruta reģistrēšana</string>

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

@@ -522,8 +522,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Vil du sende det til alle brukere?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål</string>
+    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål.</string>
     <string name="navigation_stop_button">Stopp</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Tar opp sporet</string>
@@ -894,4 +894,5 @@
     <string name="opens_day_at">Åpner %1$s %2$s</string>
     <string name="closes_at">Stenger %s</string>
     <string name="opens_at">Åpner %s</string>
+    <string name="editor_submit">Send</string>
 </resources>

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

@@ -520,8 +520,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Wil je het naar alle gebruikers sturen?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben</string>
+    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben.</string>
     <string name="navigation_stop_button">Stop</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Spoor opnemen</string>

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

@@ -462,8 +462,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Deseja enviar para todos os usuários?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal</string>
-    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida</string>
+    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as alterações e entrarão em contato caso tenham alguma dúvida.</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Registro da pista</string>
     <!-- For the first routing -->
@@ -880,4 +880,8 @@
         <item quantity="many">%d min</item>
         <item quantity="other">%d min</item>
     </plurals>
+    <string name="editor_business_vacant_button">Local está desocupado</string>
+    <string name="editor_mark_business_vacant_title">Marcar local como desocupado</string>
+    <string name="editor_mark_business_vacant_description">Use isto se o estabelecimento mudou de endereço ou o local está vago e disponível para outra empresa.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>

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

@@ -513,8 +513,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Да ли желите да поделите са свим другим корисницима?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања</string>
+    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања.</string>
     <string name="navigation_stop_button">Стоп</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Снимање путање</string>

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

@@ -530,8 +530,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">您想要发送给所有用户吗？</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系</string>
+    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据。</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系。</string>
     <string name="navigation_stop_button">停止</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">记录轨迹</string>
@@ -634,7 +634,7 @@
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">避开收费公路</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">避开非铺装道路‌</string>
+    <string name="avoid_unpaved">避开非铺装道路</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_ferry">避开轮渡</string>
     <string name="avoid_motorways">避开高速公路</string>
@@ -643,7 +643,7 @@
     <string name="define_to_avoid_btn">选择要避开的道路</string>
     <string name="change_driving_options_btn">绕行设置已开启</string>
     <string name="toll_road">收费公路</string>
-    <string name="unpaved_road">非铺装道路‌</string>
+    <string name="unpaved_road">非铺装道路</string>
     <string name="ferry_crossing">轮渡</string>
     <!-- A generic "Yes" button in dialogs -->
     <string name="yes">是</string>

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

@@ -306,7 +306,7 @@
     <string name="type.entrance">Vchod</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Hlavní vchod</string>
-    <string name="type.entrance.exit">Východ</string>
+    <string name="type.entrance.exit">Východ (Pouze)</string>
     <string name="type.fee.no">Zdarma</string>
     <string name="type.healthcare.laboratory">Lékařská laboratoř</string>
     <string name="type.healthcare.physiotherapist">Fyzioterapeut</string>
@@ -1001,7 +1001,7 @@
     <string name="type.shop.jewelry">Klenotnictví</string>
     <string name="type.shop.kitchen">Prodejna kuchyní</string>
     <string name="type.shop.laundry">Prádelna</string>
-    <string name="type.shop.mall">Obchoďák</string>
+    <string name="type.shop.mall">Obchodní centrum</string>
     <string name="type.shop.massage">Masážní salon</string>
     <string name="type.shop.mobile_phone">Obchod s mobilními telefony</string>
     <string name="type.shop.money_lender">Půjčovatel peněz</string>
@@ -1454,4 +1454,46 @@
     <string name="type.social_facility.soup_kitchen">Vývařovna</string>
     <string name="type.amenity.food_sharing">Food sharing</string>
     <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.beacon.cardinal.east">Kardinální baken</string>
+    <string name="type.beacon.cardinal.north">Kardinální baken</string>
+    <string name="type.beacon.cardinal.south">Kardinální baken</string>
+    <string name="type.beacon.cardinal.west">Kardinální baken</string>
+    <string name="type.beacon.isolated_danger">Izolovaný výstražný baken</string>
+    <string name="type.beacon.lateral.port">Laterální baken</string>
+    <string name="type.beacon.lateral.starboard">Laterální baken</string>
+    <string name="type.beacon.safe_water">Baken pro bezpečnou vodu</string>
+    <string name="type.beacon.special_purpose">Baken pro speciální účely</string>
+    <string name="type.buoy.cardinal.east">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.north">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.south">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.west">Kardinální bóje</string>
+    <string name="type.buoy.isolated_danger">Izolovaná výstražná bóje</string>
+    <string name="type.buoy.lateral.port">Laterální bóje</string>
+    <string name="type.buoy.lateral.starboard">Laterální bóje</string>
+    <string name="type.buoy.safe_water">Bóje pro bezpečnou vodu</string>
+    <string name="type.buoy.special_purpose">Bóje pro speciální účely</string>
+    <string name="type.spherical_buoy.cardinal.east">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.north">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.south">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.west">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.isolated_danger">Sférická izolovaná výstražná bóje</string>
+    <string name="type.spherical_buoy.lateral.port">Sférická laterální bóje</string>
+    <string name="type.spherical_buoy.lateral.starboard">Sférická laterální bóje</string>
+    <string name="type.spherical_buoy.safe_water">Sférická bóje pro bezpečnou vodu</string>
+    <string name="type.spherical_buoy.special_purpose">Sférická bóje pro speciální účely</string>
+    <string name="type.lateral.port">Levobok</string>
+    <string name="type.lateral.starboard">Pravobok</string>
+    <string name="type.cardinal.east">Východ</string>
+    <string name="type.cardinal.north">Sever</string>
+    <string name="type.cardinal.south">Jih</string>
+    <string name="type.cardinal.west">Západ</string>
+    <string name="type.entrance.house">Vchod do domu</string>
+    <string name="type.entrance.garage">Vchod do garáže</string>
+    <string name="type.entrance.service">Služební vchod</string>
+    <string name="type.entrance.entry">Vstup (Pouze)</string>
+    <string name="type.entrance.emergency">Nouzový východ</string>
+    <string name="type.natural.sand">Písek</string>
+    <string name="type.natural.tree">Strom</string>
+    <string name="type.shop.beauty.nails">Nehtový salón</string>
+    <string name="type.xmas.tree">Vánoční strom</string>
 </resources>

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

@@ -1416,5 +1416,8 @@
     <string name="type.social_facility.food_bank">Fødevarebank</string>
     <string name="type.social_facility.soup_kitchen">Suppekøkken</string>
     <string name="type.amenity.food_sharing">Fødevarerdeling</string>
-    <string name="type.amenity.give_box">Donationsbøsse</string>
+    <string name="type.amenity.give_box">Bytteboks</string>
+    <string name="type.amenity.sailing_school">Sejlerskole</string>
+    <string name="type.amenity.flight_school">Flyveskole</string>
+    <string name="type.power.portal">Kraftværksportal</string>
 </resources>

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

@@ -1161,6 +1161,7 @@
     <string name="type.shop.bakery">Bäckerei</string>
     <string name="type.shop.bathroom_furnishing">Badezimmerausstattung</string>
     <string name="type.shop.beauty">Schönheitssalon</string>
+    <string name="type.shop.beauty.nails">Nagelstudio</string>
     <string name="type.shop.beverages">Getränkemarkt</string>
     <string name="type.shop.bicycle">Fahrradladen</string>
     <string name="type.shop.bookmaker">Wettbüro</string>
@@ -1496,4 +1497,7 @@
     <string name="type.shop.beauty.day_spa">Tages-Spa</string>
     <string name="type.amenity.give_box">Spendenbox</string>
     <string name="type.xmas.tree">Weihnachtsbaum</string>
+    <string name="type.amenity.mobile_money_agent">Mobile Money Vertretung</string>
+    <string name="type.amenity.food_sharing">Food Sharing</string>
+    <string name="type.natural.sand">Sand</string>
 </resources>

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

@@ -1454,4 +1454,49 @@
     <string name="type.social_facility.soup_kitchen">Comedor social</string>
     <string name="type.amenity.food_sharing">Alimentos compartidos</string>
     <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.amenity.sailing_school">Escuela de vela</string>
+    <string name="type.amenity.flight_school">Escuela de aviación</string>
+    <string name="type.amenity.prep_school">Escuela de tutoría</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marca cardinal</string>
+    <string name="type.beacon.isolated_danger">Marca de peligro aislado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.beacon.lateral.starboard">Marca lateral</string>
+    <string name="type.beacon.safe_water">Marca de aguas navegables</string>
+    <string name="type.beacon.special_purpose">Marca especial</string>
+    <string name="type.buoy.cardinal.east">Boya cardinal</string>
+    <string name="type.buoy.cardinal.north">Boya cardinal</string>
+    <string name="type.buoy.cardinal.south">Boya cardinal</string>
+    <string name="type.buoy.cardinal.west">Boya cardinal</string>
+    <string name="type.buoy.isolated_danger">Boya de peligro aislado</string>
+    <string name="type.buoy.lateral.port">Boya lateral</string>
+    <string name="type.buoy.lateral.starboard">Boya lateral</string>
+    <string name="type.buoy.safe_water">Boya de aguas navegables</string>
+    <string name="type.buoy.special_purpose">Boya de uso especial</string>
+    <string name="type.spherical_buoy.cardinal.east">Boya cardinal especial</string>
+    <string name="type.spherical_buoy.cardinal.north">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.south">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.west">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.isolated_danger">Boya esférica de peligro aislado</string>
+    <string name="type.spherical_buoy.lateral.port">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boya esférica de aguas navegables</string>
+    <string name="type.spherical_buoy.special_purpose">Boya esférica de uso especial</string>
+    <string name="type.lateral.port">Babor</string>
+    <string name="type.lateral.starboard">Estribor</string>
+    <string name="type.cardinal.east">Este</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sur</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garaje</string>
+    <string name="type.entrance.service">Entrada de servicio</string>
+    <string name="type.entrance.entry">Entrada (únicamente)</string>
+    <string name="type.entrance.emergency">Salida de emergencia</string>
+    <string name="type.natural.sand">Arena</string>
+    <string name="type.natural.tree">Árbol</string>
+    <string name="type.shop.beauty.day_spa">Spa</string>
+    <string name="type.xmas.tree">Árbol de Navidad</string>
 </resources>

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

@@ -358,7 +358,7 @@
     <string name="type.entrance">Sissepääs</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Peasissepääs</string>
-    <string name="type.entrance.exit">Väljapääs</string>
+    <string name="type.entrance.exit">Vaid väljapääs</string>
     <string name="type.fee.no">Tasuta</string>
     <string name="type.healthcare.laboratory">Meditsiinilabor</string>
     <string name="type.healthcare.physiotherapist">Füsioterapeut</string>
@@ -1457,4 +1457,39 @@
     <string name="type.amenity.flight_school">Lennukool</string>
     <string name="type.amenity.prep_school">Tugiõpe</string>
     <string name="type.amenity.sailing_school">Purjetamiskool</string>
+    <string name="type.entrance.house">Maja sissepääs</string>
+    <string name="type.entrance.garage">Garaaži sissepääs</string>
+    <string name="type.entrance.service">Teenistuskäik</string>
+    <string name="type.entrance.entry">Vaid sissepääs</string>
+    <string name="type.entrance.emergency">Avariiväljapääs</string>
+    <string name="type.natural.sand">Liiv</string>
+    <string name="type.natural.tree">Üksik puu</string>
+    <string name="type.xmas.tree">Jõulupuu</string>
+    <string name="type.beacon.cardinal.east">Idatooder</string>
+    <string name="type.beacon.cardinal.north">Põhjatooder</string>
+    <string name="type.beacon.cardinal.south">Lõunatooder</string>
+    <string name="type.beacon.cardinal.west">Läänetooder</string>
+    <string name="type.buoy.cardinal.east">Idapoi</string>
+    <string name="type.buoy.cardinal.north">Põhjapoi</string>
+    <string name="type.buoy.cardinal.south">Lõunapoi</string>
+    <string name="type.buoy.cardinal.west">Läänepoi</string>
+    <string name="type.buoy.lateral.port">Lateraalpoi pakpoordis</string>
+    <string name="type.buoy.lateral.starboard">Lateraalpoi tüürpoordis</string>
+    <string name="type.buoy.special_purpose">Eriotstarbeline poi</string>
+    <string name="type.spherical_buoy.cardinal.east">Kerapoi idas</string>
+    <string name="type.spherical_buoy.cardinal.north">Kerapoi põhjas</string>
+    <string name="type.spherical_buoy.cardinal.south">Kerapoi lõunas</string>
+    <string name="type.spherical_buoy.cardinal.west">Kerapoi läänes</string>
+    <string name="type.spherical_buoy.lateral.port">Kerapoi pakpoordis</string>
+    <string name="type.spherical_buoy.lateral.starboard">Kerapoi tüürpoordis</string>
+    <string name="type.spherical_buoy.special_purpose">Eritistarbeline kerapoi</string>
+    <string name="type.spherical_buoy.isolated_danger">Kerapoi eraldiasetseva ohu märkimiseks</string>
+    <string name="type.buoy.isolated_danger">Poi eraldiasetseva ohu märkimiseks</string>
+    <string name="type.beacon.isolated_danger">Tooder eraldiasetseva ohu märkimiseks</string>
+    <string name="type.beacon.lateral.port">Lateraalne tooder tüürpoordis</string>
+    <string name="type.beacon.lateral.starboard">Lateraalne tooder pakpoordis</string>
+    <string name="type.beacon.special_purpose">Eriotstarbeline tooder</string>
+    <string name="type.beacon.safe_water">Faarvaatri tooder</string>
+    <string name="type.buoy.safe_water">Faarvaatri poi</string>
+    <string name="type.spherical_buoy.safe_water">Faarvaatri kerapoi</string>
 </resources>

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

@@ -1457,4 +1457,45 @@
     <string name="type.emergency.access_point">Point de secours d\'urgence</string>
     <string name="type.emergency.life_ring">Bouée de sauvetage</string>
     <string name="type.shop.beauty.day_spa">Spa de jour</string>
+    <string name="type.beacon.cardinal.east">Phare cardinal</string>
+    <string name="type.beacon.cardinal.north">Phare cardinal</string>
+    <string name="type.beacon.cardinal.south">Phare cardinal</string>
+    <string name="type.beacon.cardinal.west">Phare cardinal</string>
+    <string name="type.beacon.isolated_danger">Balise de danger isolée</string>
+    <string name="type.beacon.lateral.port">Balise latérale</string>
+    <string name="type.beacon.lateral.starboard">Balise latérale</string>
+    <string name="type.beacon.safe_water">Balise d\'eau potable</string>
+    <string name="type.beacon.special_purpose">Balise à usage spécial</string>
+    <string name="type.buoy.cardinal.east">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.north">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.south">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.west">Bouée cardinale</string>
+    <string name="type.buoy.isolated_danger">Bouée de danger isolée</string>
+    <string name="type.buoy.lateral.port">Bouée latérale</string>
+    <string name="type.buoy.lateral.starboard">Bouée latérale</string>
+    <string name="type.buoy.safe_water">Bouée en eau sûre</string>
+    <string name="type.buoy.special_purpose">Bouée à usage spécial</string>
+    <string name="type.spherical_buoy.cardinal.east">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.north">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.south">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.west">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.isolated_danger">Bouée de danger sphérique isolée</string>
+    <string name="type.spherical_buoy.lateral.port">Bouée latérale sphérique</string>
+    <string name="type.spherical_buoy.lateral.starboard">Bouée latérale sphérique</string>
+    <string name="type.spherical_buoy.safe_water">Bouée sphérique de sécurité en eau</string>
+    <string name="type.spherical_buoy.special_purpose">Bouée sphérique à usage spécial</string>
+    <string name="type.lateral.port">Port</string>
+    <string name="type.lateral.starboard">Tribord</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Sud</string>
+    <string name="type.cardinal.west">Ouest</string>
+    <string name="type.entrance.house">Entrée de la maison</string>
+    <string name="type.entrance.garage">Entrée du garage</string>
+    <string name="type.entrance.service">Entrée de service</string>
+    <string name="type.entrance.entry">Entrée (uniquement)</string>
+    <string name="type.entrance.emergency">Issue de secours</string>
+    <string name="type.xmas.tree">Arbre de Noël</string>
+    <string name="type.natural.tree">Arbre</string>
+    <string name="type.natural.sand">Sable</string>
 </resources>

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

@@ -1431,4 +1431,10 @@
     <string name="type.leisure.sports_centre.sport.yoga">Sportközpont</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Jógastúdió</string>
     <string name="type.amenity.charging_station.motorcar.small">Elektromos töltőpont</string>
+    <string name="type.amenity.boat_rental">Hajóbérlés</string>
+    <string name="type.man_made.telescope">Távcső</string>
+    <string name="type.man_made.telescope.optical">Távcső (Optikai)</string>
+    <string name="type.man_made.telescope.radio">Távcső (Rádió)</string>
+    <string name="type.man_made.telescope.gamma">Távcső (Gamma)</string>
+    <string name="type.man_made.observatory">Csillagvizsgáló</string>
 </resources>

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

@@ -163,4 +163,23 @@
     <string name="type.emergency.assembly_point">Ārkārtas tikšanās punkts</string>
     <string name="type.shop.beauty.day_spa">Dienas spa</string>
     <string name="type.shop.massage">Masāžas salons</string>
+    <string name="type.natural.sand">Smiltis</string>
+    <string name="type.natural.geyser">Geizers</string>
+    <string name="type.natural.glacier">Ledājs</string>
+    <string name="type.natural.grassland">Pļava</string>
+    <string name="type.natural.heath">Tīrelis</string>
+    <string name="type.natural.hot_spring">Karstais avots</string>
+    <string name="type.natural.water.lake">Ezers</string>
+    <string name="type.natural.tree">Koks</string>
+    <string name="type.natural.tree_row">Koku rinda</string>
+    <string name="type.natural.vineyard">Vīnogu dārzs</string>
+    <string name="type.natural.volcano">Vulkāns</string>
+    <string name="type.natural.water">Ūdens</string>
+    <string name="type.natural.wetland">Mitrājs</string>
+    <string name="type.natural.wetland.bog">Muklājs</string>
+    <string name="type.natural.wetland.marsh">Dumbrājs</string>
+    <string name="type.natural.wetland.saltmarsh">Sāļūdens dumbrājs</string>
+    <string name="type.xmas.tree">Ziemassvētku egle</string>
+    <string name="type.entrance.emergency">Ārkārtas izeja</string>
+    <string name="type.lateral.port">Osta</string>
 </resources>

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

@@ -314,7 +314,7 @@
     <string name="type.entrance">Inngang</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Hovedinngang</string>
-    <string name="type.entrance.exit">Utgang</string>
+    <string name="type.entrance.exit">Utgang (bare)</string>
     <string name="type.fee.no">Gratis</string>
     <string name="type.healthcare.laboratory">Medisinsk laboratorium</string>
     <string name="type.healthcare.physiotherapist">Fysioterapeut</string>
@@ -1373,4 +1373,13 @@
     <string name="type.amenity.boat_rental">Båtutleie</string>
     <string name="type.man_made.observatory">Observatorium</string>
     <string name="type.emergency.life_ring">Livbøye</string>
+    <string name="type.natural.sand">Sand</string>
+    <string name="type.natural.tree">Tre</string>
+    <string name="type.cardinal.south">Sør</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.east">Øst</string>
+    <string name="type.cardinal.west">Vest</string>
+    <string name="type.xmas.tree">Juletre</string>
+    <string name="type.entrance.emergency">Nødutgang</string>
+    <string name="type.entrance.entry">Inngang (bare)</string>
 </resources>

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

@@ -355,7 +355,7 @@
     <string name="type.entrance">Ingang</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Hoofdingang</string>
-    <string name="type.entrance.exit">Ga naar</string>
+    <string name="type.entrance.exit">Uitgang (enig)</string>
     <string name="type.fee.no">Gratis</string>
     <string name="type.healthcare.laboratory">Medisch laboratorium</string>
     <string name="type.healthcare.physiotherapist">Fysiotherapeut</string>
@@ -419,8 +419,8 @@
     <string name="type.highway.path.difficult">Moeilijk of slecht zichtbaar pad</string>
     <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
     <string name="type.highway.path.expert">Zeer moeilijk of niet te onderscheiden spoor</string>
-    <string name="type.highway.path.bicycle">Fietspad</string>
-    <string name="type.highway.footway.bicycle">Fietspad</string>
+    <string name="type.highway.path.bicycle">Fiets- &amp; voetpad</string>
+    <string name="type.highway.footway.bicycle">Fiets- &amp; voetpad</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.path.bridge">Brug</string>
     <string name="type.highway.path.horse">Ruiterpad</string>
@@ -1453,4 +1453,43 @@
     <string name="type.amenity.sailing_school">Zeilschool</string>
     <string name="type.amenity.flight_school">Vliegschool</string>
     <string name="type.amenity.prep_school">Bijscholing</string>
+    <string name="type.cardinal.east">Oost</string>
+    <string name="type.cardinal.north">Noorden</string>
+    <string name="type.cardinal.south">Zuiden</string>
+    <string name="type.natural.sand">Zand</string>
+    <string name="type.natural.tree">Boom</string>
+    <string name="type.beacon.cardinal.east">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.north">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.south">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.west">Kardinaal baken</string>
+    <string name="type.beacon.lateral.port">Lateraal baken</string>
+    <string name="type.beacon.lateral.starboard">Lateraal baken</string>
+    <string name="type.beacon.safe_water">Scheidingsbaken</string>
+    <string name="type.beacon.special_purpose">Speciaal baken</string>
+    <string name="type.buoy.cardinal.east">Kardinale boei</string>
+    <string name="type.buoy.cardinal.north">Kardinale boei</string>
+    <string name="type.buoy.cardinal.south">Kardinale boei</string>
+    <string name="type.buoy.cardinal.west">Kardinale boei</string>
+    <string name="type.buoy.lateral.port">Laterale boei</string>
+    <string name="type.buoy.lateral.starboard">Laterale boei</string>
+    <string name="type.buoy.safe_water">Scheidingsboei</string>
+    <string name="type.buoy.special_purpose">Speciale boei</string>
+    <string name="type.spherical_buoy.cardinal.east">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.north">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.south">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.west">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.lateral.port">Sferische laterale boei</string>
+    <string name="type.spherical_buoy.lateral.starboard">Sferische laterale boei</string>
+    <string name="type.spherical_buoy.safe_water">Sferische scheidingsboei</string>
+    <string name="type.spherical_buoy.special_purpose">Sferische speciale boei</string>
+    <string name="type.lateral.port">Haven</string>
+    <string name="type.lateral.starboard">Stuurboord</string>
+    <string name="type.cardinal.west">West</string>
+    <string name="type.entrance.house">Huis entree</string>
+    <string name="type.entrance.garage">Garage entree</string>
+    <string name="type.entrance.service">Dienstingang</string>
+    <string name="type.entrance.entry">Ingang (enig)</string>
+    <string name="type.entrance.emergency">Nooduitgang</string>
+    <string name="type.xmas.tree">Kerstboom</string>
+    <string name="type.shop.beauty.day_spa">Schoonheidssalon</string>
 </resources>

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

@@ -1131,7 +1131,7 @@
     <string name="type.sport.curling">Curling</string>
     <string name="type.emergency.assembly_point">Ponto de Reunião de Emergência</string>
     <string name="type.emergency.mountain_rescue">Estação de resgate na montanha</string>
-    <string name="type.entrance.exit">Saída</string>
+    <string name="type.entrance.exit">Saída (apenas)</string>
     <string name="type.amenity.arts_centre">Centro de artes</string>
     <string name="type.amenity.bbq">Churrasqueira</string>
     <string name="type.amenity.compressed_air">Ar comprimido</string>
@@ -1442,4 +1442,49 @@
     <string name="type.amenity.give_box">Caixa de doação</string>
     <string name="type.emergency.access_point">Ponto de Resgate de Emergência</string>
     <string name="type.emergency.life_ring">Boia salva-vidas</string>
+    <string name="type.amenity.sailing_school">Escola de vela</string>
+    <string name="type.amenity.flight_school">Escola de aviação</string>
+    <string name="type.amenity.prep_school">Cursinho</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marco cardinal</string>
+    <string name="type.beacon.isolated_danger">Marco de período isolado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.buoy.lateral.starboard">Boia lateral</string>
+    <string name="type.buoy.safe_water">Boia de águas seguras</string>
+    <string name="type.buoy.special_purpose">Boia para fins especiais</string>
+    <string name="type.spherical_buoy.cardinal.east">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.north">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.south">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.west">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.isolated_danger">Boia esférica de perigo isolado</string>
+    <string name="type.spherical_buoy.lateral.port">Boia esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boia esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boia esférica de águas seguras</string>
+    <string name="type.spherical_buoy.special_purpose">Boia esférica para fins especiais</string>
+    <string name="type.lateral.port">Bombordo</string>
+    <string name="type.lateral.starboard">Estibordo</string>
+    <string name="type.cardinal.east">Leste</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sul</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garagem</string>
+    <string name="type.entrance.service">Entrada de serviço</string>
+    <string name="type.entrance.entry">Entrada (apenas)</string>
+    <string name="type.entrance.emergency">Saída de emergência</string>
+    <string name="type.natural.sand">Areia</string>
+    <string name="type.natural.tree">Árvore</string>
+    <string name="type.shop.beauty.day_spa">Spa sem alojamento</string>
+    <string name="type.xmas.tree">Árvore de natal</string>
+    <string name="type.beacon.lateral.starboard">Marco lateral</string>
+    <string name="type.beacon.safe_water">Marco de águas seguras</string>
+    <string name="type.beacon.special_purpose">Marco de fins especiais</string>
+    <string name="type.buoy.cardinal.east">Boia cardeal</string>
+    <string name="type.buoy.cardinal.north">Boia cardeal</string>
+    <string name="type.buoy.cardinal.south">Boia cardeal</string>
+    <string name="type.buoy.cardinal.west">Boia cardeal</string>
+    <string name="type.buoy.isolated_danger">Boia de perigo isolado</string>
+    <string name="type.buoy.lateral.port">Boia lateral</string>
 </resources>

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

@@ -236,4 +236,13 @@
     <string name="type.amenity.vending_machine.newspapers">Avtomat za časopis</string>
     <string name="type.amenity.vending_machine.parking_tickets">Avtomat za parkirne listke</string>
     <string name="type.amenity.vending_machine.sweets">Avtomat za sladkarije</string>
+    <string name="type.entrance.emergency">Izhod v sili</string>
+    <string name="type.fee.yes">€</string>
+    <string name="type.fee.no">Plačilo</string>
+    <string name="type.healthcare.physiotherapist">Fizioterapevt</string>
+    <string name="type.healthcare.alternative">Alternativno zdravljenje</string>
+    <string name="type.healthcare.audiologist">Strokovnjak za sluh</string>
+    <string name="type.healthcare.blood_donation">Središče za darovanje krvi</string>
+    <string name="type.healthcare.optometrist">Optometrist</string>
+    <string name="type.healthcare.podiatrist">Podiater</string>
 </resources>

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

@@ -359,7 +359,7 @@
     <string name="type.entrance">Улаз</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Главни улаз</string>
-    <string name="type.entrance.exit">Излаз</string>
+    <string name="type.entrance.exit">Излаз (искључиво)</string>
     <string name="type.fee.no">Бесплатно</string>
     <string name="type.healthcare.laboratory">Медицинска лабораторија</string>
     <string name="type.healthcare.physiotherapist">Физиотерапеут</string>
@@ -1454,4 +1454,49 @@
     <string name="type.shop.beauty.day_spa">Дневни спа</string>
     <string name="type.emergency.life_ring">Појас за спасавање</string>
     <string name="type.emergency.access_point">Спасилачка тачка</string>
+    <string name="type.amenity.sailing_school">Школа једрења</string>
+    <string name="type.amenity.flight_school">Школа летења</string>
+    <string name="type.amenity.prep_school">Припремна школа</string>
+    <string name="type.beacon.cardinal.east">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.north">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.south">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.west">Кардинални светионик</string>
+    <string name="type.beacon.isolated_danger">Светионик изоловане опасности</string>
+    <string name="type.beacon.lateral.port">Бочни светионик</string>
+    <string name="type.beacon.lateral.starboard">Бочни светионик</string>
+    <string name="type.beacon.safe_water">Светионик безбедне воде</string>
+    <string name="type.beacon.special_purpose">Светионик посебне намене</string>
+    <string name="type.buoy.cardinal.east">Кардинална бова</string>
+    <string name="type.buoy.cardinal.north">Кардинална бова</string>
+    <string name="type.buoy.cardinal.south">Кардинална бова</string>
+    <string name="type.buoy.cardinal.west">Кардинална бова</string>
+    <string name="type.buoy.isolated_danger">Бова изоловане опасности</string>
+    <string name="type.buoy.lateral.port">Бочна бова</string>
+    <string name="type.buoy.lateral.starboard">Бочна бова</string>
+    <string name="type.buoy.safe_water">Бова безбедне воде</string>
+    <string name="type.buoy.special_purpose">Бова посебне намене</string>
+    <string name="type.spherical_buoy.cardinal.east">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.north">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.south">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.west">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.isolated_danger">Сферна бова изоловане опасности</string>
+    <string name="type.spherical_buoy.lateral.port">Сферна бочна бова</string>
+    <string name="type.spherical_buoy.lateral.starboard">Сферна бочна бова</string>
+    <string name="type.spherical_buoy.safe_water">Сферна бова безбедне воде</string>
+    <string name="type.spherical_buoy.special_purpose">Сферна бова посебне намене</string>
+    <string name="type.lateral.port">Лево (порт)</string>
+    <string name="type.lateral.starboard">Десно (старборд)</string>
+    <string name="type.cardinal.east">Исток</string>
+    <string name="type.cardinal.north">Север</string>
+    <string name="type.cardinal.south">Југ</string>
+    <string name="type.cardinal.west">Запад</string>
+    <string name="type.entrance.house">Улаз у кућу</string>
+    <string name="type.entrance.garage">Улаз у гаражу</string>
+    <string name="type.entrance.service">Сервисни улаз</string>
+    <string name="type.entrance.entry">Улаз (искључиво)</string>
+    <string name="type.entrance.emergency">Улаз за хитне случајеве</string>
+    <string name="type.natural.sand">Песак</string>
+    <string name="type.natural.tree">Дрво</string>
+    <string name="type.xmas.tree">Божићна јелка</string>
+    <string name="type.shop.beauty.nails">Салон за нокте</string>
 </resources>

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

@@ -8,16 +8,27 @@
     <string name="ft">அடி</string>
     <string name="today">இன்று</string>
     <string name="yesterday">நேற்று</string>
-    <string name="days_ago">%s நாட்களுக்கு முன்</string>
-    <string name="weeks_ago">%s வாரங்களுக்கு முன்</string>
-    <string name="months_ago">%s மாதங்களுக்கு முன்</string>
-    <string name="years_ago">%s வருடங்களுக்கு முன்</string>
+    <string name="days_ago">%s நாட்களுக்கு முன்பு</string>
+    <string name="weeks_ago">%s வாரங்களுக்கு முன்பு</string>
+    <string name="months_ago">%s மாதங்களுக்கு முன்பு</string>
+    <string name="years_ago">%s ஆண்டுகளுக்கு முன்பு</string>
     <string name="km">கி.மீ</string>
     <string name="postal_code">குறியீடு</string>
     <string name="core_placepage_unknown_place">வரைபட புள்ளி</string>
     <string name="core_exit">வெளியேறு</string>
     <string name="core_entrance">நுழைவாயில்</string>
     <string name="subway_data_unavailable">சுரங்கப்பாதை வரைபடம் கிடைக்கவில்லை</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
+    <string name="mb">எம்பி</string>
+    <string name="gb">சிபி</string>
+    <string name="maps_storage_internal">உள் தனிப்பட்ட சேமிப்பு</string>
+    <string name="maps_storage_shared">உள் பகிரப்பட்ட சேமிப்பு</string>
+    <string name="maps_storage_removable">SD அட்டை</string>
+    <string name="maps_storage_external">வெளிப்புற பகிர்ந்த சேமிப்பு</string>
+    <string name="public_access">பொது அணுகல்</string>
+    <string name="limited_access">வரையறுக்கப்பட்ட அணுகல்</string>
+    <string name="not_shared">தனிப்பட்ட</string>
+    <string name="access_rules_author_only">நிகழ்நிலை திருத்துதல்</string>
+    <string name="week_ago">%s வாரத்திற்கு முன்பு</string>
+    <string name="month_ago">%s மாதம் முன்பு</string>
+    <string name="year_ago">%s வருடத்திற்கு முன்பு</string>
 </resources>

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

@@ -9,4 +9,8 @@
     <string name="type.addr_interpolation">முகவரி/சாலைத் தொகுதி</string>
     <string name="type.addr_interpolation.even">முகவரி/சாலைத் தொகுதி</string>
     <string name="type.amenity.music_school">இசை பள்ளிக்கூடம்</string>
+    <string name="type.aerialway.cable_car">கேபிள் கார்</string>
+    <string name="type.aeroway.aerodrome.international">சர்வதேச விமான நிலையம்</string>
+    <string name="type.aeroway.helipad">ஹெலிபேட்</string>
+    <string name="type.aeroway.runway">ஓடுதளம்</string>
 </resources>

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

@@ -1228,6 +1228,7 @@
     <string name="type.shop.bakery">Bakery</string>
     <string name="type.shop.bathroom_furnishing">Bathroom Furnishings</string>
     <string name="type.shop.beauty">Beauty Shop</string>
+    <string name="type.shop.beauty.nails">Nail Salon</string>
     <string name="type.shop.beverages">Beverages</string>
     <string name="type.shop.bicycle">Bicycle Shop</string>
     <string name="type.shop.bookmaker">Bookmaker</string>

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

@@ -47,7 +47,8 @@
 "shop-jewelry|@category_shopping|@shop": "4Juwelier|Juweliergeschäft|Schmuck",
 "shop-optician|@shop": "4Optiker|5Brillengeschäft|5Augenoptiker",
 "shop-gift|@category_shopping|@shop": "5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen",
-"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung",
+"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Kosmetikstudio|Kosmetiksalon",
+"shop-beauty-nails": "5Nagelstudio|Nagelsalon|Fingernägel|Fußnägel|Nägel",
 "shop-greengrocer|@category_food|@shop": "5Gemüseladen|Gemüsehändler",
 "shop-sports|@category_shopping|@shop": "4Sportgeschäft|Sportartikel|Fitnessgeschäft",
 "shop-supermarket|@category_food|@shop": "3Supermarkt",

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

@@ -50,7 +50,8 @@
 "shop-jewelry|@category_shopping|@shop": "4Jewelry|U+1F48D",
 "shop-optician|@shop": "4Optician|glasses|sunglasses|U+1F453",
 "shop-gift|@category_shopping|@shop": "Gift|U+1F381|souvenir|souvenirs|3gifts|presents|4Souvenir shop|gift shop|giftshop",
-"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|nail salon|coloring",
+"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|coloring",
+"shop-beauty-nails": "4Nail salon|nail technician|nail tech|finger nails|toe nails|nails",
 "shop-greengrocer|@category_food|@shop": "4Greengrocer|U+1F345|U+1F346|U+1F33D|U+1F360|U+1F348|U+1F347|U+1F349|U+1F34A|U+1F34C|U+1F34D|U+1F34E|U+1F34F|U+1F350|U+1F351|U+1F353",
 "shop-sports|@category_shopping|@shop": "4Sports Goods|U+1F3BF|U+1F3A3|U+1F3C2|U+1F6B4|U+26BD|U+1F3C0|U+1F3C8|U+26BE|U+1F3BE|U+1F3C9|U+26F3",
 "shop-supermarket|@category_food|@shop": "3Supermarket",

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

@@ -130,5 +130,67 @@
 "Brazil_Southeast Region_Sao Paulo_City":"Сао Пауло - Сантос",
 "Brazil_Southeast Region_Sao Paulo_West":"Сао Пауло - Рибеирао Прето",
 "British Indian Ocean Territory":"Британска територија у Индијском океану",
-"British Virgin Islands":"Британска Девичанска Острва"
+"British Virgin Islands":"Британска Девичанска Острва",
+"Campo de Hielo Sur":"Јужно патагонско ледено поље",
+"Canada_British Columbia_Central":"Британска Колумбија — центар",
+"Canada_British Columbia_Far_North":"Британска Колумбија — исток",
+"Canada_British Columbia_Islands":"Острво Ванкувер",
+"Canada_British Columbia_North":"Британска Колумбија — запад",
+"Canada_British Columbia_Northeast":"Британска Колумбија — север",
+"Canada_British Columbia_Southeast":"Келоуна",
+"Canada_British Columbia_Vancouver":"Ванкувер",
+"Canada_Labrador":"Лабрадор",
+"Canada_Labrador_North":"Лабрадор — север",
+"Canada_Labrador_South":"Лабрадор — југ",
+"Canada_Labrador_West":"Лабрадор — запад",
+"Canada_Manitoba":"Манитоба",
+"Canada_Manitoba_Northeast":"Манитоба — север",
+"Canada_Manitoba_Northwest":"Манитоба — запад",
+"Canada_Manitoba_South":"Брендон",
+"Canada_Manitoba_Winnipeg":"Винипег",
+"Canada_New Brunswick":"Њу Бранзвик",
+"Canada_Newfoundland":"Њуфаундленд",
+"Canada_Newfoundland_East":"Њуфаундленд — исток",
+"Canada_Newfoundland_North":"Њуфаундленд — север",
+"Canada_Newfoundland_South":"Њуфаундленд — југ",
+"Canada_Newfoundland_West":"Њуфаундленд — запад",
+"Canada_Northwest Territories":"Северозападне Територије",
+"Canada_Northwest Territories_East":"Северозападне Територије — исток",
+"Canada_Northwest Territories_North":"Северозападне Територије — север",
+"Canada_Northwest Territories_Yellowknife":"Јелоунајф",
+"Canada_Nova Scotia":"Нова Шкотска",
+"Canada_Nova Scotia_Halifax":"Халифакс",
+"Canada_Nova Scotia_Sydney":"Сидни",
+"Canada_Nunavut":"Нунавут",
+"Canada_Nunavut_North":"Нунавут — север",
+"Canada_Nunavut_South":"Нунавут — југ",
+"Canada_Ontario":"Онтарио",
+"Canada_Ontario_Bame":"Бери",
+"Canada_Ontario_Kingston":"Кингстон",
+"Canada_Ontario_London":"Лондон",
+"Canada_Ontario_Northeastern_Central":"Тиминс",
+"Canada_Ontario_Northeastern_North":"Мус Фектори",
+"Canada_Ontario_Northeastern_S":"Велики Садбери",
+"Canada_Ontario_Northeastern_SE":"Норт Беј",
+"Canada_Ontario_Northeastern_SW":"Су Сент Мари",
+"Canada_Ontario_Northeastern_Wawa":"Вава",
+"Canada_Ontario_Northern":"Тандербеј",
+"Canada_Ontario_Northwestern":"Онтарио — север",
+"Canada_Ontario_Toronto":"Торонто",
+"Canada_Prince Edward Island":"Острво Принца Едварда",
+"Canada_Quebec":"Квебек",
+"Canada_Quebec_Quebec":"Град Квебек",
+"Canada_Quebek_Far North":"Квебек — север",
+"Canada_Quebek_Montreal":"Монтреал",
+"Canada_Quebek_North":"Септ-Ил",
+"Canada_Quebek_Southeast_Rimouski":"Римуски",
+"Canada_Quebek_Southeast_Saguenay":"Сагне",
+"Canada_Quebek_West_Chibougamau":"Шибугамо",
+"Canada_Quebek_West_Rouyn-Noranda":"Руен-Норанда",
+"Canada_Saskatchewan":"Саскачеван",
+"Canada_Saskatchewan_North":"Саскачеван — север",
+"Canada_Saskatchewan_South":"Саскачеван — југ",
+"Canada_Yukon":"Јукон",
+"Canada_Yukon_North":"Јукон — север",
+"Canada_Yukon_Whitehorse":"Вајтхорс"
 }

data/mapcss-mapping.csv

@@ -578,7 +578,7 @@ boundary|administrative|4;[boundary=administrative][admin_level=4];;;;459;
 # ~100k usages.
 railway|station;460;
 sport|handball;461;
-deprecated:boundary|administrative|city:04.2024;[boundary=administrative][border_type=city];x;name;int_name;462;
+shop|beauty|nails;[shop=beauty][beauty=nails];;name;int_name;462;
 piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride],[piste:type=downhill][piste:grooming=backcountry][!piste:difficulty];;name;int_name;463;
 # _path_grade is a surrogate tag which combines sac_scale and trail_visibility, see osm2type.cpp
 highway|path|difficult;[highway=path][_path_grade=difficult];;name;int_name;464;

data/styles/default/dark/colors.mapcss

@@ -51,6 +51,7 @@
 @wetland_swamp: #3D5045;
 @wetland_mangrove: #3E5143;
 @beach: #322C20;
+@sand: #312d24;
 @barerock: #2B2A26;
 @scree: #292825;
 @desert: #312E28;

data/styles/default/dark/symbols/bicycle-rental-xm.svg

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/bicycle-rental.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<title>bike-parking-m</title>
-	<g>
-		<rect id="Rectangle" width="20" height="20" rx="2.5" fill="#000" opacity=".6"/>
-		<rect x="1" y="1" width="18" height="18" rx="2" fill="#2F6499"/>
-		<path d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#000"/>
-		<path d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786 0 1.8052 1.468 3.2786 3.2667 3.2786 1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786c0-1.8052-1.468-3.2786-3.2667-3.2786-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419-1.2941 0-2.3333-1.043-2.3333-2.3419 0-1.2989 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#000"/>
-	</g>
-</svg>

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

@@ -0,0 +1 @@
+<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="#6b425c" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#000" fill-rule="evenodd"/></g></svg>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#000" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#000" />
- </g>
-</svg>

data/styles/default/dark/symbols/taxi-xm.svg

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m4.5004375 5.7355v1.765625h1.99825v-1.765625zm1.99825 1.765625v1.763375h2.0004375v-1.763375zm2.0004375 0h2.0004375v-1.765625h-2.0004375zm2.0004375 0v1.763375h2.0004375v-1.763375zm-5.999125 0h-2.0004375v1.763375h2.0004375z" fill="#000"/></g></svg>

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

@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.76536686 3.31703659 2.71190694 1.12330864c.4900562.20298791.8794043.59233602 1.0823922 1.0823922l1.1233087 2.71190696c.2029879.49005617.2029879 1.04067755 0 1.53073372l-1.1233087 2.71190699c-.2029879.4900561-.592336.8794043-1.0823922 1.0823922l-2.71190694 1.1233086c-.49005617.2029879-1.04067755.2029879-1.53073372 0l-2.71190696-1.1233086c-.49005618-.2029879-.87940429-.5923361-1.0823922-1.0823922l-1.12330864-2.71190699c-.20298792-.49005617-.20298792-1.04067755 0-1.53073372l1.12330864-2.71190696c.20298791-.49005618.59233602-.87940429 1.0823922-1.0823922l2.71190696-1.12330864c.43560548-.18043371.91906496-.20048189 1.36530467-.06014457z" fill="#202510" fill-rule="evenodd"/></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#202510" fill-rule="evenodd"/></svg>

data/styles/default/include/Basemap.mapcss

@@ -254,7 +254,7 @@ area|z11-[natural=bare_rock],
 /* 5.BEACH, GLACIER, DESERT, etc. */
 
 area|z0-[natural=glacier],
-area|z10-[natural=sand],
+area|z0-[natural=sand],
 area|z10-[natural=beach],
 area|z0-[natural=desert],
 area|z10-[leisure=beach_resort],
@@ -263,11 +263,13 @@ area|z10-[leisure=beach_resort],
 area|z0-[natural=glacier]
 {fill-color: @glacier;}
 
-area|z10-[natural=sand],
 area|z10-[natural=beach],
 area|z10-[leisure=beach_resort],
 {fill-color: @beach;}
 
+area|z10-[natural=sand],
+{fill-color: @sand;}
+
 area|z0-[natural=desert],
 area|z0-9[natural=sand],
 {fill-color: @desert;}

data/styles/default/include/Icons.mapcss

@@ -957,7 +957,6 @@ node|z16-[amenity=biergarten],
 /* 5.AMENITY (infrastructure) */
 
 node|z13-[leisure=stadium],
-node|z14-[barrier=toll_booth],
 node|z14-[amenity=university],
 node|z14-[amenity=place_of_worship],
 node|z14-[man_made=lighthouse],
@@ -981,6 +980,7 @@ node|z16-[barrier=kissing_gate],
 node|z16-[barrier=lift_gate],
 node|z16-[barrier=swing_gate],
 node|z16-[barrier=stile],
+node|z16-[barrier=toll_booth],
 node|z16-[barrier=turnstile],
 node|z17-[barrier=wicket_gate],
 node|z16-[barrier=cycle_barrier],
@@ -1521,9 +1521,7 @@ node|z13-14[man_made=lighthouse],
 node|z15-[man_made=lighthouse],
 {icon-image: lighthouse-m.svg;}
 
-node|z12-14[barrier=toll_booth],
-{icon-image: toll_booth-s.svg;}
-node|z15-[barrier=toll_booth],
+node|z16-[barrier=toll_booth],
 {icon-image: toll_booth-m.svg;}
 
 node|z14[barrier=border_control],
@@ -1581,7 +1579,7 @@ node|z17-[man_made=petroleum_well],
 {icon-image: pole-m.svg;}
 
 node|z16-[amenity=taxi],
-{icon-image: taxi-m.svg;icon-min-distance: 30;}
+{icon-image: taxi-xm.svg;icon-min-distance: 30;}
 node|z17-[amenity=taxi],
 {icon-min-distance: 20;}
 
@@ -1677,12 +1675,12 @@ node|z18-[amenity=motorcycle_rental],
 {font-size: 11;}
 
 node|z17-[amenity=boat_rental],
-{icon-image: boat-rental.svg;}
+{icon-image: boat_rental-m.svg;}
 node|z18-[amenity=boat_rental],
 {font-size: 11;}
 
 node|z17-[amenity=bicycle_rental],
-{icon-image: bicycle-rental.svg;}
+{icon-image: bicycle-rental-xm.svg;}
 node|z18-[amenity=bicycle_rental],
 {font-size: 11;}
 
@@ -1730,14 +1728,13 @@ node|z17-[amenity=telephone]
 node|z17-[emergency=phone]
 {icon-image: emergency-phone-m.svg; text-offset: 1;}
 
-
-node|z16-[amenity=recycling][recycling_type=centre],
-{icon-image: recycling-centre-m.svg;}
-
 node|z17-[amenity=recycling],
 node|z17-[amenity=waste_transfer_station],
 {icon-image: recycling-m.svg;}
 
+node|z16-[amenity=recycling][recycling_type=centre],
+{icon-image: recycling-centre-m.svg;}
+
 node|z17-[power=plant],
 /* Skip individual solar generators, because there are a lot of mapped panels */
 node|z17-[power=generator][generator:source!=solar],
@@ -2162,6 +2159,8 @@ node|z17-[shop=pastry],
 {icon-image: bakery-m.svg;icon-min-distance: 24;}
 node|z17-[shop=beauty],
 {icon-image: beauty-m.svg;icon-min-distance: 24;}
+node|z17-[shop=beauty][beauty=nails],
+{icon-image: nails-m.svg;icon-min-distance: 24;}
 node|z17-[shop=cosmetics],
 {icon-image: beauty-m.svg;icon-min-distance: 24;}
 node|z17-[shop=beverages],
@@ -2519,4 +2518,4 @@ node|z18-[amenity=parking_space][parking_space=disabled],
 
 /* 8. Colored Labels */
 
-@import("../../default/include/Icons_Label_Colors.mapcss");
+@import("../../default/include/Icons_Label_Colors.mapcss");

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -133,6 +133,7 @@ node[amenity=police],
 node[amenity=post_office],
 node[amenity=prep_school],
 node[amenity=prison],
+node[amenity=recycling][recycling_type=centre],
 node[amenity=sailing_school],
 node[amenity=school],
 node[amenity=townhall],

data/styles/default/include/Roads.mapcss

@@ -739,7 +739,8 @@ line|z15-[highway=track][bridge?]::bridgewhite,
 line|z15-[highway=bridleway][bridge?]::bridgewhite,
 line|z15-[highway=steps][bridge?]::bridgewhite,
 line|z16-[highway=road][bridge?]::bridgewhite,
-line|z16-[highway=service][bridge?]::bridgewhite
+line|z15-[highway=service][bridge?]::bridgewhite,
+line|z15-[highway=busway][bridge?]::bridgewhite
 {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
 line|z13-[highway=pedestrian][bridge?]::bridgeblack,
 line|z17-[highway=footway][bridge?]::bridgeblack,
@@ -749,7 +750,8 @@ line|z17-[highway=track][bridge?]::bridgeblack,
 line|z17-[highway=bridleway][bridge?]::bridgeblack,
 line|z17-[highway=steps][bridge?]::bridgeblack,
 line|z16-[highway=road][bridge?]::bridgeblack,
-line|z16-[highway=service][bridge?]::bridgeblack
+line|z15-[highway=service][bridge?]::bridgeblack,
+line|z15-[highway=busway][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
 line|z15-[highway=track],
 {color: @track;opacity: 0.6;}

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

@@ -111,7 +111,7 @@ natural-water-lake                                  # caption z10- (also has are
 natural-water-reservoir                             # caption z10- (also has area z1-)
 === 6650
 
-barrier-toll_booth                                  # icon z12- (also has caption(optional) z14-)
+barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600
 
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
@@ -846,6 +846,7 @@ shop-appliance                                      # icon z18- (also has captio
 shop-baby_goods                                     # icon z18- (also has caption(optional) z18-)
 shop-beauty                                         # icon z16- (also has caption(optional) z16-)
 shop-beauty-day_spa                                 # icon z16- (also has caption(optional) z16-)
+shop-beauty-nails                                   # icon z16- (also has caption(optional) z16-)
 shop-beverages                                      # icon z16- (also has caption(optional) z16-)
 shop-boutique                                       # icon z18- (also has caption(optional) z18-)
 shop-car_repair                                     # icon z16- (also has caption(optional) z16-)
@@ -1420,7 +1421,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-nature_reserve                            # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17)
 # === -3300
 
-# barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
+# barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400
 
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
@@ -1931,6 +1932,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-baby_goods                                   # caption(optional) z18- (also has icon z18-)
 # shop-beauty                                       # caption(optional) z16- (also has icon z16-)
 # shop-beauty-day_spa                               # caption(optional) z16- (also has icon z16-)
+# shop-beauty-nails                                 # caption(optional) z16- (also has icon z16-)
 # shop-beverages                                    # caption(optional) z16- (also has icon z16-)
 # shop-boutique                                     # caption(optional) z18- (also has icon z18-)
 # shop-car_repair                                   # caption(optional) z16- (also has icon z16-)

data/styles/default/light/colors.mapcss

@@ -51,6 +51,7 @@
 @wetland_swamp: #A1D4B7;
 @wetland_mangrove: #A2D4B0;
 @beach: #FADDA0;
+@sand: #F7E4C3;
 @barerock: #D9D2BF;
 @scree: #CCC7BA;
 @desert: #F4E5C8;

data/styles/default/light/symbols/bicycle-rental-xm.svg

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/bicycle-rental.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<title>bike-parking-m</title>
-	<g>
-		<rect id="Rectangle" width="20" height="20" rx="2.5" fill="#fff" opacity=".6"/>
-		<rect x="1" y="1" width="18" height="18" rx="2" fill="#2f6499"/>
-		<path d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#fff"/>
-		<path d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786 0 1.8052 1.468 3.2786 3.2667 3.2786 1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786c0-1.8052-1.468-3.2786-3.2667-3.2786-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419-1.2941 0-2.3333-1.043-2.3333-2.3419 0-1.2989 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#fff"/>
-	</g>
-</svg>

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

@@ -0,0 +1 @@
+<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="#be75a3" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#fff" fill-rule="evenodd"/></g></svg>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#fff" />
- </g>
-</svg>

data/styles/default/light/symbols/taxi-xm.svg

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m4.5004375 5.7355v1.765625h1.99825v-1.765625zm1.99825 1.765625v1.763375h2.0004375v-1.763375zm2.0004375 0h2.0004375v-1.765625h-2.0004375zm2.0004375 0v1.763375h2.0004375v-1.763375zm-5.999125 0h-2.0004375v1.763375h2.0004375z" fill="#fff"/></g></svg>

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

@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.76536686 3.31703659 2.71190694 1.12330864c.4900562.20298791.8794043.59233602 1.0823922 1.0823922l1.1233087 2.71190696c.2029879.49005617.2029879 1.04067755 0 1.53073372l-1.1233087 2.71190699c-.2029879.4900561-.592336.8794043-1.0823922 1.0823922l-2.71190694 1.1233086c-.49005617.2029879-1.04067755.2029879-1.53073372 0l-2.71190696-1.1233086c-.49005618-.2029879-.87940429-.5923361-1.0823922-1.0823922l-1.12330864-2.71190699c-.20298792-.49005617-.20298792-1.04067755 0-1.53073372l1.12330864-2.71190696c.20298791-.49005618.59233602-.87940429 1.0823922-1.0823922l2.71190696-1.12330864c.43560548-.18043371.91906496-.20048189 1.36530467-.06014457z" fill="#a2ba4e" fill-rule="evenodd"/></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#a2ba4e" fill-rule="evenodd"/></svg>

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

@@ -111,7 +111,7 @@ natural-water-lake                                  # caption z10- (also has are
 natural-water-reservoir                             # caption z10- (also has area z1-)
 === 6650
 
-barrier-toll_booth                                  # icon z12- (also has caption(optional) z14-)
+barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600
 
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
@@ -846,6 +846,7 @@ shop-appliance                                      # icon z18- (also has captio
 shop-baby_goods                                     # icon z18- (also has caption(optional) z18-)
 shop-beauty                                         # icon z16- (also has caption(optional) z16-)
 shop-beauty-day_spa                                 # icon z16- (also has caption(optional) z16-)
+shop-beauty-nails                                   # icon z16- (also has caption(optional) z16-)
 shop-beverages                                      # icon z16- (also has caption(optional) z16-)
 shop-boutique                                       # icon z18- (also has caption(optional) z18-)
 shop-car_repair                                     # icon z16- (also has caption(optional) z16-)
@@ -1423,7 +1424,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-nature_reserve                            # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17)
 # === -3300
 
-# barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
+# barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400
 
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
@@ -1934,6 +1935,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-baby_goods                                   # caption(optional) z18- (also has icon z18-)
 # shop-beauty                                       # caption(optional) z16- (also has icon z16-)
 # shop-beauty-day_spa                               # caption(optional) z16- (also has icon z16-)
+# shop-beauty-nails                                 # caption(optional) z16- (also has icon z16-)
 # shop-beverages                                    # caption(optional) z16- (also has icon z16-)
 # shop-boutique                                     # caption(optional) z18- (also has icon z18-)
 # shop-car_repair                                   # caption(optional) z16- (also has icon z16-)

data/styles/vehicle/include/Basemap.mapcss

@@ -187,13 +187,12 @@ area|z10-[leisure=beach_resort],
 area|z0-[natural=glacier]
 {fill-color: @glacier;}
 
-area|z10-[natural=sand],
 area|z10-[natural=beach],
 area|z10-[leisure=beach_resort],
 {fill-color: @beach;fill-opacity: 0.35;}
 
 area|z0-[natural=desert],
-area|z0-9[natural=sand],
+area|z0-[natural=sand],
 {fill-color: @desert;}
 
 /* 6.WATER */

data/styles/vehicle/include/Basemap_label.mapcss

@@ -531,13 +531,13 @@ node|z18-[addr:housenumber][addr:street]::int_name,
 
 node|z19-[entrance],
 node|z19-[amenity=loading_dock],
-{icon-image: entrance-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-m.svg; font-size: 13; text-offset: 1;}
 node|z19-[entrance=exit],
-{icon-image: entrance-exit-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-exit-m.svg; font-size: 13; text-offset: 1;}
 node|z18-[entrance=main],
-{icon-image: entrance-main-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-main-m.svg; font-size: 13; text-offset: 1;}
 node|z18-[emergency=emergency_ward_entrance],
-{icon-image: entrance-emergency-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-emergency-m.svg; font-size: 13; text-offset: 1;}
 
 /* 8.3 Airports */
 area|z14-[aeroway=terminal]

data/taginfo.json

@@ -1,7 +1,7 @@
 {
     "data_format": 1,
     "data_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/taginfo.json",
-    "data_updated": "20251110T190102Z",
+    "data_updated": "20251117T175008Z",
     "project": {
         "name": "CoMaps",
         "description": "CoMaps is a community-focused privacy navigation iOS & Android app for travelers - drivers, hikers, and cyclists.",
@@ -146,7 +146,7 @@
             "description": "amenity=boat_rental",
             "key": "amenity",
             "value": "boat_rental",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boat-rental.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boat_rental-m.svg"
         },
         {
             "description": "amenity=brothel",
@@ -377,6 +377,12 @@
             "value": "fire_station",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fire_station-m.svg"
         },
+        {
+            "description": "amenity=flight_school",
+            "key": "amenity",
+            "value": "flight_school",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/flying_school-m.svg"
+        },
         {
             "description": "amenity=food_court",
             "key": "amenity",
@@ -901,6 +907,12 @@
             "value": "post_office",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/mail-m.svg"
         },
+        {
+            "description": "amenity=prep_school",
+            "key": "amenity",
+            "value": "prep_school",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/prep_school-m.svg"
+        },
         {
             "description": "amenity=prison",
             "key": "amenity",
@@ -955,6 +967,12 @@
             "value": "restaurant",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/restaurant-m.svg"
         },
+        {
+            "description": "amenity=sailing_school",
+            "key": "amenity",
+            "value": "sailing_school",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boating_school-m.svg"
+        },
         {
             "description": "amenity=sanitary_dump_station",
             "key": "amenity",
@@ -1268,7 +1286,7 @@
             "description": "barrier=entrance",
             "key": "barrier",
             "value": "entrance",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/entrance-barrier-s.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/entrance-barrier-xs.svg"
         },
         {
             "description": "barrier=gate",
@@ -1499,6 +1517,12 @@
             "key": "disused:shop",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/disusedbusiness-m.svg"
         },
+        {
+            "description": "emergency=access_point",
+            "key": "emergency",
+            "value": "access_point",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/access_point-m.svg"
+        },
         {
             "description": "emergency=assembly_point",
             "key": "emergency",
@@ -1517,6 +1541,12 @@
             "value": "fire_hydrant",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/firehydrant-m.svg"
         },
+        {
+            "description": "emergency=life_ring",
+            "key": "emergency",
+            "value": "life_ring",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/lifebuoy-m.svg"
+        },
         {
             "description": "emergency=lifeguard",
             "key": "emergency",
@@ -1599,7 +1629,7 @@
             "description": "highway=bus_stop",
             "key": "highway",
             "value": "bus_stop",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bus-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bus-xm.svg"
         },
         {
             "description": "highway=elevator",
@@ -2914,6 +2944,12 @@
             "value": "spring",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/drinking-water-no-m.svg"
         },
+        {
+            "description": "natural=tree",
+            "key": "natural",
+            "value": "tree",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tree-m.svg"
+        },
         {
             "description": "natural=volcano",
             "key": "natural",
@@ -3057,6 +3093,825 @@
             "value": "tram_stop",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tram-m.svg"
         },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=buoyant",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=lattice",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=pile",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=tower",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=buoyant",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=lattice",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=pile",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=tower",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=buoyant",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=lattice",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=pile",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=tower",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "south"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "south[seamark:buoy_cardinal:shape=spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_isolated_danger",
+            "key": "seamark:type",
+            "value": "buoy_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_isolated_danger + seamark:buoy_isolated_danger:shape=spherical",
+            "key": "seamark:buoy_isolated_danger:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_isolated_danger + seamark:buoy_isolated_danger:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port",
+            "key": "seamark:buoy_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard",
+            "key": "seamark:buoy_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_safe_water",
+            "key": "seamark:type",
+            "value": "buoy_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_safe_water + seamark:buoy_safe_water:shape=spherical",
+            "key": "seamark:buoy_safe_water:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_safe_water + seamark:buoy_safe_water:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_special_purpose",
+            "key": "seamark:type",
+            "value": "buoy_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_special_purpose + seamark:buoy_special_purpose:shape=spherical",
+            "key": "seamark:buoy_special_purpose:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_special_purpose + seamark:buoy_special_purpose:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg"
+        },
         {
             "description": "shop=*",
             "key": "shop",
@@ -3104,6 +3959,18 @@
             "value": "beauty",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beauty-m.svg"
         },
+        {
+            "description": "shop=beauty + beauty=spa",
+            "key": "beauty",
+            "value": "spa",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/day-spa-m.svg"
+        },
+        {
+            "description": "shop=beauty + beauty=spa",
+            "key": "shop",
+            "value": "beauty",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/day-spa-m.svg"
+        },
         {
             "description": "shop=beverages",
             "key": "shop",
@@ -4078,6 +4945,12 @@
             "key": "waterway",
             "value": "waterfall",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/waterfall-m.svg"
+        },
+        {
+            "description": "xmas:feature=tree",
+            "key": "xmas:feature",
+            "value": "tree",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/christmas-tree-m.svg"
         }
     ]
 }

iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>atm_dark</title>
     <g id="atm_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M20,8 L8,8 C7.17275,8 6.5,8.67275 6.5,9.5 L6.5,18.5 C6.5,19.32725 7.17275,20 8,20 L20,20 C20.82725,20 21.5,19.32725 21.5,18.5 L21.5,9.5 C21.5,8.67275 20.82725,8 20,8 Z M20.00075,14 L20.0015,18.5 L8,18.5 L8,14 L20.00075,14 Z M14,15.5 L9.5,15.5 L9.5,17 L14,17 L14,15.5 Z M20,9.5 L20,11 L8,11 L8,9.5 L20,9.5 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M20,8 L8,8 C7.17275,8 6.5,8.67275 6.5,9.5 L6.5,18.5 C6.5,19.32725 7.17275,20 8,20 L20,20 C20.82725,20 21.5,19.32725 21.5,18.5 L21.5,9.5 C21.5,8.67275 20.82725,8 20,8 Z M20.00075,14 L20.0015,18.5 L8,18.5 L8,14 L20.00075,14 Z M14,15.5 L9.5,15.5 L9.5,17 L14,17 L14,15.5 Z M20,9.5 L20,11 L8,11 L8,9.5 L20,9.5 Z" id="Shape" fill="#51585E"></path>
     </g>
 </svg>

iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>bank_dark</title>
     <g id="bank_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.3 L7,9.53073333 L7,10.60766 L8.07692667,10.60766 L8.07692667,18.68461 L7,18.68461 L7,20.2999767 L21,20.2999767 L21,18.68461 L19.9230733,18.68461 L19.9230733,10.60766 L21,10.60766 L21,9.53073333 L14,6.3 Z M14.8974933,9.53068667 L14.8974933,10.3803583 C15.94096,10.6789083 16.69241,11.4673883 16.69241,12.4012583 L14.8974933,12.4012583 C14.8974933,12.0070417 14.4954483,11.6817167 13.9976667,11.6817167 C13.4998967,11.6817167 13.09784,12.003215 13.09784,12.4012583 C13.09784,12.7993017 13.50468,13.1208 13.9976667,13.1208 C15.4814333,13.1208 16.6923167,14.0852833 16.6923167,15.2756333 C16.6923167,16.2095617 15.94082,16.997995 14.8974,17.2965333 L14.8974,18.146205 L13.1024833,18.146205 L13.1024833,17.2965333 C12.0590167,16.9979833 11.3075667,16.2095033 11.3075667,15.2756333 L13.1024833,15.2756333 C13.1024833,15.66985 13.5045283,15.995175 14.00231,15.995175 C14.50008,15.995175 14.9021367,15.6736767 14.9021367,15.2756333 C14.9021367,14.87759 14.5000917,14.5560917 14.00231,14.5560917 C12.5185433,14.5560917 11.30766,13.5916083 11.30766,12.4012583 C11.30766,11.46733 12.0591567,10.6788967 13.1025767,10.3803583 L13.1025767,9.53068667 L14.8974933,9.53068667 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.3 L7,9.53073333 L7,10.60766 L8.07692667,10.60766 L8.07692667,18.68461 L7,18.68461 L7,20.2999767 L21,20.2999767 L21,18.68461 L19.9230733,18.68461 L19.9230733,10.60766 L21,10.60766 L21,9.53073333 L14,6.3 Z M14.8974933,9.53068667 L14.8974933,10.3803583 C15.94096,10.6789083 16.69241,11.4673883 16.69241,12.4012583 L14.8974933,12.4012583 C14.8974933,12.0070417 14.4954483,11.6817167 13.9976667,11.6817167 C13.4998967,11.6817167 13.09784,12.003215 13.09784,12.4012583 C13.09784,12.7993017 13.50468,13.1208 13.9976667,13.1208 C15.4814333,13.1208 16.6923167,14.0852833 16.6923167,15.2756333 C16.6923167,16.2095617 15.94082,16.997995 14.8974,17.2965333 L14.8974,18.146205 L13.1024833,18.146205 L13.1024833,17.2965333 C12.0590167,16.9979833 11.3075667,16.2095033 11.3075667,15.2756333 L13.1024833,15.2756333 C13.1024833,15.66985 13.5045283,15.995175 14.00231,15.995175 C14.50008,15.995175 14.9021367,15.6736767 14.9021367,15.2756333 C14.9021367,14.87759 14.5000917,14.5560917 14.00231,14.5560917 C12.5185433,14.5560917 11.30766,13.5916083 11.30766,12.4012583 C11.30766,11.46733 12.0591567,10.6788967 13.1025767,10.3803583 L13.1025767,9.53068667 L14.8974933,9.53068667 Z" id="Shape" fill="#51585E"></path>
     </g>
 </svg>

iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>children_dark</title>
     <g id="children_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#7F5933"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#802D19"></path>
     </g>
 </svg>

iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>children_light</title>
     <g id="children_light" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#9C6136"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#EB785D"></path>
     </g>
 </svg>

iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>eat_dark</title>
     <g id="eat_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 Z M8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 Z" id="Shape" fill="#BB9342"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 Z M8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 Z" id="Shape" fill="#8C491C"></path>
     </g>
 </svg>

iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>entertainment_dark</title>
     <g id="entertainment_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#7F5933"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#802D19"></path>
     </g>
 </svg>

iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg

@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>entertainment_light</title>
     <g id="entertainment_light" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#9C6136"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#EB785D"></path>
     </g>
 </svg>