[ios] Don't let custom map appearance influence CarPlay

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
[ios] Always use light map appearance by default
2026-01-06 20:44:25 +00:00 · 2025-11-17 16:52:53 +01:00 · 2025-11-17 16:52:52 +01:00 · 2025-11-17 14:09:31 +00:00 · 2025-11-17 08:54:48 +01:00 · 2025-11-17 08:28:40 +01:00
305 changed files with 6389 additions and 4977 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,11 +88,6 @@ else()
  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
 endif()

-# Needed for std::execution::par
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  add_compile_options(-fexperimental-library)
-endif()
-
 if (PLATFORM_WIN)
  add_definitions(
    -DWIN32_LEAN_AND_MEAN
@@ -227,6 +222,11 @@ if (PLATFORM_DESKTOP AND NOT WITH_SYSTEM_PROVIDED_3PARTY)
  include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
 endif()

+# Android fails to find boost in many cases, this fixes it.
+if (PLATFORM_ANDROID)
+  include_directories("${OMIM_ROOT}/3party/boost")
+endif()
+
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)

--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -18,9 +18,7 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
-import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.util.RtlUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import java.util.Objects;

@@ -42,7 +40,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  {
    super.onCreate(savedInstanceState);
    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
-    RtlUtils.manageRtl(this);
    if (!MwmApplication.from(this).getOrganicMaps().arePlatformAndCoreInitialized())
    {
      final Intent intent = Objects.requireNonNull(getIntent());
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -18,7 +18,6 @@ import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
-import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.routing.CarDirection;
 import app.organicmaps.sdk.routing.RoutingController;
@@ -268,18 +267,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

  private void updateSpeedWidgets(@NonNull final RoutingInfo info)
  {
-    final LocationHelper locationHelper = MwmApplication.from(mFrame.getContext()).getLocationHelper();
-    final Location location = locationHelper.getSavedLocation();
+    final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation();
    if (location == null)
    {
      mSpeedLimit.setSpeedLimit(-1, false);
      mCurrentSpeed.setCurrentSpeed(-1);
      return;
    }
-    final double currentAvgSpeed = locationHelper.getAverageSpeed();
    final int fSpeedLimit = StringUtils.nativeFormatSpeed(info.speedLimitMps);
-    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(currentAvgSpeed);
+    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(location.getSpeed());
    mSpeedLimit.setSpeedLimit(fSpeedLimit, speedLimitExceeded);
-    mCurrentSpeed.setCurrentSpeed(currentAvgSpeed);
+    mCurrentSpeed.setCurrentSpeed(location.getSpeed());
  }
 }
--- a/android/app/src/main/java/app/organicmaps/util/RtlUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/RtlUtils.java
@@ -1,25 +0,0 @@
-package app.organicmaps.util;
-
-import android.app.Activity;
-import android.view.View;
-import androidx.annotation.NonNull;
-import androidx.core.text.TextUtilsCompat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-public class RtlUtils
-{
-  private final static List<String> rtlLocalesWithTranslation = Arrays.asList("ar", "fa");
-
-  public static void manageRtl(@NonNull final Activity activity)
-  {
-    final String currentLanguage = Locale.getDefault().getLanguage();
-    final boolean isRTL =
-        TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL;
-    if (isRTL && rtlLocalesWithTranslation.contains(currentLanguage))
-      activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-    else
-      activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
-  }
-}
--- a/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
+++ b/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -1,7 +1,6 @@
 <?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:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:layout_margin="@dimen/margin_double_and_half"
@@ -33,8 +32,7 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="true"
-      android:text="@string/by_default"
-      app:buttonTint="@null"/>
+      android:text="@string/by_default"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -43,8 +41,7 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_name"
-      app:buttonTint="@null"/>
+      android:text="@string/by_name"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -53,8 +50,7 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_type"
-      app:buttonTint="@null"/>
+      android:text="@string/by_type"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -63,8 +59,7 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_distance"
-      app:buttonTint="@null"/>
+      android:text="@string/by_distance"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -73,7 +68,6 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_date"
-      app:buttonTint="@null"/>
+      android:text="@string/by_date"/>
  </RadioGroup>
 </LinearLayout>
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -91,9 +91,8 @@
    style="?fontBody1"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginEnd="@dimen/margin_half"
-    android:layout_marginStart="@dimen/margin_half"
    android:layout_below="@id/rl__bookmark_set"
+    android:layout_margin="@dimen/margin_half"
    android:hint="@string/placepage_personal_notes_hint"
    android:textColorHint="?android:textColorSecondary">

--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/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"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -23,7 +23,7 @@
        android:textAppearance="@style/MwmTextAppearance.Body4"/>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__category"
-        style="@style/MwmWidget.M3.Editor.CardView">
+        style="@style/MwmWidget.Editor.CardView">
      <RelativeLayout
          android:id="@+id/category"
          style="@style/MwmWidget.Editor.MetadataBlock"
@@ -64,7 +64,7 @@
    </com.google.android.material.card.MaterialCardView>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__charging_station"
-        style="@style/MwmWidget.M3.Editor.CardView"
+        style="@style/MwmWidget.Editor.CardView"
        android:visibility="gone">
      <LinearLayout
          android:layout_width="match_parent"
@@ -86,12 +86,12 @@
    </com.google.android.material.card.MaterialCardView>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__name"
-        style="@style/MwmWidget.M3.Editor.CardView">
+        style="@style/MwmWidget.Editor.CardView">
      <include layout="@layout/localized_name"/>
    </com.google.android.material.card.MaterialCardView>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__address"
-        style="@style/MwmWidget.M3.Editor.CardView">
+        style="@style/MwmWidget.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -147,7 +147,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__details"
-        style="@style/MwmWidget.M3.Editor.CardView">
+        style="@style/MwmWidget.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -327,7 +327,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__social_media"
-        style="@style/MwmWidget.M3.Editor.CardView">
+        style="@style/MwmWidget.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -369,7 +369,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__building"
-        style="@style/MwmWidget.M3.Editor.CardView">
+        style="@style/MwmWidget.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -394,7 +394,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__more"
-        style="@style/MwmWidget.M3.Editor.CardView"
+        style="@style/MwmWidget.Editor.CardView"
        android:layout_marginBottom="@dimen/margin_base">
      <LinearLayout
          android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -16,7 +16,6 @@
    <com.google.android.material.card.MaterialCardView
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      style="@style/MwmWidget.M3.Editor.CardView"
      card_view:cardBackgroundColor="?cardBackground"
      card_view:cardCornerRadius="2dp"
      card_view:cardElevation="4dp">
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -8,8 +8,8 @@
  android:background="@drawable/bg_clickable_card">
  <com.google.android.material.checkbox.MaterialCheckBox
    android:id="@+id/checkbox"
-    android:layout_width="40dp"
-    android:layout_height="40dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
    android:layout_alignBottom="@id/bottom_line_container"
    android:layout_alignParentStart="true"
    android:layout_alignParentTop="true"
@@ -18,7 +18,7 @@
    android:layout_marginStart="8dp"
    android:background="@null"
    android:button="@drawable/visibility_selector"
-    app:buttonTint="@color/accent_color_selector"
+    android:buttonTint="?accentColorSelector"
    android:padding="@dimen/margin_half" />
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/name"
--- a/android/app/src/main/res/layout/item_bookmark_category_choose.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category_choose.xml
@@ -1,7 +1,6 @@
 <?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:layout_width="match_parent"
    android:layout_height="48dp"
    android:background="?clickableBackground"
@@ -15,8 +14,7 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:clickable="false"
-    android:focusable="false"
-    app:buttonTint="@null"/>
+    android:focusable="false"/>

  <com.google.android.material.textview.MaterialTextView
      android:id="@+id/tv__set_name"
--- a/android/app/src/main/res/layout/item_editor_input.xml
+++ b/android/app/src/main/res/layout/item_editor_input.xml
@@ -18,6 +18,7 @@
    android:layout_width="0dp"
    android:layout_centerVertical="true"
    android:layout_marginStart="14dp"
+    android:textColorHint="?android:textColorSecondary"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toEndOf="@+id/icon"
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -28,12 +28,12 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/delete_icon"
        app:layout_constraintStart_toEndOf="@+id/phone_icon"
+        app:hintEnabled="false"
        app:layout_constraintTop_toTopOf="parent">
        <com.google.android.material.textfield.TextInputEditText
            android:id="@+id/input"
            style="@style/MwmWidget.Editor.FieldLayout.EditText"
-            tools:hint="Hint"
-            tools:text="Input"
+            android:hint="@string/phone_format"
            android:inputType="phone"/>
    </com.google.android.material.textfield.TextInputLayout>

--- a/android/app/src/main/res/layout/item_search_result.xml
+++ b/android/app/src/main/res/layout/item_search_result.xml
@@ -6,7 +6,7 @@
  android:layout_height="wrap_content"
  android:background="?selectableItemBackground"
  android:minHeight="@dimen/search_item_height"
-  android:padding="@dimen/margin_base"
+  android:padding="@dimen/margin_half_double_plus"
  tools:background="#20FF0000">

  <com.google.android.material.textview.MaterialTextView
--- a/android/app/src/main/res/layout/item_selection.xml
+++ b/android/app/src/main/res/layout/item_selection.xml
@@ -19,8 +19,7 @@
    android:layout_marginEnd="@dimen/margin_base"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:buttonTint="@null"/>
+    app:layout_constraintTop_toTopOf="parent"/>

  <LinearLayout
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_street.xml
+++ b/android/app/src/main/res/layout/item_street.xml
@@ -19,8 +19,7 @@
    android:layout_marginEnd="@dimen/margin_base"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:buttonTint="@null"/>
+    app:layout_constraintTop_toTopOf="parent"/>

  <LinearLayout
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/MwmWidget.M3.Editor.CardView"
+  style="@style/MwmWidget.Editor.CardView"
  android:layout_marginBottom="@dimen/margin_half"
  android:layout_marginTop="@dimen/margin_half">

--- a/android/app/src/main/res/layout/map_buttons_layers.xml
+++ b/android/app/src/main/res/layout/map_buttons_layers.xml
@@ -7,4 +7,4 @@
  android:tint="?iconTint"
  android:contentDescription="@string/layers_title"
  app:tint="?accentColorSelector"
-  app:srcCompat="@drawable/ic_layers" />
+  app:srcCompat="@drawable/ic_layers" />
--- a/android/app/src/main/res/layout/place_page_add.xml
+++ b/android/app/src/main/res/layout/place_page_add.xml
@@ -2,7 +2,6 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/ll__place_add"
  style="@style/PlacePageItemFrame"
  tools:visibility="visible">
@@ -12,7 +11,5 @@
    style="@style/MwmWidget.M3.Button.Secondary"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    app:backgroundTint="?cardBackground"
-    android:backgroundTint="?cardBackground"
    android:text="@string/placepage_add_place_button" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/place_page_editor.xml
+++ b/android/app/src/main/res/layout/place_page_editor.xml
@@ -2,7 +2,6 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/ll__place_editor"
  style="@style/PlacePageItemFrame"
  tools:visibility="visible">
@@ -11,7 +10,5 @@
    style="@style/MwmWidget.M3.Button.Secondary"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    app:backgroundTint="?cardBackground"
-    android:backgroundTint="?cardBackground"
    android:text="@string/edit_place"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -43,8 +43,9 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/vehicle"
-              android:layout_width="@dimen/routing_toolbar_button"
-              android:layout_height="@dimen/routing_toolbar_button"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
              android:layout_marginStart="@dimen/routing_selector_wheel_margin"
              android:contentDescription="@string/vehicle"
              tools:button="@drawable/ic_car"
@@ -52,8 +53,9 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/pedestrian"
-              android:layout_width="@dimen/routing_toolbar_button"
-              android:layout_height="@dimen/routing_toolbar_button"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
              android:layout_marginStart="12dp"
              android:layout_marginEnd="12dp"
              android:contentDescription="@string/pedestrian"
@@ -62,8 +64,9 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/transit"
-              android:layout_width="@dimen/routing_toolbar_button"
-              android:layout_height="@dimen/routing_toolbar_button"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
              android:layout_marginEnd="@dimen/margin_half_plus"
              android:contentDescription="@string/subway"
              tools:button="@drawable/ic_route_planning_metro_40px"
@@ -71,8 +74,9 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/bicycle"
-              android:layout_width="@dimen/routing_toolbar_button"
-              android:layout_height="@dimen/routing_toolbar_button"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
              android:layout_marginEnd="12dp"
              android:contentDescription="@string/bicycle"
              tools:button="@drawable/ic_bike"
@@ -80,8 +84,9 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/ruler"
-              android:layout_width="@dimen/routing_toolbar_button"
-              android:layout_height="@dimen/routing_toolbar_button"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
              android:layout_marginEnd="12dp"
              android:contentDescription="@string/ruler"
              tools:button="@drawable/ic_ruler_route"
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -3,4 +3,4 @@
  <background android:drawable="@color/bg_app_icon_release"/>
  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/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 -->
@@ -890,4 +890,18 @@
    <string name="offline_explanation_title">Offline mapy</string>
    <string name="list_description_empty">Upravit seznam pro přidání popisu</string>
    <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
+    <string name="opens_at">Otevírá v %s</string>
+    <string name="closes_at">Zavírá v %s</string>
+    <string name="opens_day_at">Otevírá %1$s v %2$s</string>
+    <string name="closes_day_at">Zavírá %1$s v %2$s</string>
+    <string name="editor_business_vacant_button">Podnik je volný</string>
+    <string name="editor_mark_business_vacant_title">Označit podnik jako volný</string>
+    <string name="editor_mark_business_vacant_description">Použijte, pokud se podnik přestěhoval a místo je volné a připravené pro nového zájemce.</string>
+    <string name="editor_submit">Odeslat</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="few">%d min</item>
+        <item quantity="many">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -894,4 +894,14 @@
    <string name="error_invalid_number">ungültige Zahl</string>
    <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
    <string name="avoid_paved">Befst. Straßen vermeiden</string>
+    <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>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/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>
@@ -898,4 +898,8 @@
        <item quantity="one">%d min</item>
        <item quantity="other">%d min</item>
    </plurals>
+    <string name="editor_business_vacant_button">Äripind on vaba</string>
+    <string name="editor_mark_business_vacant_title">Märgi äripind vabaks</string>
+    <string name="editor_mark_business_vacant_description">Kasuta seda valikut, kui senine rentnik/omanik on kolinud välja ja äripind on tühi ja uue ootel.</string>
+    <string name="editor_submit">Saada</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -899,4 +899,17 @@
    <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
    <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
    <string name="avoid_paved">Éviter les routes goudronnées</string>
+    <string name="opens_at">Ouvre à %s</string>
+    <string name="closes_at">Ferme à %s</string>
+    <string name="opens_day_at">Ouverture le %1$s à %2$s</string>
+    <string name="closes_day_at">Fermeture le %1$s à %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="many">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="editor_business_vacant_button">Local commercial vacant</string>
+    <string name="editor_mark_business_vacant_title">Marquer l\'établissement comme vacant</string>
+    <string name="editor_mark_business_vacant_description">Utilisez cette option si l\'entreprise a déménagé et que l\'espace est vide et prêt à accueillir un nouveau locataire.</string>
+    <string name="editor_submit">Soumettre</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -627,4 +627,17 @@
    <string name="offline_explanation_title">Mapas sen conexión</string>
    <string name="offline_explanation_text">Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar.</string>
    <string name="list_description_empty">Editar a lista para engadir unha descrición</string>
+    <string name="opens_at">Abre ás %s</string>
+    <string name="closes_at">Fecha ás %s</string>
+    <string name="opens_day_at">Abre o %1$s ás %2$s</string>
+    <string name="closes_day_at">Fecha o %1$s ás %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="editor_mark_business_vacant_description">Usa isto se a empresa marchou e o espazo está baleiro e preparado para un novo proxecto.</string>
+    <string name="editor_submit">Enviar</string>
+    <string name="avoid_paved">Evitar estradas asfaltadas</string>
+    <string name="editor_business_vacant_button">Dispoñible para empresas</string>
+    <string name="editor_mark_business_vacant_title">Marcar como dispoñible para negocios</string>
 </resources>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -506,9 +506,9 @@
    <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
    <string name="delete_place_empty_comment_error">Norādiet šīs vietas dzēšanas iemeslu</string>
    <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Ierakstiet derīgu tālruņa numuru</string>
-    <string name="error_enter_correct_web">Ierakstiet derīgu tīmekļa vietnes adresi</string>
-    <string name="error_enter_correct_email">Ierakstiet e-pasta adresi</string>
+    <string name="error_enter_correct_phone">Jāievada derīgs tālruņa numurs</string>
+    <string name="error_enter_correct_web">Jāievada derīga tīmekļa adrese</string>
+    <string name="error_enter_correct_email">Jāievada derīga e-pasta adrese</string>
    <string name="error_enter_correct_facebook_page">Ierakstiet „Facebook“ lapas adresi, kontu vai mājaslapas nosaukumu</string>
    <string name="error_enter_correct_instagram_page">Ierakstiet „Instagram“ vietnes adresi vai konta nosaukumu</string>
    <string name="error_enter_correct_twitter_page">Ierakstiet „Twitter“ vietnes adresi vai lietotājvārdu</string>
@@ -845,4 +845,5 @@
    <string name="clear">Notīrīt</string>
    <string name="closed_now">Šobrīd slēgts</string>
    <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
+    <string name="editor_submit">Iesniegt</string>
 </resources>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -3,7 +3,7 @@
  <color name="base_accent">#FF7CBC7B</color>
  <color name="base_accent_pressed">#FF588157</color>

-  <color name="icon_tint">#FFC4C6C7</color>
+  <color name="icon_tint">#FFF</color>

  <color name="icon_tint_light">#FF76797C</color>

--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <style name="MwmTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
+  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
    <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
    <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
@@ -121,17 +121,11 @@
    <item name="colorSecondary">@color/base_accent</item>
    <item name="colorPrimaryContainer">?colorSecondary</item>
    <item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
-    <item name="colorOnSurfaceInverse">?android:textColorPrimaryInverse</item>
-    <item name="colorPrimaryInverse">?colorSecondary</item>
-    <item name="android:textColorLink">?colorSecondary</item>
-    <item name="colorOnSurfaceVariant">?colorSecondary</item>
-    <item name="colorControlActivated">?colorSecondary</item>
-    <item name="colorOutlineVariant">@color/divider</item>
  </style>

  <style name="MwmTheme" parent="MwmTheme.Base"/>

-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.DayNight">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.DayNight">
    <item name="colorControlNormal">@color/text_dark_hint</item>
    <item name="android:textColorHint">@color/text_light_hint</item>
  </style>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -387,10 +387,10 @@
    <string name="editor_time_open">Deschis</string>
    <string name="editor_time_close">Închis</string>
    <string name="editor_time_add_closed">Adaugă ore de închidere</string>
-    <string name="editor_time_title">Ore de deschidere</string>
+    <string name="editor_time_title">Program</string>
    <string name="editor_time_advanced">Mod Avansat</string>
    <string name="editor_time_simple">Mod simplu</string>
-    <string name="editor_hours_closed">Ore de închidere</string>
+    <string name="editor_hours_closed">Pauză</string>
    <string name="editor_example_values">Exemple</string>
    <string name="editor_correct_mistake">Corectare greșeală</string>
    <string name="editor_add_select_location">Selectați locația</string>
@@ -867,4 +867,16 @@
    <string name="pref_tts_no_system_tts_short">Nu s-a găsit un motor de text-to-speech, verifică setările aplicației</string>
    <string name="osm_note_hint">Sau, alternativ, lăsați un mesaj comunității OpenStreetMap, astfel încât altcineva să poată adăuga sau corecta un loc aici.</string>
    <string name="osm_note_toast">Nota va fi trimisă către OpenStreetMap</string>
+    <string name="opens_at">Deschide la %s</string>
+    <string name="closes_at">Închide la %s</string>
+    <string name="opens_day_at">Deschide %1$s la %2$s</string>
+    <string name="closes_day_at">Închide %1$s la %2$s</string>
+    <string name="editor_business_vacant_button">Magazinul este vacant</string>
+    <string name="editor_mark_business_vacant_title">Machează magazinul ca vacant</string>
+    <string name="editor_place_doesnt_exist_description">Descrie cum arată locul acum ca să trimiți o notiță comunității OpenStreetMap</string>
+    <string name="editor_mark_business_vacant_description">Folosește acest buton dacă magazinul a plecat din spațiu și spațiul este gol, aștepând alt magazin.</string>
+    <string name="editor_submit">Trimite</string>
+    <string name="avoid_paved">Evită drumurile pavate</string>
+    <string name="avoid_steps">Evită treptele</string>
+    <string name="offline_explanation_text">O hartă trebuie descărcată ca să vezi și si să nevighezi prin zonă.\nDescarcă hărți pentru zonele în care vrei să mergi.</string>
 </resources>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-ta/strings.xml
+++ b/android/app/src/main/res/values-ta/strings.xml
@@ -449,8 +449,8 @@
    <string name="opens_day_at">%1$s அன்று %2$sக்கு திறக்கப்படும்</string>
    <string name="closes_day_at">%1$s அன்று %2$s இல் மூடப்படும்</string>
    <plurals name="minutes_short">
-        <item quantity="one">%dmin</item>
-        <item quantity="other">%dmin</item>
+        <item quantity="one">%d நிமையம்</item>
+        <item quantity="other">%d நிமையங்கள்</item>
    </plurals>
    <string name="hours_confirmed_time_ago">%s உறுதிப்படுத்தப்பட்டது</string>
    <string name="existence_confirmed_time_ago">இருப்பு உறுதிப்படுத்தப்பட்டது %s</string>
@@ -626,4 +626,18 @@
    <string name="charge_socket_chademo">சேட்மோ</string>
    <string name="unknown_socket_type">தெரியாத சாக்கெட்</string>
    <string name="unknow_socket_type">தெரியாத சாக்கெட்</string>
+    <string name="edit_socket_info_tooltip">புதிய சாக்கெட்டுகளை உருவாக்கவும் அல்லது ஏற்கனவே உள்ளவற்றைத் திருத்தவும்.</string>
+    <string name="charging_station_available_sockets">கிடைக்கும் சாக்கெட்டுகள்</string>
+    <string name="charge_socket_unknown_other">மற்றவை அல்லது தெரியாதவை</string>
+    <string name="charge_socket_count">எண்ணுங்கள்</string>
+    <string name="charge_socket_power">ஆற்றல் (kW)</string>
+    <string name="editor_socket">சாக்கெட்டை திருத்து</string>
+    <string name="unknown_count">தெரியவில்லை</string>
+    <string name="error_value_must_be_positive">மதிப்பு நேர்மறையாக இருக்க வேண்டும்</string>
+    <string name="error_invalid_number">தவறான எண்</string>
+    <string name="list_description_empty">விளக்கத்தைச் சேர்க்க பட்டியலைத் திருத்தவும்</string>
+    <string name="editor_business_vacant_button">வணிகம் காலியாக உள்ளது</string>
+    <string name="editor_mark_business_vacant_title">வணிகம் காலியாக இருப்பதாகக் குறி</string>
+    <string name="editor_mark_business_vacant_description">வணிகம் வெளியேறி, இடம் காலியாக இருந்தால் மற்றும் புதிய குத்தகைதாரருக்கு தயாராக இருந்தால் இதைப் பயன்படுத்தவும்.</string>
+    <string name="editor_submit">சமர்ப்பி</string>
 </resources>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -74,8 +74,8 @@
  <color name="bg_statusbar_translucent">#66000000</color>

  <!-- App icons background and foreground colors -->
-  <color name="bg_app_icon_release">@color/bg_primary</color>
-  <color name="bg_app_icon_test">@color/bg_primary</color>
+  <color name="bg_app_icon_release">#588157</color>
+  <color name="bg_app_icon_test">#588157</color>
  <color name="bg_app_icon_debug">#f8b42e</color>

  <color name="fg_app_icon_white">#fefdf6</color>
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -183,5 +183,4 @@
  <!--App Icons -->
  <dimen name="app_icon_border_width">0.8</dimen>

-  <dimen name="routing_toolbar_button">40dp</dimen>
 </resources>
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -100,4 +100,5 @@
  <string name="pixelfed" translatable="false">Pixelfed</string>
  <string name="count_label" translatable="false">× %d</string>
  <string name="kw_label" translatable="false">%s kW</string>
+  <string name="phone_format" translatable="false">+ XX X XX XX XX</string>
 </resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -578,8 +578,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Do you want to send it to all users?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions</string>
+    <string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions.</string>
    <string name="navigation_stop_button">Stop</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Recording the track</string>
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -57,14 +57,12 @@
  <style name="MwmWidget.Editor.CustomTextInput">
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_width">match_parent</item>
-    <item name="android:textColorHint">?iconTint</item>
  </style>

  <style name="MwmWidget.Editor.FieldLayout">
    <item name="android:layout_width">match_parent</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_marginStart">@dimen/editor_margin_left</item>
-    <item name="android:textColorHighlight">?colorPrimary</item>
  </style>

  <style name="MwmWidget.Editor.FieldLayout.EditText" parent="MwmWidget.Editor">
@@ -85,13 +83,4 @@
    <item name="android:clickable">true</item>
    <item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
  </style>
-
-  <style name="MwmWidget.M3.Editor.CardView" parent="Widget.Material3.CardView.Elevated">
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?cardBackground</item>
-    <item name="android:padding">@dimen/margin_base</item>
-    <item name="cardPreventCornerOverlap">false</item>
-  </style>
 </resources>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -35,20 +35,17 @@
    <item name="maxImageSize">34dp</item>
  </style>

-  <style name="MwmWidget.Components.SearchWheel" parent="Widget.MaterialComponents.FloatingActionButton">
+  <style name="MwmWidget.Components.SearchWheel" parent="Theme.Material3.Dark">
    <item name="android:layout_width">wrap_content</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:backgroundTint">?menuBackground</item>
-    <item name="backgroundTint">?menuBackground</item>
    <item name="elevation">0dp</item>
    <item name="hoveredFocusedTranslationZ">0dp</item>
    <item name="pressedTranslationZ">0dp</item>
    <item name="android:tint">?iconTint</item>
-    <item name="tint">?iconTint</item>
    <item name="maxImageSize">@dimen/map_button_icon_size</item>
    <item name="borderWidth">0dp</item>
    <item name="fabCustomSize">38dp</item>
-    <item name="ensureMinTouchTargetSize">false</item>
  </style>

  <style name="MwmWidget.MapButton.Bottom">
@@ -141,7 +138,7 @@
    <item name="cornerSize">50%</item>
  </style>

-  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.Material3.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
    <item name="android:background">?colorPrimary</item>
    <item name="android:displayOptions">homeAsUp|showTitle</item>
    <item name="contentInsetStart">0dp</item>
@@ -158,7 +155,7 @@
    <item name="android:elevation">0dp</item>
  </style>

-  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.Material3.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
    <item name="android:gravity">center_vertical</item>
    <item name="colorAccent">@android:color/white</item>
    <item name="colorSecondary">@android:color/white</item>
@@ -171,7 +168,7 @@
    <item name="colorSecondary">#FF32363A</item>
  </style>

-  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
    <item name="android:gravity">center_vertical</item>
    <item name="colorAccent">@android:color/white</item>
    <item name="colorSecondary">@android:color/white</item>
@@ -181,7 +178,7 @@

  <style
    name="MwmWidget.ToolbarTheme.DownButton"
-    parent="ThemeOverlay.Material3.Dark.ActionBar">
+    parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
    <item name="android:gravity">center_vertical</item>
    <item name="colorAccent">@android:color/white</item>
    <item name="colorSecondary">@android:color/white</item>
@@ -318,12 +315,12 @@
  </style>

  <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
-    parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
+    parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
    <item name="colorSurface">@color/material_calendar_surface_dark</item>
  </style>

  <style name="MwmWidget.MaterialCalendar.Theme.Dark"
-    parent="ThemeOverlay.Material3.MaterialCalendar">
+    parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
    <item name="colorSurface">@color/material_calendar_surface_dark</item>
  </style>

--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
  <!-- Default theme -->
-  <style name="MwmTheme.Base" parent="Theme.Material3.Light.NoActionBar">
-    <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
-    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.Material3.MaterialCalendar.Fullscreen</item>
-    <item name="materialCalendarTheme">@style/ThemeOverlay.Material3.MaterialCalendar</item>
+  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
+    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
+    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
    <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
@@ -128,12 +128,6 @@
    <item name="colorSecondary">@color/base_accent</item>
    <item name="colorPrimaryContainer">?colorSecondary</item>
    <item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
-    <item name="colorOnSurfaceInverse">?android:textColorPrimaryInverse</item>
-    <item name="colorPrimaryInverse">?colorSecondary</item>
-    <item name="android:textColorLink">?colorSecondary</item>
-    <item name="colorOnSurfaceVariant">?colorSecondary</item>
-    <item name="colorControlActivated">?colorSecondary</item>
-    <item name="colorOutlineVariant">@color/divider</item>

  </style>

@@ -167,7 +161,7 @@
    <item name="android:windowBackground">@color/bg_window</item>
  </style>

-  <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
+  <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
    <item name="colorAccent">?buttonDialogTextColor</item>
    <item name="colorSecondary">?buttonDialogTextColor</item>
    <item name="colorPrimary">?buttonDialogTextColor</item>
@@ -186,7 +180,7 @@
    <item name="android:textColor">?titleDialogTheme</item>
  </style>

-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.Light">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
    <item name="android:colorPrimaryDark">?statusBar</item>
    <item name="colorAccent">@color/base_accent</item>
    <item name="colorPrimary">@color/bg_primary</item>
@@ -253,7 +247,7 @@
    <item name="iconTint">@color/white_primary</item>
  </style>

-  <style name="PopupMenu" parent="ThemeOverlay.Material3">
+  <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
    <item name="android:popupBackground">?windowBackgroundForced</item>
  </style>
 </resources>
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -26,7 +26,6 @@ import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
 import org.chromium.base.ObserverList;
-import java.util.ArrayList;

 public class LocationHelper implements BaseLocationProvider.Listener
 {
@@ -36,8 +35,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
  private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours
  private static final long LOCATION_UPDATE_TIMEOUT_MS = 30 * 1000; // 30 seconds

-  private static final double SPEED_AVERAGING_TIME = 0.5; // 0.5 seconds
-
  @NonNull
  private final Context mContext;
  @NonNull
@@ -59,10 +56,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
  private Handler mHandler;
  private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;

-  private double mTimeElapsedAtLastAverage = Double.NaN;
-  private float mLastAverageSpeed = Float.NaN;
-  private ArrayList<Float> mSpeedHistory = new ArrayList<>();
-
  @NonNull
  private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
    @Override
@@ -174,8 +167,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
                                        mSavedLocation.getLongitude(), mSavedLocation.getAccuracy(),
                                        mSavedLocation.getAltitude(), mSavedLocation.getSpeed(),
                                        mSavedLocation.getBearing());
-
-    updateSpeedHistory();
  }

  private void notifyLocationUpdateTimeout()
@@ -488,41 +479,4 @@ public class LocationHelper implements BaseLocationProvider.Listener
      Framework.nativeRunFirstLaunchAnimation();
    }
  }
-
-  private void updateSpeedHistory()
-  {
-    if (mSavedLocation == null)
-    {
-      return;
-    }
-
-    if (Double.isNaN(mTimeElapsedAtLastAverage))
-    {
-      mTimeElapsedAtLastAverage = mSavedLocation.getElapsedRealtimeNanos() * 1.0E-9;
-    }
-    mSpeedHistory.add(mSavedLocation.getSpeed());
-  }
-
-  public float getAverageSpeed()
-  {
-    if (mSavedLocation == null)
-      return Float.NaN;
-    if (Double.isNaN(mTimeElapsedAtLastAverage))
-      updateSpeedHistory();
-    double timeDiff = mSavedLocation.getElapsedRealtimeNanos() * 1.0E-9 - mTimeElapsedAtLastAverage;
-    if (timeDiff < SPEED_AVERAGING_TIME || mSpeedHistory.isEmpty())
-    {
-      if (!Float.isNaN(mLastAverageSpeed))
-        return mLastAverageSpeed;
-      else
-        return mSavedLocation.getSpeed();
-    }
-    else {
-      mLastAverageSpeed = mSpeedHistory.stream().reduce(0.0F, Float::sum);
-      mLastAverageSpeed /= mSpeedHistory.size();
-      mSpeedHistory.clear();
-      mTimeElapsedAtLastAverage = mSavedLocation.getElapsedRealtimeNanos() * 1.0E-9;
-      return mLastAverageSpeed;
-    }
-  }
 }
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -1439,4 +1439,19 @@
    <string name="type.leisure.indoor_play">Vnitřní herní centrum</string>
    <string name="type.shop.telecommunication">Telekomunikační obchod</string>
    <string name="type.amenity.car_pooling">Spolujízda</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.amenity.sailing_school">Jachtařská škola</string>
+    <string name="type.amenity.flight_school">Letecká škola</string>
+    <string name="type.amenity.prep_school">Přípravná škola</string>
+    <string name="type.emergency.access_point">Nouzový bod záchrany</string>
+    <string name="type.emergency.life_ring">Záchranný kruh</string>
+    <string name="type.shop.beauty.day_spa">Denní lázně</string>
+    <string name="type.social_facility.food_bank">Potravinová banka</string>
+    <string name="type.man_made.telescope.optical">Teleskop (optický)</string>
+    <string name="type.man_made.telescope.radio">Teleskop (rádio)</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (gamma)</string>
+    <string name="type.man_made.observatory">Observatoř</string>
+    <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>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -345,6 +345,39 @@
    <string name="type.emergency.phone">Notruftelefon</string>
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Rettungsschwimmer</string>
+    <string name="type.beacon.cardinal.east">Kardinalbake</string>
+    <string name="type.beacon.cardinal.north">Kardinalbake</string>
+    <string name="type.beacon.cardinal.south">Kardinalbake</string>
+    <string name="type.beacon.cardinal.west">Kardinalbake</string>
+    <string name="type.beacon.isolated_danger">Einzelgefahrenbake</string>
+    <string name="type.beacon.lateral.port">Lateralbake</string>
+    <string name="type.beacon.lateral.starboard">Lateralbake</string>
+    <string name="type.beacon.safe_water">Mittefahrwasserbarke</string>
+    <string name="type.beacon.special_purpose">Spezialbake</string>
+    <string name="type.buoy.cardinal.east">Kardinalboje</string>
+    <string name="type.buoy.cardinal.north">Kardinalboje</string>
+    <string name="type.buoy.cardinal.south">Kardinalboje</string>
+    <string name="type.buoy.cardinal.west">Kardinalboje</string>
+    <string name="type.buoy.isolated_danger">Einzelgefahrenboje</string>
+    <string name="type.buoy.lateral.port">Lateralboje</string>
+    <string name="type.buoy.lateral.starboard">Lateralboje</string>
+    <string name="type.buoy.safe_water">Mittefahrwasserboje</string>
+    <string name="type.buoy.special_purpose">Spezialboje</string>
+    <string name="type.spherical_buoy.cardinal.east">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.cardinal.north">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.cardinal.south">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.cardinal.west">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.isolated_danger">Kugelförmige Einzelgefahrenboje</string>
+    <string name="type.spherical_buoy.lateral.port">Kugelförmige Lateralboje</string>
+    <string name="type.spherical_buoy.lateral.starboard">Kugelförmige Lateralboje</string>
+    <string name="type.spherical_buoy.safe_water">Kugelförmige Mittefahrwasserboje</string>
+    <string name="type.spherical_buoy.special_purpose">Kugelförmige Spezialboje</string>
+    <string name="type.lateral.port">Backbord</string>
+    <string name="type.lateral.starboard">Steuerbord</string>
+    <string name="type.cardinal.east">Ost</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Süd</string>
+    <string name="type.cardinal.west">West</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
@@ -1451,10 +1484,19 @@
    <string name="type.shop.telecommunication">Telekommunikationsgeschäft</string>
    <string name="type.man_made.telescope">Teleskop</string>
    <string name="type.man_made.telescope.optical">Teleskop (Optisch)</string>
-    <string name="type.man_made.telescope.radio">Radioteleskop</string>
+    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
    <string name="type.man_made.observatory">Observatorium</string>
    <string name="type.amenity.payment_centre">Zahlungszentrum</string>
    <string name="type.social_facility.soup_kitchen">Suppenküche</string>
    <string name="type.social_facility.food_bank">Tafel</string>
+    <string name="type.amenity.flight_school">Flugschule</string>
+    <string name="type.amenity.sailing_school">Segelschule</string>
+    <string name="type.amenity.prep_school">Nachhilfeschule</string>
+    <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>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/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>
@@ -1454,4 +1454,42 @@
    <string name="type.emergency.access_point">Asukohatuvastuspunkt hädaolukorras</string>
    <string name="type.emergency.life_ring">Päästerõngas</string>
    <string name="type.shop.beauty.day_spa">Päevaspaa</string>
+    <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>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -1451,4 +1451,51 @@
    <string name="type.social_facility.soup_kitchen">Soupe populaire</string>
    <string name="type.amenity.give_box">Boîte à don</string>
    <string name="type.man_made.telescope">Télescope</string>
+    <string name="type.amenity.sailing_school">École de voile</string>
+    <string name="type.amenity.flight_school">École de pilotage</string>
+    <string name="type.amenity.prep_school">École de soutien scolaire</string>
+    <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>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/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>
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/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>
@@ -1450,4 +1450,46 @@
    <string name="type.amenity.lounger">Lounge</string>
    <string name="type.amenity.payment_centre">Betaalkantoor</string>
    <string name="type.leisure.indoor_play">Speelhal</string>
+    <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>
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/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>
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -1455,4 +1455,7 @@
    <string name="type.amenity.food_sharing">Partilha de Comida</string>
    <string name="type.amenity.give_box">Caixa de Doações</string>
    <string name="type.shop.beauty.day_spa">Spa Diurno</string>
+    <string name="type.amenity.sailing_school">Escola Náutica</string>
+    <string name="type.amenity.flight_school">Escola de Aviação</string>
+    <string name="type.amenity.prep_school">Centro de Explicações</string>
 </resources>
--- a/android/sdk/src/main/res/values-ro/types_strings.xml
+++ b/android/sdk/src/main/res/values-ro/types_strings.xml
@@ -1437,4 +1437,5 @@
    <string name="type.leisure.sports_centre.sport.volleyball">Centru Sportiv</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Centru de Yoga</string>
    <string name="type.leisure.sports_centre.sport.tennis">Centru Sportiv</string>
+    <string name="type.leisure.bandstand">Foișor</string>
 </resources>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/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>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/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,48 @@
    <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>
 </resources>
--- a/android/sdk/src/main/res/values-ta/strings.xml
+++ b/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>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -74,6 +74,9 @@
    <string name="type.amenity.exhibition_centre">Exhibition Center</string>
    <string name="type.amenity.money_transfer">Money Transfer</string>
    <string name="type.amenity.music_school">Music School</string>
+    <string name="type.amenity.sailing_school">Sailing School</string>
+    <string name="type.amenity.flight_school">Flight School</string>
+    <string name="type.amenity.prep_school">Tutorial School</string>
    <string name="type.amenity.language_school">Language School</string>
    <string name="type.office.diplomatic">Embassy</string>
    <string name="type.office.security">Security Guards Office</string>
@@ -379,6 +382,39 @@
    <string name="type.emergency.phone">Emergency Phone</string>
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Lifeguard</string>
+    <string name="type.beacon.cardinal.east">Cardinal Beacon</string>
+    <string name="type.beacon.cardinal.north">Cardinal Beacon</string>
+    <string name="type.beacon.cardinal.south">Cardinal Beacon</string>
+    <string name="type.beacon.cardinal.west">Cardinal Beacon</string>
+    <string name="type.beacon.isolated_danger">Isolated Danger Beacon</string>
+    <string name="type.beacon.lateral.port">Lateral Beacon</string>
+    <string name="type.beacon.lateral.starboard">Lateral Beacon</string>
+    <string name="type.beacon.safe_water">Safe Water Beacon</string>
+    <string name="type.beacon.special_purpose">Special Purpose Beacon</string>
+    <string name="type.buoy.cardinal.east">Cardinal Buoy</string>
+    <string name="type.buoy.cardinal.north">Cardinal Buoy</string>
+    <string name="type.buoy.cardinal.south">Cardinal Buoy</string>
+    <string name="type.buoy.cardinal.west">Cardinal Buoy</string>
+    <string name="type.buoy.isolated_danger">Isolated Danger Buoy</string>
+    <string name="type.buoy.lateral.port">Lateral Buoy</string>
+    <string name="type.buoy.lateral.starboard">Lateral Buoy</string>
+    <string name="type.buoy.safe_water">Safe Water Buoy</string>
+    <string name="type.buoy.special_purpose">Special Purpose Buoy</string>
+    <string name="type.spherical_buoy.cardinal.east">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.cardinal.north">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.cardinal.south">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.cardinal.west">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.isolated_danger">Spherical Isolated Danger Buoy</string>
+    <string name="type.spherical_buoy.lateral.port">Spherical Lateral Buoy</string>
+    <string name="type.spherical_buoy.lateral.starboard">Spherical Lateral Buoy</string>
+    <string name="type.spherical_buoy.safe_water">Spherical Safe Water Buoy</string>
+    <string name="type.spherical_buoy.special_purpose">Spherical Special Purpose Buoy</string>
+    <string name="type.lateral.port">Port</string>
+    <string name="type.lateral.starboard">Starboard</string>
+    <string name="type.cardinal.east">East</string>
+    <string name="type.cardinal.north">North</string>
+    <string name="type.cardinal.south">South</string>
+    <string name="type.cardinal.west">West</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Mountain Rescue Station</string>
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
@@ -1466,4 +1502,5 @@
    <string name="type.amenity.dojo">Dojo</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Sports hall</string>
+    <string name="type.xmas.tree">Christmas Tree</string>
 </resources>
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -415,6 +415,9 @@
 "leisure-resort|@category_hotel": "Resort",
 "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
 "amenity-driving_school": "4Driving school",
+"amenity-sailing_school": "4Sailing school|4Boating school",
+"amenity-flight_school": "5Flight school|Flying school",
+"amenity-prep_school": "3Tutorial school|Prep school|Test prep center|Cram school",
 "amenity-music_school": "4Music school",
 "amenity-language_school": "4Language school",
 "amenity-ice_cream": "3Ice cream|Gelato",
--- a/data/copyright.html
+++ b/data/copyright.html
@@ -200,6 +200,9 @@
    <li><a href="https://pugixml.org/">Pugixml</a><br>
      &copy; 2006-2015 Arseny Kapoulkine; <a href="#mit-license" class="license">MIT License</a></li>

+    <li><a href="https://github.com/mnalis/StreetComplete-taginfo-categorize">StreetComplete Taginfo Categorize</a><br>
+      &copy; 2025; <a href="#cc0-1" class="license">CC0 1.0 Universal</a></li>
+
    <li><a href="https://github.com/ot/succinct">succinct library</a><br>
      &copy; 2011 Giuseppe Ottaviano; <a href="#apache2-license" class="license">Apache License</a></li>

@@ -223,10 +226,10 @@

    <li><a href="https://github.com/skarupke/flat_hash_map">Skarupke Hash Tables</a><br>
      &copy; Malte Skarupke 2017; <a href="#boost-license" class="license">Boost License</a></li>
-
-</ul>
+  </ul>

  <p lang="en">Beyond OpenStreetMap, we also use a few other open data sources to improve our map data:</p>
+  <p lang="de">Neben OpenStreetMap verwenden wir auch einige andere freie Datenquellen, um die Kartendaten zu verbessern:</p>

  <ul>
    <li><a href="https://simplemaps.com/data/us-zips">US Zip Codes Database</a><br>
@@ -349,13 +352,13 @@
    &copy; 2023 Sergey Vartanov <a href="#cc-by-4" class="license">CC BY 4.0 License</a></li>

  <li><a href="https://upload.wikimedia.org/wikipedia/commons/a/a9/Panoramax.svg">Panoramax</a><br>
-      &copy; 2023 Adrien Pavie; <a href="#cc-by-4" class="license">CC BY 4.0 License</a></li>
+    &copy; 2023 Adrien Pavie; <a href="#cc-by-4" class="license">CC BY 4.0 License</a></li>
  
  <li><a href="https://github.com/gravitystorm/openstreetmap-carto">OpenStreetMap Carto</a><br>
-      &copy; 2025 OpenStreetMap Carto; <a href="#cc0-1" class="license">CC0 1.0 Universal</li>
-      
-      <li><a href="https://github.com/rapideditor/temaki">Temaki</a><br>
-          &copy; 2025 Rapid Editor; <a href="#cc0-1" class="license">CC0 1.0 Universal</li>
+    &copy; 2025 OpenStreetMap Carto; <a href="#cc0-1" class="license">CC0 1.0 Universal</a></li>
+
+  <li><a href="https://github.com/rapideditor/temaki">Temaki</a><br>
+    &copy; 2025 Rapid Editor; <a href="#cc0-1" class="license">CC0 1.0 Universal</a></li>
 </ul>
 </div>

--- a/data/countries.txt
+++ b/data/countries.txt
--- a/data/editor.config
+++ b/data/editor.config
@@ -1255,6 +1255,15 @@
      <type id="amenity-music_school" group="education">
        <include group="poi_internet" />
      </type>
+      <type id="amenity-flight_school" group="education">
+        <include group="poi_internet" />
+      </type>
+      <type id="amenity-sailing_school" group="education">
+        <include group="poi_internet" />
+      </type>
+      <type id="amenity-prep_school" group="education">
+        <include group="poi_internet" />
+      </type>
      <type id="amenity-ice_cream" group="shop">
        <include group="poi_internet" />
        <include field="website_menu" />
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -101,7 +101,7 @@ natural|wetland;33;
 deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track
 # ~1M usages.
 power|minor_line;[power=minor_line][!location];;;;35;
-amenity|school;36;
+amenity|school;[amenity=school],[education=school];;name;int_name;36;
 # Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp).
 highway|cycleway;37;
 # ~16M usages.
@@ -276,7 +276,7 @@ deprecated:natural|wood|coniferous:01.2020;[natural=wood][wood=coniferous],[natu
 landuse|recreation_ground;173;
 landuse|village_green;174;
 amenity|drinking_water;175;
-amenity|university;176;
+amenity|university;[amenity=university],[education=university];;name;int_name;176;
 highway|secondary_link;177;
 power|substation;178;
 railway|tram_stop;179;
@@ -327,7 +327,7 @@ sport|swimming;220;
 leisure|track;221;
 sport|skateboard;222;
 barrier|retaining_wall;223;
-amenity|college;224;
+amenity|college;[amenity=college],[education=college];;name;int_name;224;
 sport|baseball;225;
 highway|service|area;[highway=service][area?];;name;int_name;226;
 highway|residential|area;[highway=residential][area?];;name;int_name;227;
@@ -618,16 +618,16 @@ amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int
 waterway|fish_pass;496;
 waterway|fish_pass|tunnel;[waterway=fish_pass][tunnel?];;name;int_name;497;
 natural|water|lock;[natural=water][water=lock];;name;int_name;498;
-deprecated:waterway|lock:06.2022;499;waterway|canal
+xmas|tree;[xmas:feature=tree];;name;int_name;499;
 fee|yes;[fee?];;name;int_name;500;
 fee|no;[fee=not],[fee=no];;name;int_name;501;
 toilets|yes;502;
 highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
 drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
 drinking_water|no;505;
-deprecated|deprecated;506;x
-deprecated|deprecated;507;x
-deprecated|deprecated;508;x
+amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
+amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
+amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;
 social_facility|food_bank;511;
@@ -700,26 +700,26 @@ aerialway|rope_tow;575;
 natural|pond;576;natural|water|pond
 railway|station|funicular;[railway=station][station=funicular],[railway=halt][station=funicular];;name;int_name;577;
 highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578;
-deprecated|deprecated;579;x
-deprecated|deprecated;580;x
-deprecated|deprecated;581;x
-deprecated|deprecated;582;x
-deprecated|deprecated;583;x
-deprecated|deprecated;584;x
-deprecated|deprecated;585;x
-deprecated|deprecated;586;x
+buoy|lateral|port;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port];;;;579;
+buoy|lateral|starboard;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard];;;;580;
+buoy|isolated_danger;[seamark:type=buoy_isolated_danger];;;;581;
+buoy|cardinal|east;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east];;;;582;
+buoy|cardinal|west;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west];;;;583;
+buoy|cardinal|south;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south];;;;584;
+buoy|cardinal|north;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north];;;;585;
+buoy|special_purpose;[seamark:type=buoy_special_purpose];;;;586;
 aerialway|mixed_lift;587;
-deprecated|deprecated;588;x
-deprecated|deprecated;589;x
-deprecated|deprecated;590;x
+buoy|safe_water;[seamark:type=buoy_safe_water];;;;588;
+beacon|lateral|port;[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;589;
+beacon|lateral|starboard;[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:type=beacon_lateral][seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;590;
 highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];x;name;int_name;591;highway|track
-deprecated|deprecated;592;x
-deprecated|deprecated;593;x
-deprecated|deprecated;594;x
-deprecated|deprecated;595;x
-deprecated|deprecated;596;x
-deprecated:boundary|administrative|region:04.2024;[boundary=administrative][border_type=region];x;name;int_name;597;
-deprecated|deprecated;598;x
+beacon|isolated_danger;[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=tower],[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=lattice],[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=pile],[seamark:type=beacon_isolated_danger][seamark:beacon_isolated_danger:shape=buoyant];;;;592;
+beacon|cardinal|east;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant];;;;593;
+beacon|cardinal|west;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant];;;;594;
+beacon|cardinal|south;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant];;;;595;
+beacon|cardinal|north;[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile],[seamark:type=beacon_cardinal][seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant];;;;596;
+beacon|special_purpose;[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=tower],[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=lattice],[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=pile],[seamark:type=beacon_special_purpose][seamark:beacon_special_purpose:shape=buoyant];;;;597;
+beacon|safe_water;[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=tower],[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=lattice],[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=pile],[seamark:type=beacon_safe_water][seamark:beacon_safe_water:shape=buoyant];;;;598;
 deprecated|deprecated;599;x
 deprecated|deprecated;600;x
 place|continent;601;
@@ -738,23 +738,23 @@ piste:type|downhill|expert|area;[piste:type=downhill][piste:difficulty=expert][a
 piste:type|downhill|area;[piste:type=downhill][area?];;;;614;
 piste:type|sled|area;[piste:type=sled][area?];;;;615;
 piste:type|snow_park;616;
-deprecated|deprecated;617;x
-deprecated|deprecated;618;x
+spherical_buoy|lateral|port;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=port][seamark:buoy_lateral:shape=spherical];;;;617;
+spherical_buoy|lateral|starboard;[seamark:type=buoy_lateral][seamark:buoy_lateral:category=starboard][seamark:buoy_lateral:shape=spherical];;;;618;
 aerialway|j-bar;619;
-deprecated|deprecated;620;x
-deprecated|deprecated;621;x
-deprecated|deprecated;622;x
-deprecated|deprecated;623;x
-deprecated|deprecated;624;x
-deprecated|deprecated;625;x
-deprecated:railway|siding|bridge:06.2023;626;x
-deprecated:highway|footway|difficult_alpine_hiking:04.2024;[highway=footway][sac_scale=difficult_alpine_hiking];x;name;int_name;627;highway|path|expert
-deprecated|deprecated;628;x
-deprecated|deprecated;629;x
-deprecated|deprecated;630;x
+spherical_buoy|isolated_danger;[seamark:type=buoy_isolated_danger][seamark:buoy_isolated_danger:shape=spherical];;;;620;
+spherical_buoy|cardinal|east;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=east][seamark:buoy_cardinal:shape=spherical];;;;621;
+spherical_buoy|cardinal|west;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=west][seamark:buoy_cardinal:shape=spherical];;;;622;
+spherical_buoy|cardinal|south;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=south][seamark:buoy_cardinal:shape=spherical];;;;623;
+spherical_buoy|cardinal|north;[seamark:type=buoy_cardinal][seamark:buoy_cardinal:category=north][seamark:buoy_cardinal:shape=spherical];;;;624;
+spherical_buoy|special_purpose;[seamark:type=buoy_special_purpose][seamark:buoy_special_purpose:shape=spherical];;;;625;
+spherical_buoy|safe_water;[seamark:type=buoy_safe_water][seamark:buoy_safe_water:shape=spherical];;;;626;
+cardinal|east;[seamark:buoy_cardinal:category=east],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=east][seamark:beacon_cardinal:shape=buoyant];;;;627;
+cardinal|west;[seamark:buoy_cardinal:category=west],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=west][seamark:beacon_cardinal:shape=buoyant];;;;628;
+cardinal|south;[seamark:buoy_cardinal:category=south],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=south][seamark:beacon_cardinal:shape=buoyant];;;;629;
+cardinal|north;[seamark:buoy_cardinal:category=north],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=tower],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=lattice],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=pile],[seamark:beacon_cardinal:category=north][seamark:beacon_cardinal:shape=buoyant];;;;630;
 highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];x;name;int_name;631;highway|track
-deprecated|deprecated;632;x
-deprecated|deprecated;633;x
+lateral|port;[seamark:buoy_lateral:category=port],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;632;
+lateral|starboard;[seamark:buoy_lateral:category=starboard],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;633;
 highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634;
 deprecated|deprecated;635;x
 deprecated|deprecated;636;x
@@ -1257,8 +1257,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n
 amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130;
 amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131;
 leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132;
-amenity|music_school;1133;
-amenity|language_school;1134;
+amenity|music_school;[amenity=music_school],[education=music_school];;name;int_name;1133;
+amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134;
 historic|city_gate;1135;
 sport|padel;1136;
 sport|futsal;1137;
@@ -1285,7 +1285,7 @@ shop|charity;1157;
 hwtag|toll;1158;
 amenity|arts_centre;1159;
 amenity|biergarten;1160;
-amenity|driving_school;1161;
+amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161;
 amenity|food_court;1162;
 amenity|ice_cream;1163;
 amenity|internet_cafe;1164;
--- a/data/styles/default/dark/symbols/beacon-cardinal-east-m.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-east-m.svg
@@ -0,0 +1 @@
+<svg height="21" viewBox="0 0 15 21" width="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.5071 .0629)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.98081375 13.7487506.00015176 3.2209072c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00063311-3.5279972zm-.00097-7.4987506-.00028 2.5h-2.5l.00028-2.5zm-1.25-6.24999944 1.25 2.5-1.25 2.5-1.25-2.5z" fill="#000"/><path d="m7.97956423 8.75125v4.99875h-2.5v-4.99875z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-east-s.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-east-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.384651 10.9990004.00012141 2.5767259c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.00050649-2.8223978zm-.000776-5.9990004-.000224 2h-2l.000224-2zm-1-4.99999955 1 2-1 2-1-2z" fill="#000"/><path d="m6.38365139 7.001v3.999h-2v-3.999z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-north-m.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-north-m.svg
@@ -0,0 +1 @@
+<svg height="21" viewBox="0 0 14 21" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(0 .8681)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.97956423 11.25125.00140128 5.7184078c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00060757-6.0267472z" fill="#c99e01"/><path d="m7.97984375 6.25-.00027952 5.00125h-2.5l.00027952-5.00125zm-1.25-3.74999944 1.25 2.5h-2.5zm0-2.5 1.25 2.5h-2.5z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-north-s.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-north-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.38365139 9.001.00112102 4.5747263c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.00048605-4.82139775z" fill="#c99e01"/><path d="m6.383875 5-.00022361 4.001h-2l.00022361-4.001zm-1-2.99999955 1 2h-2zm0-2 1 2h-2z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-south-m.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-south-m.svg
@@ -0,0 +1 @@
+<svg height="20" viewBox="0 0 14 20" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.97956423 11.25125.00140128 5.7184078c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00060757-6.0267478zm.00027952-8.75124944-1.25 2.5-1.25-2.5zm0-2.5-1.25 2.5-1.25-2.5z" fill="#000"/><path d="m7.97984375 6.25-.00027952 5.00125h-2.5l.00027952-5.00125z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-south-s.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-south-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.38365139 9.001.00112102 4.5747263c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.00048605-4.8213982zm.00022361-7.00099955-1 2-1-2zm0-2-1 2-1-2z" fill="#000"/><path d="m6.383875 5-.00022361 4.001h-2l.00022361-4.001z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-west-m.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-west-m.svg
@@ -0,0 +1 @@
+<svg height="21" viewBox="0 0 14 21" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.1323 .5)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.98081423 13.7487506.00015128 3.2209072c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00063263-3.5279972zm-.00097048-7.4987506-.00027952 2.5h-2.5l.00027952-2.5zm-1.25-3.74999944 1.25 2.5h-2.5zm1.25-2.5-1.25 2.5-1.25-2.5z" fill="#000"/><path d="m7.97956423 8.75125v4.99875h-2.5v-4.99875z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-cardinal-west-s.svg
+++ b/data/styles/default/dark/symbols/beacon-cardinal-west-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.38465139 10.9990004.00012102 2.5767259c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.0005061-2.8223978zm-.00077639-5.9990004-.00022361 2h-2l.00022361-2zm-1-2.99999955 1 2h-2zm1-2-1 2-1-2z" fill="#000"/><path d="m6.38365139 7.001v3.999h-2v-3.999z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-isolated_danger-m.svg
+++ b/data/styles/default/dark/symbols/beacon-isolated_danger-m.svg
@@ -0,0 +1 @@
+<svg height="20" viewBox="0 0 14 20" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.98081375 13.7487506.00015176 3.2209072c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00063311-3.5279972zm-.00097-7.4987506-.00028 2.5h-2.5l.00028-2.5zm-1.25-6.24999944c.69035594 0 1.25.55964406 1.25 1.25 0 .6410448-.48255024 1.16938395-1.10422359 1.24159034l-.13605641.00840966.13605641.0084091c.62167335.07220639 1.10422359.60054554 1.10422359 1.24159034 0 .69035594-.55964406 1.25000056-1.25 1.25000056s-1.25-.55964462-1.25-1.25000056c0-.6410448.48255024-1.16938395 1.10422359-1.24159034l.13549641-.0084091-.13549641-.00840966c-.62167335-.07220639-1.10422359-.60054554-1.10422359-1.24159034 0-.69035594.55964406-1.25 1.25-1.25z" fill="#000"/><path d="m7.97956423 8.75125v4.99875h-2.5v-4.99875z" fill="#750105"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-isolated_danger-s.svg
+++ b/data/styles/default/dark/symbols/beacon-isolated_danger-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.384651 10.9990004.00012141 2.5767259c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.00050649-2.8223978zm-.000776-5.9990004-.000224 2h-2l.000224-2zm-1-4.99999955c.55228475 0 1 .44771525 1 1 0 .51283584-.38604019.93550716-.88337887.99327227l-.10884513.00672773.10884513.00672728c.49733868.05776511.88337887.48043643.88337887.99327272 0 .5522843-.44771525 1-1 1s-1-.4477157-1-1c0-.51283629.38604019-.93550761.88337887-.99327272l.10839713-.00672728-.10839713-.00672773c-.49733868-.05776511-.88337887-.48043643-.88337887-.99327227 0-.55228475.44771525-1 1-1z" fill="#000"/><path d="m6.38365139 7.001v3.999h-2v-3.999z" fill="#750105"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-lateral-port-m.svg
+++ b/data/styles/default/dark/symbols/beacon-lateral-port-m.svg
@@ -0,0 +1 @@
+<svg height="20" viewBox="0 0 15 20" width="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.9333333v19h-13.9333333z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.966 .5)" xlink:href="#a"><path d="m12.6668608 16.9593863c.3821487.2687357.8146898.4530049 1.2663825.5528076l.0002762 1.1790563c-.441894-.0803744-.8708522-.2269957-1.2666587-.4398639-1.285706.684-2.8998259.684-4.18562888 0-1.28570593.684-2.89982587.684-4.17165378 0-1.28570593.684-2.89982587.684-4.18562885 0l-.12395432.0595333.00210417-1.2706282.12185015-.0809051c1.2367932.855 2.95572613.855 4.18562885 0 1.2158306.855 2.94175106.855 4.17165378 0 1.2367932.855 2.95572608.855 4.18562888 0z" fill="#0a6074"/><path d="m7.50198145 4.98591913.93939194 10.73409347c-.73107522.4930622-1.63068063.6891446-2.49285497.5882473l-.97023021-11.10154622zm-.33119182-3.78553985.22081925 2.52397561-2.52369324.22079455-.22081925-2.52397561z" fill="#750105"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-lateral-port-s.svg
+++ b/data/styles/default/dark/symbols/beacon-lateral-port-s.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 11 15" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v15h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001532 13.3889892c.3016964.2121598.6431762.3576355.9997757.436427l.0002181.930834c-.3488637-.0634535-.6875149-.1792072-.9999938-.347261-1.01503096.54-2.28933618.54-3.30444379 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031276.09619749-.0638724c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444379 0z" fill="#0a6074"/><path d="m5.92261693 3.93625195.74162522 8.47428425c-.57716465.3892597-1.28737944.5440616-1.9680434.4644058l-.76597121-8.76437857zm-.26146723-2.9885841.17433099 1.99261233-1.99238939.17431149-.17433099-1.99261233z" fill="#750105"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg
+++ b/data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 11 15" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v15h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 13.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m4.94746851 3.94145213 1.9923894.17431149-.74779262 8.54994718c-.63555593.2680363-1.36218283.3013189-2.01697175.0998479zm1.25805218-2.90588889.82188321 2.07954514-1.9923894-.17431149z" fill="#01421d"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-lateral-starboard.svg
+++ b/data/styles/default/dark/symbols/beacon-lateral-starboard.svg
@@ -0,0 +1 @@
+<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.9333333v19h-13.9333333z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.6668658 16.9606667c.3821487.2687357.8146898.4530049 1.2663825.5528075l.0002762 1.1790564c-.4418939-.0803745-.8708522-.2269958-1.2666587-.4398639-1.2857059.684-2.89982588.684-4.18562885 0-1.28570593.684-2.89982587.684-4.17165378 0-1.28570593.684-2.89982587.684-4.18562885 0l-.12395432.0595333.00210417-1.2706282.12185015-.0809051c1.2367932.855 2.95572613.855 4.18562885 0 1.2158306.855 2.94175106.855 4.17165378 0 1.2367932.855 2.95572615.855 4.18562885 0z" fill="#0a6074"/><path d="m6.26679345 4.99250603 2.52369324.22079455-.94720399 10.82993312c-.80503751.3395126-1.72543158.3816706-2.55483088.1264739zm1.59353275-3.68079259 1.04105207 2.6340905-2.52369323-.22079454z" fill="#01421d"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-safe_water-m.svg
+++ b/data/styles/default/dark/symbols/beacon-safe_water-m.svg
@@ -0,0 +1 @@
+<svg height="21" viewBox="0 0 15 21" width="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.8677 .5)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.97984375 6.25-.0001426 10.7203075c-.76700302.3939196-1.66791857.495972-2.50074755.3061572l.00089015-11.0257997zm-1.25-1.25c.69035594 0 1.25-.55964406 1.25-1.25s-.55964406-1.25-1.25-1.25-1.25.55964406-1.25 1.25.55964406 1.25 1.25 1.25z" fill="#750105"/><path d="m6.72734375 6.62533875.00223457 10.34212615c-.29911276.0377346-.60308798.0352951-.90075503-.0073042l-.00022954-10.3351607z" fill="#999"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-safe_water-s.svg
+++ b/data/styles/default/dark/symbols/beacon-safe_water-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.383875 5-.00011408 8.576246c-.61360242.3151357-1.33433486.3967776-2.00059804.2449257l.00071212-8.8206397zm-1-1c.55228475 0 1-.44771525 1-1s-.44771525-1-1-1-1 .44771525-1 1 .44771525 1 1 1z" fill="#750105"/><path d="m5.381875 5.300271.00178766 8.2737009c-.23929021.0301877-.48247038.0282361-.72060403-.0058433l-.00018363-8.2681286z" fill="#999"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-special_purpose-m.svg
+++ b/data/styles/default/dark/symbols/beacon-special_purpose-m.svg
@@ -0,0 +1 @@
+<svg height="20" viewBox="0 0 14 20" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.97984375 6.25.00112176 10.7196578c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00035311-11.0267478zm.14525058-3.12193368-.625.625.625.625-.625.625-.625-.625-.625.625-.625-.625.625-.625-.625-.625.625-.625.625.625.625-.625z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/beacon-special_purpose-s.svg
+++ b/data/styles/default/dark/symbols/beacon-special_purpose-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.383875 5 .00089741 8.5757263c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.00028249-8.8213982zm.11620046-2.49754695-.5.5.5.5-.5.5-.5-.5-.5.5-.5-.5.5-.5-.5-.5.5-.5.5.5.5-.5z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/boating_school-m.svg
+++ b/data/styles/default/dark/symbols/boating_school-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="#51585e" r="8.25"/><path d="m4.55 4.75h5.9c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm.2 5.6232607h5.5c-.2423109.7837509-.76661176 1.1756264-1.57290244 1.1756264h-2.72808995c-.56021615 0-1.04260671-.3952991-1.15270115-.9445907zm2.4982045-3.91875476.3589162.38847336c.50360233.557123.85073087.99910438 1.0413856 1.32594414.23302246.39947082.50380319 1.00362473.8123422 1.81246174h-2.0573269c.09664789-.66029437.14497184-1.2056974.14497184-1.63620908s-.10009631-1.06073507-.30028894-1.89067016zm-.13860882.78766812-1.661552 2.73921112h1.661552zm5.34040432-2.49047756h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm.6394427 8.3211146.6605573-1.3211146h-1.5l.6605573 1.3211146c.0246989.0493978.0847662.0694202.1341641.0447213.0193527-.0096763.0350449-.0253686.0447213-.0447213z" fill="#000" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/buoy-cardinal-east-m.svg
+++ b/data/styles/default/dark/symbols/buoy-cardinal-east-m.svg
@@ -0,0 +1 @@
+<svg height="21" viewBox="0 0 15 21" width="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.3245 .8386)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m8.60484375 13.75 2.50000005 1.25-.5912659 2.3682807c-.75352099.015209-1.51242157-.1954725-2.14394114-.6320444-1.21371979.84375-2.91693076.84375-4.1167636 0-.40009633.2781377-.85263422.4645888-1.32328309.5593533l-.57474632-2.2955896 2.5-1.25zm-.625-7.499335.20875 2.50058556h-2.9175l.20875-2.50058556zm-1.25-6.25066444 1.25 2.5-1.25 2.5-1.25-2.5z" fill="#000"/><path d="m8.18831423 8.751915.41652952 4.998085h-3.75l.41597048-4.998085z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/buoy-cardinal-east-s.svg
+++ b/data/styles/default/dark/symbols/buoy-cardinal-east-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.883875 11 2 1-.47301264 1.8946246c-.60281683.0121672-1.2099373-.156378-1.71515295-.5056356-.97097583.675-2.33354461.675-3.29341088 0-.32007706.2225102-.68210738.3716711-1.05862647.4474826l-.45979706-1.8364716 2-1zm-.5-5.999468.167 2.00046845h-2.334l.167-2.00046845zm-1-5.00053155 1 2-1 2-1-2z" fill="#000"/><path d="m6.55065139 7.001532.33322361 3.998468h-3l.33277639-3.998468z" fill="#c99e01"/></g></svg>
--- a/data/styles/default/dark/symbols/buoy-cardinal-north-m.svg
+++ b/data/styles/default/dark/symbols/buoy-cardinal-north-m.svg
@@ -0,0 +1 @@
+<svg height="20" viewBox="0 0 14 20" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m8.39581423 11.251915.20902952 2.498085 2.50000005 1.25-.5912659 2.3682807c-.75352099.015209-1.51242157-.1954725-2.14394114-.6320444-1.21371979.84375-2.91693076.84375-4.1167636 0-.40009633.2781377-.85263422.4645888-1.32328309.5593533l-.57474632-2.2955896 2.5-1.25.20875-2.4987494z" fill="#c99e01"/><path d="m7.97984375 6.250665.41597048 5.00125h-3.3325l.41652952-5.00125zm-1.25-3.75066444 1.25 2.5h-2.5zm0-2.5 1.25 2.5h-2.5z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/buoy-cardinal-north-s.svg
+++ b/data/styles/default/dark/symbols/buoy-cardinal-north-s.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.71665139 9.001532.16722361 1.998468 2 1-.47301264 1.8946246c-.60281683.0121672-1.2099373-.156378-1.71515295-.5056356-.97097583.675-2.33354461.675-3.29341088 0-.32007706.2225102-.68210738.3716711-1.05862647.4474826l-.45979706-1.8364716 2-1 .167-1.99899955z" fill="#c99e01"/><path d="m6.383875 5.000532.33277639 4.001h-2.666l.33322361-4.001zm-1-3.00053155 1 2h-2zm0-2 1 2h-2z" fill="#000"/></g></svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yannik Bloscheck	34bb81e516	[ios] Don't let custom map appearance influence CarPlay Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 16:52:53 +01:00
Yannik Bloscheck	3035116fec	[ios] Always use light map appearance by default Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 16:52:52 +01:00
Codeberg Translate	40b0023046	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Juno Takano <jutty@noreply.codeberg.org> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: clacsonduro <clacsonduro@noreply.codeberg.org> Co-authored-by: dobridabar <dobridabar@noreply.codeberg.org> Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: tace16 <tace16@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-11-17 14:09:31 +00:00
Yannik Bloscheck	efe4570adf	[styles] Fix boat rental icon name Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 08:54:48 +01:00
Jean-Baptiste	b72d747a5e	[android] Add avoid icons in settings Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-17 08:28:40 +01:00
Codeberg Translate	1a95097fbb	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/iOS - Map Feature Types	2025-11-16 20:20:56 +00:00
map-per	0243b1e86b	[copyright] Add StreetComplete-taginfo-categorize to copyright Signed-off-by: map-per <map-per@gmx.de>	2025-11-16 21:20:43 +01:00
Codeberg Translate	8f3978e391	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/iOS - Map Feature Types	2025-11-16 20:08:15 +01:00
map-per	680d97bc4f	[styles] Add natural=sand (#2451 ) Signed-off-by: map-per <map-per@gmx.de> Reviewed-on: https://codeberg.org/comaps/comaps/pulls/2451 Reviewed-by: Yannik Bloscheck <yannikbloscheck@noreply.codeberg.org> Reviewed-by: Konstantin Pastbin <pastk@noreply.codeberg.org> Co-authored-by: map-per <map-per@gmx.de> Co-committed-by: map-per <map-per@gmx.de>	2025-11-16 19:19:58 +01:00
zyphlar	5683606c31	[android] Punctuate complete sentences Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org> Co-authored-by: zyphlar <zyphlar@noreply.codeberg.org> Co-committed-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-11-16 19:15:08 +01:00
Yannik Bloscheck	3c7eb92b17	[styles] Adding trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 18:30:49 +01:00
x7z4w	226b0f03c8	[cmake] Fix Android boost errors Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-16 18:27:04 +01:00
x7z4w	0a3a4ebd9a	[core] Regex refactoring Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-16 18:27:04 +01:00
map-per	a62f6c0ef6	[translations] Fix translation merge conflict Signed-off-by: map-per <map-per@gmx.de>	2025-11-16 17:35:29 +01:00
Yannik Bloscheck	ef280c7f89	[styles] Differentiate between different entrances Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 15:22:47 +01:00
Yannik Bloscheck	c49c414ec4	[styles] Added smaller bus stop icons Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 15:16:20 +01:00
Jean-Baptiste	e62196798f	[android] Add place holder in phone field Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 14:52:21 +01:00
Jean-Baptiste	c687c850b8	[android] Reduce padding foreach items in the search view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 14:51:59 +01:00
Codeberg Translate	f549358f28	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: ghose <ghose@noreply.codeberg.org> Co-authored-by: tace16 <tace16@noreply.codeberg.org> Co-authored-by: teletext <teletext@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-11-16 14:51:41 +01:00
Yannik Bloscheck	e3c8e422d5	[styles] Apply pill shape road sign also to tertiary roads in Austria Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:38:18 +01:00
Yannik Bloscheck	f664138a42	[types] Adding buoys Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:38:02 +01:00
x7z4w	6ae28a0ccf	[android] Fix layers button tint Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-16 14:34:46 +01:00
Jean-Baptiste	6cef8e3594	[android] Add new fresh screenshots Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 14:21:41 +01:00
Yannik Bloscheck	ec76982895	[styles] Reduce visbility of service roads Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:12:38 +01:00
Yannik Bloscheck	17fb4dd855	[styles] Reduce visbility of tram tunnels Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:12:38 +01:00
Yannik Bloscheck	8c880f00b2	[styles] Decrease visbility of railway tunnels further Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:12:38 +01:00
Yannik Bloscheck	6c02e1d53a	[types] Christmas trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:02:08 +01:00
zyphlar	a1944435ae	Add French national library archiving info/instructions Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-11-16 12:39:44 +01:00
Jean-Baptiste	5beed2672f	[android] Remove custom right to left implementation Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 08:45:51 +01:00
x7z4w	64eb8af3c1	[android] Fix dark mode launcher icon Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-15 21:23:48 +01:00
Yannik Bloscheck	316e259ebb	[types] Preperations for new education tag Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:40:57 +01:00
Yannik Bloscheck	dce50b2ca6	[types] Adding prep, sailing and flight school Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:40:57 +01:00
Yannik Bloscheck	8db1dd55b5	[generator] Name method parameter more clearly Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:32:43 +01:00
Yannik Bloscheck	14c4d08e32	[generator] Shorten code to avoid unnecessary `if` condition Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:32:43 +01:00
Yannik Bloscheck	2ae482de76	[generator] Ignore edited status for nearby places during map generation Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:32:43 +01:00
				`@@ -0,0 +1 @@`
				<svg height="21" viewBox="0 0 15 21" width="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.5071 .0629)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.98081375 13.7487506.00015176 3.2209072c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00063311-3.5279972zm-.00097-7.4987506-.00028 2.5h-2.5l.00028-2.5zm-1.25-6.24999944 1.25 2.5-1.25 2.5-1.25-2.5z" fill="#000"/><path d="m7.97956423 8.75125v4.99875h-2.5v-4.99875z" fill="#c99e01"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="16" viewBox="0 0 11 16" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v16h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001572 14.39c.3016963.2121598.6431762.3576355.9997757.436427l.000218.930834c-.3488636-.0634535-.6875149-.1792072-.9999937-.347261-1.01503099.54-2.28933621.54-3.30444382 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031275.09619749-.0638725c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444382 0z" fill="#0a6074"/><path d="m6.384651 10.9990004.00012141 2.5767259c-.61351649.3154087-1.33426296.3972993-2.00061492.2456719l-.00050649-2.8223978zm-.000776-5.9990004-.000224 2h-2l.000224-2zm-1-4.99999955 1 2-1 2-1-2z" fill="#000"/><path d="m6.38365139 7.001v3.999h-2v-3.999z" fill="#c99e01"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="21" viewBox="0 0 14 21" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(0 .8681)" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.97956423 11.25125.00140128 5.7184078c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00060757-6.0267472z" fill="#c99e01"/><path d="m7.97984375 6.25-.00027952 5.00125h-2.5l.00027952-5.00125zm-1.25-3.74999944 1.25 2.5h-2.5zm0-2.5 1.25 2.5h-2.5z" fill="#000"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="20" viewBox="0 0 14 20" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.75v20h-13.75z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.5001965 17.9875c.3771204.2651997.8039702.4470443 1.2497196.5455338l.0002726 1.1635424c-.4360796-.0793169-.8593936-.2240089-1.2499922-.4340762-1.2687887.675-2.86167026.675-4.13055477 0-1.26878875.675-2.86167027.675-4.1167636 0-1.26878875.675-2.86167027.675-4.13055479 0l-.12232334.05875.00207649-1.2539094.12024685-.0798406c1.22051961.84375 2.916835.84375 4.13055479 0 1.19983283.84375 2.90304381.84375 4.1167636 0 1.2205196.84375 2.91683497.84375 4.13055477 0z" fill="#0a6074"/><path d="m7.97956423 11.25125.00140128 5.7184078c-.76689562.3942609-1.66782869.4966242-2.50076865.30709l-.00060757-6.0267478zm.00027952-8.75124944-1.25 2.5-1.25-2.5zm0-2.5-1.25 2.5-1.25-2.5z" fill="#000"/><path d="m7.97984375 6.25-.00027952 5.00125h-2.5l.00027952-5.00125z" fill="#c99e01"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="20" viewBox="0 0 15 20" width="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.9333333v19h-13.9333333z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(.966 .5)" xlink:href="#a"><path d="m12.6668608 16.9593863c.3821487.2687357.8146898.4530049 1.2663825.5528076l.0002762 1.1790563c-.441894-.0803744-.8708522-.2269957-1.2666587-.4398639-1.285706.684-2.8998259.684-4.18562888 0-1.28570593.684-2.89982587.684-4.17165378 0-1.28570593.684-2.89982587.684-4.18562885 0l-.12395432.0595333.00210417-1.2706282.12185015-.0809051c1.2367932.855 2.95572613.855 4.18562885 0 1.2158306.855 2.94175106.855 4.17165378 0 1.2367932.855 2.95572608.855 4.18562888 0z" fill="#0a6074"/><path d="m7.50198145 4.98591913.93939194 10.73409347c-.73107522.4930622-1.63068063.6891446-2.49285497.5882473l-.97023021-11.10154622zm-.33119182-3.78553985.22081925 2.52397561-2.52369324.22079455-.22081925-2.52397561z" fill="#750105"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="15" viewBox="0 0 11 15" width="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h11v15h-11z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m10.0001532 13.3889892c.3016964.2121598.6431762.3576355.9997757.436427l.0002181.930834c-.3488637-.0634535-.6875149-.1792072-.9999938-.347261-1.01503096.54-2.28933618.54-3.30444379 0-1.015031.54-2.28933621.54-3.29341088 0-1.01503099.54-2.28933621.54-3.30444382 0l-.09785868.047.00166119-1.0031276.09619749-.0638724c.97641568.675 2.33346799.675 3.30444382 0 .95986627.675 2.32243505.675 3.29341088 0 .97641569.675 2.33346799.675 3.30444379 0z" fill="#0a6074"/><path d="m5.92261693 3.93625195.74162522 8.47428425c-.57716465.3892597-1.28737944.5440616-1.9680434.4644058l-.76597121-8.76437857zm-.26146723-2.9885841.17433099 1.99261233-1.99238939.17431149-.17433099-1.99261233z" fill="#750105"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h13.9333333v19h-13.9333333z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m12.6668658 16.9606667c.3821487.2687357.8146898.4530049 1.2663825.5528075l.0002762 1.1790564c-.4418939-.0803745-.8708522-.2269958-1.2666587-.4398639-1.2857059.684-2.89982588.684-4.18562885 0-1.28570593.684-2.89982587.684-4.17165378 0-1.28570593.684-2.89982587.684-4.18562885 0l-.12395432.0595333.00210417-1.2706282.12185015-.0809051c1.2367932.855 2.95572613.855 4.18562885 0 1.2158306.855 2.94175106.855 4.17165378 0 1.2367932.855 2.95572615.855 4.18562885 0z" fill="#0a6074"/><path d="m6.26679345 4.99250603 2.52369324.22079455-.94720399 10.82993312c-.80503751.3395126-1.72543158.3816706-2.55483088.1264739zm1.59353275-3.68079259 1.04105207 2.6340905-2.52369323-.22079454z" fill="#01421d"/></g></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="#51585e" r="8.25"/><path d="m4.55 4.75h5.9c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm.2 5.6232607h5.5c-.2423109.7837509-.76661176 1.1756264-1.57290244 1.1756264h-2.72808995c-.56021615 0-1.04260671-.3952991-1.15270115-.9445907zm2.4982045-3.91875476.3589162.38847336c.50360233.557123.85073087.99910438 1.0413856 1.32594414.23302246.39947082.50380319 1.00362473.8123422 1.81246174h-2.0573269c.09664789-.66029437.14497184-1.2056974.14497184-1.63620908s-.10009631-1.06073507-.30028894-1.89067016zm-.13860882.78766812-1.661552 2.73921112h1.661552zm5.34040432-2.49047756h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm.6394427 8.3211146.6605573-1.3211146h-1.5l.6605573 1.3211146c.0246989.0493978.0847662.0694202.1341641.0447213.0193527-.0096763.0350449-.0253686.0447213-.0447213z" fill="#000" fill-rule="evenodd"/></g></svg>