[ci] Fix appstream

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
2026-01-09 22:04:43 +00:00 · 2025-08-20 09:00:45 +00:00
148 changed files with 95 additions and 894 deletions
--- a/.forgejo/workflows/appstream-check.yaml
+++ b/.forgejo/workflows/appstream-check.yaml
@@ -21,11 +21,12 @@ jobs:
      - name: Install appstream validator and flatpak Builder
        shell: bash
        run: |
-          sudo apt update -y
-          sudo apt install -y \
-              flatpak
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.flatpak.Builder
+          apt-get update
+          apt-get install -y flatpak dbus --no-install-recommends
+          mkdir /run/dbus
+          dbus-daemon --system
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y org.flatpak.Builder

      - name: Lint appstream data with flatpak Builder
        shell: bash
--- a/.forgejo/workflows/linux-check.yaml
+++ b/.forgejo/workflows/linux-check.yaml
@@ -133,14 +133,6 @@ jobs:
        with:
          key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}

-      - name: Configure repository
-        shell: bash
-        env:
-          SKIP_MAP_DOWNLOAD: 1
-          SKIP_GENERATE_SYMBOLS: 1
-          SKIP_GENERATE_DRULES: 1
-        run: ./configure.sh
-
      - name: CMake
        shell: bash
        env:
--- a/.gitignore
+++ b/.gitignore
@@ -9,16 +9,17 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
-*.local.*

 stxxl.errlog
 stxxl.log
 screenlog.0

+data/symbols/*/design/
 # symbols png/sdf are now generated at build
 data/symbols/**/symbols.png
 data/symbols/**/symbols.sdf
-
+data/colors_design.txt
+data/patterns_design.txt
 data/bookmarks
 data/edits.xml
 data/World.mwm
@@ -26,15 +27,11 @@ data/WorldCoasts.mwm
 data/world_mwm/*
 data/*_hash
 data/drules_proto*
-data/classificator.txt*
-data/types.txt*
-data/visibility.txt*
-data/colors.txt*
-data/patterns.txt*
-# TODO: designer is not used at the moment
-# data/symbols/*/design/
-# data/colors_design.txt
-# data/patterns_design.txt
+data/classificator.txt
+data/types.txt
+data/visibility.txt
+data/colors.txt
+data/patterns.txt

 # Compiled Python
 *.pyc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
  set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()

+execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
+
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")

 if (CMAKE_UNITY_BUILD)
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 </div>
 <div align="center">
  <p align="center">
-    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
+    <a href="https://codeberg.org/comaps/comaps/releases">
      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
@@ -41,6 +41,8 @@

 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.

+**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
+
 <p align="center">
  <a href="https://apps.apple.com/app/comaps/id6747180809">
    <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
@@ -75,10 +77,9 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
 ## ⚡️ Highlights

 - **Offline-first**: Navigate without a connection
- **Privacy-respecting**: No tracking, ads or data collection
+- **Privacy-respecting**: No tracking, Ads or data collection
 - **Lightweight**: Battery- and space-efficient
 - **Simple**: Polished, user-focused interface
- **Cross-platform**: Available for Android, iOS, MacOS, and Linux.
 - **Community-built**: Free, open source, and collaborative
 - **Transparent**: Open finances and governance

--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -236,11 +236,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    return true;
  }

-  boolean saveEdits()
-  {
-    return setEdits() && beforeSavingValidation();
-  }
-
  @NonNull
  protected String getDescription()
  {
@@ -287,18 +282,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    return validateNames();
  }

-  private boolean beforeSavingValidation() {
-    // Validation to make sure address features have a house number
-    if (!Editor.nativeCheckHouseNumberWhenIsAddress())
-    {
-      mHouseNumber.requestFocus();
-      UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number);
-      InputUtils.showKeyboard(mHouseNumber);
-      return false;
-    }
-    return true;
-  }
-
  private boolean validateNames()
  {
    for (int pos = 0; pos < mNamesAdapter.getItemCount(); pos++)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -276,11 +276,6 @@ public class EditorHostFragment
    return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
  }

-  private boolean saveEdits()
-  {
-    return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).saveEdits();
-  }
-
  @Override
  public void onClick(View v)
  {
@@ -315,7 +310,7 @@ public class EditorHostFragment
      case LANGUAGE -> editMapObject();
      case MAP_OBJECT ->
      {
-        if (!saveEdits())
+        if (!setEdits())
          return;

        // Save object edits
--- a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
@@ -112,7 +112,6 @@ public final class Editor
  public static native String nativeGetHouseNumber();
  public static native void nativeSetHouseNumber(String houseNumber);
  public static native boolean nativeIsHouseValid(String houseNumber);
-  public static native boolean nativeCheckHouseNumberWhenIsAddress();
  public static boolean nativeIsLevelValid(String level)
  {
    return nativeIsMetadataValid(Metadata.MetadataType.FMD_BUILDING_LEVELS.toInt(), level);
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -169,7 +169,6 @@
    <string name="type.amenity.water_point">Waterpunt</string>
    <string name="type.amenity.water_point.drinking_water_no">Waterpunt</string>
    <string name="type.barrier">Versperring</string>
-    <string name="type.barrier.yes">Versperring</string>
    <string name="type.barrier.block">Blok</string>
    <string name="type.barrier.bollard">Bolder</string>
    <string name="type.barrier.border_control">Grensbeheer</string>
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -185,7 +185,6 @@
    <string name="type.amenity.water_point">نقطة إعادة تعبة قنينة المياه</string>
    <string name="type.amenity.water_point.drinking_water_no">نقطة إعادة تعبة قنينة المياه</string>
    <string name="type.barrier">حاجز</string>
-    <string name="type.barrier.yes">حاجز</string>
    <string name="type.barrier.block">حاجز</string>
    <string name="type.barrier.bollard">حاجز سيارات</string>
    <string name="type.barrier.border_control">أمن الحدود</string>
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -177,7 +177,6 @@
    <string name="type.amenity.water_point">Karvanlar üçün su nöqtəsi</string>
    <string name="type.amenity.water_point.drinking_water_no">Karvanlar üçün su nöqtəsi</string>
    <string name="type.barrier">Maneə</string>
-    <string name="type.barrier.yes">Maneə</string>
    <string name="type.barrier.block">Blok</string>
    <string name="type.barrier.bollard">Birbaşa</string>
    <string name="type.barrier.border_control">Sərhəd Nəzarəti</string>
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -603,7 +603,6 @@
    <string name="type.amenity.waste_disposal">Кофа</string>
    <string name="type.amenity.waste_basket">Кошче за отпадък</string>
    <string name="type.barrier">Бариера</string>
-    <string name="type.barrier.yes">Бариера</string>
    <string name="type.barrier.chain">Верига</string>
    <string name="type.amenity.place_of_worship.muslim">Джамия</string>
    <string name="type.amenity.post_box">Пощенска кутия</string>
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -187,7 +187,6 @@
    <string name="type.amenity.water_point">Punt d’aigua</string>
    <string name="type.amenity.water_point.drinking_water_no">Punt d’aigua</string>
    <string name="type.barrier">Barrera</string>
-    <string name="type.barrier.yes">Barrera</string>
    <string name="type.barrier.block">Bloc</string>
    <string name="type.barrier.bollard">Bol·lard</string>
    <string name="type.barrier.border_control">Control fronterer</string>
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1193,7 +1193,6 @@
    <string name="type.amenity.vending_machine.fuel">Palivové čerpadlo</string>
    <string name="type.amenity.waste_transfer_station">Překladiště odpadu</string>
    <string name="type.barrier">Bariéra</string>
-    <string name="type.barrier.yes">Bariéra</string>
    <string name="type.barrier.cycle_barrier">Cyklistická bariéra</string>
    <string name="type.cuisine.bubble_tea">Bubble Tea</string>
    <string name="type.emergency">Nouzová stanice</string>
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1201,7 +1201,6 @@
    <string name="type.amenity.vending_machine.fuel">Benzinautomat</string>
    <string name="type.amenity.waste_transfer_station">Affaldsplads</string>
    <string name="type.barrier">Barriere</string>
-    <string name="type.barrier.yes">Barriere</string>
    <string name="type.barrier.chain">Kæde</string>
    <string name="type.amenity.vending_machine.food">Madautomat</string>
    <string name="type.barrier.cycle_barrier">Cykelbarriere</string>
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -182,7 +182,6 @@
    <string name="type.amenity.water_point">Wasseranschluss</string>
    <string name="type.amenity.water_point.drinking_water_no">Wasseranschluss</string>
    <string name="type.barrier">Barriere</string>
-    <string name="type.barrier.yes">Barriere</string>
    <string name="type.barrier.block">Block</string>
    <string name="type.barrier.bollard">Poller</string>
    <string name="type.barrier.border_control">Grenzkontrolle</string>
--- a/android/app/src/main/res/values-el/types_strings.xml
+++ b/android/app/src/main/res/values-el/types_strings.xml
@@ -1230,7 +1230,6 @@
    <string name="type.barrier.wall">Τοίχος</string>
    <string name="type.recycling.cans">Κονσερβοκούτια</string>
    <string name="type.barrier">Εμπόδιο</string>
-    <string name="type.barrier.yes">Εμπόδιο</string>
    <string name="type.amenity.vending_machine.sweets">Διανεμητής γλυκών</string>
    <string name="type.barrier.cycle_barrier">Εμπόδιο ποδηλάτου</string>
    <string name="type.recycling.shoes">Παπούτσια</string>
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -188,7 +188,6 @@
    <string name="type.amenity.water_point">Fuente de agua para caravanas</string>
    <string name="type.amenity.water_point.drinking_water_no">Fuente de agua para caravanas</string>
    <string name="type.barrier">Barrera</string>
-    <string name="type.barrier.yes">Barrera</string>
    <string name="type.barrier.block">Bloque</string>
    <string name="type.barrier.bollard">Bolardo</string>
    <string name="type.barrier.border_control">Control fronterizo</string>
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -186,7 +186,6 @@
    <string name="type.amenity.water_point">Joogivee tankimispunkt</string>
    <string name="type.amenity.water_point.drinking_water_no">Joogivee tankimispunkt</string>
    <string name="type.barrier">Barjäär</string>
-    <string name="type.barrier.yes">Barjäär</string>
    <string name="type.barrier.block">Kiviplokk</string>
    <string name="type.barrier.bollard">Piirdetulp</string>
    <string name="type.barrier.border_control">Piirikontroll</string>
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -181,7 +181,6 @@
    <string name="type.amenity.water_point">Ur iturria</string>
    <string name="type.amenity.water_point.drinking_water_no">Ur iturria</string>
    <string name="type.barrier">Hesia</string>
-    <string name="type.barrier.yes">Hesia</string>
    <string name="type.barrier.block">Blokea</string>
    <string name="type.barrier.bollard">Pibotea</string>
    <string name="type.barrier.border_control">Muga kontrola</string>
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -184,7 +184,6 @@
    <string name="type.amenity.water_point">Vesipiste</string>
    <string name="type.amenity.water_point.drinking_water_no">Vesipiste</string>
    <string name="type.barrier">Este</string>
-    <string name="type.barrier.yes">Este</string>
    <string name="type.barrier.block">Este</string>
    <string name="type.barrier.bollard">Tolppa</string>
    <string name="type.barrier.border_control">Rajavalvonta</string>
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -177,7 +177,6 @@
    <string name="type.amenity.water_point">Point d’eau</string>
    <string name="type.amenity.water_point.drinking_water_no">Point d’eau</string>
    <string name="type.barrier">Barrière</string>
-    <string name="type.barrier.yes">Barrière</string>
    <string name="type.barrier.block">Bloc</string>
    <string name="type.barrier.bollard">Poteau</string>
    <string name="type.barrier.border_control">Contrôle aux frontières</string>
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -189,7 +189,6 @@
    <string name="type.amenity.water_point">Fonte de auga para caravanas</string>
    <string name="type.amenity.water_point.drinking_water_no">Fonte de auga para caravanas</string>
    <string name="type.barrier">Barreira</string>
-    <string name="type.barrier.yes">Barreira</string>
    <string name="type.barrier.block">Bloque</string>
    <string name="type.barrier.bollard">Bolardo</string>
    <string name="type.barrier.border_control">Control fronteirizo</string>
--- a/android/app/src/main/res/values-gsw/types_strings.xml
+++ b/android/app/src/main/res/values-gsw/types_strings.xml
@@ -176,7 +176,6 @@
    <string name="type.amenity.waste_disposal">Müllcontainer</string>
    <string name="type.amenity.water_point">Wasseraaschluss</string>
    <string name="type.barrier">Barriere</string>
-    <string name="type.barrier.yes">Barriere</string>
    <string name="type.barrier.block">Block</string>
    <string name="type.barrier.bollard">Poller</string>
    <string name="type.barrier.border_control">Grenzkontrolle</string>
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1220,7 +1220,6 @@
    <string name="type.aerialway.chair_lift">Ülőlift</string>
    <string name="type.aerialway.gondola">Gondolakabinos felvonó</string>
    <string name="type.barrier">Akadály</string>
-    <string name="type.barrier.yes">Akadály</string>
    <string name="type.barrier.cycle_barrier">Kerékpárakadály</string>
    <string name="type.barrier.fence">Kerítés</string>
    <string name="type.barrier.hedge">Sövény</string>
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -620,7 +620,6 @@
    <string name="type.amenity.water_point">Vatnspóstur</string>
    <string name="type.amenity.water_point.drinking_water_no">Vatnspóstur</string>
    <string name="type.barrier">Hindrun</string>
-    <string name="type.barrier.yes">Hindrun</string>
    <string name="type.barrier.city_wall">Borgarmúr</string>
    <string name="type.barrier.cycle_barrier">Hjólahindrun</string>
    <string name="type.waterway.ditch">Drenskurður</string>
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -186,7 +186,6 @@
    <string name="type.amenity.water_point">Punto acqua</string>
    <string name="type.amenity.water_point.drinking_water_no">Punto acqua</string>
    <string name="type.barrier">Barriera</string>
-    <string name="type.barrier.yes">Barriera</string>
    <string name="type.barrier.block">Blocco</string>
    <string name="type.barrier.bollard">Pilastro</string>
    <string name="type.barrier.border_control">Controllo di frontiera</string>
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -186,7 +186,6 @@
    <string name="type.amenity.water_point">נקודת מילוי מיכלי מים</string>
    <string name="type.amenity.water_point.drinking_water_no">נקודת מילוי מיכלי מים</string>
    <string name="type.barrier">מחסום</string>
-    <string name="type.barrier.yes">מחסום</string>
    <string name="type.barrier.block">חסימה</string>
    <string name="type.barrier.bollard">עמוד</string>
    <string name="type.barrier.border_control">ביקורת גבולות</string>
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -170,7 +170,6 @@
    <string name="type.amenity.water_point">給水所</string>
    <string name="type.amenity.water_point.drinking_water_no">給水所</string>
    <string name="type.barrier">障害物</string>
-    <string name="type.barrier.yes">障害物</string>
    <string name="type.barrier.block">ブロック</string>
    <string name="type.barrier.bollard">柱</string>
    <string name="type.barrier.border_control">国境管理</string>
--- a/android/app/src/main/res/values-mr/types_strings.xml
+++ b/android/app/src/main/res/values-mr/types_strings.xml
@@ -163,7 +163,6 @@
    <string name="type.amenity.waste_disposal">कचऱ्याची मोठी पेटी</string>
    <string name="type.amenity.waste_transfer_station">कचरा हस्तांतरण केंद्र</string>
    <string name="type.barrier">अडथळा</string>
-    <string name="type.barrier.yes">अडथळा</string>
    <string name="type.barrier.block">अडथळा</string>
    <string name="type.barrier.bollard">खांब</string>
    <string name="type.barrier.border_control">सीमा नियंत्रण</string>
--- a/android/app/src/main/res/values-nb/types_strings.xml
+++ b/android/app/src/main/res/values-nb/types_strings.xml
@@ -158,7 +158,6 @@
    <string name="type.amenity.water_point">Vannpunkt</string>
    <string name="type.amenity.water_point.drinking_water_no">Vannpunkt</string>
    <string name="type.barrier">Barriere</string>
-    <string name="type.barrier.yes">Barriere</string>
    <string name="type.barrier.block">Blokk</string>
    <string name="type.barrier.bollard">Pullert</string>
    <string name="type.barrier.border_control">Grensekontroll</string>
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -185,7 +185,6 @@
    <string name="type.amenity.water_point">Waterpunt</string>
    <string name="type.amenity.water_point.drinking_water_no">Waterpunt</string>
    <string name="type.barrier">Barrière</string>
-    <string name="type.barrier.yes">Barrière</string>
    <string name="type.barrier.block">Blok</string>
    <string name="type.barrier.bollard">Pilaar</string>
    <string name="type.barrier.border_control">Grenscontrole</string>
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -185,7 +185,6 @@
    <string name="type.amenity.water_point">Ujęcie wody</string>
    <string name="type.amenity.water_point.drinking_water_no">Ujęcie wody</string>
    <string name="type.barrier">Bariera</string>
-    <string name="type.barrier.yes">Bariera</string>
    <string name="type.barrier.block">Blok</string>
    <string name="type.barrier.bollard">Słupek</string>
    <string name="type.barrier.border_control">Kontrola graniczna</string>
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -162,7 +162,6 @@
    <string name="type.amenity.water_point">Ponto de água</string>
    <string name="type.amenity.water_point.drinking_water_no">Ponto de água</string>
    <string name="type.barrier">Barreira</string>
-    <string name="type.barrier.yes">Barreira</string>
    <string name="type.barrier.block">Bloco</string>
    <string name="type.barrier.bollard">Pilarete</string>
    <string name="type.barrier.border_control">Controle de fronteira</string>
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -174,7 +174,6 @@
    <string name="type.amenity.water_point">Ponto de água</string>
    <string name="type.amenity.water_point.drinking_water_no">Ponto de água</string>
    <string name="type.barrier">Barreira</string>
-    <string name="type.barrier.yes">Barreira</string>
    <string name="type.barrier.block">Bloco</string>
    <string name="type.barrier.bollard">Pilarete</string>
    <string name="type.barrier.border_control">Controlo de fronteira</string>
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -182,14 +182,12 @@
    <string name="type.amenity.vehicle_inspection">Техосмотр автомобиля</string>
    <string name="type.amenity.vending_machine.fuel">Топливная колонка</string>
    <string name="type.amenity.veterinary">Ветеринарная клиника</string>
-    <string name="type.amenity.animal_shelter">Приют для животных</string>
    <string name="type.amenity.waste_basket">Урна</string>
    <string name="type.amenity.waste_disposal">Мусорный контейнер</string>
    <string name="type.amenity.waste_transfer_station">Станция перевалки отходов</string>
    <string name="type.amenity.water_point">Вода для автодомов</string>
    <string name="type.amenity.water_point.drinking_water_no">Вода для автодомов</string>
    <string name="type.barrier">Преграда</string>
-    <string name="type.barrier.yes">Преграда</string>
    <string name="type.barrier.block">Блок</string>
    <string name="type.barrier.bollard">Столбик</string>
    <string name="type.barrier.border_control">Погранконтроль</string>
@@ -208,7 +206,6 @@
    <string name="type.barrier.retaining_wall">Поддерживающая стена</string>
    <string name="type.barrier.stile">Перелаз</string>
    <string name="type.barrier.turnstile">Турникет</string>
-    <string name="type.barrier.wicket_gate">Калитка</string>
    <string name="type.barrier.swing_gate">Шлагбаум</string>
    <string name="type.barrier.toll_booth">Пункт оплаты</string>
    <string name="type.barrier.wall">Стена</string>
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -178,7 +178,6 @@
    <string name="type.amenity.water_point">Voda</string>
    <string name="type.amenity.water_point.drinking_water_no">Voda</string>
    <string name="type.barrier">Zábrana</string>
-    <string name="type.barrier.yes">Zábrana</string>
    <string name="type.barrier.block">Blok</string>
    <string name="type.barrier.bollard">Pilier</string>
    <string name="type.barrier.border_control">Hraničná kontrola</string>
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -187,7 +187,6 @@
    <string name="type.amenity.water_point">Чесма</string>
    <string name="type.amenity.water_point.drinking_water_no">Чесма</string>
    <string name="type.barrier">Баријера</string>
-    <string name="type.barrier.yes">Баријера</string>
    <string name="type.barrier.block">Блок</string>
    <string name="type.barrier.bollard">Стуб</string>
    <string name="type.barrier.border_control">Гранична контрола</string>
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1182,7 +1182,6 @@
    <string name="type.amenity.vending_machine.coffee">Kaffeautomat</string>
    <string name="type.amenity.vending_machine.fuel">Bränslepump</string>
    <string name="type.barrier">Hinder</string>
-    <string name="type.barrier.yes">Hinder</string>
    <string name="type.barrier.chain">Kedja</string>
    <string name="type.barrier.cycle_barrier">Cykelhinder</string>
    <string name="type.barrier.hedge">Häck</string>
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -181,7 +181,6 @@
    <string name="type.amenity.water_point">Su Tankı Yeniden Doldurma Noktası</string>
    <string name="type.amenity.water_point.drinking_water_no">Su Tankı Yeniden Doldurma Noktası</string>
    <string name="type.barrier">Bariyer</string>
-    <string name="type.barrier.yes">Bariyer</string>
    <string name="type.barrier.block">Blok</string>
    <string name="type.barrier.bollard">Direk</string>
    <string name="type.barrier.border_control">Sınır Denetimi</string>
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -188,7 +188,6 @@
    <string name="type.amenity.water_point">Вода для автобудинків</string>
    <string name="type.amenity.water_point.drinking_water_no">Вода для автобудинків</string>
    <string name="type.barrier">Перешкода</string>
-    <string name="type.barrier.yes">Перешкода</string>
    <string name="type.barrier.block">Блок</string>
    <string name="type.barrier.bollard">Стовпчик</string>
    <string name="type.barrier.border_control">Прикордонний контроль</string>
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -183,7 +183,6 @@
    <string name="type.amenity.water_point">飲水站</string>
    <string name="type.amenity.water_point.drinking_water_no">飲水站</string>
    <string name="type.barrier">障礙物</string>
-    <string name="type.barrier.yes">障礙物</string>
    <string name="type.barrier.block">街區</string>
    <string name="type.barrier.bollard">柱</string>
    <string name="type.barrier.border_control">邊境管制</string>
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -292,7 +292,6 @@
    <string name="type.healthcare.physiotherapist">物理治療師</string>
    <string name="type.leisure.escape_game">密室脫逃</string>
    <string name="type.barrier">障礙物</string>
-    <string name="type.barrier.yes">障礙物</string>
    <string name="type.entrance.main">主要入口</string>
    <string name="type.entrance.exit">出口</string>
    <string name="type.amenity.shelter">涼亭</string>
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -183,7 +183,6 @@
    <string name="type.amenity.water_point">取水点</string>
    <string name="type.amenity.water_point.drinking_water_no">取水点</string>
    <string name="type.barrier">障碍物</string>
-    <string name="type.barrier.yes">障碍物</string>
    <string name="type.barrier.block">路障</string>
    <string name="type.barrier.bollard">护柱</string>
    <string name="type.barrier.border_control">边境检查站</string>
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -187,14 +187,12 @@
    <string name="type.amenity.vehicle_inspection">Vehicle Inspection</string>
    <string name="type.amenity.vending_machine.fuel">Fuel Pump</string>
    <string name="type.amenity.veterinary">Veterinary Doctor</string>
-    <string name="type.amenity.animal_shelter">Animal Shelter</string>
    <string name="type.amenity.waste_basket">Trash Bin</string>
    <string name="type.amenity.waste_disposal">Dumpster</string>
    <string name="type.amenity.waste_transfer_station">Waste Transfer Station</string>
    <string name="type.amenity.water_point">Water Tank Refill Point</string>
    <string name="type.amenity.water_point.drinking_water_no">Water Tank Refill Point</string>
    <string name="type.barrier">Barrier</string>
-    <string name="type.barrier.yes">Barrier</string>
    <string name="type.barrier.block">Block</string>
    <string name="type.barrier.bollard">Bollard</string>
    <string name="type.barrier.border_control">Border Control</string>
@@ -214,7 +212,6 @@
    <string name="type.barrier.retaining_wall">Retaining Wall</string>
    <string name="type.barrier.stile">Stile</string>
    <string name="type.barrier.turnstile">Turnstile</string>
-    <string name="type.barrier.wicket_gate">Wicket Gate</string>
    <string name="type.barrier.swing_gate">Swing Gate</string>
    <string name="type.barrier.toll_booth">Toll Booth</string>
    <string name="type.barrier.wall">Wall</string>
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -114,20 +114,6 @@ project.afterEvaluate {
      nativeTask.onlyIf { false }
    }
  }
-
-  final taskName = gradle.startParameter.taskNames
-
-  if (['assemble', 'bundle', 'compile', 'install'].any{taskName.any{task->task.startsWith(it)}}) {
-    exec {
-      workingDir '../..'
-
-      if (!taskName.toString().contains('Google')) {
-        environment 'SKIP_MAP_DOWNLOAD', '1'
-      }
-
-      commandLine './configure.sh'
-    }
-  }
 }

 tasks.withType(JavaCompile).configureEach {
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -493,12 +493,6 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseV
  return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
 }

-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env, jclass clazz)
-{
-  return g_editableMapObject.CheckHouseNumberWhenIsAddress();
-}
-
 JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz,
                                                                                    jstring name)
 {
--- a/configure.sh
+++ b/configure.sh
@@ -9,26 +9,6 @@ SKIP_MAP_DOWNLOAD=$SKIP_MAP_DOWNLOAD
 SKIP_GENERATE_SYMBOLS=$SKIP_GENERATE_SYMBOLS
 SKIP_GENERATE_DRULES=$SKIP_GENERATE_DRULES

-DRULES_NOT_GENERATED=
-SYMBOLS_NOT_GENERATED=
-
-DRULES_FILES=(drules_proto.bin drules_proto_default_dark.bin drules_proto_default_light.bin drules_proto_outdoors_dark.bin drules_proto_outdoors_light.bin drules_proto_vehicle_dark.bin drules_proto_vehicle_light.bin classificator.txt types.txt visibility.txt colors.txt patterns.txt)
-SYMBOLS_FILES=(xhdpi/light/symbols.png xhdpi/light/symbols.sdf xhdpi/dark/symbols.png xhdpi/dark/symbols.sdf mdpi/light/symbols.png mdpi/light/symbols.sdf mdpi/dark/symbols.png mdpi/dark/symbols.sdf 6plus/light/symbols.png 6plus/light/symbols.sdf 6plus/dark/symbols.png 6plus/dark/symbols.sdf xxxhdpi/light/symbols.png xxxhdpi/light/symbols.sdf xxxhdpi/dark/symbols.png xxxhdpi/dark/symbols.sdf hdpi/light/symbols.png hdpi/light/symbols.sdf hdpi/dark/symbols.png hdpi/dark/symbols.sdf xxhdpi/light/symbols.png xxhdpi/light/symbols.sdf xxhdpi/dark/symbols.png xxhdpi/dark/symbols.sdf)
-
-for f in ${DRULES_FILES[*]}; do
-  if [ ! -f "data/$f" ]; then
-    DRULES_NOT_GENERATED=1
-    break
-  fi
-done
-
-for f in ${SYMBOLS_FILES[*]}; do
-  if [ ! -f "data/symbols/$f" ]; then
-    SYMBOLS_NOT_GENERATED=1
-    break
-  fi
-done
-
 ############################# PROCESS OPTIONS ################################

 TEMP=$(getopt -o ms --long skip-map-download,skip-generate-symbols,skip-generate-drules \
@@ -107,7 +87,7 @@ else
 fi

 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
-  if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
+  if Diff data/symbols_hash data/styles/*/*/symbols/*; then
    echo "Generating symbols..."
    bash ./tools/unix/generate_symbols.sh
  fi
@@ -116,7 +96,7 @@ else
 fi

 if [ -z "$SKIP_GENERATE_DRULES" ]; then
-  if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv || [ ! -z "$DRULES_NOT_GENERATED" ]; then
+  if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv; then
    echo "Generating drules..."
    bash ./tools/unix/generate_drules.sh
  fi
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10162,48 +10162,6 @@ sw:Jengo
 fa:ساختمان
 mr:इमारत|बिल्डिंग|वाडा

-building-address
-en:Address
-ar:العنوان
-be:Адрас
-bg:Адрес
-ca:Adreça
-cs:Adresa
-da:Adresse
-de:Adresse
-el:Διεύθυνση
-es:Dirección
-et:Aadress
-eu:Helbidea
-fa:آدرس
-fi:Osoite
-fr:Adresse
-he:כתובת
-hi:पता
-hu:Cím
-id:Alamat
-it:Indirizzo
-ja:住所
-ko:주소
-mr:पत्ता
-nb:Adresse
-nl:Adres
-pl:Adres
-pt:Morada|Endereço
-pt-BR:Endereço
-ro:Adresă
-ru:Адрес
-sk:Adresa
-sr:Адреса
-sv:Adress
-sw:Anwani
-th:ที่อยู่
-tr:Adres
-uk:Адреса
-vi:Địa chỉ
-zh-Hans:地址
-zh-Hant:地址
-
 # First keyword should match [police] definition in strings.txt!
@category_police
 en:4Police|cops
@@ -12994,10 +12952,6 @@ sk:4Veterinár
 fa:دامپزشکی
 mr:पशुवैद्यकीय डॉक्टर|प्राण्यांचा डॉक्टर

-amenity-animal_shelter
-en:Animal Shelter
-ru:Приют для животных
-
@charging_station
 en:4Charging Station|charging
 ru:4Зарядная станция|зарядка|электрозарядка|зарядить
--- a/data/editor.config
+++ b/data/editor.config
@@ -455,9 +455,6 @@
      <type id="amenity-veterinary" group="health">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-animal_shelter">
-        <include group="poi_internet" />
-      </type>
      <type id="amenity-charging_station">
        <include group="poi" />
        <include field="operator" />
@@ -1452,7 +1449,8 @@
      <type id="building" can_add="no">
        <include group="address" />
      </type>
-      <type id="building-address" can_add="yes">
+      <!-- No consensus yet, see https://github.com/organicmaps/organicmaps/issues/6394 -->
+      <type id="building-address" can_add="no">
        <include group="address" />
      </type>
      <!-- Uncomment this after a map style is added
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -642,8 +642,7 @@ sport|diving;520;
 #~270k uses.
 man_made|utility_pole;521;
 deprecated:boundary|administrative|suburb:04.2024;[boundary=administrative][border_type=suburb];x;name;int_name;522;
-# Generic unspecified barrier, could be node (50k) or way (100k)
-barrier|yes;523;
+deprecated|deprecated;523;x
 railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524;
 railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525;
 deprecated|deprecated;526;x
@@ -1022,9 +1021,9 @@ historic|pillory;[historic=pillory];;name;int_name;897;
 amenity|money_transfer;898;
 man_made|crane;899;
 railway|subway|darkgreen;[railway=subway][colour=darkgreen];x;name;int_name;900;railway|subway|tunnel
-barrier|wicket_gate;901;
+deprecated|deprecated;901;x
 railway|subway|gray;[railway=subway][colour=gray];x;name;int_name;902;railway|subway|tunnel
-amenity|animal_shelter;903;
+deprecated|deprecated;903;x
 railway|subway|lightblue;[railway=subway][colour=lightblue];x;name;int_name;904;railway|subway|tunnel
 amenity|motorcycle_rental;[amenity=motorcycle_rental],[shop=motorcycle][motorcycle:rental=yes],[shop=motorcycle][rental=yes],[amenity=scooter_rental];;;;905;
 railway|subway|lightgreen;[railway=subway][colour=lightgreen];x;name;int_name;906;railway|subway|tunnel
--- a/data/styles/default/dark/symbols/animal_shelter-m.svg
+++ b/data/styles/default/dark/symbols/animal_shelter-m.svg
@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#717065" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/square-m.svg
+++ b/data/styles/default/dark/symbols/square-m.svg
@@ -1 +0,0 @@
-<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#000"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#747474"/></g></svg>
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -672,15 +672,12 @@ area|z17-[waterway=dam],

 line|z16-[barrier=fence],
 line|z16-[barrier=wall],
-line|z16-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.5;}
 line|z17[barrier=fence],
 line|z17[barrier=wall],
-line|z17[barrier=yes],
 {width: 1.3; opacity: 0.6;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
-line|z18-[barrier=yes],
 {width: 1.5; opacity: 0.8;}

 line|z17-[barrier=guard_rail],
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -705,20 +705,14 @@ node|z18-[addr:housenumber][addr:street],
 node|z16-[addr:housenumber][addr:street]::int_name,
 {font-size: 8;}

-node|z17[entrance],
-node|z18[amenity=loading_dock],
-node|z16[entrance=main],
-node|z16[emergency=emergency_ward_entrance],
-{icon-image: square-m.svg;}
-
-node|z18-[entrance],
+node|z19-[entrance],
 node|z19-[amenity=loading_dock],
 {icon-image: entrance-s.svg; font-size: 10; text-offset: 1;}
-node|z18-[entrance=exit],
+node|z19-[entrance=exit],
 {icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;}
-node|z17-[entrance=main],
+node|z18-[entrance=main],
 {icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;}
-node|z17-[emergency=emergency_ward_entrance],
+node|z18-[emergency=emergency_ward_entrance],
 {icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;}

 /* 8.3 Airports */
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -745,7 +745,6 @@ node|z16-[leisure=marina],
 node|z16-[leisure=water_park],
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
-node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=entrance],
 node|z16-[barrier=gate],
@@ -754,7 +753,6 @@ node|z16-[barrier=lift_gate],
 node|z16-[barrier=swing_gate],
 node|z16-[barrier=stile],
 node|z16-[barrier=turnstile],
-node|z17-[barrier=wicket_gate],
 node|z16-[barrier=cycle_barrier],
 node|z16-[amenity=nightclub],
 node|z16-[amenity=townhall],
@@ -788,7 +786,6 @@ node|z17-[leisure=amusement_arcade],
 node|z17-[amenity=courthouse],
 node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
-node|z17-[amenity=animal_shelter],
 node|z17-[amenity=kindergarten],
 node|z17-[amenity=childcare],
 node|z17-[amenity=school],
@@ -923,11 +920,6 @@ node|z16-[amenity=veterinary],
 node|z18-[amenity=veterinary],
 {font-size: 11;}

-node|z17-[amenity=animal_shelter],
-{icon-image: animal_shelter-m.svg;}
-node|z18-[amenity=animal_shelter],
-{font-size: 11;}
-
 node|z16-[amenity=pharmacy],
 {icon-image: pharmacy-m.svg;icon-min-distance: 20;}
 node|z17-[amenity=pharmacy],
@@ -1177,11 +1169,9 @@ node|z15-[barrier=border_control],

 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
-node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=stile],
 node|z16-[barrier=turnstile],
-node|z17-[barrier=wicket_gate],
 {icon-image: dot-m.svg;font-size: 11;}

 node|z16-[barrier=entrance],
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -58,7 +58,6 @@ barrier-fence                                       # line z16-
 barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z16-
-barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
 railway-funicular                                   # line z12-
 railway-funicular-bridge                            # line z12-
 railway-funicular-tunnel                            # line z12-
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -875,8 +875,6 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
-barrier-wicket_gate                                 # icon z17- (also has caption(optional) z17-)
-barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z16-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300

@@ -916,7 +914,6 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650

-amenity-animal_shelter                              # icon z17- (also has caption(optional) z17-)
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
@@ -1217,7 +1214,7 @@ amenity-motorcycle_parking                          # icon z17- (also has captio
 amenity-parking-permissive                          # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking_entrance                            # icon z17- (also has caption(optional) z19-)
 amenity-parking_entrance-permissive                 # icon z17- (also has caption(optional) z19-)
-emergency-emergency_ward_entrance                   # icon z16- (also has caption(optional) z18-)
+emergency-emergency_ward_entrance                   # icon z18- (also has caption(optional) z18-)
 === 250

 building                                            # caption z16- (also has area z14-)
@@ -1232,7 +1229,7 @@ power-plant-wind                                    # icon z15- (also has captio
 === 230

 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
-entrance-main                                       # icon z16- (also has caption(optional) z18-)
+entrance-main                                       # icon z18- (also has caption(optional) z18-)
 === 220

 highway-traffic_signals                             # icon z19-
@@ -1859,8 +1856,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
-# barrier-wicket_gate                               # caption(optional) z17- (also has icon z17-)
-# barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z16-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700

@@ -1878,7 +1873,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200

-# amenity-animal_shelter                            # caption(optional) z17- (also has icon z17-)
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
@@ -2153,14 +2147,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-permissive                        # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking_entrance                          # caption(optional) z19- (also has icon z17-)
 # amenity-parking_entrance-permissive               # caption(optional) z19- (also has icon z17-)
-# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z16-)
+# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
 # === -9750

 # power-plant-wind                                  # caption(optional) z16- (also has icon z15-, area z13-)
 # === -9770

 # barrier-entrance                                  # caption(optional) z16- (also has icon z16-)
-# entrance-main                                     # caption(optional) z18- (also has icon z16-)
+# entrance-main                                     # caption(optional) z18- (also has icon z18-)
 # === -9780

 # historic-anchor                                   # caption(optional) z18- (also has icon z18-)
@@ -2207,7 +2201,7 @@ tourism-information-map                             # icon z16- (also has captio

 amenity                                             # caption z19-
 amenity-telephone                                   # icon z17- (also has caption(optional) z19-)
-entrance                                            # icon z17- (also has caption(optional) z19-)
+entrance                                            # icon z19- (also has caption(optional) z19-)
 === -9960

 amenity-parking_space                               # caption z19-
@@ -2240,8 +2234,8 @@ power-substation                                    # icon z19- (also has captio
 === -9990

 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
-amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
-# amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
+amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
+# amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
 # amenity-parking_space-disabled                    # caption(optional) z19- (also has icon z18-)
 # amenity-telephone                                 # caption(optional) z19- (also has icon z17-)
 # amenity-vending_machine                           # caption(optional) z18- (also has icon z18-)
@@ -2258,9 +2252,9 @@ amenity-loading_dock                                # icon z18- (also has captio
 # emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
-# entrance                                          # caption(optional) z19- (also has icon z17-)
-entrance-exit                                       # icon z17- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
+# entrance                                          # caption(optional) z19- (also has icon z19-)
+entrance-exit                                       # icon z19- (also has caption(optional) z19-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
--- a/data/styles/default/light/animal_shelter-m.svg
+++ b/data/styles/default/light/animal_shelter-m.svg
@@ -1 +0,0 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#fff"/></g></svg>
--- a/data/styles/default/light/symbols/square-m.svg
+++ b/data/styles/default/light/symbols/square-m.svg
@@ -1 +0,0 @@
-<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#eed"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#65655E"/></g></svg>
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -53,15 +53,12 @@ line|z18-[man_made=cutline],

 line|z15-[barrier=fence],
 line|z15-[barrier=wall],
-line|z15-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.7;}
 line|z17[barrier=fence],
 line|z17[barrier=wall],
-line|z17[barrier=yes],
 {width: 1.3; opacity: 0.8;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
-line|z18-[barrier=yes],
 {width: 1.5; opacity: 1;}

 line|z16-[barrier=guard_rail],
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -60,7 +60,6 @@ barrier-fence                                       # line z15-
 barrier-guard_rail                                  # line z16-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z15-
-barrier-yes                                         # line z15- (also has icon z16-, caption(optional) z16-)
 railway-funicular                                   # line z12-
 railway-funicular-bridge                            # line z12-
 railway-funicular-tunnel                            # line z12-
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -875,8 +875,6 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
-barrier-wicket_gate                                 # icon z17- (also has caption(optional) z17-)
-barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z15-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300

@@ -916,7 +914,6 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650

-amenity-animal_shelter                              # icon z17- (also has caption(optional) z17-)
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
@@ -1218,7 +1215,7 @@ amenity-motorcycle_parking                          # icon z17- (also has captio
 amenity-parking-permissive                          # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking_entrance                            # icon z17- (also has caption(optional) z19-)
 amenity-parking_entrance-permissive                 # icon z17- (also has caption(optional) z19-)
-emergency-emergency_ward_entrance                   # icon z16- (also has caption(optional) z18-)
+emergency-emergency_ward_entrance                   # icon z18- (also has caption(optional) z18-)
 === 250

 building                                            # caption z16- (also has area z14-)
@@ -1235,7 +1232,7 @@ power-pole                                          # icon z15-
 === 230

 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
-entrance-main                                       # icon z16- (also has caption(optional) z18-)
+entrance-main                                       # icon z18- (also has caption(optional) z18-)
 === 220

 highway-traffic_signals                             # icon z19-
@@ -1862,8 +1859,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
-# barrier-wicket_gate                               # caption(optional) z17- (also has icon z17-)
-# barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z15-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700

@@ -1881,7 +1876,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200

-# amenity-animal_shelter                            # caption(optional) z17- (also has icon z17-)
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
@@ -2158,14 +2152,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-permissive                        # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking_entrance                          # caption(optional) z19- (also has icon z17-)
 # amenity-parking_entrance-permissive               # caption(optional) z19- (also has icon z17-)
-# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z16-)
+# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
 # === -9750

 # power-plant-wind                                  # caption(optional) z16- (also has icon z13-, area z13-)
 # === -9770

 # barrier-entrance                                  # caption(optional) z16- (also has icon z16-)
-# entrance-main                                     # caption(optional) z18- (also has icon z16-)
+# entrance-main                                     # caption(optional) z18- (also has icon z18-)
 # === -9780

 # historic-anchor                                   # caption(optional) z18- (also has icon z18-)
@@ -2212,7 +2206,7 @@ tourism-information-map                             # icon z15- (also has captio

 amenity                                             # caption z19-
 amenity-telephone                                   # icon z17- (also has caption(optional) z19-)
-entrance                                            # icon z17- (also has caption(optional) z19-)
+entrance                                            # icon z19- (also has caption(optional) z19-)
 === -9960

 amenity-parking_space                               # caption z19-
@@ -2245,8 +2239,8 @@ power-substation                                    # icon z19- (also has captio
 === -9990

 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
-amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
-# amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
+amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
+# amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
 # amenity-parking_space-disabled                    # caption(optional) z19- (also has icon z18-)
 # amenity-telephone                                 # caption(optional) z19- (also has icon z17-)
 # amenity-vending_machine                           # caption(optional) z18- (also has icon z18-)
@@ -2263,9 +2257,9 @@ amenity-loading_dock                                # icon z18- (also has captio
 # emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
-# entrance                                          # caption(optional) z19- (also has icon z17-)
-entrance-exit                                       # icon z17- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
+# entrance                                          # caption(optional) z19- (also has icon z19-)
+entrance-exit                                       # icon z19- (also has caption(optional) z19-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -465,11 +465,9 @@ area|z16-[waterway=dam],

 line|z17-[barrier=fence],
 line|z17-[barrier=wall],
-line|z17-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.5;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
-line|z18-[barrier=yes],
 {width: 1.3; opacity:0.6;}

 line|z17-[barrier=guard_rail],
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -30,7 +30,6 @@ barrier-fence                                       # line z17-
 barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z18-
 barrier-wall                                        # line z17-
-barrier-yes                                         # line z17-
 railway-monorail                                    # line z14-
 railway-monorail-bridge                             # line z14-
 railway-monorail-tunnel                             # line z14-
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2053,6 +2053,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
      // {"area:highway", "track"},
      // {"area:highway", "trunk"},
      // {"area:highway", "unclassified"},
+      {"barrier", "cycle_barrier"},
      // {"boundary", "administrative"},
      // {"communication", "line"},
      // {"earthquake:damage", "spontaneous_camp"},
@@ -2185,14 +2186,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
      {"barrier", "lift_gate"},
      {"barrier", "retaining_wall"},
      {"barrier", "stile"},
-      {"barrier", "kissing_gate"},
-      {"barrier", "turnstile"},
-      {"barrier", "wicket_gate"},
-      {"barrier", "cycle_barrier"},
      {"barrier", "swing_gate"},
      {"barrier", "toll_booth"},
      {"barrier", "wall"},
-      {"barrier", "yes"},
      {"boundary", "national_park"},
      {"boundary", "protected_area"},
      {"building", "has_parts"},
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -86,7 +86,6 @@ TagMapping const kVehicleTagMapping = {
 TagMapping const kCarBarriersTagMapping = {
    {OsmElement::Tag("barrier", "block"), RoadAccess::Type::No},
    {OsmElement::Tag("barrier", "bollard"), RoadAccess::Type::No},
-    {OsmElement::Tag("barrier", "yes"), RoadAccess::Type::No},
    {OsmElement::Tag("barrier", "cycle_barrier"), RoadAccess::Type::No},
    {OsmElement::Tag("barrier", "chain"), RoadAccess::Type::Private},
    {OsmElement::Tag("barrier", "gate"), RoadAccess::Type::Private},
--- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Waterpunt";
 "type.amenity.water_point.drinking_water_no" = "Waterpunt";
 "type.barrier" = "Versperring";
-"type.barrier.yes" = "Versperring";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Bolder";
 "type.barrier.border_control" = "Grensbeheer";
--- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "نقطة إعادة تعبة قنينة المياه";
 "type.amenity.water_point.drinking_water_no" = "نقطة إعادة تعبة قنينة المياه";
 "type.barrier" = "حاجز";
-"type.barrier.yes" = "حاجز";
 "type.barrier.block" = "حاجز";
 "type.barrier.bollard" = "حاجز سيارات";
 "type.barrier.border_control" = "أمن الحدود";
--- a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
@@ -368,7 +368,6 @@
 "type.leisure.fitness_centre" = "Fitness Centre";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
 "type.cuisine.steak_house" = "Steak House";
--- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Karvanlar üçün su nöqtəsi";
 "type.amenity.water_point.drinking_water_no" = "Karvanlar üçün su nöqtəsi";
 "type.barrier" = "Maneə";
-"type.barrier.yes" = "Maneə";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Birbaşa";
 "type.barrier.border_control" = "Sərhəd Nəzarəti";
--- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Вада для аўтадомаў";
 "type.amenity.water_point.drinking_water_no" = "Вада для аўтадомаў";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -188,7 +188,6 @@
 "type.amenity.water_point" = "Остановка за пълнене на водни хранилища";
 "type.amenity.water_point.drinking_water_no" = "Остановка за пълнене на водни хранилища";
 "type.barrier" = "Бариера";
-"type.barrier.yes" = "Бариера";
 "type.barrier.block" = "Блокова преграда";
 "type.barrier.bollard" = "Колчета";
 "type.barrier.border_control" = "Гранична остановка";
--- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
@@ -960,7 +960,6 @@
 "type.leisure.fitness_centre" = "Fitness Centre";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.railway.station.subway.santiago" = "Subway Station";
 "type.cuisine.italian" = "Italian";
 "type.man_made.bridge" = "Bridge";
--- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Punt d’aigua";
 "type.amenity.water_point.drinking_water_no" = "Punt d’aigua";
 "type.barrier" = "Barrera";
-"type.barrier.yes" = "Barrera";
 "type.barrier.block" = "Bloc";
 "type.barrier.bollard" = "Bol·lard";
 "type.barrier.border_control" = "Control fronterer";
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Doplňovací místo vodní nádrže";
 "type.amenity.water_point.drinking_water_no" = "Doplňovací místo vodní nádrže";
 "type.barrier" = "Bariéra";
-"type.barrier.yes" = "Bariéra";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Sloupek";
 "type.barrier.border_control" = "Pohraniční kontrola";
--- a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
@@ -13,7 +13,6 @@
 "type.natural.water.wastewater" = "Wastewater";
 "type.barrier.bollard" = "Bollard";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.chain" = "Chain";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier.stile" = "Stile";
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Vandpost";
 "type.amenity.water_point.drinking_water_no" = "Vandstation";
 "type.barrier" = "Barriere";
-"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Blokering";
 "type.barrier.bollard" = "Pullert";
 "type.barrier.border_control" = "Grænsekontrol";
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Wasseranschluss";
 "type.amenity.water_point.drinking_water_no" = "Wasseranschluss";
 "type.barrier" = "Barriere";
-"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Poller";
 "type.barrier.border_control" = "Grenzkontrolle";
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Παροχή νερού";
 "type.amenity.water_point.drinking_water_no" = "Παροχή νερού";
 "type.barrier" = "Εμπόδιο";
-"type.barrier.yes" = "Εμπόδιο";
 "type.barrier.block" = "Εμπόδιο";
 "type.barrier.bollard" = "Πυλώνας";
 "type.barrier.border_control" = "Έλεγχος συνόρων";
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -197,14 +197,12 @@
 "type.amenity.vehicle_inspection" = "Vehicle Inspection";
 "type.amenity.vending_machine.fuel" = "Fuel Pump";
 "type.amenity.veterinary" = "Veterinary Doctor";
-"type.amenity.animal_shelter" = "Animal Shelter";
 "type.amenity.waste_basket" = "Trash Bin";
 "type.amenity.waste_disposal" = "Dumpster";
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
@@ -224,7 +222,6 @@
 "type.barrier.retaining_wall" = "Retaining Wall";
 "type.barrier.stile" = "Stile";
 "type.barrier.turnstile" = "Turnstile";
-"type.barrier.wicket_gate" = "Wicket gate";
 "type.barrier.swing_gate" = "Swing Gate";
 "type.barrier.toll_booth" = "Toll Booth";
 "type.barrier.wall" = "Wall";
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Fuente de agua para caravanas";
 "type.amenity.water_point.drinking_water_no" = "Fuente de agua para caravanas";
 "type.barrier" = "Barrera";
-"type.barrier.yes" = "Barrera";
 "type.barrier.block" = "Bloque";
 "type.barrier.bollard" = "Bolardo";
 "type.barrier.border_control" = "Control fronterizo";
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Fuente de agua para caravanas";
 "type.amenity.water_point.drinking_water_no" = "Fuente de agua para caravanas";
 "type.barrier" = "Barrera";
-"type.barrier.yes" = "Barrera";
 "type.barrier.block" = "Bloque";
 "type.barrier.bollard" = "Bolardo";
 "type.barrier.border_control" = "Control fronterizo";
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Joogivee tankimispunkt";
 "type.amenity.water_point.drinking_water_no" = "Joogivee tankimispunkt";
 "type.barrier" = "Barjäär";
-"type.barrier.yes" = "Barjäär";
 "type.barrier.block" = "Kiviplokk";
 "type.barrier.bollard" = "Piirdetulp";
 "type.barrier.border_control" = "Piirikontroll";
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Ur iturria";
 "type.amenity.water_point.drinking_water_no" = "Ur iturria";
 "type.barrier" = "Hesia";
-"type.barrier.yes" = "Hesia";
 "type.barrier.block" = "Blokea";
 "type.barrier.bollard" = "Pibotea";
 "type.barrier.border_control" = "Muga kontrola";
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "شیر آب قابل شرب";
 "type.amenity.water_point.drinking_water_no" = "شیر آب قابل شرب";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "بلوک";
 "type.barrier.bollard" = "ستون";
 "type.barrier.border_control" = "کنترل مرزی";
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Vesipiste";
 "type.amenity.water_point.drinking_water_no" = "Vesipiste";
 "type.barrier" = "Este";
-"type.barrier.yes" = "Este";
 "type.barrier.block" = "Este";
 "type.barrier.bollard" = "Tolppa";
 "type.barrier.border_control" = "Rajavalvonta";
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Point d’eau";
 "type.amenity.water_point.drinking_water_no" = "Point d’eau";
 "type.barrier" = "Barrière";
-"type.barrier.yes" = "Barrière";
 "type.barrier.block" = "Bloc";
 "type.barrier.bollard" = "Poteau";
 "type.barrier.border_control" = "Contrôle aux frontières";
--- a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
@@ -288,7 +288,6 @@
 "type.amenity.water_point" = "Fonte de auga para caravanas";
 "type.amenity.water_point.drinking_water_no" = "Fonte de auga para caravanas";
 "type.barrier" = "Barreira";
-"type.barrier.yes" = "Barreira";
 "type.barrier.block" = "Bloque";
 "type.barrier.bollard" = "Bolardo";
 "type.barrier.border_control" = "Control fronteirizo";
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
@@ -261,7 +261,6 @@
 "type.amenity.water_point" = "Wasseraaschluss";
 "type.amenity.water_point.drinking_water_no" = "Wasseraaschluss";
 "type.barrier" = "Barriere";
-"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Poller";
 "type.barrier.border_control" = "Grenzkontrolle";
--- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "נקודת מילוי מיכלי מים";
 "type.amenity.water_point.drinking_water_no" = "נקודת מילוי מיכלי מים";
 "type.barrier" = "מחסום";
-"type.barrier.yes" = "מחסום";
 "type.barrier.block" = "חסימה";
 "type.barrier.bollard" = "עמוד";
 "type.barrier.border_control" = "ביקורת גבולות";
--- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "पानी की टंकी पुनः भरने का स्थान";
 "type.amenity.water_point.drinking_water_no" = "पानी की टंकी पुनः भरने का स्थान";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
--- a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
@@ -361,7 +361,6 @@
 "type.amenity" = "Amenity";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.railway.station.subway.santiago" = "Subway Station";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -188,7 +188,6 @@
 "type.amenity.water_point" = "Vízvételi pont";
 "type.amenity.water_point.drinking_water_no" = "Vízvételi pont (ivóvíz nélkül)";
 "type.barrier" = "Akadály";
-"type.barrier.yes" = "Akadály";
 "type.barrier.block" = "Blokk";
 "type.barrier.bollard" = "Terelőoszlop";
 "type.barrier.border_control" = "Határátkelő";
--- a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
@@ -391,7 +391,6 @@
 "type.drinking_water.yes" = "Drinking Water";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
 "type.boundary.protected_area.3" = "Protected Area";
--- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Titik Air";
 "type.amenity.water_point.drinking_water_no" = "Titik Air";
 "type.barrier" = "Barrier";
-"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Pilar";
 "type.barrier.border_control" = "Gerbang perbatasan";
--- a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
@@ -83,7 +83,6 @@
 "type.amenity.water_point" = "Vatnspóstur";
 "type.amenity.water_point.drinking_water_no" = "Vatnspóstur";
 "type.barrier" = "Hindrun";
-"type.barrier.yes" = "Hindrun";
 "type.barrier.block" = "Lokun";
 "type.barrier.bollard" = "Polli";
 "type.barrier.border_control" = "Landamæraeftirlit";
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "Punto acqua";
 "type.amenity.water_point.drinking_water_no" = "Punto acqua";
 "type.barrier" = "Barriera";
-"type.barrier.yes" = "Barriera";
 "type.barrier.block" = "Blocco";
 "type.barrier.bollard" = "Pilastro";
 "type.barrier.border_control" = "Controllo di frontiera";
--- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
@@ -190,7 +190,6 @@
 "type.amenity.water_point" = "給水所";
 "type.amenity.water_point.drinking_water_no" = "給水所";
 "type.barrier" = "障害物";
-"type.barrier.yes" = "障害物";
 "type.barrier.block" = "ブロック";
 "type.barrier.bollard" = "柱";
 "type.barrier.border_control" = "国境管理";
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#717065" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#000"/></g></svg>
				`@@ -1 +0,0 @@`
				`<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#000"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#747474"/></g></svg>`