fix Vienna U-Bahn Icon, using colors by PTA

Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>

android/app/build.gradle

@@ -254,6 +254,7 @@ android {
   androidResources {
     ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
+    // Some languages not supported by Android require to be specified here to be applied
     localeFilters += [
             "af",
             "ar",
@@ -281,6 +282,7 @@ android {
             "in",
             "it",
             "ja",
+            "kw",
             "ko",
             "lt",
             "lv",

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

@@ -1,8 +1,9 @@
-• OpenStreetMap Daten vom 17. Dezember
-• Map download server nun wählbar
-• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
-• Vermeidung von Parkplatzwegen im Routing
-• Neuer Zoombutton
-• Verbesserte Französchische Suchsynonme
-• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
-Mehr auf codeberg.org/comaps/comaps/releases
+• OSM-Daten vom 6. Januar
+• Editor: POI mit mehr als einem Tag, (z.B. Arten von Kunstwerken wie Skulpturen...), mehr POI können als leer/stillgelegt werden
+• Miniatureisenbahnen & Kläranlagen hinzugefügt
+• Material 3-Dialoge & dunklerer Hintergrund im Darkmode
+• Fiktive Geschwindigkeitsbegrenzungen für Verbindungsstraßen entfernt
+• Versatz der Kameraausschnitt in der Navigation behoben
+• Weniger empfindliches langes Antippen
+
+Weitere Details unter codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,32 @@
+A community-led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
+
+Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
+Join the community there and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+‣ <b>Offline-focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, cycling, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!

android/app/src/fdroid/play/listings/en-GB/short-description.txt

@@ -0,0 +1 @@
+Easy map navigation - Discover more of your journey - Powered by the community

android/app/src/fdroid/play/listings/en-GB/title.txt

@@ -0,0 +1 @@
+CoMaps - Hike, Bike, Drive Offline with Privacy

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

@@ -1,8 +1,9 @@
-• OpenStreetMap data as of December 17
-• Make map download server configurable
-• Added info about outdated maps and an update button to the selected place info card
-• Avoid using parking aisles for routing
-• Changed shape of zoom buttons
-• Improved French search synonyms
-• OSM editor: check length limit for OSM tags in value validation
+• OpenStreetMap data as of January 6
+• Editor: add POI types with more than one OSM tag, e.g. artwork subtypes sculptures, paintings..; more POI types could be marked as vacant/disused
+• Added miniature railways and wastewater treatment plants
+• Use Material 3 dialogs and darker background in dark mode
+• Removed fictional speed limits for link roads
+• Fixed camera cutout offset in navigation
+• Less sensitive long tap (full-screen mode)
+
 More details on codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,9 @@
+• Datos OSM a 06/01
+• Editor: se añaden tipos de POI con más de una etiqueta, ej. esculturas, pinturas...; se podrán marcar más tipos como en desuso
+• Se añaden ferrocarriles mini y plantas de tratamiento de aguas
+• Se utilizan diálogos Material 3 y fondo más oscuro en el modo oscuro
+• Se eliminan límites de velocidad ficticios para enlaces
+• Se corrige desplazamiento en la navegación
+• Toque largo menos sensible (en pantalla completa)
+
+Más detalles en codeberg.org/comaps/comaps/releases

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

@@ -1,8 +1,9 @@
-• Données OpenStreetMap du 17 décembre
-• Serveur de téléchargement de cartes configurable
-• Ajout d'un message d'avertissement pour les cartes trop anciennes
-• Évitement des allées de parking dans les itinéraires
-• Mise à jour de l'apparence des boutons de zooms
-• Amélioration des synonymes de recherche en français
-• Editeur OSM: vérification de la taille limite des tags OSM
-Plus d'informations sur codeberg.org/comaps/comaps/releases
+• Données OpenStreetMap du 6 janvier
+• Éditeur : support des types de POI avec plus d’un tag OSM, par exemple types d’œuvres d’art sculptures, peintures..
+• Rendu des rails pour trains miniatures et des stations d'épuration
+• Utilisation des pop-ups Material 3 et d'un fond plus sombre en thème sombre
+• Suppression des limites de vitesse fictives sur les bretelles de routes
+• Correction des instructions de navigation sur les appareils avec des encoches
+• Appui long moins sensible (en mode plein écran)
+
+Plus de détails sur codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,7 @@
+• OpenStreetMap podaci od 6. siječnja
+• Uređivač: dodane točake interesa s više od jedne OSM oznake, npr. podtipovi umjetnina kao skulpture, slike...; više točaka interesa se sada može označiti kao upražnjene/napuštene
+• Dodane minijaturne željeznice i postrojenja za pročišćavanje otpadnih voda
+• Korištenje Material 3 dijaloga i tamnije pozadine u tamnom načinu rada
+• Uklonjena su izmišljena ograničenja brzine za spojne ceste
+
+Više detalja na codeberg.org/comaps/comaps/releases

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

@@ -1,8 +1,9 @@
-• Dados OSM de 17/12
-• Servidor de download de mapas configurável
-• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
-• Evita o uso de corredores de estacionamento para roteamento
-• Formato dos botões de zoom alterado
-• Sinônimos de busca em francês aprimorados
-• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
+• Dados OSM de 6/1
+• Editor: adição de POIs com mais de uma etiqueta OSM, por exemplo esculturas e pinturas; mais tipos de POI podem ser marcados como vagos/desativados
+• Adição de ferrovias em miniatura e ETEs
+• Uso de diálogos Material 3 e fundo mais escuro no modo escuro
+• Remoção de limites de velocidade fictícios para vias de ligação
+• Correção de recorte da câmera na navegação
+• Toque longo menos sensível (modo tela cheia)
+
 Mais detalhes em codeberg.org/comaps/comaps/releases

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

@@ -1,8 +1,8 @@
-• Карты OpenStreetMap от 17 декабря
-• Возможность настройки сервера для скачивания карт
-• Добавлена ​​информация об устаревании карт и ​​кнопка обновления (при выборе места на карте)
-• Парковочные проезды больше не используются для транзитной маршрутизации
-• Изменены кнопки масштабирования карты
-• На карту добавлены ирригационные гидранты
-• Редактор OSM: проверка максимальной длины OSM тегов
+• Карты OpenStreetMap от 6 января
+• Редактор: возможность добавления POI, определяемых несколькими тегами, например церквей, мечетей, буддистских храмов..
+• Добавлены миниатюрные железные дороги и очистные сооружения
+• Использование диалогов Material 3 и более тёмного фона в тёмном режиме
+• Удалены фиктивные ограничения скорости для заездов / съездов с шоссе
+• Менее чувствительное длительное нажатие на экран (переход в полноэкранный режим)
+
 Подробнее на codeberg.org/comaps/comaps/releases

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -132,7 +132,6 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -712,7 +711,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!TextUtils.isEmpty(appName))
     {
       setTitle(appName);
-      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
     }
   }
 

android/app/src/main/java/app/organicmaps/car/CarAppSession.java

@@ -114,6 +114,7 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onCreate(@NonNull LifecycleOwner owner)
   {
     Logger.d(TAG);
+    Framework.nativeSetCarScreenMode(true);
     mSensorsManager = new CarSensorsManager(getCarContext());
     mDisplayManager = MwmApplication.from(getCarContext()).getDisplayManager();
     mDisplayManager.addListener(DisplayType.Car, this);
@@ -159,6 +160,7 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
     mDisplayManager.removeListener(DisplayType.Car);
+    Framework.nativeSetCarScreenMode(false);
   }
 
   private void init()

android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java

@@ -237,6 +237,7 @@ public class EditorHostFragment
     for (LocalizedName name : sNames)
       languages.add(name.lang);
     args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
+    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
     editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
   }
 

android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java

@@ -1,11 +1,15 @@
 package app.organicmaps.editor;
 
+import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.core.os.ConfigurationCompat;
 import androidx.core.os.LocaleListCompat;
 import androidx.fragment.app.Fragment;
+
+import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.Language;
@@ -21,6 +25,7 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
   final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
+  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";
 
   public interface Listener
   {
@@ -34,6 +39,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
   protected LanguagesAdapter createAdapter()
   {
     Bundle args = getArguments();
+    boolean includeLocalLanguage =
+        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
     Set<String> existingLanguages =
         args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();
 
@@ -68,6 +75,12 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 
     languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());
 
+    if (includeLocalLanguage) {
+      String localLanguageLabel = getString(R.string.pref_maplanguage_local);
+      Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
+      languages.add(0, localLanguage);
+    }
+
     return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()]));
   }
 

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

@@ -1,6 +1,7 @@
 package app.organicmaps.settings;
 
 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
+import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -140,8 +141,13 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
   private void updateMapLanguageCodeSummary()
   {
     final Preference pref = getPreference(getString(R.string.pref_map_locale));
-    Locale locale = new Locale(MapLanguageCode.getMapLanguageCode());
-    pref.setSummary(locale.getDisplayLanguage());
+    String mapLanguageCode = MapLanguageCode.getMapLanguageCode();
+    if (mapLanguageCode.equals(DEFAULT_LANG_CODE)) {
+      pref.setSummary(R.string.pref_maplanguage_local);
+    } else {
+      Locale locale = new Locale(mapLanguageCode);
+      pref.setSummary(locale.getDisplayLanguage());
+    }
   }
 
   private void updateRoutingSettingsPrefsSummary()

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

@@ -428,8 +428,9 @@ public class PlacePageView extends Fragment
 
   private void updateBookmarkView()
   {
+   boolean enabled = mMapObject.isBookmark() || mMapObject.isTrack();
     updateViewFragment(PlacePageBookmarkFragment.class, BOOKMARK_FRAGMENT_TAG, R.id.place_page_bookmark_fragment,
-                       mMapObject.isBookmark());
+                       enabled);
   }
 
   private void updateTrackView()

android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java

@@ -23,6 +23,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -41,6 +42,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
   private PlacePageViewModel mViewModel;
 
   private Bookmark currentBookmark;
+  private Track currentTrack;
 
   @Nullable
   @Override
@@ -88,7 +90,15 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
 
   private void updateBookmarkDetails()
   {
-    final String notes = currentBookmark.getBookmarkDescription();
+      String notes = null;
+      if (currentBookmark != null)
+      {
+          notes = currentBookmark.getBookmarkDescription();
+      }
+      if (currentTrack != null)
+      {
+          notes = currentTrack.getTrackDescription();
+      }
     if (TextUtils.isEmpty(notes))
     {
       UiUtils.hide(mTvBookmarkNote);
@@ -120,8 +130,16 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
   public void onClick(View v)
   {
     final FragmentActivity activity = requireActivity();
-    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
-                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    if (currentBookmark != null)
+    {
+        EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
+                getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    }
+    else if (currentTrack != null)
+    {
+        EditBookmarkFragment.editBookmark(currentTrack.getCategoryId(), currentTrack.getTrackId(), activity,
+                getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    }
   }
 
   @Override
@@ -152,6 +170,11 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
       currentBookmark = (Bookmark) mapObject;
       updateBookmarkDetails();
     }
+    if (mapObject != null && mapObject.isTrack())
+    {
+      currentTrack = (Track) mapObject;
+      updateBookmarkDetails();
+    }
   }
 
   @Override

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

@@ -20,8 +20,8 @@
       android:gravity="center"
       android:layout_gravity="end|center_vertical"
       android:background="?selectableItemBackgroundBorderless"
+      android:textSize="@dimen/text_size_toolbar"
       android:padding="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
       android:text="@string/editor_report_problem_send_button"/>
   </com.google.android.material.appbar.MaterialToolbar>
 

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

@@ -15,15 +15,8 @@
     android:theme="@style/MwmWidget.ToolbarTheme"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-      <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_half"
-        android:text="@string/editor_add_select_location"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:title="@string/editor_add_select_location">
     </com.google.android.material.appbar.MaterialToolbar>
 
   <com.google.android.material.textview.MaterialTextView

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

@@ -315,4 +315,22 @@
     <string name="error_enter_correct_web">সঠিক ওয়েব এড্রেস দিন</string>
     <string name="error_enter_correct_email">সঠিক ইমেইল দিন</string>
     <string name="placepage_add_place_button">OpenStreetMap এ স্থান যোগ করুন</string>
+    <string name="editor_zip_code">ডাক কোড</string>
+    <string name="error_enter_correct_zip_code">সঠিক ডাক কোড প্রদান করুন</string>
+    <string name="editor_reset_edits_button">পরিবর্তনগুলো বাতিল করুন</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%dটি বুকমার্ক</item>
+        <item quantity="other">%dটি বুকমার্ক</item>
+    </plurals>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি এটি দেখতে পারবেন।</item>
+        <item quantity="other">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি সেগুলো দেখতে পারবেন।</item>
+    </plurals>
+    <plurals name="tracks">
+        <item quantity="one">%dটি ট্র্যাক</item>
+        <item quantity="other">%dটি ট্র্যাক</item>
+    </plurals>
+    <string name="app_tip_06">আপনি আমাদের অ্যাপটি আপনার ভাষায় অনুবাদ করতে সাহায্য করতে পারেন।</string>
+    <string name="offline_explanation_title">অফলাইন মানচিত্র</string>
+    <string name="offline_explanation_text">এলাকাটি দেখতে এবং নেভিগেট করতে একটি মানচিত্র ডাউনলোড করতে হবে।\nআপনি যেসব এলাকায় ভ্রমণ করতে চান সেগুলোর মানচিত্র ডাউনলোড করুন।</string>
 </resources>

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

@@ -924,5 +924,5 @@
     <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
     <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">No establert</string>
-    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
 </resources>

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

@@ -915,7 +915,7 @@
     <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
     <string name="download_resources_custom_url_title">Vlastní mapový server</string>
     <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
-    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
+    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na http:// nebo https://</string>
     <string name="advanced">Pokročilé</string>
     <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>

android/app/src/main/res/values-en-rAU/strings.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Back</string>
+    <string name="cancel">Cancel</string>
+    <string name="delete">Delete</string>
+    <string name="download_maps">Download Maps</string>
+    <string name="download_has_failed">Download failed, tap to try again</string>
+    <string name="downloading">Downloading…</string>
+    <string name="kilometres">Kilometres</string>
+    <string name="miles">Miles</string>
+    <string name="later">Later</string>
+    <string name="search">Search</string>
+    <string name="search_map">Search Map</string>
+    <string name="location_is_disabled_long_text">You currently have all Location Services for this device or application disabled. Please enable them in Settings.</string>
+    <string name="limited_accuracy">Limited Accuracy</string>
+    <string name="choose_color">Choose Colour</string>
+    <string name="bookmark_color">Bookmark colour</string>
+    <string name="precise_location_is_disabled_long_text">To ensure accurate navigation enable Precise Location in settings</string>
+    <string name="zoom_to_country">Show on the map</string>
+    <string name="country_status_download_failed">Download failed</string>
+    <string name="try_again">Try Again</string>
+    <string name="about_menu_title">About CoMaps</string>
+    <string name="about_headline">Open project powered by the community</string>
+    <string name="about_proposition_1">• Easy to use and polished</string>
+    <string name="about_proposition_2">• Privacy focused and ad-free</string>
+    <string name="about_proposition_3">• Offline, fast and compact</string>
+    <string name="about_developed_by_enthusiasts">Fully open source, not for profit, transparent decision-making and finances.</string>
+    <string name="location_settings">Location Settings</string>
+    <string name="close">Close</string>
+    <string name="unsupported_phone">The app requires hardware accelerated OpenGL. Unfortunately, your device is not supported.</string>
+    <string name="download">Download</string>
+    <string name="disconnect_usb_cable">Please disconnect USB cable or insert a memory card to use CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Please free up some space on the SD card or USB storage first in order to use the app</string>
+    <string name="download_resources">Before you start using the app, please download the world overview map to your device. \nIt will use %s of storage.</string>
+    <string name="download_resources_continue">Go to Map</string>
+    <string name="downloading_country_can_proceed">Downloading %1$s (%2$s). You can now \nproceed to the map.</string>
+    <string name="download_country_ask">Download %1$s? (%2$s)</string>
+    <string name="update_country_ask">Update %1$s? (%2$s)</string>
+    <string name="download_country_failed">%s download has failed</string>
+    <string name="add_new_set">Add a new list</string>
+    <string name="bookmarks">Bookmarks</string>
+    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
+    <string name="name">Name</string>
+    <string name="address">Address</string>
+    <string name="list">List</string>
+    <string name="settings">Settings</string>
+    <string name="maps_storage">Save maps to</string>
+    <string name="maps_storage_summary">Select the folder to download maps to</string>
+    <string name="maps_storage_downloaded">Downloaded maps</string>
+    <string name="maps_storage_free_size">%1$s free of %2$s</string>
+    <string name="move_maps">Move maps?</string>
+    <string name="move_maps_error">Error moving map files</string>
+    <string name="wait_several_minutes">This might take several minutes. \nPlease wait…</string>
+    <string name="measurement_units">Unit of measurement</string>
+    <string name="description">Notes</string>
+    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
+    <string name="share_bookmarks_email_body">Hello! \n \nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/ \n \nEnjoy travelling with CoMaps!</string>
+    <string name="load_kmz_title">Loading Bookmarks</string>
+    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or in the Bookmarks Manager screen.</string>
+    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted.</string>
+    <string name="failed_to_open_file">Failed to open file %1$s \n \n%2$s</string>
+    <string name="edit">Edit</string>
+    <string name="unknown_current_position">Your location hasn\'t been determined yet</string>
+    <string name="cant_change_this_setting">Sorry, Map Storage settings are currently disabled</string>
+    <string name="downloading_is_active">Map download is in progress now</string>
+    <string name="my_position_share_sms">Check out my current location in CoMaps! %1$s or %2$s Don\'t have offline maps? Download here: https://www.comaps.app/download/</string>
+    <string name="share">Share</string>
+    <string name="email">Email</string>
+    <string name="copied_to_clipboard">Copied to clipboard: %s</string>
+    <string name="done">Done</string>
+    <string name="tracks_title">Tracks</string>
+    <string name="length">Length</string>
+    <string name="share_my_location">Share My Location</string>
+    <string name="prefs_group_general">General settings</string>
+    <string name="prefs_group_information">Information</string>
+    <string name="prefs_group_route">Navigation</string>
+    <string name="pref_zoom_title">Zoom buttons</string>
+    <string name="pref_zoom_summary">Display on the map</string>
+    <string name="pref_map_style_title">Night Mode</string>
+    <string name="off">Off</string>
+    <string name="on">On</string>
+    <string name="auto">Auto</string>
+    <string name="pref_map_3d_title">Perspective view</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D buildings are disabled in power saving mode</string>
+    <string name="pref_tts_enable_title">Voice Instructions</string>
+    <string name="pref_tts_street_names_title">Announce Street Names</string>
+    <string name="pref_tts_street_names_description">When enabled, the name of the street or exit to turn onto will be spoken aloud.</string>
+    <string name="pref_tts_language_title">Voice Language</string>
+    <string name="pref_tts_test_voice_title">Test Voice Directions</string>
+    <string name="pref_tts_playing_test_voice">Check the volume or system Text-To-Speech settings if you don\'t hear the voice now</string>
+    <string name="pref_tts_unavailable">Not Available</string>
+    <string name="pref_map_auto_zoom">Auto zoom</string>
+    <string name="placepage_distance">Distance</string>
+    <string name="search_show_on_map">View on map</string>
+    <string name="menu">Menu</string>
+    <string name="website">Website</string>
+    <string name="news">News</string>
+    <string name="panoramax">Panoramax Picture</string>
+    <string name="feedback">Feedback</string>
+    <string name="rate_the_app">Rate the app</string>
+    <string name="help">Help</string>
+    <string name="faq">Frequently Asked Questions</string>
+    <string name="donate">Donate</string>
+    <string name="how_to_support_us">Volunteer and improve CoMaps</string>
+    <string name="copyright">Copyright</string>
+    <string name="report_a_bug">Report a bug</string>
+    <string name="compass_calibration_recommended">Improve arrow direction by moving the phone in a figure-eight motion to calibrate the compass.</string>
+    <string name="compass_calibration_required">Move the phone in a figure-eight motion to calibrate the compass and fix the arrow direction on the map.</string>
+    <string name="long_tap_toast">Long-tap on the map again to see the interface</string>
+    <string name="downloader_update_all_button">Update All</string>
+    <string name="downloader_cancel_all">Cancel All</string>
+    <string name="downloader_downloaded_subtitle">Downloaded</string>
+    <string name="downloader_queued">Queued</string>
+    <string name="downloader_near_me_subtitle">Near me</string>
+    <string name="downloader_status_maps">Maps</string>
+    <string name="downloader_download_all_button">Download All</string>
+    <string name="downloader_downloading">Downloading:</string>
+    <string name="downloader_delete_map_while_routing_dialog">To delete map, please stop navigation</string>
+    <string name="downloader_download_map">Download map</string>
+    <string name="downloader_retry">Retry</string>
+    <string name="downloader_delete_map">Delete Map</string>
+    <string name="downloader_update_map">Update Map</string>
+    <string name="google_play_services">Google Fused Location Service</string>
+    <string name="pref_use_google_play">A proprietary service that combines GPS, WiFi, cellular networks etc. to determine your location more accurately. It may connect to Google servers.</string>
+    <string name="routing_requires_all_map">In order to create a route, we need to download and update all the maps from your location to your destination.</string>
+    <string name="routing_not_enough_space">Not enough space</string>
+    <string name="enable_location_services">Please enable Location Services</string>
+    <string name="save">Save</string>
+    <string name="create">Create</string>
+    <string name="red">Red</string>
+    <string name="yellow">Yellow</string>
+    <string name="blue">Blue</string>
+    <string name="green">Green</string>
+    <string name="purple">Purple</string>
+    <string name="orange">Orange</string>
+    <string name="brown">Brown</string>
+    <string name="pink">Pink</string>
+    <string name="deep_purple">Deep Purple</string>
+    <string name="light_blue">Light Blue</string>
+    <string name="cyan">Cyan</string>
+    <string name="teal">Teal</string>
+    <string name="lime">Lime</string>
+    <string name="deep_orange">Deep Orange</string>
+    <string name="gray">Grey</string>
+    <string name="blue_gray">Blue Grey</string>
+    <string name="dialog_routing_disclaimer_title">When following the route, please keep in mind:</string>
+    <string name="dialog_routing_disclaimer_priority">— Road conditions, traffic laws, and road signs always take priority over navigation hints;</string>
+    <string name="dialog_routing_disclaimer_precision">— The map might be inaccurate, and the suggested route might not always be the most optimal way to reach the destination;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Suggested routes should only be understood as recommendations;</string>
+    <string name="dialog_routing_disclaimer_borders">— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.</string>
+    <string name="dialog_routing_disclaimer_beware">Please stay alert and safe on the roads!</string>
+    <string name="dialog_routing_check_gps">Check GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Unable to create route. Current GPS coordinates could not be identified.</string>
+    <string name="dialog_routing_location_turn_wifi">Please check your GPS signal. Enabling WiFi will improve your location accuracy.</string>
+    <string name="dialog_routing_location_turn_on">Enable location services</string>
+    <string name="dialog_routing_location_unknown_turn_on">Unable to locate current GPS coordinates. Enable location services to calculate route.</string>
+    <string name="dialog_routing_unable_locate_route">Unable to locate route</string>
+    <string name="dialog_routing_cant_build_route">Unable to create route</string>
+    <string name="dialog_routing_change_start_or_end">Please change your starting point or destination.</string>
+    <string name="dialog_routing_change_start">Change starting point</string>
+    <string name="dialog_routing_start_not_determined">Route was not created. Unable to locate starting point.</string>
+</resources>

android/app/src/main/res/values-en-rGB/strings.xml

@@ -19,8 +19,8 @@
     <string name="editor_zip_code">Postcode</string>
     <string name="error_enter_correct_zip_code">Enter a valid postcode</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bookmark</item>
-        <item quantity="other">%d bookmarks</item>
+        <item quantity="one">%d place</item>
+        <item quantity="other">%d places</item>
     </plurals>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d file was found. You can see it after conversion.</item>

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

@@ -915,5 +915,5 @@
     <string name="advanced">Täiendavad seadistused</string>
     <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
     <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
-    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
+    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on http:// või https://</string>
 </resources>

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

@@ -31,7 +31,7 @@
     <string name="editor_time_from">De</string>
     <string name="daily">Diario</string>
     <string name="details">Detalles</string>
-    <string name="editor_reset_edits_button">Restablecer</string>
+    <string name="editor_reset_edits_button">Desbotar cambios</string>
     <string name="category_parking">Aparcamento</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
@@ -57,8 +57,8 @@
     <string name="editor_time_title">Horario de apertura</string>
     <string name="editor_zip_code">Código postal</string>
     <string name="editor_share_to_all_dialog_title">Quere envialo a todos os usuarios?</string>
-    <string name="editor_share_to_all_dialog_message_1">Comprobe que non escribeu ningún dato privado ou persoal</string>
-    <string name="editor_share_to_all_dialog_message_2">Os editores de OpenStreetMap comprobarán os cambios e poñeranse en contacto con vostede se teñen algunha pregunta</string>
+    <string name="editor_share_to_all_dialog_message_1">Comproba que non escribiches ningún dato privado ou persoal</string>
+    <string name="editor_share_to_all_dialog_message_2">Desde OpenStreetMap comprobarán os cambios e poñeranse en contacto contigo se teñen algunha pregunta.</string>
     <string name="navigation_stop_button">Deter</string>
     <string name="mobile_data_option_ask">Preguntar sempre</string>
     <string name="traffic_update_maps_text">Para mostrar os datos de tráfico, deben actualizarse os mapas</string>
@@ -489,7 +489,7 @@
     <string name="help">Axuda</string>
     <string name="downloader_downloaded_subtitle">Descargado</string>
     <string name="kilometers_per_hour">km/h</string>
-    <string name="create">crear</string>
+    <string name="create">Crear</string>
     <string name="brown">Marrón</string>
     <string name="no_available">Non</string>
     <string name="categories">Categorías</string>
@@ -639,4 +639,19 @@
     <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>
+    <string name="place_page_map_too_old_title">Datos do mapa desactualizados</string>
+    <string name="place_page_map_too_old_description">Os datos do mapa son moi antigos, por favor actualiza o mapa.</string>
+    <string name="place_page_app_too_old_description">Os datos do mapa actual son moi antigos, actualiza a app CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizar rexión do mapa</string>
+    <string name="place_page_too_old_to_edit">A edición de OpenStreetMap está desactivada porque o mapa é demasiado antigo.</string>
+    <string name="prefs_speed_cameras_information">Os avisos de radares están desactivados nos paises onde a lei local prohibe estas alertas.</string>
+    <string name="power_management">Xestión da enerxía</string>
+    <string name="navigation_start_tts_message">"Comezando a Navegación, idioma das instruccións por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruccións por voz desactivadas: non hai un motor TTS dispoñible</string>
+    <string name="charge_socket_schuko">Doméstico na UE</string>
+    <string name="advanced">Avanzado</string>
+    <string name="download_resources_custom_url_title">Servidor persoal do mapa</string>
+    <string name="download_resources_custom_url_message">Sobrescribe o servidor predefinido para descargar mapas. Deixar baleiro para usar o servidor por defecto de CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Sen establecer</string>
+    <string name="download_resources_custom_url_error_scheme">Escribe un URL que comece por http:// ou https://</string>
 </resources>

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

@@ -71,7 +71,7 @@
     <string name="pref_map_3d_buildings_title">Drehevyansow lymnys tri</string>
     <string name="pref_tts_enable_title">Danvonadow dre lev</string>
     <string name="pref_tts_street_names_title">Deklarya Henwyn Stretow</string>
-    <string name="pref_tts_language_title">Tavas Lev</string>
+    <string name="pref_tts_language_title">Yeth Lev</string>
     <string name="pref_tts_test_voice_title">Prov Tuyow Dre Lev</string>
     <string name="pref_tts_unavailable">Nakavadow</string>
     <string name="search_show_on_map">Gweles war mappa</string>
@@ -158,7 +158,7 @@
     <string name="login_osm">Omgelmi dhe OpenStreetMap</string>
     <string name="logout">Omdenna</string>
     <string name="edit_place">Golegi Le</string>
-    <string name="add_language">Addya unn tavas</string>
+    <string name="add_language">Addya unn yeth</string>
     <string name="street">Stret</string>
     <string name="house_number">Niver drehevyans</string>
     <string name="details">Manylyon</string>
@@ -166,7 +166,7 @@
     <string name="building">Drehevyans</string>
     <string name="add_street">Addya unn stret</string>
     <string name="empty_street_name_error">Ynworra unn hanow street mar pleg</string>
-    <string name="choose_language">Dewis unn tavas</string>
+    <string name="choose_language">Dewis unn yeth</string>
     <string name="choose_street">Dewis unn stret</string>
     <string name="editor_add_phone">Addya Niver Fon</string>
     <string name="level">Leur</string>
@@ -175,7 +175,7 @@
     <string name="downloader_search_field_hint">Kavos mappa</string>
     <string name="editor_login_error_dialog">Error dres omgelmi</string>
     <string name="editor_edit_place_name_hint">Hanow a an le</string>
-    <string name="editor_default_language_hint">Dell yw skrifys yn an tavas teythiek</string>
+    <string name="editor_default_language_hint">Dell yw skrifys yn an yeth teythiek</string>
     <string name="editor_edit_place_category_title">Klass</string>
     <string name="detailed_problem_description">Deskrifans manylys a an kudyn</string>
     <string name="editor_report_problem_other_title">Kudyn dyffrans</string>
@@ -195,10 +195,10 @@
     <string name="hour">o</string>
     <string name="minute">mynysen</string>
     <string name="placepage_more_button">Moy</string>
-    <string name="placepage_edit_bookmark_button">Pennskrifa Lyververk</string>
+    <string name="placepage_edit_bookmark_button">Golegi Lyververk</string>
     <string name="placepage_personal_notes_hint">Notennow privedh (tekst bo html)</string>
     <string name="editor_reset_edits_message">Dilea oll chanjyow dhywarlinen?</string>
-    <string name="editor_reset_edits_button">Dilea</string>
+    <string name="editor_reset_edits_button">Dilea chanjyow</string>
     <string name="editor_remove_place_message">Dilea le keworrys?</string>
     <string name="editor_remove_place_button">Dilea</string>
     <string name="editor_place_doesnt_exist">Le na eksistya</string>
@@ -311,7 +311,7 @@
     <string name="download_map_title">Iskarga an mappa bys simpel</string>
     <string name="disk_error_title">Error plasen</string>
     <string name="connection_failure">Defowt kevren</string>
-    <string name="change_map_locale">Tavas mappow</string>
+    <string name="change_map_locale">Yeth mappow</string>
     <string name="splash_subtitle">Data mappow a OpenStreetMap</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
@@ -321,7 +321,7 @@
     <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
     <string name="app_tip_01">Gans agas argevrohow ha skoodhyans, ni a yll gul an mappys an gwella yn an Nor!</string>
     <string name="app_tip_02">Yw da genes a\'gan app? Argevri mar pleg dhe skoodhya an displegyans! Yw na da genes a\'n hwath? Mar pleg, kedhlewgh dhyn prag ha ni a ewnhe a\'n!</string>
-    <string name="app_tip_06">Hwi a yll gweres treylya a\'gan app yn agas tavas.</string>
+    <string name="app_tip_06">Ty a yll gweres treylya a\'gan app yn dhayeth.</string>
     <string name="aa_connected_title">Dha vos lemmyn rosweythys dhe Android Auto</string>
     <string name="aa_grant_permissions">Grontya grontys</string>
     <string name="button_layer_outdoor">Yn-mes</string>
@@ -375,4 +375,299 @@
     <string name="edit">Golegi</string>
     <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
+    <string name="download_has_failed">Y fyllis an iskarg, tava dhe dasassaya</string>
+    <string name="downloading">Iskargaow…</string>
+    <string name="location_is_disabled_long_text">Hwi ungallosegi y\'n eur ma oll Gonisyow GPS rag an devis po app ma. Mar pleg, gallosegi y\'s yn Settyansow.</string>
+    <string name="precise_location_is_disabled_long_text">Rag surhe navygacyon ewn, gallosegi GPS Kewar yn Settyansow</string>
+    <string name="country_status_download_failed">Yn fyllis iskarg</string>
+    <string name="about_headline">Ragdres poblek selys war an kementh</string>
+    <string name="about_proposition_1">• Es y us ha polsys</string>
+    <string name="about_proposition_2">• Fogellys war privetter ha heb argemynnow</string>
+    <string name="about_developed_by_enthusiasts">Kod poblek yn leun, heb budh, erviransow treusweladow ha arghansereth.</string>
+    <string name="unsupported_phone">An app rekwirya OpenGL gans uskisheans kalesweyth. Soweth, gas devis na skoodhys.</string>
+    <string name="disconnect_usb_cable">Mar pleg, unjunya an korsen USB po ynworra kyf kov dhe devnydhya CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Mar pleg, gul neb dalghuster yn an karten SD/kyf kov kyns dhe devnydhya an app</string>
+    <string name="download_resources">Dherag hwi dalleth devnydhya an app, mar pleg iskarga an mappa ollvysel sempel dhe gas devis.\nY devnydhya %s a dalghuster.</string>
+    <string name="downloading_country_can_proceed">Iskargaow %1$s (%2$s). Hwi gallos\nprocedya dhe an mappa.</string>
+    <string name="download_country_failed">%s iskarg yw fyllis</string>
+    <string name="add_new_set">Addya unn Rol Nowydh</string>
+    <string name="bookmark_set_name">Hanow Rol Lyververkys</string>
+    <string name="maps_storage">Sawya mappys dhe</string>
+    <string name="maps_storage_summary">Dewis an restrenva dhe iskarga mappys dhe</string>
+    <string name="maps_storage_downloaded">Mappys iskargys</string>
+    <string name="maps_storage_free_size">%1$s kavadow yn-mes a %2$s</string>
+    <string name="move_maps_error">Error dres gwaya restrennow mappa</string>
+    <string name="wait_several_minutes">An argerdh ma re durya meur a mynysen.\nGortewgh mar pleg…</string>
+    <string name="category_eat">Leow rag dybri</string>
+    <string name="category_secondhand">Gwarennow Wortaswerth</string>
+    <string name="category_nightlife">Delit dres Nos</string>
+    <string name="share_bookmarks_email_subject">Lyververkys CoMaps yw kevrennys gans ty</string>
+    <string name="share_bookmarks_email_body">Dydh da!\n\nOw lyververkys yw stag; mar pleg, ygeri y\'s yn CoMaps. A hwi kavos y na leys, hwi gallos iskarga y omma: https://www.comaps.app/download/ \n\nEnjoya travalya gans CoMaps!</string>
+    <string name="load_kmz_successful">Lyververkys kargys yn sewen! Hwi gallos kavos y\'s war an mappa po yn an skrin Dyghtyer Lyververkys.</string>
+    <string name="load_kmz_failed">Y fyllis an karga lyververkys. An restren re bos anewn.</string>
+    <string name="unknown_file_type">An eghen restren yw anaswonys gans an app:\n%1$s</string>
+    <string name="failed_to_open_file">Y fyllis ygeri restren %1$s \n\n%2$s</string>
+    <string name="unknown_current_position">Dhe tyller yw determys na hwath</string>
+    <string name="cant_change_this_setting">Drog yw genev, settyansyow Gwithyans Mappa yw marow y\'n eur ma</string>
+    <string name="downloading_is_active">Iskarg mappa hwarvos lemmyn</string>
+    <string name="my_position_share_sms">Mires orth ow tyller y\'n eur ma yn CoMaps! %1$s po %2$s Na kavos mappys dhywarlinen? Iskarga omma: https://www.comaps.app/download/</string>
+    <string name="my_position_share_email">Hou,\n\nOv omma lemmyn: %1$s. Klyckya an gorgevren ma %2$s po an unn ma %3$s dhe gweles an tyller war an mappa.\n\nMeur ras.</string>
+    <string name="copied_to_clipboard">Kopys dhe astel glypp: %s</string>
+    <string name="pref_zoom_title">Botonyow brashe</string>
+    <string name="off">Marow</string>
+    <string name="on">Byw</string>
+    <string name="pref_map_3d_buildings_disabled_summary">Drehevyansow 3D yw ungallosegi yn fordh erbysyon batri</string>
+    <string name="pref_tts_street_names_description">Pan gallosegys, an hanow a an stret po fordh \'mes rag mos yn-mes yw lenna.</string>
+    <string name="pref_tts_playing_test_voice">Checkya an ughelder po settyansow system Tekst-dhe-Areth a hwi na klewes an lev lemmyn</string>
+    <string name="pref_map_auto_zoom">Brashe yn awtomatek</string>
+    <string name="placepage_distance">Pellder</string>
+    <string name="how_to_support_us">Bodhegi ha gwellhe CoMaps</string>
+    <string name="compass_calibration_recommended">Gwellhe tu seth gans gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh.</string>
+    <string name="compass_calibration_required">Gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh ha ewna an tu seth war an mappa.</string>
+    <string name="long_tap_toast">Tava hir war an mappa arta dhe gweles an ynterfas</string>
+    <string name="downloader_downloaded_subtitle">Iskargys</string>
+    <string name="downloader_queued">Lostys</string>
+    <string name="downloader_downloading">Iskargaow:</string>
+    <string name="downloader_delete_map_while_routing_dialog">Dhe dilea mappa, hedhi navygacyon, mar pleg</string>
+    <string name="routing_failed_cross_mwm_building">Kerdhow gallos gul yw kontaynys yn leun a-berth yn unn mappa a unn pow hepken.</string>
+    <string name="pref_use_google_play">Unn gonis perghenogel may kesunya GPS, Wi-fi, rosweythyow kellgowser h.e. rag determya dhe tyller yn kewar. Y re junya dhe servellow Google.</string>
+    <string name="routing_download_maps_along">Iskarga oll mappys a-hys gas kerdh</string>
+    <string name="routing_requires_all_map">Rag gul unn kerdh, ni res iskarga ha nowedhi oll mappys a gas tyller dhe gas penn an fordh.</string>
+    <string name="save">Sawya</string>
+    <string name="cyan">Blou</string>
+    <string name="dialog_routing_disclaimer_title">Pan holya an hyns, kofhe mar pleg:</string>
+    <string name="dialog_routing_disclaimer_priority">— Studh fordh, laghys traffik, ha arwodhyow kavos ragwir pub eur a-ugh dhe hyntys navygacyon;</string>
+    <string name="dialog_routing_disclaimer_precision">— An mappa re bos ankewar, ha an kussul hyns re na bos an method gwella dhe drehedhes an penn an fordh;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Kussus kyns yw komendyansow hepken;</string>
+    <string name="dialog_routing_disclaimer_borders">— Gul rach gans hyns ogas emlow: an kerdhow gulys gans agan app re tremena treweythyow emlow keswlasek yn tylleryow anreythhes.</string>
+    <string name="dialog_routing_disclaimer_beware">Mar pleg, gortos hewol ha saw war an fordhow!</string>
+    <string name="dialog_routing_error_location_not_found">Anabel dhe gul kerdh. Kesordenogyon GPS na gallos determys.</string>
+    <string name="dialog_routing_location_turn_wifi">Mar pleg, checkya gas sinell GPS. Gallosegi Wi-Fi re gwellhe gas kewerder GPS.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Anabel dhe desedha kesordenogyon GPS. Gallosegi gonisyow GPS dhe kalkya kerdh.</string>
+    <string name="dialog_routing_unable_locate_route">Anabel dhe desedha kerdh</string>
+    <string name="dialog_routing_cant_build_route">Anabel dhe gul kerdh</string>
+    <string name="dialog_routing_change_start_or_end">Mar pleg, chanjya gas tyller dalleth po penn an fordh.</string>
+    <string name="dialog_routing_change_start">Chanjya tyller dalleth</string>
+    <string name="dialog_routing_start_not_determined">Kerdh na gulys. Anabel dhe desedha tyller dalleth.</string>
+    <string name="dialog_routing_select_closer_start">Mar pleg, dewis unn tyller dalleth yn-nes dhe unn fordh.</string>
+    <string name="dialog_routing_end_not_determined">Kerdh na gulys. Anabel dhe desedha an penn an fordh.</string>
+    <string name="dialog_routing_select_closer_end">Mar pleg, dewis unn penn an fordh yn-nes dhe unn fordh</string>
+    <string name="dialog_routing_change_intermediate">Anabel dhe desedha an tyller kres</string>
+    <string name="dialog_routing_intermediate_not_determined">Mar pleg, chanjya gas tyller kres</string>
+    <string name="dialog_routing_application_error">Anabel dhe gul kerdh drefen unn error app</string>
+    <string name="dialog_routing_download_and_build_cross_route">A vynnsowgh iskarga an mappa ha gul unn kerdh gwell a-dreus moy ages unn mappa?</string>
+    <string name="dialog_routing_download_cross_route">Iskarga mappys keworransel dhe gul unn kerdh gwell a-dreus moy ages unn mappa.</string>
+    <string name="search_without_internet_advertisement">Rag dalleth hwilas ha gul kerdhow, iskarga an mappa, mar pleg. Wosa henna, hwi na fella res unn junyans kesrosweyth.</string>
+    <string name="search_not_found">Soweth, sewyansow kavos vyth</string>
+    <string name="search_not_found_query">Iskarga an pow py tyller hwi hwilas po assaya addya unn hanow tre/gwig yn ogas.</string>
+    <string name="search_history_text">Gweles gas hwithransow a-dhiwedhes</string>
+    <string name="p2p_from_here">Mos dhyworth</string>
+    <string name="p2p_to_here">Mos war-tu</string>
+    <string name="p2p_only_from_current">Navygacyon yw kavadow hepken dhyworth gas tyller a\'n jydh</string>
+    <string name="p2p_reroute_from_current">A vynn\'ta devisya unn kerdh dhyworth gas tyller a\'n jydh?</string>
+    <string name="editor_time_from">Dhyworth</string>
+    <string name="editor_time_to">Bys</string>
+    <string name="editor_example_values">Niverow Ensampel</string>
+    <string name="editor_report_problem_desription_1">Mar pleg, deskrifa an kudyn yn manylyon rag may an kemeneth OpenStreetMap gallos ewnhe y.</string>
+    <string name="editor_report_problem_desription_2">Po gul y dha honan yn https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_no_place_title">An le ma na eksistya</string>
+    <string name="editor_report_problem_under_construction_title">Deges rag mentons</string>
+    <string name="editor_report_problem_duplicate_place_title">Le dewblek</string>
+    <string name="autodownload">Iskarga mappys yn awtomatek</string>
+    <string name="opens_in">Ygeri yn %s</string>
+    <string name="closes_in">Degea yn %s</string>
+    <string name="opens_at">Ygeri dhe %s</string>
+    <string name="closes_at">Degea dhe %s</string>
+    <string name="opens_day_at">Ygeri war %1$s dhe %2$s</string>
+    <string name="closes_day_at">Degea war %1$s dhe %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="zero">%d mynysennow</item>
+        <item quantity="one">%d mynysen</item>
+        <item quantity="two">%d mynysennow</item>
+        <item quantity="few">%d mynysennow</item>
+        <item quantity="many">%d mynysennow</item>
+        <item quantity="other">%d mynysennow</item>
+    </plurals>
+    <string name="hours_confirmed_time_ago">Komfirmys %s</string>
+    <string name="existence_confirmed_time_ago">Bosva konfirmys %s</string>
+    <string name="not_signed_in">Na omgelmys</string>
+    <string name="cuisine">Eghen Boos</string>
+    <string name="select_cuisine">Dewis eghen boos</string>
+    <string name="downloader_delete_map_dialog">Oll gas chanjyow mappa a vydh dileys a-barth an mappa</string>
+    <string name="downloader_mwm_migration_dialog">Rag gul unn kerdh, hwi res nowedhi oll mappys ha dhanna devisya an kerdh arta.</string>
+    <string name="common_check_internet_connection_dialog">Mar pleg, surhe gas devis yw rosweythys dhe an kesrosweyth</string>
+    <string name="downloader_no_space_message">Mar pleg, dilea neb data heb res</string>
+    <string name="editor_profile_changes">Chanjyow Gwirhys</string>
+    <string name="editor_focus_map_on_location">Draylya an mappa rag settya an krows yn an tyller a an le po negys.</string>
+    <string name="editor_edit_place_title">Golegi</string>
+    <string name="editor_add_place_title">Addya</string>
+    <string name="message_invalid_feature_position">Tra vyth gallos bos desedhys omma</string>
+    <string name="osm_presentation">Data OpenStreetMap gulys gans an kemeneth dhyworth %s. Dyski moy a-dro fatel golegi ha nowedhi an mappa yn OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) yw unn ragdres kemeneth dhe byldya unn mappa rydh ha apert. Y yw an devedhyans chif a data mappa yn CoMaps ha oberi haval dhe Wikipedya. Hwi gallos addya po golegi leow ha i bos kavadow dhe milvilyow usyoryon dres oll an bys.\nOmjunya an kemeneth ha gweres gul unn mappa gwell rag keniver!</string>
+    <string name="login_to_make_edits_visible">Gul unn akont OpenStreetMap po omgelmi dhe dyllo gas chanjyow dhe an bys</string>
+    <string name="downloader_of">%1$d a %2$d</string>
+    <string name="download_over_mobile_message">Y re bos kostek meur lowr war nebes towlow po a tramor</string>
+    <string name="error_enter_correct_storey_number">An niver a leuryow res na eksedya %d</string>
+    <string name="editor_note_hint">Deskrifa errors war an mappa po pyth may na golegys yn CoMaps</string>
+    <string name="editor_about_osm">Gas chanjyow yw ughkargys dhe an sel dherivadow <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> poblek. Mar pleg, addya kudhlow privedh po gwirbryntys vyth.</string>
+    <string name="editor_category_unsuitable_title">Na gallos kavos unn klass fytti?</string>
+    <string name="editor_category_unsuitable_text">CoMaps alowa hwi addya klassys sempel hepken, rag henna trevow, fordhow, lynnyn, drehevyansow, h.e. vyth. Mar pleg, addya a\'n par na klassys dhe <a href="https://www.openstreetmap.org">OpenStreetMap</a>. Checkya agan <a href="https://www.openstreetmap.org">kowethlyver</a> rag danvonadow kamm ha kamm manylys.</string>
+    <string name="downloader_no_downloaded_maps_title">Hwi na iskargys neb mappys</string>
+    <string name="downloader_no_downloaded_maps_message">Iskarga mappys dhe hwilas ha viajya dhywarlinen</string>
+    <string name="current_location_unknown_error_title">Tyller a\'n jydh yw ankoth</string>
+    <string name="day">d</string>
+    <string name="editor_place_doesnt_exist_description">Deskrifa an studh lemmyn dhe danvon unn noten error dhe an kemeneth OpenStreetMap</string>
+    <string name="editor_mark_business_vacant_description">Devnydhya ma a an negys re movys ha an spas yw gwag ha parys rag unn gobrener nowydh.</string>
+    <string name="place_page_map_too_old_title">Data mappa anterrus</string>
+    <string name="place_page_map_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an mappa mar pleg.</string>
+    <string name="place_page_app_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an app CoMaps.</string>
+    <string name="place_page_update_too_old_map">Nowedhi pow mappa</string>
+    <string name="place_page_too_old_to_edit">Golegi OpenStreetMap yw ungallosegi dre reson an data mappa yw re koth.</string>
+    <string name="editor_share_to_all_dialog_message_1">Surhe hwi na ynworra neb kudhlow privedh po personel.</string>
+    <string name="editor_share_to_all_dialog_message_2">Pennskriforyon OpenStreetMap a wra checkya an chanjyow ha kestava hwi a i kavos neb kwestyons.</string>
+    <string name="mobile_data_dialog">Devnydhya junyans kellgowser dhe diskwedhes kudhlow manylys?</string>
+    <string name="mobile_data_option_always">Devnydhya Pub Prys</string>
+    <string name="mobile_data_option_not_today">Na Devnydhya Hedhyw</string>
+    <string name="mobile_data">Junyans Kellgowser</string>
+    <string name="mobile_data_description">Junyans kellgowser yw res rag messajys nowedhyans mappa ha ughkarga chanjyow</string>
+    <string name="mobile_data_option_never">Devnydhya Bynner</string>
+    <string name="mobile_data_option_ask">Govyn Pub Prys</string>
+    <string name="traffic_update_maps_text">Rag diskwedhes data daromdak, mappys res bos nowedhys</string>
+    <string name="big_font">Moghhe braster a labelyow mappa</string>
+    <string name="traffic_data_unavailable">Data daromdak ankavadow</string>
+    <string name="enable_logging">Gallosegi kovadhow</string>
+    <string name="prefs_languages_information">Ni devnydhya lev system rag danvonadow a dros. Lies devisyow Android devnydhya TTS Google, hwi gallos iskarga po nowedhi y yn Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Rag nebes yethow, hwi res lea unn synthesyer kows po unn fardel yeth keworransel yn an gwerthji appys (Google Play, Galaxy Store, App Gallery, FDroid). \nYgeri gas settyansyow devis → Yeth ha ynworrans → Areth → Eskorrans tekst dhe areth. \nHwi gallos dyghtya omma settyansow rag synthesyans kows (rag ensampel, iskarga fardel yeth dhe devnydh dhywarlinen) ha dewis jynn tekst-dhe-areth aral.</string>
+    <string name="prefs_languages_information_off_link">Rag moy kudhlow checkya an kowethlyver ma</string>
+    <string name="prefs_speed_cameras_information">Gwarnyans kamera tooth yw marow yn broyow le may gwarnyansow yw difennys erbynn lagha leel.</string>
+    <string name="transliteration_title">Treylya yn lytherennans Latin</string>
+    <string name="routing_add_start_point">Devnydhya hwithrans po tava war an mappa rag addya unn tyller dalleth</string>
+    <string name="routing_add_finish_point">Devnydhya hwithrans po tava war an mappa rag addya unn penn an fordh</string>
+    <string name="planning_route_manage_route">Dyghtya Kerdh</string>
+    <string name="saved">Sawys</string>
+    <string name="dialog_error_storage_title">Kudyn hedhas dalghuster</string>
+    <string name="dialog_error_storage_message">Dalghuster a-ves ankavadow. An karten SD re bos removys, shyndys, po an system restrennow yw redya-hepken. Mar pleg, checkya gas karten SD po kestava ni gans support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Hevelebya dalghuster drog</string>
+    <plurals name="bookmarks_places">
+        <item quantity="zero">%d lyververkys</item>
+        <item quantity="one">%d lyververk</item>
+        <item quantity="two">%d lyververkys</item>
+        <item quantity="few">%d lyververkys</item>
+        <item quantity="many">%d lyververkys</item>
+        <item quantity="other">%d lyververkys</item>
+    </plurals>
+    <string name="bookmarks_error_message_share_general">Anabel dhe kevrenna awos unn error app</string>
+    <string name="bookmarks_error_title_share_empty">Error dres kevrenna</string>
+    <string name="bookmarks_error_message_share_empty">Na gallos kevrenna unn rol gwag</string>
+    <string name="bookmarks_error_title_empty_list_name">Hanow a res</string>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="zero">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="one">%d restrenn kavos. Hwi gallos gweles y wosa treylyans.</item>
+        <item quantity="two">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="few">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="many">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="other">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+    </plurals>
+    <plurals name="tracks">
+        <item quantity="zero">%d lerghow</item>
+        <item quantity="one">%d lergh</item>
+        <item quantity="two">%d lerghow</item>
+        <item quantity="few">%d lerghow</item>
+        <item quantity="many">%d lerghow</item>
+        <item quantity="other">%d lerghow</item>
+    </plurals>
+    <string name="bookmarks_empty_list_message">Rag addya unn lyververk, tava unn le war an mappa ha tava an arwodik steren</string>
+    <string name="notification_channel_downloader">Iskarger mappa</string>
+    <string name="pref_tts_speedcams_always">Gwarnya pub prys</string>
+    <string name="pref_tts_speedcams_never">Gwarnya bynner</string>
+    <string name="power_managment_title">Fordh erbysyon batri</string>
+    <string name="power_managment_description">Assaya lehe usadow batri yn despit dhe nebes nasyow</string>
+    <string name="power_managment_setting_never">Bynner</string>
+    <string name="power_managment_setting_auto">Pan batri yw isel</string>
+    <string name="power_managment_setting_manual_max">Pub prys</string>
+    <string name="enable_logging_warning_message">Gallosegi yn servadow an dewis ma rag rekordya ha danvon dre dhorn kovadhow manylys a-dro gas kudyn dhe ni gans \"Derivas unn kudyn\" yn an folen Gweres. Kovadhow re komprehendya kudhlow GPS.</string>
+    <string name="driving_options_title">Dewisyow kerdh</string>
+    <string name="avoid_tolls">Goheles tollow</string>
+    <string name="avoid_unpaved">Goheles fordh ankonsys</string>
+    <string name="avoid_ferry">Goheles kowbalow</string>
+    <string name="avoid_motorways">Goheles gorfordhow</string>
+    <string name="avoid_steps">Goheles stayrys</string>
+    <string name="avoid_paved">Goheles fordh konsys</string>
+    <string name="unable_to_calc_alert_title">Anabel kalkya kerdh</string>
+    <string name="unable_to_calc_alert_subtitle">Unn kerdh na gallos kavosys. Ma re bos drefen gas dewisyow kerdh po data OpenStreetMap andhien. Mar pleg chanjya gas dewisyow kerdh ha dasassaya.</string>
+    <string name="change_driving_options_btn">Dewisyow kerdh gallosegys</string>
+    <string name="week_ago_sorttype">Nans yw unn seythen</string>
+    <string name="month_ago_sorttype">Nans yw unn mis</string>
+    <string name="moremonth_ago_sorttype">Moy ages nans yw unn mis</string>
+    <string name="moreyear_ago_sorttype">Moy ages nans yw unn bledhen</string>
+    <string name="dialog_pedestrian_route_is_long_header">Kerdh metro kavosys vyth</string>
+    <string name="dialog_pedestrian_route_is_long_message">Mar pleg, dewis unn tyller dalleth po penn an fordh yn-nes unn gorvas metro</string>
+    <string name="isolines_activation_error_dialog">Bywhe linen kettresow res iskargaow data mappa rag an arenebedh ma</string>
+    <string name="isolines_location_error_dialog">Linen kettresow yw kavadow yn an arenebedh ma na hwath</string>
+    <string name="elevation_profile_ascent">Ascendyans</string>
+    <string name="elevation_profile_descent">Diyskynnys</string>
+    <string name="downloader_loading_ios">Iskargaow</string>
+    <string name="disk_error">Anabel dhe gul restrenva ha gwaya restrennow war devis kov po sdcard</string>
+    <string name="disconnect_usb_cable_title">Unjunya korsen USB</string>
+    <string name="enable_keep_screen_on">Gwitha an skrin byw</string>
+    <string name="enable_keep_screen_on_description">A gallosegys, an skrin yw bos byw pub prys dres diskwedhes an mappa.</string>
+    <string name="enable_show_on_lock_screen">Diskwedhes war an skrin floren</string>
+    <string name="enable_show_on_lock_screen_description">A gallosegys, an app yw diskwedhes war an skrin floren pan an devis yw alhwedhys hwath.</string>
+    <string name="app_tip_03">A hwi aswon unn gwrier medhelweyth, hwi gallos peji ga kowlwul unn nas may hwi res.</string>
+    <string name="app_tip_04">Tava yn neb le war an mappa dhe dewis neb tra. Unn tava hir yw rag kudha ha diskwedhes an ynterfas.</string>
+    <string name="app_tip_05">A wodhowgh gas tyller a\'n jydh war an mappa gallos dewisys?</string>
+    <string name="app_tip_07">Agan app yw gul gans nebes diwysygyon ha an kemeneth.</string>
+    <string name="app_tip_08">Hwi gallos ewnhe ha gwellhe yn es an data map.</string>
+    <string name="app_tip_09">Agan amkan chif yw byldya mappys uskis, privedh, ha es may hwi a wra kara.</string>
+    <string name="car_used_on_the_phone_screen">Hwi devnydhya lemmyn CoMaps war an skrin kellgowser</string>
+    <string name="car_used_on_the_car_screen">Hwi devnydhya lemmyn CoMaps war an skrin karr</string>
+    <string name="car_continue_on_the_phone">Pesya war an kellgowser</string>
+    <string name="car_continue_in_the_car">Dhe an skrin karr</string>
+    <string name="aa_location_permissions_request">CoMaps res hedhas GPS. Pan y yw saw, checkya an messach war gas kellgowser.</string>
+    <string name="aa_request_permission_notification">An app ma res gas gront</string>
+    <string name="aa_request_permission_activity_text">CoMaps yn Android Auto res grontys GPS rag oberyans effeythus</string>
+    <string name="pref_tts_open_system_settings">Settyansow system tekst-dhe-areth</string>
+    <string name="pref_tts_no_system_tts">Settyansow tekst-dhe-areth na kavosys, Os ta sur gas devis skoodhya y?</string>
+    <string name="drive_through">Drivya-dredh</string>
+    <string name="self_service">Omgonis</string>
+    <string name="power_save_dialog_summary">Rag navygacyon moggha, ni komendya ungallosegi fordh batri yn settyansow kellgowser batri.</string>
+    <string name="stop_track_recording">Finsya Rekordyans Lergh</string>
+    <string name="stop_without_saving">Hedhi Rekordyans Lergh</string>
+    <string name="continue_recording">Pesya Rekordya</string>
+    <string name="track_recording_alert_title">Sawya yn Lyververkys ha Lerghow?</string>
+    <string name="track_recording_toast_nothing_to_save">Lergh yw gwag - mann rag sawyans</string>
+    <string name="error_no_file_manager_app">Anabel diskwedhes fenester dewis restrenva dre reson app fytti vyth yw leys war gas devis. Mar pleg, lea unn dyghtyer restrennow ha dasassaya.</string>
+    <string name="uri_open_location_failed">App leys vyth may gallos ygeri an tyller</string>
+    <string name="pref_left_button_disable">Ungallosegi</string>
+    <string name="pref_backup_title">Fardel ewnans gans lyververkys ha lerghow</string>
+    <string name="pref_backup_summary">Gul yn awtomatek unn fardel gans data rag ewnans yn unn restrenva war gas devis</string>
+    <string name="pref_backup_now_title">Gul y lemmyn</string>
+    <string name="pref_backup_now_summary">Gul a\'n par na fardel a-dhesempis</string>
+    <string name="pref_backup_now_summary_progress">Yn avonsyans…</string>
+    <string name="pref_backup_now_summary_ok">Sewena</string>
+    <string name="pref_backup_now_summary_empty_lists">Lyververkys ha lerghow vyth rag gul unn fardel</string>
+    <string name="pref_backup_now_summary_failed">Y fyllis gul unn fardel</string>
+    <string name="pref_backup_now_summary_folder_unavailable">An restrenva dewisys yw ankavadow</string>
+    <string name="pref_backup_status_summary_success">Gwrians sewen a-dhiwedhes</string>
+    <string name="pref_backup_location_title">Tyller</string>
+    <string name="pref_backup_location_summary_initial">Mar pleg, dewis unn restrenva a-dherag ha grontya gront</string>
+    <string name="pref_backup_history_title">Niver a fardellow dhe gwitha</string>
+    <string name="pref_backup_interval_title">Gul fardellow yn awtomatek</string>
+    <string name="backup_interval_manual_only">Marow (dre dhorn hepken)</string>
+    <string name="dialog_report_error_missing_folder">An tyller dewisys yw ankavadow po redya-hepken. Dewis unn tyller aral, mar pleg.</string>
+    <string name="dialog_report_error_with_logs">Mar pleg danvon unn derivas error dhe ni:\n - \"Gallosegi kovadhow\" yn an settyansow\n - Dasleverel yn diogel an kudyn\n - yn an skrin \"A-dro ha Gweres\", levna an boton \"Derivas unn kudyn\" ha danvon der ebost po keskows\n - ungallosegi kovadhow</string>
+    <string name="route_type">Eghen kerdh</string>
+    <string name="open_now">Ygeri lemmyn</string>
+    <string name="closed_now">Degeys lemmyn</string>
+    <string name="at">dhe %s</string>
+    <string name="pref_tts_no_system_tts_short">Jynn tekst-dhe-areth kavosys vyth, checkya an settyansow app</string>
+    <string name="navigation_start_tts_message">"Dalleth navygacyon, yeth lev: "</string>
+    <string name="navigation_start_tts_disabled_message">Lenna danvonadow marow: jynn tekst-dhe-areth ankavadow</string>
+    <string name="offline_explanation_text">Unn mappa res iskargys rag gweles ha viajya an arenebedh.\nIskarga mappys rag arenebedhow may hwi mynnes viajya dhe.</string>
+    <string name="list_description_empty">Golegi an rol rag addya unn deskrifans</string>
+    <string name="advanced">Avonsys</string>
+    <string name="download_resources_custom_url_title">Servell Mappa Personel</string>
+    <string name="download_resources_custom_url_message">Aslea an servell defowt devnydhys rag iskargow mappa. Gwitha gwag rag devnydhya an servell CoMaps defowt.</string>
+    <string name="download_resources_custom_url_summary_none">Anavleythys</string>
+    <string name="download_resources_custom_url_error_scheme">Mar pleg, ynworra unn URL may dalleth gans http:// po https://</string>
 </resources>

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

@@ -900,5 +900,5 @@
     <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
     <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
     <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
-    <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
+    <string name="download_resources_custom_url_error_scheme">Įveskite URL adresą, prasidedantį „http://“ arba „https://“</string>
 </resources>

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

@@ -897,5 +897,5 @@
     <string name="download_resources_custom_url_title">Servidor de Mapas Personalizado</string>
     <string name="download_resources_custom_url_message">Substitua o servidor padrão usado para baixar mapas. Deixe em branco para usar o servidor padrão do CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">Não definido</string>
-    <string name="download_resources_custom_url_error_scheme">Insira um URL completo começando com https:// e terminando com /</string>
+    <string name="download_resources_custom_url_error_scheme">Insira uma URL começando com http:// ou https://</string>
 </resources>

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

@@ -913,5 +913,5 @@
     <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
     <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
     <string name="download_resources_custom_url_summary_none">Indefinido</string>
-    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor, insira um URL começando com http:// ou https://</string>
 </resources>

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

@@ -73,11 +73,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Add a New List</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Bookmark List Name</string>
+    <string name="bookmark_set_name">List Name</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bookmarks</string>
+    <string name="bookmarks">Places</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
+    <string name="bookmarks_and_tracks">Favorites</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Name</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -156,18 +156,18 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
+    <string name="share_bookmarks_email_subject">My CoMaps Favorites</string>
     <string name="share_bookmarks_email_body">Hello!
 \n
-\nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/
+\nAttached are my favorites; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/
 \n
 \nEnjoy travelling with CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Loading Bookmarks</string>
+    <string name="load_kmz_title">Loading Favorites</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.</string>
+    <string name="load_kmz_successful">Favorites loaded successfully! You can find them on the map or on the Favorites Manager screen.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted or defective.</string>
+    <string name="load_kmz_failed">Failed to load favorites. The file may be corrupted or defective.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">The file type is not recognized by the app:
 \n%1$s</string>
@@ -541,7 +541,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">More</string>
-    <string name="placepage_edit_bookmark_button">Edit Bookmark</string>
+    <string name="placepage_edit_bookmark_button">Edit Saved Place</string>
     <string name="placepage_personal_notes_hint">Personal notes (text or html)</string>
     <string name="editor_reset_edits_message">Discard all local changes?</string>
     <string name="editor_reset_edits_button">Discard changes</string>
@@ -635,17 +635,17 @@
     <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulate bad storage</string>
     <string name="error_enter_correct_name">Please enter a correct name</string>
-    <string name="bookmark_lists">Lists</string>
+    <string name="bookmark_lists">Favorite Lists</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Hide all</string>
     <string name="bookmark_lists_show_all">Show all</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bookmark</item>
-        <item quantity="other">%d bookmarks</item>
+        <item quantity="one">%d saved place</item>
+        <item quantity="other">%d saved places</item>
     </plurals>
     <string name="bookmarks_create_new_group">Create a new list</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Import Bookmarks and Tracks</string>
+    <string name="bookmarks_import">Import Favorites</string>
     <string name="bookmarks_error_message_share_general">Unable to share due to an application error</string>
     <string name="bookmarks_error_title_share_empty">Sharing error</string>
     <string name="bookmarks_error_message_share_empty">Cannot share an empty list</string>
@@ -675,7 +675,7 @@
     <string name="subway">Subway</string>
     <string name="layers_title">Map Styles and Layers</string>
     <string name="bookmarks_empty_list_title">This list is empty</string>
-    <string name="bookmarks_empty_list_message">To add a bookmark, tap a place on the map and then tap the star icon</string>
+    <string name="bookmarks_empty_list_message">To save a place, tap a place on the map and then tap the star icon</string>
     <string name="category_desc_more">…more</string>
     <string name="export_file">Export KMZ</string>
     <string name="export_file_gpx">Export GPX</string>
@@ -730,7 +730,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sort…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sort bookmarks</string>
+    <string name="sort_bookmarks">Sort favorites</string>
     <!-- Android -->
     <string name="by_default">By default</string>
     <!-- Android -->
@@ -797,8 +797,10 @@
     <string name="enable_show_on_lock_screen">Show on the lock screen</string>
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">When enabled, the app will work on the lockscreen even when the device is locked.</string>
-    <!-- Current language of the map! -->
+    <!-- Current language of the map -->
     <string name="change_map_locale">Map language</string>
+    <!-- Local language -->
+    <string name="pref_maplanguage_local">Local Language</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Map data from OpenStreetMap</string>
     <!-- Telegram group url for the "?" About page -->
@@ -811,7 +813,7 @@
     <string name="translated_om_site_url">https://comaps.app/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
-    <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 bookmark, 5 tracks -->
+    <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 saved place, 5 tracks -->
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Thank you for using our community-built maps!</string>
@@ -857,7 +859,7 @@
     <string name="browser_not_available">Web browser is not available</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Export all Bookmarks and Tracks</string>
+    <string name="bookmarks_export">Export all Places and Tracks</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Speech synthesis system settings</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -889,7 +891,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continue Recording</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Save into Bookmarks and Tracks?</string>
+    <string name="track_recording_alert_title">Save into Favorites?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Track is empty - nothing to save</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -903,13 +905,13 @@
     <string name="pref_left_button_disable">Disable</string>
 
     <!-- Settings "Backup" category: "Backup" title -->
-    <string name="pref_backup_title">Bookmarks and tracks backup</string>
+    <string name="pref_backup_title">Backup favorites</string>
     <string name="pref_backup_summary">Automatically backup to a folder on your device</string>
     <string name="pref_backup_now_title">Backup now</string>
     <string name="pref_backup_now_summary">Create a backup immediately</string>
     <string name="pref_backup_now_summary_progress">Backup in progress…</string>
     <string name="pref_backup_now_summary_ok">Backup completed successfully</string>
-    <string name="pref_backup_now_summary_empty_lists">No bookmarks and tracks to backup</string>
+    <string name="pref_backup_now_summary_empty_lists">No places and tracks to backup</string>
     <string name="pref_backup_now_summary_failed">Backup failed</string>
     <string name="pref_backup_now_summary_folder_unavailable">The backup folder is not available</string>
     <string name="pref_backup_status_summary_success">Last successful backup</string>
@@ -933,7 +935,7 @@
     <string name="pedestrian">Pedestrian</string>
     <string name="bicycle">Bicycle</string>
     <string name="ruler">Ruler</string>
-    <string name="bookmark_color">Bookmark color</string>
+    <string name="bookmark_color">Color for Favorite</string>
     <string name="about_help">About &amp; Help</string>
     <string name="open_now">Open now</string>
     <string name="closed_now">Closed now</string>

android/app/src/main/res/values/styles-text.xml

@@ -98,16 +98,6 @@
     <item name="android:textColorHint">@color/text_light_hint</item>
   </style>
 
-  <style name="MwmTextAppearance.Toolbar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-    <item name="android:textColor">@color/text_light</item>
-    <item name="android:textColorHint">@color/text_light_hint</item>
-  </style>
-
-  <style name="MwmTextAppearance.Toolbar.Title.Light">
-    <item name="android:textColor">@color/bg_cards</item>
-  </style>
-
   <style name="MwmTextAppearance.NavMenu">
     <item name="android:textStyle">bold</item>
   </style>

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

@@ -143,8 +143,7 @@
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="titleTextColor">@color/text_light</item>
     <item name="buttonGravity">center_vertical</item>
   </style>
 
@@ -169,9 +168,7 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
-    <item name="android:background">@android:color/transparent</item>
-  </style>
+  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView" />
 
   <style name="MwmWidget.TextView.Item">
     <item name="android:layout_width">match_parent</item>

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

@@ -253,8 +253,9 @@
     <item name="android:fontFamily">@string/robotoMedium</item>
   </style>
 
-  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
+  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.M3.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
+    <item name="android:background">?attr/colorSurfaceContainerHigh</item>
   </style>
 
   <style name="MwmTheme.Downloader">

android/app/src/main/res/xml/locales_config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Some languages not supported by Android require to be specified here to be applied -->
     <locale android:name="en" />
     <locale android:name="af" />
     <locale android:name="ar" />
@@ -26,6 +27,7 @@
     <locale android:name="in" />
     <locale android:name="it" />
     <locale android:name="ja" />
+    <locale android:name="kw" />
     <locale android:name="ko" />
     <locale android:name="lt" />
     <locale android:name="lv" />

android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp

@@ -1490,6 +1490,12 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv
   g_framework->Set3dMode(allow3d, allow3dBuildings);
 }
 
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCarScreenMode(JNIEnv * env, jclass, jboolean enabled)
+{
+  if (g_framework)
+    frm()->SetCarScreenMode(static_cast<bool>(enabled));
+}
+
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
 {
   bool enabled;

android/sdk/src/main/java/app/organicmaps/sdk/Framework.java

@@ -280,6 +280,8 @@ public class Framework
 
   public static native void nativeSet3dMode(boolean allow3d, boolean allow3dBuildings);
 
+  public static native void nativeSetCarScreenMode(boolean enabled);
+
   public static native boolean nativeGetAutoZoomEnabled();
 
   public static native void nativeSetAutoZoomEnabled(boolean enabled);

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Handler;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresPermission;
@@ -16,6 +17,9 @@ import androidx.annotation.UiThread;
 import androidx.core.content.ContextCompat;
 import androidx.core.location.GnssStatusCompat;
 import androidx.core.location.LocationManagerCompat;
+
+import org.chromium.base.ObserverList;
+
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
@@ -25,7 +29,8 @@ import app.organicmaps.sdk.util.Config;
 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.HashMap;
 
 public class LocationHelper implements BaseLocationProvider.Listener
 {
@@ -56,6 +61,12 @@ public class LocationHelper implements BaseLocationProvider.Listener
   private Handler mHandler;
   private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;
 
+  private static final double INTERVAL_PROVIDER_DECISION = 3.0; // seconds
+  private final HashMap<String, Integer> mProviderLocationCounts = new HashMap<>();
+  private final HashMap<String, Float> mProviderAccuracyMeans = new HashMap<>();
+  private double mTimeAtLastProviderChange = Double.NaN;
+  private String mCurrentProvider = null;
+
   @NonNull
   private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
     @Override
@@ -187,7 +198,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
   @Override
   public void onLocationChanged(@NonNull Location location)
   {
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
 
     if (!isActive())
     {
@@ -201,20 +211,80 @@ public class LocationHelper implements BaseLocationProvider.Listener
       return;
     }
 
-    if (mSavedLocation != null)
+    updateProviderDecision(location);
+    if (mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider()))
     {
-      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
-      {
-        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
-        return;
-      }
+      Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+      return;
     }
 
+    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+
     mSavedLocation = location;
     mMyPosition = null;
     notifyLocationUpdated();
   }
 
+  private void updateProviderDecision(Location location)
+  {
+    if (Double.isNaN(mTimeAtLastProviderChange))
+      mTimeAtLastProviderChange = location.getElapsedRealtimeNanos() * 1.0E-9;
+
+    String provider = location.getProvider();
+
+    Integer cnt = mProviderLocationCounts.getOrDefault(provider, 0);
+    Float avg = mProviderAccuracyMeans.getOrDefault(provider, 0.0f);
+
+    if (cnt == null || avg == null)
+    {
+      mProviderLocationCounts.clear();
+      mProviderAccuracyMeans.clear();
+      return;
+    }
+
+    int count = cnt;
+    float average = avg;
+
+    float accuracy = location.getAccuracy();
+    int newCount = count + 1;
+    float newAverage = (count * average + accuracy) / newCount;
+
+    mProviderLocationCounts.put(provider, newCount);
+    mProviderAccuracyMeans.put(provider, newAverage);
+
+    double currentTime = location.getElapsedRealtimeNanos();
+    double timeDiff = (currentTime - mTimeAtLastProviderChange) * 1.0E-9;
+
+    if (timeDiff > INTERVAL_PROVIDER_DECISION)
+    {
+      mCurrentProvider = getMinAccuracyProvider();
+      Logger.d(TAG, "Selected: " + mCurrentProvider + ", with acc. " + mProviderAccuracyMeans.get(mCurrentProvider));
+      mTimeAtLastProviderChange = currentTime;
+      mProviderLocationCounts.clear();
+      mProviderAccuracyMeans.clear();
+    }
+  }
+
+  private String getMinAccuracyProvider()
+  {
+    String minAccuracyProvider = null;
+    float minAccuracy = Float.MAX_VALUE;
+    for (String p : mProviderAccuracyMeans.keySet())
+    {
+      Float pAcc = mProviderAccuracyMeans.get(p);
+      if (pAcc == null)
+        continue;
+      float pAccuracy = pAcc;
+
+      if (pAccuracy < minAccuracy)
+      {
+        minAccuracy = pAccuracy;
+        minAccuracyProvider = p;
+      }
+    }
+    return minAccuracyProvider;
+  }
+
   // Used by GoogleFusedLocationProvider.
   @SuppressWarnings("unused")
   @Override

android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java

@@ -81,20 +81,6 @@ public class LocationUtils
     return location.getAccuracy() > 0.0f;
   }
 
-  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
-  {
-    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
-      return false;
-
-    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
-    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
-      return true;
-
-    double speed = Math.max(DEFAULT_SPEED_MPS, (newLocation.getSpeed() + lastLocation.getSpeed()) / 2.0);
-    double lastAccuracy = lastLocation.getAccuracy() + speed * LocationUtils.getTimeDiff(lastLocation, newLocation);
-    return newLocation.getAccuracy() < lastAccuracy;
-  }
-
   public static boolean areLocationServicesTurnedOn(@NonNull Context context)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)

android/sdk/src/main/res/values-b+sr+Latn/strings.xml

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="mb">MB</string>
+</resources>

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

@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="type.addr_interpolation">Adresa/Blok</string>
+    <string name="type.addr_interpolation.even">Adresa/Blok</string>
+    <string name="type.addr_interpolation.odd">Adresa/Blok</string>
+    <string name="type.aerialway">Vazdušni put</string>
+    <string name="type.aerialway.mixed_lift">Kombinovana žičara</string>
+</resources>

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

@@ -18,4 +18,11 @@
     <string name="month_ago">%s মাস আগে</string>
     <string name="year_ago">%s বছর আগে</string>
     <string name="core_entrance">প্রবেশ</string>
+    <string name="core_placepage_unknown_place">মানচিত্র বিন্দু</string>
+    <string name="subway_data_unavailable">সাবওয়ে মানচিত্র অনুপলব্ধ</string>
+    <string name="core_exit">প্রস্থান</string>
+    <string name="weeks_ago">%s সপ্তাহ আগে</string>
+    <string name="months_ago">%s মাস আগে</string>
+    <string name="years_ago">%s বছর আগে</string>
+    <string name="m">মি</string>
 </resources>

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

@@ -139,4 +139,37 @@
     <string name="type.public_transport">গণপরিবহন</string>
     <string name="type.route.ferry">ফেরি</string>
     <string name="type.amenity.studio">মিডিয়া স্টুডিও</string>
+    <string name="type.barrier.gate">গেট</string>
+    <string name="type.barrier.kissing_gate">কিসিঙ্গ গেট</string>
+    <string name="type.barrier.lift_gate">লিফ্ট গেট</string>
+    <string name="type.barrier.wicket_gate">উইকেট গেট</string>
+    <string name="type.barrier.swing_gate">সুইঙ্গ গেট</string>
+    <string name="type.aeroway.helipad">হেলিপ্যাড</string>
+    <string name="type.amenity.bicycle_parking.covered">আচ্ছাদিত সাইকেল পার্কিং</string>
+    <string name="type.amenity.boat_rental">নৌকা ভাড়া</string>
+    <string name="type.amenity.bicycle_rental">সাইকেল ভাড়া</string>
+    <string name="type.man_made.telescope">দূরবিক্ষণ</string>
+    <string name="type.man_made.telescope.optical">দূরবিক্ষণ (আলোক রশ্মি)</string>
+    <string name="type.man_made.telescope.radio">দূরবিক্ষণ (রেডিও রশ্মি)</string>
+    <string name="type.man_made.telescope.gamma">দূরবিক্ষণ (গামা রশ্মি)</string>
+    <string name="type.man_made.observatory">পর্যবেক্ষণাগার</string>
+    <string name="type.amenity.car_rental">গাড়ি ভাড়া</string>
+    <string name="type.amenity.motorcycle_rental">মোটরসাইকেল ভাড়া</string>
+    <string name="type.amenity.cinema">সিনেমা</string>
+    <string name="type.amenity.shelter.public_transport">আশ্রয়</string>
+    <string name="type.amenity.post_office">পোস্ট অফিস</string>
+    <string name="type.amenity.restaurant">রেস্টুরেন্ট</string>
+    <string name="type.amenity.taxi">ট্যাক্সি স্ট্যান্ড</string>
+    <string name="type.shop.mobile_phone">মোবাইল ফোনের দোকান</string>
+    <string name="type.addr_interpolation.even">ঠিকানা/ব্লক</string>
+    <string name="type.addr_interpolation.odd">ঠিকানা/ব্লক</string>
+    <string name="type.natural.water.wastewater">নিকাশী জল</string>
+    <string name="type.man_made.wastewater_plant">নিকাশী জল পরিশোধনাগার</string>
+    <string name="type.man_made.water_tap.drinking_water_no">জলের কল</string>
+    <string name="type.man_made.water_well.drinking_water_no">পাতকুয়া</string>
+    <string name="type.natural.water.reservoir">জলাধার</string>
+    <string name="type.natural.water.basin">অববাহিকা</string>
+    <string name="type.waterway">জলপথ</string>
+    <string name="type.waterway.canal">ক্যানাল</string>
+    <string name="type.waterway.drain">ড্রেন</string>
 </resources>

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

@@ -1463,4 +1463,5 @@
     <string name="type.entrance.house">Husdør</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Yogastudie</string>
     <string name="type.leisure.sports_centre.sport.climbing">Klatrehal</string>
+    <string name="type.aeroway.gate">Gate</string>
 </resources>

android/sdk/src/main/res/values-en-rAU/types_strings.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.amenity.bbq">Barbecue</string>
+    <string name="type.amenity.bicycle_parking">Bike Parking</string>
+    <string name="type.amenity.bicycle_parking.covered">Covered Bike Parking</string>
+    <string name="type.amenity.bicycle_rental">Bike Rental</string>
+    <string name="type.amenity.bicycle_repair_station">Bike Repair Station</string>
+    <string name="type.amenity.motorcycle_rental">Motorbike Rental</string>
+    <string name="type.amenity.childcare">Childcare</string>
+    <string name="type.amenity.charging_station.bicycle">Bike Charging Station</string>
+    <string name="type.amenity.fuel">Servo</string>
+    <string name="type.amenity.motorcycle_parking">Motorbike Parking</string>
+    <string name="type.amenity.parking.multi.storey.fee">Multi Story Parking</string>
+    <string name="type.amenity.parking.multi.storey">Multi Story Parking</string>
+    <string name="type.amenity.telephone">Payphone</string>
+    <string name="type.amenity.veterinary">Vet</string>
+    <string name="type.highway.cycleway">Bike Path</string>
+    <string name="type.highway.cycleway.permissive">Bike Path</string>
+    <string name="type.highway.footway">Footpath</string>
+    <string name="type.highway.motorway">Freeway</string>
+    <string name="type.highway.motorway.bridge">Freeway Bridge</string>
+    <string name="type.highway.motorway.tunnel">Freeway Tunnel</string>
+    <string name="type.highway.motorway_link">Freeway Ramp</string>
+    <string name="type.area_highway.cycleway">Bike Path</string>
+    <string name="type.area_highway.footway">Footpath</string>
+    <string name="type.area_highway.motorway">Freeway</string>
+</resources>

android/sdk/src/main/res/values-en-rGB/strings.xml

@@ -2,4 +2,5 @@
 <resources>
     <string name="postal_code">Postcode</string>
     <string name="subway_data_unavailable">Metro map is unavailable</string>
+    <string name="mb">MB</string>
 </resources>

android/sdk/src/main/res/values-en-rGB/types_strings.xml

@@ -287,4 +287,6 @@
     <string name="type.power.pole">Power Pole</string>
     <string name="type.man_made.utility_pole">Utility Pole</string>
     <string name="type.railway.station.subway.qingdao">Metro Station</string>
+    <string name="type.addr_interpolation">Address/Block</string>
+    <string name="type.addr_interpolation.even">Address/Block</string>
 </resources>

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

@@ -627,7 +627,7 @@
     <string name="type.landuse.vineyard">Viñedo</string>
     <string name="type.leisure">Ocio</string>
     <string name="type.leisure.common">Zona pública</string>
-    <string name="type.leisure.dog_park">Parque para perros</string>
+    <string name="type.leisure.dog_park">Parque canino</string>
     <string name="type.leisure.fitness_centre">Centro de fitnes</string>
     <string name="type.leisure.fitness_station">Parque de fitnes</string>
     <string name="type.leisure.dance">Salón de baile</string>

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

@@ -1495,4 +1495,10 @@
     <string name="type.man_made.mast.communication">Sidemast</string>
     <string name="type.shop.beauty.nails">Küünestuudio</string>
     <string name="type.amenity.hydrant">Kastmishüdrant</string>
+    <string name="type.lateral.port">Pakpoordis</string>
+    <string name="type.lateral.starboard">Tüürpoordis</string>
+    <string name="type.cardinal.east">Idas</string>
+    <string name="type.cardinal.north">Põhjas</string>
+    <string name="type.cardinal.south">Lõunas</string>
+    <string name="type.cardinal.west">Läänes</string>
 </resources>

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

@@ -50,7 +50,7 @@
     <string name="type.amenity.money_transfer">Treusworrans Mona</string>
     <string name="type.amenity.music_school">Skol-ilowek</string>
     <string name="type.amenity.flight_school">Skol Ayr</string>
-    <string name="type.amenity.language_school">Skol Tavas</string>
+    <string name="type.amenity.language_school">Skol Yeth</string>
     <string name="type.office.diplomatic">Kanatti</string>
     <string name="type.office.security">Buro Gwithyas Diogeledh</string>
     <string name="type.building.guardhouse">Borth Gwithyas Diogeledh</string>
@@ -123,7 +123,7 @@
     <string name="type.toilets.yes">Attesva</string>
     <string name="type.amenity.townhall">Odyans</string>
     <string name="type.amenity.university">Pennskol</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Jynn Tokyn</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Jynn Tokyn rag Karyans Poblek</string>
     <string name="type.amenity.parcel_locker">Amari Fardel</string>
     <string name="type.amenity.vehicle_inspection">Hwithrans Karr</string>
     <string name="type.amenity.vending_machine.fuel">Pomp Petrol</string>
@@ -278,7 +278,7 @@
     <string name="type.healthcare.podiatrist">Medhek Troos</string>
     <string name="type.healthcare.psychotherapist">Yaghheans Brysoniethel</string>
     <string name="type.healthcare.sample_collection">Kres Kuntel Sampel</string>
-    <string name="type.healthcare.speech_therapist">Pathologydh Kows ha Tavas</string>
+    <string name="type.healthcare.speech_therapist">Pathologydh Kows ha Yeth</string>
     <string name="type.highway">Fordh Veur</string>
     <string name="type.highway.bridleway">Marghlergh</string>
     <string name="type.highway.bridleway.bridge">Pons</string>
@@ -861,4 +861,550 @@
     <string name="type.railway.subway_entrance.hamburg">Entrans Metro</string>
     <string name="type.railway.subway_entrance.helsinki">Entrans Metro</string>
     <string name="type.railway.subway_entrance.hiroshima">Entrans Metro</string>
+    <string name="type.aerialway">Hyns Ayrel</string>
+    <string name="type.aerialway.drag_lift">Yskynnell Drayl</string>
+    <string name="type.aerialway.mixed_lift">Yskynnell Kemyskys</string>
+    <string name="type.aerialway.station">Gorsav Hyns Ayrel</string>
+    <string name="type.aeroway">Isframweyth Ayrel</string>
+    <string name="type.aeroway.taxiway">Hyns Ayrennow</string>
+    <string name="type.amenity.bench.backless">Bynk heb Keyn</string>
+    <string name="type.amenity.car_sharing">Kevrennewgh Karr</string>
+    <string name="type.man_made.telescope.optical">Pellweler (Optek)</string>
+    <string name="type.man_made.telescope.gamma">Pellweler (Gamma)</string>
+    <string name="type.amenity.casino">Casino</string>
+    <string name="type.amenity.gambling">Hapwaryans</string>
+    <string name="type.leisure.adult_gaming_centre">Kres Gwariow Tevesik</string>
+    <string name="type.amenity.charging_station">Poyntys-karga</string>
+    <string name="type.amenity.charging_station.bicycle">Poyntys-karga Diwros</string>
+    <string name="type.amenity.charging_station.motorcar">Poyntys-karga Karr</string>
+    <string name="type.amenity.charging_station.motorcar.small">Poynt-karga Karr</string>
+    <string name="type.leisure.bowling_alley">Kres Gwari Pelyow</string>
+    <string name="type.amenity.compressed_air">Ayr Strooth</string>
+    <string name="type.amenity.driving_school">Skol Lewya</string>
+    <string name="type.amenity.sailing_school">Skol Golya</string>
+    <string name="type.amenity.prep_school">Skol Ragober</string>
+    <string name="type.amenity.food_court">Lys Boos</string>
+    <string name="type.amenity.hunting_stand">Tour Helgh</string>
+    <string name="type.amenity.lounger">Gweli-worwedha</string>
+    <string name="type.amenity.mobile_money_agent">Maynor Mobile Money</string>
+    <string name="type.amenity.nursing_home">Annedh-witha</string>
+    <string name="type.amenity.parking.street_side">Parkans ryb Stret</string>
+    <string name="type.amenity.parking.street_side.fee">Parkans ryb Stret</string>
+    <string name="type.amenity.parking.street_side.private">Parkans Privedh ryb Stret</string>
+    <string name="type.amenity.parking.lane">Parkyans war Stret</string>
+    <string name="type.amenity.parking.lane.fee">Parkyans war Stret</string>
+    <string name="type.amenity.parking.lane.private">Parkyans Privedh war Stret</string>
+    <string name="type.amenity.parking_space">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.permissive">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.private">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.underground">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.disabled">Spas Parkyans Evredhek</string>
+    <string name="type.amenity.car_pooling">Kevrennewgh Karr</string>
+    <string name="type.amenity.payment_centre">Kres Talas</string>
+    <string name="type.amenity.payment_terminal">Termynal Talas</string>
+    <string name="type.amenity.place_of_worship">Gordhyaji</string>
+    <string name="type.amenity.place_of_worship.christian.mormon">Eglos Mormon</string>
+    <string name="type.amenity.place_of_worship.christian.jehovahs_witness">Hel Jehovah\'s Witnesses</string>
+    <string name="type.amenity.place_of_worship.hindu">Tempel Hindu</string>
+    <string name="type.amenity.place_of_worship.shinto">Krerva Shinto</string>
+    <string name="type.amenity.place_of_worship.taoist">Tempel Taoist</string>
+    <string name="type.amenity.post_box">Kist lytherow</string>
+    <string name="type.post_office.post_partner">Keskoweth Post</string>
+    <string name="type.recycling.cartons">Kisten</string>
+    <string name="type.amenity.sanitary_dump_station">Poynt Skollva Tankow Septyk</string>
+    <string name="type.amenity.shelter.basic_hut">Krellas</string>
+    <string name="type.amenity.shelter.lean_to">Skovva Posa</string>
+    <string name="type.amenity.stripclub">Klub Omdhiwiskans</string>
+    <string name="type.amenity.taxi">Poynt Taksi</string>
+    <string name="type.amenity.vending_machine">Jynn-Gwertha</string>
+    <string name="type.amenity.vending_machine.cigarettes">Jynn-Cigarigow</string>
+    <string name="type.amenity.vending_machine.coffee">Jynn-Koffi</string>
+    <string name="type.amenity.vending_machine.condoms">Jynn-Kondoms</string>
+    <string name="type.amenity.vending_machine.drinks">Jynn-Diwosow</string>
+    <string name="type.amenity.vending_machine.food">Jynn-Boos</string>
+    <string name="type.amenity.vending_machine.newspapers">Jynn-Paper-Nowodhow</string>
+    <string name="type.amenity.vending_machine.parking_tickets">Jynn-Feow-Parkya</string>
+    <string name="type.amenity.vending_machine.sweets">Jynn-Hwegennow</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Jynn-Seghyer-Kawgh-Ki</string>
+    <string name="type.amenity.waste_transfer_station">Poynt Treusporth Tredn</string>
+    <string name="type.amenity.water_point">Poynt Daslenwel Dowrarghow</string>
+    <string name="type.amenity.water_point.drinking_water_no">Poynt Daslenwel Dowrarghow</string>
+    <string name="type.barrier.bollard">Peul</string>
+    <string name="type.natural.water.moat">Kleys Kastel</string>
+    <string name="type.natural.water.wastewater">Dowr Wast</string>
+    <string name="type.barrier.lift_gate">Yet ow Sevel</string>
+    <string name="type.barrier.retaining_wall">Fos Gwitha</string>
+    <string name="type.barrier.turnstile">Yet Rosellek</string>
+    <string name="type.barrier.swing_gate">Yet Leska</string>
+    <string name="type.boundary.protected_area">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.2">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.3">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.4">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.5">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.6">Arenebedh Gwithys</string>
+    <string name="type.craft.beekeeper">Gonis Bewin</string>
+    <string name="type.craft.brewery">Bragji Kreft</string>
+    <string name="type.craft.caterer">Provier Metherieth</string>
+    <string name="type.craft.confectionery">Gwerthji Hwegennow</string>
+    <string name="type.craft.grinding_mill">Melin-Rolya</string>
+    <string name="type.craft.hvac">Ayrewnans</string>
+    <string name="type.craft.key_cutter">Gwrier a Alhwedhow</string>
+    <string name="type.craft.locksmith">Florener</string>
+    <string name="type.craft.sawmill">Melin-Prenn</string>
+    <string name="type.cuisine.bagel">Bagel</string>
+    <string name="type.cuisine.balkan">Balkek</string>
+    <string name="type.cuisine.bavarian">Bavariek</string>
+    <string name="type.cuisine.buschenschank">Buschenschank</string>
+    <string name="type.cuisine.caribbean">Karibiek</string>
+    <string name="type.cuisine.crepe">Krampoth</string>
+    <string name="type.cuisine.deli">Deli</string>
+    <string name="type.cuisine.diner">Dinerji</string>
+    <string name="type.cuisine.filipino">Felypinek</string>
+    <string name="type.aerialway.cable_car">Karr Fun</string>
+    <string name="type.aerialway.gondola">Karr Fun</string>
+    <string name="type.amenity">Le</string>
+    <string name="type.leisure.amusement_arcade">Kres Gwari Gwydhyow</string>
+    <string name="type.boundary.protected_area.1">Arenebedh Gwithys</string>
+    <string name="type.cuisine.friture">Asklos</string>
+    <string name="type.cuisine.heuriger">Heuriger</string>
+    <string name="type.cuisine.hotdog">Hotdog</string>
+    <string name="type.cuisine.kebab">Kebab</string>
+    <string name="type.cuisine.malagasy">Malagasiek</string>
+    <string name="type.cuisine.ramen">Ramen</string>
+    <string name="type.cuisine.savory_pancakes">Krampothennow</string>
+    <string name="type.cuisine.seafood">Boos a an Mor</string>
+    <string name="type.cuisine.soba">Soba</string>
+    <string name="type.cuisine.tapas">Tapas</string>
+    <string name="type.emergency.defibrillator">Jynn Dastalleth Kolon</string>
+    <string name="type.emergency.fire_hydrant">Poynt Dowr rag Tangasoryon</string>
+    <string name="type.amenity.hydrant">Poynt Dowr rag Tiogow</string>
+    <string name="type.beacon.cardinal.east">Beacon Cardinek</string>
+    <string name="type.beacon.cardinal.north">Beacon Cardinek</string>
+    <string name="type.beacon.cardinal.south">Beacon Cardinek</string>
+    <string name="type.beacon.cardinal.west">Beacon Cardinek</string>
+    <string name="type.beacon.isolated_danger">Beacon Enyshes Peryl</string>
+    <string name="type.beacon.lateral.port">Beacon Tenewen</string>
+    <string name="type.beacon.lateral.starboard">Beacon Tenewen</string>
+    <string name="type.beacon.safe_water">Beacon Dowr Saw</string>
+    <string name="type.beacon.special_purpose">Beacon Arbennik</string>
+    <string name="type.buoy.cardinal.east">Morverk Cardinek</string>
+    <string name="type.buoy.cardinal.north">Morverk Cardinek</string>
+    <string name="type.buoy.cardinal.south">Morverk Cardinek</string>
+    <string name="type.buoy.cardinal.west">Morverk Cardinek</string>
+    <string name="type.buoy.isolated_danger">Morverk Enyshes Peryl</string>
+    <string name="type.buoy.lateral.port">Morverk Tenewen</string>
+    <string name="type.buoy.lateral.starboard">Morverk Tenewen</string>
+    <string name="type.buoy.safe_water">Morverk Dowr Saw</string>
+    <string name="type.buoy.special_purpose">Morverk Arbennik</string>
+    <string name="type.spherical_buoy.cardinal.east">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.cardinal.north">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.cardinal.south">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.cardinal.west">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.isolated_danger">Morverk Pelyek Enyshes Peryl</string>
+    <string name="type.spherical_buoy.lateral.port">Morverk Pelyek Tenewen</string>
+    <string name="type.spherical_buoy.lateral.starboard">Morverk Pelyek Tenewen</string>
+    <string name="type.spherical_buoy.safe_water">Morverk Pelyek Dowr Saw</string>
+    <string name="type.spherical_buoy.special_purpose">Morverk Pelyek Arbennik</string>
+    <string name="type.highway.raceway">Fordh Resek</string>
+    <string name="type.landuse.plant_nursery">Meythrinva</string>
+    <string name="type.leisure.escape_game">Roum Diank</string>
+    <string name="type.leisure.fitness_station">Poynt Yeghes Korfek</string>
+    <string name="type.leisure.hackerspace">Spas Hacker</string>
+    <string name="type.leisure.ice_rink">Gwel Skes Yey</string>
+    <string name="type.leisure.slipway">Fordh Skath</string>
+    <string name="type.leisure.sports_centre.sport.padel">Kres Padel</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Kres Pelota</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Kres Sedh Scuba</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Kres Setha gans Gonn</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Kres Yoga</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Studhla Yoga</string>
+    <string name="type.leisure.water_park">Park Dowr</string>
+    <string name="type.man_made.breakwater">Lett Mordonnow</string>
+    <string name="type.man_made.cutline">Lin a Gwedhennow Treghys</string>
+    <string name="type.man_made.silo">Silo</string>
+    <string name="type.man_made.storage_tank">Tank</string>
+    <string name="type.man_made.flare">Tour Flamm Gass</string>
+    <string name="type.military.bunker">Dinas yn-dann Dhor</string>
+    <string name="type.mountain_pass">Nans Menydh</string>
+    <string name="type.natural.saddle">Diber Menydh</string>
+    <string name="type.natural.strait">Kons</string>
+    <string name="type.natural.wetland">Byng</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Hal Holanek an Mortid</string>
+    <string name="type.natural.wetland.tidalflat">Stag Gwastas an Mortid</string>
+    <string name="type.office.estate_agent">Gwerther Pyth</string>
+    <string name="type.power.generator.gas">Tredanva Gass</string>
+    <string name="type.power.generator.hydro">Tredanva Dowr</string>
+    <string name="type.railway.funicular">Hyns Horn Mena</string>
+    <string name="type.railway.funicular.bridge">Pons Hyns Horn Mena</string>
+    <string name="type.railway.funicular.tunnel">Kowfordh Hyns Horn Mena</string>
+    <string name="type.railway.narrow_gauge">Hyns Horn Ynn</string>
+    <string name="type.railway.narrow_gauge.bridge">Pons Hyns Horn Ynn</string>
+    <string name="type.railway.narrow_gauge.tunnel">Kowfordh Hyns Horn Ynn</string>
+    <string name="type.railway.preserved">Hyns Horn Istorek</string>
+    <string name="type.railway.preserved.bridge">Pons Hyns Horn Istorek</string>
+    <string name="type.railway.preserved.tunnel">Kowfordh Hyns Horn Istorek</string>
+    <string name="type.railway.rail.spur">Hyns Horn Berr</string>
+    <string name="type.railway.rail.service">Hyns Horn Servis</string>
+    <string name="type.railway.rail.utility.bridge">Pons Hyns Horn Servis</string>
+    <string name="type.railway.rail.spur.bridge">Pons Hyns Horn Berr</string>
+    <string name="type.railway.rail.service.bridge">Pons Hyns Horn Servis</string>
+    <string name="type.railway.rail.utility.tunnel">Kowfordh Hyns Horn Servis</string>
+    <string name="type.railway.rail.spur.tunnel">Kowfordh Hyns Horn Berr</string>
+    <string name="type.railway.rail.service.tunnel">Kowfordh Hyns Horn Servis</string>
+    <string name="type.railway.station.funicular">Gorsav Hyns Horn Mena</string>
+    <string name="type.railway.subway.bridge">Pons Metro</string>
+    <string name="type.railway.subway.tunnel">Kowfordh Metro</string>
+    <string name="type.railway.subway_entrance.hongkong">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.isfahan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.istanbul">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.izmir">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kazan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kharkiv">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kiev">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kobe">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kolkata">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kunming">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kyoto">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.la">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lausanne">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lille">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.london">Entrans Tube</string>
+    <string name="type.railway.tram">Linen Tram</string>
+    <string name="type.railway.tram.bridge">Pons Tram</string>
+    <string name="type.railway.tram.tunnel">Kowfordh Tram</string>
+    <string name="type.railway.tram_stop">Salva Tram</string>
+    <string name="type.route.ferry">Kowbalhyns</string>
+    <string name="type.shop">Gwerthji</string>
+    <string name="type.shop.alcohol">Gwerthji Las</string>
+    <string name="type.shop.bakery">Popti</string>
+    <string name="type.shop.bathroom_furnishing">Gwerthji Stevel-Omwolghi</string>
+    <string name="type.shop.beauty">Gwerthji Tekter</string>
+    <string name="type.shop.beauty.nails">Le Ewin</string>
+    <string name="type.shop.beverages">Gwerthji Swynennow</string>
+    <string name="type.shop.bicycle">Gwerthji Diwros</string>
+    <string name="type.shop.bookmaker">Gwrier Lyverow</string>
+    <string name="type.shop.books">Gwerthji Lyver</string>
+    <string name="type.shop.butcher">Kigti</string>
+    <string name="type.shop.cannabis">Gwerthji Kanabys</string>
+    <string name="type.shop.car">Gwerthji Karr</string>
+    <string name="type.shop.car_parts">Gwerthji Darnow Karr</string>
+    <string name="type.shop.car_repair">Jynner</string>
+    <string name="type.shop.car_repair.tyres">Mekanek Bonden</string>
+    <string name="type.shop.caravan">Gwerthji Karavan</string>
+    <string name="type.shop.carpet">Gwerthji Leurlen</string>
+    <string name="type.shop.chemist">Kymyst</string>
+    <string name="type.shop.chocolate">Gwerthji Choklet</string>
+    <string name="type.shop.clothes">Gwerthji Dillas</string>
+    <string name="type.shop.coffee">Gwerthji Koffi</string>
+    <string name="type.shop.computer">Gwerthji Amontyellow</string>
+    <string name="type.shop.confectionery">Gwerthji Hwegennow</string>
+    <string name="type.shop.convenience">Gwerthji Es</string>
+    <string name="type.shop.copyshop">Gwerthji Kopia</string>
+    <string name="type.shop.cosmetics">Gwerthji Tremmliw</string>
+    <string name="type.shop.curtain">Gwerthji Kroglen</string>
+    <string name="type.shop.deli">Gwerthji Deli</string>
+    <string name="type.shop.department_store">Gwerthji Asrannow</string>
+    <string name="type.shop.doityourself">Gwerthji Gwellheans Tre</string>
+    <string name="type.shop.dry_cleaning">Glanher Sygh</string>
+    <string name="type.railway.subway_entrance.lima">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lisboa">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lyon">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.madrid">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.malaga">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.manila">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.maracaibo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.mashhad">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.mecca">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.medellin">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.mexico">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.milan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.minsk">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.montreal">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.moscow">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.munchen">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.nagoya">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.newyork">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.nnov">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.novosibirsk">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.osaka">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.oslo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.palma">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.panama">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.paris">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.philadelphia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.pyongyang">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.rennes">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.rio">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.roma">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.rotterdam">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.samara">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.santiago">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.santo_domingo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.saopaulo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sapporo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sendai">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sf">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.shanghai">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.shenzhen">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.shiraz">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.singapore">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sofia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.spb">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.stockholm">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tabriz">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.taipei">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.taoyuan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tashkent">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tbilisi">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tehran">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tianjin">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tokyo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.valencia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.vienna">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.warszawa">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.washington">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.wuhan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.yerevan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.yokohama">Entrans Metro</string>
+    <string name="type.route">Hyns</string>
+    <string name="type.shop.electronics">Gwerthji Elektronek</string>
+    <string name="type.shop.erotic">Gwerthji Erotik</string>
+    <string name="type.shop.fabric">Gwerthji Gwias</string>
+    <string name="type.shop.farm">Gwerthji Amethva</string>
+    <string name="type.shop.fashion_accessories">Gwerthji Gweresoryon Kelvydh</string>
+    <string name="type.shop.florist">Flourydh</string>
+    <string name="type.shop.funeral_directors">Ynkleudhyer</string>
+    <string name="type.shop.furniture">Gwerthji Mebel</string>
+    <string name="type.shop.garden_centre">Gwerthji Jardin</string>
+    <string name="type.shop.gas">Gwerthji Gass</string>
+    <string name="type.shop.gift">Gwerthji Rohow</string>
+    <string name="type.shop.greengrocer">Gwerthji Losow</string>
+    <string name="type.shop.grocery">Gwerthji Gwara Boos</string>
+    <string name="type.shop.hairdresser">Barbour</string>
+    <string name="type.shop.hardware">Gwerthji Toulys</string>
+    <string name="type.shop.health_food">Gwerthji Sosten Yaghus</string>
+    <string name="type.shop.hearing_aids">Gwerthji Klewell</string>
+    <string name="type.shop.herbalist">Losower</string>
+    <string name="type.shop.hifi">Gwerthji HiFi</string>
+    <string name="type.shop.houseware">Gwerthji Gwara a\'n Mayni</string>
+    <string name="type.shop.jewelry">Joweler</string>
+    <string name="type.shop.kiosk">Kiosk</string>
+    <string name="type.shop.kitchen">Gwerthji Toulys Kegin</string>
+    <string name="type.shop.laundry">Golghva</string>
+    <string name="type.shop.mall">Kresen-Brenassa</string>
+    <string name="type.shop.beauty.day_spa">Spa</string>
+    <string name="type.shop.massage">Leuvdoser</string>
+    <string name="type.shop.mobile_phone">Gwerthji Kellgowser</string>
+    <string name="type.shop.money_lender">Lendyer Mona</string>
+    <string name="type.shop.motorcycle">Gwerthji Jynn Diwros</string>
+    <string name="type.shop.motorcycle_repair">Jynner Jynn Diwros</string>
+    <string name="type.shop.music">Gwerthji Musik</string>
+    <string name="type.shop.musical_instrument">Gwerthji Daffar Ilow</string>
+    <string name="type.shop.newsagent">Gwerther Jornalys</string>
+    <string name="type.shop.optician">Optycyan</string>
+    <string name="type.shop.outdoor">Gwerthji Daffar Powdir</string>
+    <string name="type.shop.outpost">Poynt Kuntel Post</string>
+    <string name="type.shop.pasta">Gwerthji Pasta</string>
+    <string name="type.shop.pastry">Gwerthji Hogen</string>
+    <string name="type.shop.pawnbroker">Gostler</string>
+    <string name="type.shop.pet">Gwerthji Enevales Dov</string>
+    <string name="type.shop.pet_grooming">Barbour rag Enevales Dov</string>
+    <string name="type.shop.photo">Gwerthji Skeusenieth</string>
+    <string name="type.shop.rental">Gobrener</string>
+    <string name="type.shop.rental.bicycle">Gobrener Diwros</string>
+    <string name="type.shop.seafood">Gwerthji Pysk</string>
+    <string name="type.shop.second_hand">Gwerthji Wortaswerth</string>
+    <string name="type.shop.shoes">Gwerthji Eskis</string>
+    <string name="type.shop.sports">Gwerthji Sport</string>
+    <string name="type.shop.stationery">Gwerthji Daffar Buro</string>
+    <string name="type.shop.supermarket">Gorvarghas</string>
+    <string name="type.shop.tattoo">Korfliwer</string>
+    <string name="type.shop.tea">Gwerthji Te</string>
+    <string name="type.shop.telecommunication">Gwerthji Pellgomunyans</string>
+    <string name="type.shop.ticket">Gwerthji Toknys</string>
+    <string name="type.shop.toys">Gwerthji Gwariellow</string>
+    <string name="type.shop.travel_agency">Mayner-Viajya</string>
+    <string name="type.shop.tyres">Gwerthji Bondennow</string>
+    <string name="type.shop.variety_store">Gwerthji Divers</string>
+    <string name="type.shop.video">Gwerthji Gwydhyow</string>
+    <string name="type.shop.video_games">Gwerthji Gwari Gwydhyow</string>
+    <string name="type.shop.wine">Gwerthji Gwin</string>
+    <string name="type.shop.agrarian">Gwerthji Amethel</string>
+    <string name="type.shop.antiques">Gwerthji Henbythow</string>
+    <string name="type.shop.appliance">Gwerthji Darbar</string>
+    <string name="type.shop.art">Gwerthji Art</string>
+    <string name="type.shop.baby_goods">Gwerthji Gwara Babanes</string>
+    <string name="type.shop.bag">Gwerthji Sagh</string>
+    <string name="type.shop.bed">Gwerthji Gweli</string>
+    <string name="type.shop.boutique">Gwerthji Dillas Kelvydh</string>
+    <string name="type.shop.charity">Gwerthji Aluseneth</string>
+    <string name="type.shop.cheese">Gwerthji Keus</string>
+    <string name="type.shop.craft">Gwerthji Toulys Kreft</string>
+    <string name="type.shop.dairy">Gwerthji Trevas Lethek</string>
+    <string name="type.shop.electrical">Gwerthji Gwara Tredanel</string>
+    <string name="type.shop.fishing">Gwerthji Pyskessa</string>
+    <string name="type.shop.interior_decoration">Gwerthji Afinans Pervedhel</string>
+    <string name="type.shop.lottery">Toknys Gwari Dall</string>
+    <string name="type.shop.medical_supply">Gwerthji Gwara Medhegel</string>
+    <string name="type.shop.nutrition_supplements">Gwerthji Keworrans Megyans</string>
+    <string name="type.shop.paint">Gwerthji Liw</string>
+    <string name="type.shop.perfumery">Gwerthji Melyseth</string>
+    <string name="type.shop.sewing">Gwerthji Gwara Gwrias</string>
+    <string name="type.shop.storage_rental">Gwithva Gobrenek</string>
+    <string name="type.shop.tobacco">Gwerthji Tobacko</string>
+    <string name="type.shop.trade">Gwerthji Trad</string>
+    <string name="type.shop.watches">Gwerthji Euryor</string>
+    <string name="type.shop.wholesale">Gwerthji Kowlwerth</string>
+    <string name="type.shop.lighting">Gwerthji Golowyans</string>
+    <string name="type.disusedbusiness">Gwerthji Gwag</string>
+    <string name="type.sport">Sport</string>
+    <string name="type.sport.multi">Sportys Divers</string>
+    <string name="type.sport.9pin">Gwari Pelyow</string>
+    <string name="type.sport.10pin">Gwari Pelyow</string>
+    <string name="type.sport.american_football">Pel Droos Amerikanek</string>
+    <string name="type.sport.archery">Gwaregieth</string>
+    <string name="type.sport.athletics">Athletek</string>
+    <string name="type.sport.australian_football">Pel Droos Ostralek</string>
+    <string name="type.sport.badminton">Badminton</string>
+    <string name="type.sport.baseball">Pel Vas</string>
+    <string name="type.sport.basketball">Pel Ganstel</string>
+    <string name="type.sport.beachvolleyball">Pel Volli war an Treth</string>
+    <string name="type.sport.bowls">Pelva</string>
+    <string name="type.sport.chess">Gwydhbol</string>
+    <string name="type.sport.climbing">Krambla Kerrek</string>
+    <string name="type.sport.cricket">Krycket</string>
+    <string name="type.sport.curling">Hurlya</string>
+    <string name="type.sport.diving">Sedhi Ughel</string>
+    <string name="type.sport.equestrian">Sportys Marghek</string>
+    <string name="type.sport.field_hockey">Hocki</string>
+    <string name="type.sport.futsal">Futsal</string>
+    <string name="type.sport.golf">Golf</string>
+    <string name="type.sport.gymnastics">Gymnastek</string>
+    <string name="type.sport.handball">Pel Dhorn</string>
+    <string name="type.sport.ice_hockey">Hocki Yey</string>
+    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.pelota">Pelota</string>
+    <string name="type.sport.scuba_diving">Sedh Scuba</string>
+    <string name="type.sport.shooting">Setha Gonn</string>
+    <string name="type.sport.skateboard">Rostella</string>
+    <string name="type.sport.skiing">Skia</string>
+    <string name="type.sport.soccer">Pel Droos</string>
+    <string name="type.sport.swimming">Neuvya</string>
+    <string name="type.sport.table_tennis">Tennis Moos</string>
+    <string name="type.sport.tennis">Tennis</string>
+    <string name="type.sport.volleyball">Pen Volli</string>
+    <string name="type.sport.yoga">Yoga</string>
+    <string name="type.tourism">Tornyaseth</string>
+    <string name="type.tourism.aquarium">Pusketti</string>
+    <string name="type.tourism.alpine_hut">Ostyans war Venydh</string>
+    <string name="type.tourism.apartment">Chi Golyow</string>
+    <string name="type.tourism.artwork">Artweyth</string>
+    <string name="type.tourism.artwork.architecture">Artweyth Pennsernethel</string>
+    <string name="type.tourism.artwork.painting">Lymnans</string>
+    <string name="type.tourism.attraction">Tennvos</string>
+    <string name="type.attraction.amusement_ride">Marghogeth-Omdhidhana</string>
+    <string name="type.attraction.animal">Garth Eneval</string>
+    <string name="type.attraction.bumper_car">Kerri Bomm</string>
+    <string name="type.attraction.big_wheel">Ros Ferris</string>
+    <string name="type.attraction.carousel">Res a-Dro</string>
+    <string name="type.attraction.historic">Tennvos istorek</string>
+    <string name="type.attraction.maze">Milhyntal</string>
+    <string name="type.attraction.roller_coaster">Tren-Omdhidhana</string>
+    <string name="type.attraction.water_slide">Slynk Dowr</string>
+    <string name="type.tourism.attraction.specified">Tennvos</string>
+    <string name="type.tourism.camp_site">Kampva</string>
+    <string name="type.tourism.caravan_site">Kampva Karavan</string>
+    <string name="type.tourism.artwork.sculpture">Gravyans</string>
+    <string name="type.tourism.artwork.statue">Delow</string>
+    <string name="type.tourism.chalet">Krowji Golyow</string>
+    <string name="type.tourism.gallery">Mirva Art</string>
+    <string name="type.tourism.guest_house">Gwesti</string>
+    <string name="type.tourism.hostel">Ostel</string>
+    <string name="type.tourism.hotel">Ostel</string>
+    <string name="type.tourism.information">Kudhlow Tornyas</string>
+    <string name="type.tourism.information.board">Bordh Kudhlow</string>
+    <string name="type.tourism.information.guidepost">Post Arwodh</string>
+    <string name="type.tourism.information.map">Mappa Tornyas</string>
+    <string name="type.tourism.information.office">Buro Tornyas</string>
+    <string name="type.tourism.information.visitor_centre">Kres Godriger</string>
+    <string name="type.amenity.ranger_station">Poynt Ranger</string>
+    <string name="type.tourism.motel">Karrostel</string>
+    <string name="type.tourism.museum">Gwithti</string>
+    <string name="type.tourism.picnic_site">Le Kroust</string>
+    <string name="type.leisure.resort">Tyller-Havi</string>
+    <string name="type.tourism.theme_park">Park-Omdhidhana</string>
+    <string name="type.tourism.viewpoint">Gwelva</string>
+    <string name="type.tourism.wilderness_hut">Krow Gwylvos</string>
+    <string name="type.tourism.zoo">Milva</string>
+    <string name="type.tourism.zoo.petting">Milva Chersya</string>
+    <string name="type.traffic_calming">Koselheans Daromres</string>
+    <string name="type.traffic_calming.bump">Bomm Tooth</string>
+    <string name="type.traffic_calming.hump">Both Tooth</string>
+    <string name="type.waterway">Dowr</string>
+    <string name="type.waterway.canal">Chanel</string>
+    <string name="type.waterway.canal.tunnel">Kowfordh Chanel</string>
+    <string name="type.waterway.fish_pass">Porth Puskes</string>
+    <string name="type.waterway.dam">Arge</string>
+    <string name="type.barrier.ditch">Kleudh</string>
+    <string name="type.natural.water.ditch">Kleudh Dowrans</string>
+    <string name="type.waterway.ditch.tunnel">Kowfordh Kleudh</string>
+    <string name="type.waterway.dock">Kay</string>
+    <string name="type.waterway.drain">Kleys</string>
+    <string name="type.natural.water.drain">Kleys</string>
+    <string name="type.waterway.drain.tunnel">Kowfordh Kleys</string>
+    <string name="type.waterway.lock_gate">Yet Dhowr</string>
+    <string name="type.waterway.river">Avon</string>
+    <string name="type.waterway.river.tunnel">Avon</string>
+    <string name="type.waterway.stream">Gover</string>
+    <string name="type.waterway.stream.ephemeral">Gover Anparhus</string>
+    <string name="type.waterway.stream.intermittent">Tergover</string>
+    <string name="type.waterway.stream.tunnel">Gover</string>
+    <string name="type.waterway.waterfall">Dowrlam</string>
+    <string name="type.waterway.weir">Arge Byghan</string>
+    <string name="type.wheelchair">Kador Ros</string>
+    <string name="type.wheelchair.limited">Hedhas Kador Ros Strothys</string>
+    <string name="type.wheelchair.no">Hedhas Kador Ros Vyth</string>
+    <string name="type.wheelchair.yes">Hedhas Kador Ros Leun</string>
+    <string name="type.aerialway.j.bar">Yskynnell J-barr</string>
+    <string name="type.aerialway.magic_carpet">Leurlen Pystrek</string>
+    <string name="type.aerialway.platter">Yskynnell Tallyour</string>
+    <string name="type.aerialway.rope_tow">Halya Lovan</string>
+    <string name="type.aerialway.t.bar">Yskynnell T-barr</string>
+    <string name="type.piste_type.downhill">Hyns Skia yn-Nans</string>
+    <string name="type.piste_type.downhill.area">Hyns Skia yn-Nans</string>
+    <string name="type.piste_type.downhill.advanced">Hyns Skia yn-Nans Avonsys</string>
+    <string name="type.piste_type.downhill.advanced.area">Hyns Skia yn-Nans Avonsys</string>
+    <string name="type.piste_type.downhill.easy">Hyns Skia yn-Nans Es</string>
+    <string name="type.piste_type.downhill.easy.area">Hyns Skia yn-Nans Es</string>
+    <string name="type.piste_type.downhill.expert">Hyns Skia yn-Nans Skentel</string>
+    <string name="type.piste_type.downhill.expert.area">Hyns Skia yn-Nans Skentel</string>
+    <string name="type.piste_type.downhill.freeride">Hyns Skia yn-Nans Rydh</string>
+    <string name="type.piste_type.downhill.intermediate">Hyns Skia yn-Nans Kres</string>
+    <string name="type.piste_type.downhill.intermediate.area">Hyns Skia yn-Nans Kres</string>
+    <string name="type.piste_type.downhill.novice">Hyns Skia yn-Nans Dallether</string>
+    <string name="type.piste_type.downhill.novice.area">Hyns Skia yn-Nans Dallether</string>
+    <string name="type.piste_type.nordic">Ol Skia Nordek</string>
+    <string name="type.piste_type.sled">Hyns Karr Slynk</string>
+    <string name="type.piste_type.sled.area">Hyns Karr Slynk</string>
+    <string name="type.piste_type.snow_park">Park Ergh</string>
+    <string name="type.piste_type.hike">Ol Gwandrans Ergh</string>
+    <string name="type.piste_type.connection">Junyans Hyns Ergh</string>
+    <string name="type.piste_type.skitour">Ol Torn Ski</string>
+    <string name="type.amenity.events_venue">Le Kentelyow</string>
+    <string name="type.shop.auction">Strifwerth</string>
+    <string name="type.shop.collector">Kunteladow</string>
+    <string name="type.self_service.yes">Omgonis kavadow</string>
+    <string name="type.self_service.only">Omgonis hepken</string>
+    <string name="type.self_service.partially">Omgonis rannel</string>
+    <string name="type.self_service.no">Omgonis vyth</string>
+    <string name="type.amenity.social_facility">Komodyta Socyal</string>
+    <string name="type.social_facility.soup_kitchen">Kegin Disto</string>
+    <string name="type.social_facility.food_bank">Arghanti Boos</string>
+    <string name="type.amenity.food_sharing">Kevren Boos</string>
+    <string name="type.amenity.give_box">Boks Ri</string>
+    <string name="type.emergency.emergency_ward_entrance">Entrans Diberthva Goredhom</string>
+    <string name="type.amenity.dojo">Dojo</string>
+    <string name="type.leisure.sports_hall">Hel sport</string>
+    <string name="type.xmas.tree">Gwedhen Nadelik</string>
+    <string name="type.power.substation">Istredanva</string>
 </resources>

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

@@ -150,7 +150,7 @@
     <string name="type.amenity.vending_machine.food">Máquina de venda de comidas</string>
     <string name="type.amenity.vending_machine.newspapers">Máquina de venda de jornais</string>
     <string name="type.amenity.vending_machine.parking_tickets">Máquina de venda de tíquetes de estacionamento</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Máquina de Venda de Passagens de Transporte Público</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Máquina de venda de passagens de transporte público</string>
     <string name="type.amenity.vending_machine.sweets">Máquina de venda de doces</string>
     <string name="type.amenity.vending_machine.excrement_bags">Saquinhos de lixo</string>
     <string name="type.amenity.parcel_locker">Armário de encomendas</string>
@@ -1489,5 +1489,5 @@
     <string name="type.buoy.lateral.port">Boia lateral</string>
     <string name="type.man_made.mast.communication">Mastro de comunicações</string>
     <string name="type.shop.beauty.nails">Manicure</string>
-    <string name="type.amenity.hydrant">Hidrante de Irrigação</string>
+    <string name="type.amenity.hydrant">Hidrante de irrigação</string>
 </resources>

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

@@ -169,7 +169,7 @@
     <string name="type.office.security">Pisarna varnostnikov</string>
     <string name="type.building.guardhouse">Stražarnica</string>
     <string name="type.power.portal">Portal daljnovoda</string>
-    <string name="type.amenity.fountain">Vodnjak</string>
+    <string name="type.amenity.fountain">Vodomet</string>
     <string name="type.amenity.fuel">Bencinska postaja</string>
     <string name="type.amenity.grave_yard">Cerkveno pokopališče</string>
     <string name="type.amenity.grave_yard.christian">Pokopališče krščanske cerkve</string>
@@ -710,4 +710,91 @@
     <string name="type.leisure.recreation_ground">Rekreacijska površina</string>
     <string name="type.leisure.sauna">Savna</string>
     <string name="type.leisure.slipway">Splavilna klančina</string>
+    <string name="type.lateral.starboard">Desni bok</string>
+    <string name="type.leisure.sports_centre.sport.padel">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Plavalno središče</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Športno središče</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Športno središče</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Joga</string>
+    <string name="type.leisure.stadium">Stadion</string>
+    <string name="type.leisure.swimming_pool">Plavalni bazen</string>
+    <string name="type.leisure.swimming_pool.private">Plavalni bazen</string>
+    <string name="type.leisure.track">Proga</string>
+    <string name="type.leisure.track.area">Proga</string>
+    <string name="type.leisure.water_park">Vodni park</string>
+    <string name="type.leisure.beach_resort">Obalno letovišče</string>
+    <string name="type.man_made">Umetno</string>
+    <string name="type.man_made.breakwater">Valobran</string>
+    <string name="type.man_made.cairn">Kamniti možic</string>
+    <string name="type.man_made.chimney">Dimnik</string>
+    <string name="type.man_made.cutline">Črta poseke</string>
+    <string name="type.man_made.survey_point">Merska točka</string>
+    <string name="type.man_made.flagpole">Zastavni drog</string>
+    <string name="type.man_made.lighthouse">Svetilnik</string>
+    <string name="type.man_made.mast">Drog</string>
+    <string name="type.man_made.pier">Pomol</string>
+    <string name="type.man_made.pipeline">Cevovod</string>
+    <string name="type.man_made.pipeline.overground">Nadzemni cevovod</string>
+    <string name="type.man_made.storage_tank">Rezervoar</string>
+    <string name="type.man_made.surveillance">Nadzorna kamera</string>
+    <string name="type.man_made.tower">Stolp</string>
+    <string name="type.man_made.communications_tower">Komunikacijski stolp</string>
+    <string name="type.man_made.tower.communication">Komunikacijski stolp</string>
+    <string name="type.man_made.mast.communication">Komunikacijski drog</string>
+    <string name="type.man_made.petroleum_well">Naftna ali plinska vrtina</string>
+    <string name="type.man_made.flare">Sežigalni stolp</string>
+    <string name="type.man_made.crane">Žerjav</string>
+    <string name="type.man_made.wastewater_plant">Čistilna naprava odpadnih voda</string>
+    <string name="type.man_made.water_tap">Vodna pipa</string>
+    <string name="type.man_made.water_tap.drinking_water_no">Vodna pipa</string>
+    <string name="type.man_made.water_tower">Vodni stolp</string>
+    <string name="type.man_made.water_well">Vodnjak</string>
+    <string name="type.man_made.water_well.drinking_water_no">Vodnjak</string>
+    <string name="type.man_made.windmill">Mlin na veter</string>
+    <string name="type.man_made.works">Industrijski obrat</string>
+    <string name="type.military">Vojaško</string>
+    <string name="type.military.bunker">Vojaško zaklonišče</string>
+    <string name="type.mountain_pass">Gorski prelaz</string>
+    <string name="type.natural">Narava</string>
+    <string name="type.natural.bare_rock">Gola skala</string>
+    <string name="type.natural.shingle">Prod</string>
+    <string name="type.natural.scree">Melišče</string>
+    <string name="type.natural.bay">Zaliv</string>
+    <string name="type.natural.beach">Plaža</string>
+    <string name="type.natural.beach.sand">Peščena plaža</string>
+    <string name="type.natural.beach.gravel">Prodnata plaža</string>
+    <string name="type.natural.cape">Rt</string>
+    <string name="type.natural.cave_entrance">Vhod jame</string>
+    <string name="type.natural.cliff">Pečina</string>
+    <string name="type.place.city.capital.9">Mesto</string>
+    <string name="type.place.city.capital.8">Mesto</string>
+    <string name="type.place.continent">Celina</string>
+    <string name="type.place.country">Država</string>
+    <string name="type.place.county">Okrožje</string>
+    <string name="type.place.farm">Kmetija</string>
+    <string name="type.place.hamlet">Zaselek</string>
+    <string name="type.place.island">Otok</string>
+    <string name="type.place.islet">Otoček</string>
+    <string name="type.place.isolated_dwelling">Osamljeno bivališče</string>
+    <string name="type.place.ocean">Ocean</string>
+    <string name="type.place.sea">Morje</string>
+    <string name="type.place.region">Regija</string>
+    <string name="type.place.square">Trg</string>
+    <string name="type.place.state">Zvezna država</string>
+    <string name="type.place.state.USA">Zvezna država ZDA</string>
+    <string name="type.place.suburb">Mestna četrt</string>
+    <string name="type.place.town">Manjše mesto</string>
+    <string name="type.place.village">Vas</string>
+    <string name="type.power">Energetika</string>
+    <string name="type.power.generator">Generator</string>
+    <string name="type.power.generator.solar">Sončna elektrarna</string>
+    <string name="type.power.generator.wind">Vetrna elektrarna</string>
 </resources>

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

@@ -5,7 +5,7 @@
     <string name="type.addr_interpolation.even">Адреса/Блок</string>
     <string name="type.addr_interpolation.odd">Адреса/Блок</string>
     <string name="type.aerialway">Гондола</string>
-    <string name="type.aerialway.cable_car">Ваздушни трамвај</string>
+    <string name="type.aerialway.cable_car">Жичара</string>
     <string name="type.aerialway.chair_lift">Ски-лифт</string>
     <string name="type.aerialway.drag_lift">Ски-лифт једносед</string>
     <string name="type.aerialway.gondola">Гондола</string>

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

@@ -961,6 +961,7 @@
     <string name="type.railway.rail.highspeed">High-Speed Railway</string>
     <string name="type.railway.rail.tourism">Touristic Railway</string>
     <string name="type.railway.rail.main">Railway</string>
+    <string name="type.railway.turntable">Railway Turntable</string>
     <!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
     <string name="type.railway.rail.branch">Railway Branch</string>
     <!-- Non-passenger utility tracks: industrial, military, test. -->
@@ -1424,6 +1425,7 @@
     <string name="type.tourism.information.board">Information Board</string>
     <string name="type.tourism.information.guidepost">Guidepost</string>
     <string name="type.tourism.information.map">Tourist Map</string>
+    <string name="type.tourism.information.tactile_map">Tactile Map</string>
     <string name="type.tourism.information.office">Tourist Office</string>
     <string name="type.tourism.information.visitor_centre">Visitor Centre</string>
     <string name="type.amenity.ranger_station">Ranger Station</string>

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

@@ -402,6 +402,7 @@
 "tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home|4Chalet",
 "tourism-information-board": "Information Board",
 "tourism-information-map": "Tourist map|map|4Information",
+"tourism-information-tactile_map": "Tactile map|map|4Information",
 "tourism-information-guidepost": "Guidepost",
 "aerialway-station": "Aerialway Station|5Cable car station",
 "aeroway-helipad": "4Helipad",

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

@@ -1 +1,543 @@
-{}
+{
+"@category_eat": "",
+"@category_food": "",
+"@category_transport": "",
+"@category_fuel": "",
+"@category_parking": "",
+"@category_shopping": "",
+"@category_hotel": "",
+"@category_tourism": "",
+"@category_entertainment": "",
+"@category_nightlife": "",
+"@category_children": "",
+"@category_atm": "",
+"@category_rv": "",
+"amenity-atm|@category_atm": "",
+"@category_bank": "",
+"@category_secondhand": "",
+"amenity-bank|@category_bank": "",
+"@category_recycling": "",
+"amenity-bureau_de_change": "",
+"amenity-studio": "",
+"amenity-bar|amenity-pub|@category_eat|@category_nightlife": "",
+"amenity-cafe|@category_eat": "",
+"amenity-fast_food|@category_eat": "",
+"amenity-restaurant|@category_eat": "",
+"amenity-fuel|@category_fuel": "",
+"@shop": "",
+"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "",
+"shop|@shop": "",
+"shop-cannabis|@shop": "",
+"shop-cosmetics|@category_shopping|@shop": "",
+"shop-convenience|@category_food|@shop": "",
+"shop-deli|@category_food|@shop": "",
+"shop-farm|@category_food|@shop": "",
+"shop-garden_centre|@shop": "",
+"shop-grocery|@category_food|@shop": "",
+"shop-health_food|@category_food|@shop": "",
+"shop-hearing_aids|@shop": "",
+"shop-mobile_phone|@shop": "",
+"shop-florist|@shop": "",
+"shop-butcher|@category_food|@shop": "",
+"shop-furniture|@shop": "",
+"shop-kitchen|@shop": "",
+"shop-alcohol|@category_food|@shop": "",
+"shop-books|@shop": "",
+"shop-shoes|@category_shopping|@shop": "",
+"shop-electronics|@shop": "",
+"shop-hardware|shop-doityourself|@shop": "",
+"shop-houseware|@shop": "",
+"shop-jewelry|@category_shopping|@shop": "",
+"shop-optician|@shop": "",
+"shop-gift|@category_shopping|@shop": "",
+"shop-beauty": "",
+"shop-beauty-nails": "",
+"shop-greengrocer|@category_food|@shop": "",
+"shop-sports|@category_shopping|@shop": "",
+"shop-supermarket|@category_food|@shop": "",
+"shop-mall|@category_shopping|@shop": "",
+"shop-department_store|@category_shopping|@shop": "",
+"shop-beverages|@category_food|@shop": "",
+"shop-computer|@shop": "",
+"shop-confectionery|craft-confectionery|@category_food|@shop": "",
+"shop-laundry": "",
+"shop-toys|@category_children|@shop": "",
+"amenity-marketplace|@category_food": "",
+"amenity-mobile_money_agent": "",
+"amenity-money_transfer": "",
+"shop-clothes|@category_shopping|@shop": "",
+"shop-caravan|@category_rv|@shop": "",
+"shop-car|@shop": "",
+"shop-bicycle|@shop": "",
+"shop-kiosk": "",
+"highway-bus_stop|@category_transport": "",
+"railway-tram_stop|@category_transport": "",
+"amenity-bus_station|@category_transport": "",
+"railway-station|railway-halt|building-train_station|@category_transport": "",
+"railway-station-funicular": "",
+"railway-station-subway|@category_transport": "",
+"amenity-ferry_terminal|@category_transport": "",
+"amenity-taxi|@category_transport": "",
+"amenity-townhall": "",
+"tourism-attraction|@category_tourism": "",
+"tourism-artwork": "",
+"tourism-artwork-sculpture": "",
+"tourism-artwork-statue": "",
+"tourism-artwork-painting": "",
+"tourism-viewpoint|@category_tourism": "",
+"tourism-information": "",
+"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "",
+"amenity-place_of_worship": "",
+"amenity-place_of_worship-christian": "",
+"amenity-place_of_worship-muslim": "",
+"amenity-place_of_worship-buddhist": "",
+"amenity-place_of_worship-hindu": "",
+"amenity-place_of_worship-shinto": "",
+"amenity-place_of_worship-jewish": "",
+"amenity-place_of_worship-taoist": "",
+"tourism-museum|@category_tourism": "",
+"waterway-waterfall|@category_tourism": "",
+"historic-archaeological_site|@category_tourism": "",
+"historic-battlefield": "",
+"historic-stone": "",
+"historic-boundary_stone": "",
+"historic-castle|@category_tourism": "",
+"historic-city_gate|@category_tourism": "",
+"historic-citywalls|@category_tourism": "",
+"historic-fort|@category_tourism": "",
+"historic-gallows|@category_tourism": "",
+"historic-memorial|@category_tourism": "",
+"historic-memorial-cross": "",
+"historic-memorial-plaque": "",
+"historic-memorial-sculpture|@category_tourism": "",
+"historic-memorial-statue|@category_tourism": "",
+"historic-memorial-stolperstein": "",
+"historic-memorial-war_memorial|@category_tourism": "",
+"historic-monument|@category_tourism": "",
+"historic-pillory|@category_tourism": "",
+"historic-cannon": "",
+"historic-anchor": "",
+"historic-ruins|@category_tourism": "",
+"historic-mine": "",
+"historic-ship|@category_tourism": "",
+"historic-wreck": "",
+"historic-locomotive|@category_tourism": "",
+"historic-tank|@category_tourism": "",
+"historic-aircraft|@category_tourism": "",
+"historic-tomb|@category_tourism": "",
+"man_made-cross": "",
+"historic-wayside_cross": "",
+"historic-wayside_shrine": "",
+"leisure-dog_park": "",
+"leisure-dance|@category_entertainment": "",
+"leisure-garden": "",
+"leisure-firepit": "",
+"amenity-bench|amenity-bench-backless": "",
+"amenity-boat_rental": "",
+"amenity-bicycle_rental": "",
+"amenity-bicycle_repair_station": "",
+"amenity-car_sharing": "",
+"amenity-car_rental": "",
+"amenity-motorcycle_rental": "",
+"amenity-cinema|@category_entertainment": "",
+"leisure-bowling_alley|@category_entertainment": "",
+"amenity-theatre|@category_entertainment": "",
+"amenity-nightclub|@category_entertainment|@category_nightlife": "",
+"amenity-brothel": "",
+"amenity-love_hotel": "",
+"@gambling": "",
+"amenity-gambling|@gambling": "",
+"amenity-casino|@category_entertainment|@category_nightlife|@gambling": "",
+"leisure-adult_gaming_centre|@gambling": "",
+"leisure-amusement_arcade|@category_entertainment": "",
+"amenity-college": "",
+"amenity-fire_station": "",
+"amenity-fountain": "",
+"amenity-grave_yard|landuse-cemetery": "",
+"shop-funeral_directors": "",
+"@category_hospital": "",
+"amenity-hospital|@category_hospital": "",
+"amenity-clinic|@category_hospital": "",
+"amenity-doctors|@category_hospital": "",
+"amenity-dentist": "",
+"healthcare-laboratory": "",
+"healthcare-physiotherapist": "",
+"healthcare-alternative": "",
+"healthcare-audiologist": "",
+"healthcare-blood_donation": "",
+"healthcare-optometrist": "",
+"healthcare-podiatrist": "",
+"healthcare-psychotherapist": "",
+"healthcare-sample_collection": "",
+"healthcare-speech_therapist": "",
+"amenity-hunting_stand": "",
+"amenity-kindergarten": "",
+"amenity-library": "",
+"amenity-parking|amenity-parking_entrance|@category_parking": "",
+"@category_pharmacy": "",
+"amenity-pharmacy|@category_pharmacy": "",
+"@category_post": "",
+"amenity-post_box|@category_post": "",
+"amenity-post_office|post_office-post_partner|@category_post": "",
+"amenity-vehicle_inspection": "",
+"amenity-waste_disposal": "",
+"amenity-recycling-centre|@category_recycling": "",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "",
+"recycling-batteries|@category_recycling": "",
+"recycling-clothes|@category_recycling": "",
+"recycling-glass_bottles|@category_recycling": "",
+"recycling-paper|@category_recycling": "",
+"recycling-plastic|@category_recycling": "",
+"recycling-plastic_bottles|@category_recycling": "",
+"recycling-scrap_metal|@category_recycling": "",
+"recycling-small_appliances|@category_recycling": "",
+"recycling-cardboard|@category_recycling": "",
+"recycling-cans|@category_recycling": "",
+"recycling-shoes|@category_recycling": "",
+"recycling-green_waste|@category_recycling": "",
+"recycling-cartons|@category_recycling": "",
+"amenity-sanitary_dump_station|@category_rv": "",
+"amenity-school": "",
+"amenity-shelter": "",
+"amenity-shelter-basic_hut": "",
+"amenity-shelter-lean_to": "",
+"amenity-stripclub": "",
+"amenity-telephone": "",
+"@category_toilet": "",
+"amenity-toilets|toilets-yes|@category_toilet": "",
+"amenity-university": "",
+"place-continent": "",
+"place-country": "",
+"place-city": "",
+"place-town": "",
+"place-city-capital": "",
+"place-county": "",
+"place-state": "",
+"place-region": "",
+"place-island|place-islet": "",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "",
+"place-hamlet": "",
+"place-village": "",
+"place-locality": "",
+"place-farm": "",
+"highway-raceway": "",
+"highway-path|highway-footway|highway-steps|highway-cycleway": "",
+"highway-pedestrian|highway-primary|highway-primary_link|highway-residential|highway-secondary|highway-secondary_link|highway-tertiary|highway-tertiary_link|highway-service|highway-road|highway-track|highway-trunk|highway-trunk_link|highway-living_street|highway-unclassified|highway-motorway_link|highway-motorway|highway-cycleway": "",
+"highway-motorway_junction": "",
+"highway-elevator": "",
+"@mountain": "",
+"natural-peak|@mountain": "",
+"natural-saddle|mountain_pass": "",
+"natural-strait": "",
+"landuse-forest": "",
+"leisure-park": "",
+"tourism-aquarium|@category_tourism": "",
+"tourism-hostel|@category_hotel": "",
+"tourism-hotel|@category_hotel": "",
+"tourism-guest_house|@category_hotel": "",
+"tourism-motel|@category_hotel": "",
+"tourism-alpine_hut|@category_hotel": "",
+"shop-hairdresser": "",
+"aeroway-aerodrome": "",
+"leisure-stadium": "",
+"leisure-playground|@category_children": "",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "",
+"leisure-sports_centre-sport-swimming": "",
+"leisure-golf_course": "",
+"leisure-miniature_golf": "",
+"leisure-escape_game": "",
+"leisure-hackerspace": "",
+"leisure-pitch": "",
+"leisure-swimming_pool": "",
+"leisure-swimming_pool-private": "",
+"sport-american_football": "",
+"sport-archery": "",
+"sport-athletics": "",
+"sport-australian_football": "",
+"sport-baseball": "",
+"sport-basketball": "",
+"sport-beachvolleyball": "",
+"sport-bowls": "",
+"sport-chess": "",
+"sport-cricket": "",
+"sport-curling": "",
+"sport-equestrian": "",
+"sport-golf": "",
+"sport-gymnastics": "",
+"sport-handball": "",
+"sport-scuba_diving": "",
+"sport-shooting": "",
+"sport-skateboard": "",
+"sport-skiing": "",
+"sport-soccer": "",
+"sport-swimming": "",
+"sport-table_tennis": "",
+"sport-tennis": "",
+"sport-padel": "",
+"sport-volleyball": "",
+"sport-9pin": "",
+"sport-10pin": "",
+"building": "",
+"building-address": "",
+"@category_police": "",
+"amenity-police|@category_police": "",
+"office-diplomatic": "",
+"natural-bay": "",
+"@category_water": "",
+"amenity-drinking_water|drinking_water-yes|@category_water": "",
+"natural-hot_spring|@category_water": "",
+"natural-spring|@category_water": "",
+"man_made-water_well|@category_water": "",
+"amenity-water_point|@category_water|@category_rv": "",
+"man_made-water_tap|@category_water": "",
+"@waterbody": "",
+"natural-water|@waterbody": "",
+"natural-water-basin|landuse-basin|@waterbody": "",
+"natural-water-pond|@waterbody": "",
+"natural-water-lake|@waterbody": "",
+"natural-water-reservoir|landuse-reservoir|@waterbody": "",
+"waterway-river|waterway-stream|natural-water-river": "",
+"waterway-canal": "",
+"shop-car_repair": "",
+"tourism-camp_site|@category_hotel": "",
+"tourism-caravan_site|@category_rv||@category_hotel": "",
+"office": "",
+"office-company": "",
+"office-government": "",
+"office-lawyer": "",
+"office-telecommunication": "",
+"craft-beekeeper": "",
+"craft-blacksmith": "",
+"craft-brewery": "",
+"craft-caterer": "",
+"craft-carpenter": "",
+"craft-confectionery": "",
+"craft-electrician": "",
+"craft-electronics_repair": "",
+"craft-gardener": "",
+"craft-grinding_mill": "",
+"craft-handicraft": "",
+"craft-hvac": "",
+"craft-metal_construction": "",
+"craft-key_cutter": "",
+"craft-locksmith": "",
+"craft-painter": "",
+"craft-photographer": "",
+"craft-plumber": "",
+"craft-sawmill": "",
+"craft-shoemaker": "",
+"craft-winery": "",
+"craft-tailor": "",
+"area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "",
+"place-sea": "",
+"place-ocean": "",
+"@category_wifi": "",
+"internet_access|internet_access-wlan|@category_wifi": "",
+"natural-beach|natural-beach-sand|natural-beach-gravel|leisure-beach_resort": "",
+"man_made-lighthouse": "",
+"man_made-survey_point": "",
+"man_made-flagpole": "",
+"man_made-mast": "",
+"man_made-communications_tower|man_made-tower-communication": "",
+"man_made-petroleum_well": "",
+"organic-only|organic-yes": "",
+"shop-copyshop": "",
+"shop-photo|@shop": "",
+"shop-camera|@shop": "",
+"shop-travel_agency": "",
+"shop-outdoor|@shop": "",
+"shop-dry_cleaning": "",
+"shop-tyres|@shop": "",
+"amenity-car_wash": "",
+"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "",
+"man_made-observatory": "",
+"amenity-veterinary": "",
+"amenity-animal_shelter": "",
+"@charging_station": "",
+"amenity-charging_station|@charging_station": "",
+"amenity-charging_station-bicycle|@charging_station": "",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "",
+"amenity-childcare": "",
+"amenity-bicycle_parking": "",
+"amenity-waste_basket": "",
+"emergency-phone": "",
+"leisure-fitness_centre": "",
+"leisure-sauna": "",
+"shop-car_repair-tyres|shop-car_repair": "",
+"shop-chemist|@shop": "",
+"shop-pet|@shop": "",
+"tourism-zoo|@category_tourism|@category_children": "",
+"attraction-animal": "",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "",
+"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "",
+"amenity-community_centre": "",
+"amenity-compressed_air": "",
+"amenity-courthouse": "",
+"amenity-vending_machine": "",
+"amenity-vending_machine-cigarettes": "",
+"amenity-vending_machine-coffee": "",
+"amenity-vending_machine-condoms": "",
+"amenity-vending_machine-drinks": "",
+"amenity-vending_machine-food|@category_food": "",
+"amenity-vending_machine-parking_tickets|@category_parking": "",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "",
+"amenity-vending_machine-newspapers": "",
+"amenity-vending_machine-sweets": "",
+"amenity-vending_machine-excrement_bags": "",
+"amenity-parcel_locker|@category_post": "",
+"shop-outpost": "",
+"amenity-vending_machine-fuel|@category_fuel": "",
+"building-garage": "",
+"highway-rest_area|highway-services": "",
+"man_made-chimney": "",
+"man_made-crane": "",
+"man_made-tower|man_made-flare": "",
+"shop-bookmaker|@gambling": "",
+"shop-seafood|@category_food|@shop": "",
+"shop-second_hand|@category_shopping|@shop|@category_secondhand": "",
+"shop-charity|@shop|@category_secondhand": "",
+"shop-ticket": "",
+"shop-wine|@category_food|@shop": "",
+"shop-car_parts|@shop": "",
+"tourism-chalet|@category_hotel": "",
+"tourism-information-board": "",
+"tourism-information-map": "",
+"tourism-information-tactile_map": "",
+"tourism-information-guidepost": "",
+"aerialway-station": "",
+"aeroway-helipad": "",
+"barrier-border_control": "",
+"leisure-water_park|@category_tourism|@category_children": "",
+"man_made-water_tower": "",
+"man_made-windmill": "",
+"natural-cave_entrance": "",
+"natural-volcano|@mountain": "",
+"office-estate_agent": "",
+"waterway-lock_gate": "",
+"amenity-public_bookcase": "",
+"sport-climbing": "",
+"sport-yoga": "",
+"leisure-fitness_centre-sport-yoga": "",
+"tourism-apartment|@category_hotel": "",
+"leisure-resort|@category_hotel": "",
+"amenity-biergarten|@category_eat|@category_nightlife": "",
+"amenity-driving_school": "",
+"amenity-sailing_school": "",
+"amenity-flight_school": "",
+"amenity-prep_school": "",
+"amenity-music_school": "",
+"amenity-language_school": "",
+"amenity-ice_cream": "",
+"amenity-internet_cafe": "",
+"amenity-motorcycle_parking": "",
+"amenity-parking_space-disabled|@category_parking": "",
+"amenity-car_pooling|@category_parking": "",
+"amenity-nursing_home": "",
+"amenity-payment_terminal": "",
+"amenity-payment_centre": "",
+"amenity-public_bath": "",
+"amenity-shower": "",
+"emergency-access_point": "",
+"emergency-assembly_point": "",
+"emergency-life_ring": "",
+"emergency-defibrillator": "",
+"emergency-fire_hydrant": "",
+"amenity-hydrant": "",
+"emergency-lifeguard": "",
+"emergency-mountain_rescue": "",
+"leisure-fitness_station": "",
+"office-insurance": "",
+"office-ngo": "",
+"shop-erotic|@shop": "",
+"shop-beauty-day_spa": "",
+"shop-massage": "",
+"shop-motorcycle|@shop": "",
+"shop-motorcycle_repair": "",
+"shop-newsagent": "",
+"shop-pawnbroker": "",
+"shop-stationery|@shop": "",
+"shop-tattoo": "",
+"shop-variety_store|@category_shopping|@shop": "",
+"shop-video|@shop": "",
+"shop-video_games|@shop": "",
+"tourism-wilderness_hut|@category_hotel": "",
+"tourism-gallery|@category_tourism": "",
+"tourism-theme_park|@category_tourism|@category_children": "",
+"boundary-national_park|@category_tourism": "",
+"leisure-nature_reserve|@category_tourism": "",
+"natural-cape": "",
+"natural-geyser": "",
+"natural-glacier|@category_tourism": "",
+"highway-ford": "",
+"leisure-marina": "",
+"leisure-indoor_play": "",
+"piste:type-downhill|piste:type-nordic": "",
+"amenity-events_venue": "",
+"shop-chocolate|@category_food|@shop": "",
+"shop-coffee|@category_food|@shop": "",
+"shop-fabric|@shop": "",
+"shop-money_lender": "",
+"shop-music|@shop": "",
+"shop-musical_instrument|@shop": "",
+"shop-tea|@shop": "",
+"shop-telecommunication|@shop": "",
+"shop-antiques|@category_shopping|@shop|@category_secondhand": "",
+"shop-art|@category_shopping|@shop": "",
+"shop-baby_goods|@category_children|@shop": "",
+"shop-bag|@category_shopping|@shop": "",
+"shop-cheese|@category_food|@shop": "",
+"shop-dairy|@category_food|@shop": "",
+"shop-electrical|@shop": "",
+"shop-fishing|@shop": "",
+"shop-interior_decoration|@shop": "",
+"shop-lighting|@shop": "",
+"shop-lottery|@gambling": "",
+"shop-medical_supply|@shop": "",
+"shop-nutrition_supplements|@shop": "",
+"shop-paint|@shop": "",
+"shop-perfumery|@category_shopping|@shop": "",
+"shop-sewing|@shop": "",
+"shop-storage_rental": "",
+"shop-tobacco|@shop": "",
+"shop-trade|@shop": "",
+"shop-watches|@category_shopping|@shop": "",
+"shop-wholesale|@shop": "",
+"leisure-track": "",
+"leisure-bandstand": "",
+"power-plant": "",
+"power-generator-wind": "",
+"shop-auction|@category_secondhand": "",
+"shop-collector|@category_shopping|@category_secondhand": "",
+"man_made-cairn": "",
+"wheelchair-yes": "",
+"amenity-social_facility": "",
+"social_facility-soup_kitchen": "",
+"social_facility-food_bank": "",
+"amenity-food_sharing": "",
+"amenity-give_box": "",
+"leisure-sports_hall": "",
+"amenity-arts_centre|@category_tourism": "",
+"amenity-prison": "",
+"amenity-exhibition_centre": "",
+"shop-bathroom_furnishing|@shop": "",
+"shop-bed|@shop": "",
+"shop-boutique|@shop": "",
+"amenity-food_court": "",
+"shop-curtain|@shop": "",
+"shop-gas|@shop": "",
+"shop-pet_grooming": "",
+"shop-hifi|@shop": "",
+"amenity-conference_centre": "",
+"shop-herbalist|@shop": "",
+"shop-appliance|@shop": "",
+"shop-agrarian|@shop": "",
+"shop-fashion_accessories|@shop": "",
+"amenity-waste_transfer_station": "",
+"shop-carpet|@shop": "",
+"shop-craft|@shop": "",
+"shop-pasta|@shop": "",
+"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "",
+"amenity-luggage_locker": "",
+"office-security": "",
+"building-guardhouse": ""
+}

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

@@ -23,12 +23,12 @@
 "amenity-fast_food|@category_eat": "4Fast food|3restaurant",
 "amenity-restaurant|@category_eat": "3Restaurant",
 "amenity-fuel|@category_fuel": "3Benzinărie|peco",
-"@shop": "4Magazin",
+"@shop": "4Magazin|Magzine",
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Brutărie|Patiserie",
 "shop-cosmetics|@category_shopping|@shop": "4Cosmetică|centru de îngrijire|4machiaj|4machiaje",
 "shop-convenience|@category_food|@shop": "4Magazin mixt|minimarket|magazin",
 "shop-deli|@category_food|@shop": "Deli|Delicatese",
-"shop-garden_centre|@shop": "Pepinieră|magazin cu articole de grădinărit",
+"shop-garden_centre|@shop": "Pepinieră|magazin cu articole de grădinărit|4grădinărit",
 "shop-hearing_aids|@shop": "5Aparate auditive",
 "shop-mobile_phone|@shop": "Magazin de telefoane mobile|magazin de electronice",
 "shop-florist|@shop": "4Florărie",
@@ -317,10 +317,10 @@
 "amenity-community_centre": "Centru comunitar",
 "amenity-compressed_air": "Aer comprimat",
 "amenity-courthouse": "Judecătorie",
-"amenity-vending_machine-cigarettes": "Automat de țigări",
+"amenity-vending_machine-cigarettes": "Automat de țigări|Țigări",
 "amenity-vending_machine-drinks": "Automat de băuturi",
-"amenity-vending_machine-parking_tickets|@category_parking": "4Parcomat|3Parcometru|Automat Parcare",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "Automat de vânzare a biletelor pentru transportul public",
+"amenity-vending_machine-parking_tickets|@category_parking": "4Parcomat|3Parcometru|Automat Parcare|Automat de parcare",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "Automat de vânzare a biletelor pentru transportul public|Bilete|Automat de bilete",
 "shop-outpost": "Punct de ridicare",
 "building-garage": "Garaj",
 "highway-rest_area|highway-services": "Zonă de odihnă|Loc de odihnă|Spațiu servicii|Refugiu",
@@ -437,7 +437,7 @@
 "shop-carpet|@shop": "Covoare",
 "shop-pasta|@shop": "Paste",
 "amenity-luggage_locker": "Dulap pentru bagaje",
-"shop-health_food|@category_food|@shop": "Magazin Naturist|Alimente Naturale|Alimente sănătoase|Mâncare sănătoasă",
+"shop-health_food|@category_food|@shop": "Magazin Naturist|Alimente Naturale|Alimente sănătoase|Mâncare sănătoasă|vegan",
 "amenity-animal_shelter": "4Adăpost pentru animale",
 "emergency-life_ring": "3Colac de salvare|Colac",
 "healthcare-sample_collection": "4Recoltare Probe|4Analize",
@@ -479,8 +479,8 @@
 "amenity-bicycle_repair_station": "4Reparații biciclete|stație reparații biciclete|stație reparare biciclete",
 "amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Încărcare|Încărcare mașini|Încărcare mașini electrice|stație de încărcare",
 "amenity-vending_machine-coffee": "Cafea|4automat de cafea|tonomat de cafea",
-"amenity-vending_machine-condoms": "Automat prezervative",
-"amenity-vending_machine-food|@category_food": "Automat de gustări|Automt de mâncare|gustări|tonomat de gustări|tonomat|automat cu gustări",
+"amenity-vending_machine-condoms": "Automat de prezervative|5prezervative",
+"amenity-vending_machine-food|@category_food": "Automat de gustări|Automat de mâncare|gustări|tonomat de gustări|tonomat|automat cu gustări",
 "amenity-vending_machine-newspapers": "4Ziare|Automt ziare|tononat ziare",
 "amenity-vending_machine-sweets": "Dulciuri|Automat de dulciuri|tonomat de dulciuri|automat cu dulciuri",
 "amenity-parcel_locker|@category_post": "Locker colete|Dulap colete",

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

@@ -5,9 +5,9 @@
 "@category_fuel": "3бензин|3дизель|4топливо|газ|АЗС",
 "@category_parking": "4Парковка",
 "@category_shopping": "3Шоппинг|4Покупки",
-"@category_hotel": "4Гостиница|отель|отели",
+"@category_hotel": "3Отель|отели|4Гостиница|гостиницы|ночлег",
 "@category_tourism": "4Достопримечательности|3Туризм",
-"@category_entertainment": "Развлечения",
+"@category_entertainment": "4Развлечения",
 "@category_nightlife": "Ночная жизнь|С друзьями|Вечер с друзьями|потусить",
 "@category_children": "Отдых с детьми",
 "@category_atm": "3Банкомат",
@@ -20,7 +20,7 @@
 "amenity-bureau_de_change": "3Обмен валюты|обмен валют|обменник|4валюта|деньги",
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "3Бар|3паб|4пиво|выпить|пивной ресторан|пивбар|крафт|коктейль бар|пивная|4коктейли|алкоголь|алкогольные напитки",
 "amenity-cafe|@category_eat": "3Кафе|3ресторан|кофейня|кофе",
-"amenity-fast_food|@category_eat": "3Фастфуд|3ресторан|3кафе|закусочная|быстрое питание|снеки|перекусить|экспресс-питание",
+"amenity-fast_food|@category_eat": "4Фастфуд|3На вынос|закусочная|быстрое питание|снеки|бистро|экспресс-питание",
 "amenity-restaurant|@category_eat": "3Ресторан|3кафе",
 "amenity-fuel|@category_fuel": "азс|агзс|агнкс|бензоколонка|бензозаправка|4автозаправка|3заправка",
 "@shop": "4Магазин",

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

@@ -2242,7 +2242,7 @@
 "Sweden_Norra Sverige Description":"Umeå, Luleå, Piteå",
 "Sweden_Ostra Gotaland Description":"Linköping, Norrköping, Jönköping",
 "Sweden_Sodra Gotaland Description":"Malmö",
-"Sweden_Stockholm Description":"Stockholm",
+"Sweden_Stockholm Description":"Huddinge, Nacka, Stockholm",
 "Sweden_Vastra Gotaland Description":"Göteborg",
 "Switzerland_Central Description":"Luzern, Zug, Sarnen, Stans, Altdorf, Schwyz",
 "Switzerland_Eastern Description":"Chur, St. Gallen, Herisau, Appenzell, Frauenfeld, Glarus, Schaffhausen",

data/editor.config

@@ -1167,6 +1167,9 @@
       <type id="tourism-information-map">
         <include field="name" />
       </type>
+      <type id="tourism-information-tactile_map">
+        <include field="name" />
+      </type>
       <type id="tourism-information-guidepost">
       </type>
       <!-- Too generic to add -->

data/mapcss-mapping.csv

@@ -351,7 +351,7 @@ sport|basketball;242;
 amenity|cinema;243;
 amenity|theatre;244;
 sport|chess;245;
-deprecated:railway|spur:06.2023;246;x
+railway|turntable;246;
 aerialway|station;247;
 landuse|brownfield;248;
 aeroway|apron;249;
@@ -518,7 +518,7 @@ piste:type|sled;402;
 leisure|beach_resort;403;
 leisure|dog_park;404;
 aerialway|gondola;405;
-deprecated:historic|museum:10.2021;[historic=museum];x;name;int_name;406;tourism|museum
+tourism|information|tactile_map;[tourism=information][information=tactile_map];;name;int_name;406;
 highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407;
 leisure|track|area;[leisure=track][area?];;name;int_name;408;
 railway|monorail;409;

data/sound-strings/ca.json/localize.json

@@ -49,37 +49,37 @@
 "in_3_kilometers":"A tres quilòmetres",
 "then":"Després",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"Agafeu la primera sortida.",
+"take_the_1_exit":"Agafa la primera sortida.",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"Agafeu la segona sortida.",
+"take_the_2_exit":"Agafa la segona sortida.",
 "take_the_2_exit_street":"NULL",
 "take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"Agafeu la tercera sortida.",
+"take_the_3_exit":"Agafa la tercera sortida.",
 "take_the_3_exit_street":"NULL",
 "take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"Agafeu la quarta sortida.",
+"take_the_4_exit":"Agafa la quarta sortida.",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"Agafeu la cinquena sortida.",
+"take_the_5_exit":"Agafa la cinquena sortida.",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"Agafeu la sisena sortida.",
+"take_the_6_exit":"Agafa la sisena sortida.",
 "take_the_6_exit_street":"NULL",
 "take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"Agafeu la setena sortida.",
+"take_the_7_exit":"Agafa la setena sortida.",
 "take_the_7_exit_street":"NULL",
 "take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"Agafeu la vuitena sortida.",
+"take_the_8_exit":"Agafa la octava sortida.",
 "take_the_8_exit_street":"NULL",
 "take_the_8_exit_street_verb":"NULL",
-"take_the_9_exit":"Agafeu la novena sortida.",
+"take_the_9_exit":"Agafa la novena sortida.",
 "take_the_9_exit_street":"NULL",
 "take_the_9_exit_street_verb":"NULL",
-"take_the_10_exit":"Agafeu la desena sortida.",
+"take_the_10_exit":"Agafa la desena sortida.",
 "take_the_10_exit_street":"NULL",
 "take_the_10_exit_street_verb":"NULL",
-"take_the_11_exit":"Agafeu la onzena sortida.",
+"take_the_11_exit":"Agafa la onzena sortida.",
 "take_the_11_exit_street":"NULL",
 "take_the_11_exit_street_verb":"NULL",
 "in_50_feet":"A cinquanta peus",

data/sound-strings/da.json/localize.json

@@ -49,37 +49,37 @@
 "in_3_kilometers":"Om tre kilometer",
 "then":"Derefter",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"Tag den første afkørsel.",
+"take_the_1_exit":"Tag første afkørsel.",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"Tag den anden afkørsel.",
+"take_the_2_exit":"Tag anden afkørsel.",
 "take_the_2_exit_street":"NULL",
 "take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"Tag den tredje afkørsel.",
+"take_the_3_exit":"Tage tredje afkørsel.",
 "take_the_3_exit_street":"NULL",
 "take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"Tag den fjerde afkørsel.",
+"take_the_4_exit":"Tag fjerde afkørsel.",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"Tag den femte afkørsel.",
+"take_the_5_exit":"Tag femte afkørsel.",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"Tag den sjette afkørsel.",
+"take_the_6_exit":"Tag sjette afkørsel.",
 "take_the_6_exit_street":"NULL",
 "take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"Tag den syvende afkørsel.",
+"take_the_7_exit":"Tag syvende afkørsel.",
 "take_the_7_exit_street":"NULL",
 "take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"Tag den ottende afkørsel.",
+"take_the_8_exit":"Tag ottende afkørsel.",
 "take_the_8_exit_street":"NULL",
 "take_the_8_exit_street_verb":"NULL",
-"take_the_9_exit":"Tag den niende afkørsel.",
+"take_the_9_exit":"Tag niende afkørsel.",
 "take_the_9_exit_street":"NULL",
 "take_the_9_exit_street_verb":"NULL",
-"take_the_10_exit":"Tag den tiende afkørsel.",
+"take_the_10_exit":"Tag tiende afkørsel.",
 "take_the_10_exit_street":"NULL",
 "take_the_10_exit_street_verb":"NULL",
-"take_the_11_exit":"Tag den ellevte afkørsel.",
+"take_the_11_exit":"Tag ellevte afkørsel.",
 "take_the_11_exit_street":"NULL",
 "take_the_11_exit_street_verb":"NULL",
 "in_50_feet":"Om halvtreds fod",

data/sound-strings/hr.json/localize.json

@@ -1,47 +1,47 @@
 {
-"make_a_slight_right_turn":"Držite desno.",
+"make_a_slight_right_turn":"Skrenite blago desno.",
 "make_a_slight_right_turn_street":"NULL",
 "make_a_slight_right_turn_street_verb":"NULL",
-"make_a_right_turn":"Skrenite udesno.",
+"make_a_right_turn":"Skrenite desno.",
 "make_a_right_turn_street":"NULL",
-"make_a_sharp_right_turn":"Oštro udesno.",
+"make_a_sharp_right_turn":"Skrenite oštro desno.",
 "make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"Uđite na zaobilaznicu.",
+"enter_the_roundabout":"Uđite u kružni tok.",
 "enter_the_roundabout_street":"NULL",
 "enter_the_roundabout_street_verb":"NULL",
-"leave_the_roundabout":"Napustite zaobilaznicu.",
+"leave_the_roundabout":"Izađite iz kružnog toka.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
-"make_a_slight_left_turn":"Držite lijevo.",
+"make_a_slight_left_turn":"Skrenite blago lijevo.",
 "make_a_slight_left_turn_street":"NULL",
 "make_a_slight_left_turn_street_verb":"NULL",
-"make_a_left_turn":"Skrenite ulijevo.",
+"make_a_left_turn":"Skrenite lijevo.",
 "make_a_left_turn_street":"NULL",
-"make_a_sharp_left_turn":"Oštro ulijevo.",
+"make_a_sharp_left_turn":"Skrenite oštro lijevo.",
 "make_a_sharp_left_turn_street":"NULL",
-"make_a_u_turn":"Napravite poluzaokret.",
+"make_a_u_turn":"Polukružno se okrenite.",
 "make_a_u_turn_street":"NULL",
 "make_a_u_turn_street_verb":"NULL",
-"go_straight":"Idite ravno.",
+"go_straight":"Nastavite pravo.",
 "exit":"Izlaz.",
 "onto":"na",
-"take_exit_number":"Izlaz na",
+"take_exit_number":"Izađite na izlaz",
 "take_exit_number_street_verb":"NULL",
-"route_recalculating":"Recalculating the route",
-"destination":"Stižete.",
-"you_have_reached_the_destination":"Stigli ste.",
+"route_recalculating":"Preračunavanje rute",
+"destination":"Stižete na odredište.",
+"you_have_reached_the_destination":"Stigli ste na odredište.",
 "in_50_meters":"Za pedeset metara",
-"in_100_meters":"Za stotinu metara",
-"in_200_meters":"Za dvije stotine metara",
-"in_250_meters":"Za dvije stotine i pedeset metara",
-"in_300_meters":"Za tri stotine metara",
-"in_400_meters":"Za četiri stotine metara",
-"in_500_meters":"Za pet stotina metara",
-"in_600_meters":"Za šest stotina metara",
-"in_700_meters":"Za sedam stotina metara",
-"in_750_meters":"Za sedam stotina i pedeset metara",
-"in_800_meters":"Za osam stotina metara",
-"in_900_meters":"Za devet stotina metara",
+"in_100_meters":"Za sto metara",
+"in_200_meters":"Za dvjesto metara",
+"in_250_meters":"Za dvjesto pedeset metara",
+"in_300_meters":"Za tristo metara",
+"in_400_meters":"Za četiristo metara",
+"in_500_meters":"Za petsto metara",
+"in_600_meters":"Za šesto metara",
+"in_700_meters":"Za sedamsto metara",
+"in_750_meters":"Za sedamsto pedeset metara",
+"in_800_meters":"Za osamsto metara",
+"in_900_meters":"Za devetsto metara",
 "in_1_kilometer":"Za jedan kilometar",
 "in_1_5_kilometers":"Za jedan i pol kilometar",
 "in_2_kilometers":"Za dva kilometra",
@@ -83,26 +83,26 @@
 "take_the_11_exit_street":"NULL",
 "take_the_11_exit_street_verb":"NULL",
 "in_50_feet":"Za pedeset stopa",
-"in_100_feet":"Za stotinu stopa",
-"in_200_feet":"Za dvije stotine stopa",
-"in_300_feet":"Za tri stotine stopa",
-"in_400_feet":"Za četiri stotine stopa",
-"in_500_feet":"Za pet stotina stopa",
-"in_600_feet":"Za šest stotina stopa",
-"in_700_feet":"Za sedam stotina stopa",
-"in_800_feet":"Za osam stotina stopa",
-"in_900_feet":"Za devet stotina stopa",
+"in_100_feet":"Za sto stopa",
+"in_200_feet":"Za dvjesto stopa",
+"in_300_feet":"Za tristo stopa",
+"in_400_feet":"Za četiristo stopa",
+"in_500_feet":"Za petsto stopa",
+"in_600_feet":"Za šeststo stopa",
+"in_700_feet":"Za sedamsto stopa",
+"in_800_feet":"Za osamsto stopa",
+"in_900_feet":"Za devetsto stopa",
 "in_1000_feet":"Za tisuću stopa",
-"in_1500_feet":"Za tisuću i pet stotina stopa",
+"in_1500_feet":"Za tisuću petsto stopa",
 "in_2000_feet":"Za dvije tisuće stopa",
-"in_2500_feet":"Za dvije tisuće i pet stotina stopa",
+"in_2500_feet":"Za dvije tisuće petsto stopa",
 "in_3000_feet":"Za tri tisuće stopa",
-"in_3500_feet":"Za tri tisuće i pet stotina stopa",
+"in_3500_feet":"Za tri tisuće petsto stopa",
 "in_4000_feet":"Za četiri tisuće stopa",
-"in_4500_feet":"Za četiri tisuće i pet stotina stopa",
+"in_4500_feet":"Za četiri tisuće petsto stopa",
 "in_5000_feet":"Za pet tisuća stopa",
 "in_1_mile":"Za jednu milju",
 "in_1_5_miles":"Za jednu i pol milju",
 "in_2_miles":"Za dvije milje",
-"unknown_camera":"Camera ahead"
+"unknown_camera":"Upozorenje, kamera za nadzor brzine"
 }

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

@@ -49,37 +49,37 @@
 "in_3_kilometers":"За три километра",
 "then":"Затим",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"Изађите на први излаз.",
+"take_the_1_exit":"Идите на први излаз.",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"Изађите на други излаз.",
+"take_the_2_exit":"Идите на други излаз.",
 "take_the_2_exit_street":"NULL",
 "take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"Изађите на трећи излаз.",
+"take_the_3_exit":"Идите на трећи излаз.",
 "take_the_3_exit_street":"NULL",
 "take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"Изађите на четврти излаз.",
+"take_the_4_exit":"Идите на четврти излаз.",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"Изађите на пети излаз.",
+"take_the_5_exit":"Идите на пети излаз.",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"Изађите на шести излаз.",
+"take_the_6_exit":"Идите на шести излаз.",
 "take_the_6_exit_street":"NULL",
 "take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"Изађите на седми излаз.",
+"take_the_7_exit":"Идите на седми излаз.",
 "take_the_7_exit_street":"NULL",
 "take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"Изађите на осми излаз.",
+"take_the_8_exit":"Идите на осми излаз.",
 "take_the_8_exit_street":"NULL",
 "take_the_8_exit_street_verb":"NULL",
-"take_the_9_exit":"Изађите на девети излаз.",
+"take_the_9_exit":"Идите на девети излаз.",
 "take_the_9_exit_street":"NULL",
 "take_the_9_exit_street_verb":"NULL",
-"take_the_10_exit":"Изађите на десети излаз.",
+"take_the_10_exit":"Идите на десети излаз.",
 "take_the_10_exit_street":"NULL",
 "take_the_10_exit_street_verb":"NULL",
-"take_the_11_exit":"Изађите на једанаести излаз.",
+"take_the_11_exit":"Идите на једанаести излаз.",
 "take_the_11_exit_street":"NULL",
 "take_the_11_exit_street_verb":"NULL",
 "in_50_feet":"За педесет стопа",

data/styles/default/dark/colors.mapcss

@@ -162,11 +162,22 @@
 @path: #944A12;
 @path_expert: #523E33;
 @bridleway: #2B2827;
+@motorway0_border: #7A4006;
+@motorway1_border: #784606;
+@trunk0_border: #794D11;
+@trunk1_border: #79511D;
+@primary0_border: #7A5C2A;
+@primary1_border: #7C5E24;
+@primary2_border: #7C622F;
+@secondary0_border: #7F6730;
+@secondary1_border: #7F6B3C;
+@minor_road_border: #b2b2b2;
 
 /* 5.2 Bridges */
 
 @bridge_background: #2C2C1A;
 @bridge_casing: #505050;
+@bridge_minor_road_border: #393928;
 
 /* 5.3 Tunnels */
 

data/styles/default/dark/symbols/subway-vienna-m.svg

@@ -1,7 +1,6 @@
-<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <circle cx="12" cy="12" r="12" fill="#FFF" opacity=".4"/>
-  <circle cx="12" cy="12" r="11" fill="#0D3C73"/>
-  <path d="m12.7 19.1c-3.6 0.4-6.7-2.5-6.7-6.1v-8h4v7.9c0 0.8 0.5 1.6 1.3 1.9 1.4 0.4 2.7-0.5 2.7-1.8v-8h4v7.8c0 3.1-2.2 5.9-5.3 6.3z" fill="#FFF" opacity=".6"/>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="12" fill="#fff" opacity=".4"/>
+ <circle cx="12" cy="12" r="11" fill="#0d3c73"/>
+ <path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#e7ecf1"/>
 </svg>

data/styles/default/dark/symbols/subway-vienna-s.svg

@@ -1,7 +1,8 @@
-<svg viewBox="0 0 18 18" width="14" height="14" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <circle cx="9" cy="9" r="9" fill="#FFF" opacity=".4"/>
-  <circle cx="9" cy="9" r="8" fill="#0D3C73"/>
-  <path d="m5 4h3v6c0 0.57157 0.42843 1 1 1s1-0.42843 1-1v-6h3v6c0 2.2284-1.7716 4-4 4-2.2284 0-4-1.7716-4-4v-6z" fill="#FFF" opacity=".6"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g stroke-width=".75">
+  <circle cx="9" cy="9" r="9" fill="#fff" opacity=".4"/>
+  <circle cx="9" cy="9" r="8.25" fill="#0d3c73"/>
+  <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#e7ecf1"/>
  </g>
 </svg>

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

@@ -0,0 +1 @@
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.70796435.16441116 2.91781369 1.20859801c.45330196.18776383.81344906.54791086 1.00121276 1.00121279l1.208598 2.91781371c.1877638.45330195.1877638.96262671 0 1.41592868l-1.208598 2.91781367c-.1877637.45330198-.5479108.81344908-1.00121276 1.00121278l-2.91781371 1.208598c-.45330195.1877638-.96262671.1877638-1.41592868 0l-2.91781367-1.208598c-.45330195-.1877637-.81344898-.5479108-1.00121281-1.00121276l-1.20859801-2.91781369c-.18776381-.45330196-.18776381-.96262674 0-1.4159287l1.20859801-2.91781369c.18776382-.45330196.54791083-.81344897 1.00121279-1.00121279l2.91781369-1.20859801c.45330196-.18776381.96262674-.18776381 1.4159287 0z" fill="#181715" fill-opacity=".5"/><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#202510" fill-rule="evenodd"/></g></svg>

data/styles/default/include/Icons.mapcss

@@ -70,6 +70,7 @@ node|z14-[natural=geyser],
 node|z16-[natural=beach],
 area|z14-[natural=bare_rock],
 node|z17-[natural=rock],
+node|z18-[natural=tree],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
 
 node|z13-[natural=peak][!name],
@@ -206,7 +207,9 @@ node|z19-[man_made=water_well][drinking_water=not],
 node|z19-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
-node|z18-[natural=tree],
+node|z18-[natural=tree][name],
+{icon-image: tree-special-m.svg;}
+node|z18-[natural=tree][!name],
 {icon-image: tree-m.svg;}
 
 node|z18-[xmas:feature=tree],
@@ -766,7 +769,8 @@ node|z16-[tourism=information][information=board]
 {icon-image: board.svg;text-offset: 1;icon-min-distance: 10;}
 node|z16-[tourism=information][information=guidepost]
 {icon-image: guidepost.svg;text-offset: 1;icon-min-distance: 10;}
-node|z16-[tourism=information][information=map]
+node|z16-[tourism=information][information=map],
+node|z16-[tourism=information][information=tactile_map],
 {icon-image: map.svg;text-offset: 1;icon-min-distance: 10;}
 
 node|z15-[amenity=ranger_station],

data/styles/default/include/Roads.mapcss

@@ -35,7 +35,9 @@
   8.7 Footway 15-22 ZOOM
   8.8 Steps 15-22 ZOOM
   8.9 Bridleway 14-22 ZOOM
-  8.10 Runway 12-22 ZOOM
+  8.10 Major road borders
+  8.11 Minor road borders
+  8.12 Runway 12-22 ZOOM
 9.RAIL 11-22 ZOOM
   9.1 RAIL 11-22 ZOOM
   9.2 Rail tunnel 14-22 ZOOM
@@ -1137,7 +1139,420 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite
 line|z17-[highway=bridleway][bridge?]::bridgeblack
 {casing-width-add: 1;}
 
-/* 8.10 Runway 12-22 ZOOM */
+
+/* 8.10 Major road borders */
+
+line|z6-9[highway=motorway]::border,
+line|z6-9[highway=trunk]::border,
+{color: @trunk0_border; opacity: 1;}
+
+line|z10-13[highway=motorway]::border,
+line|z10-13[highway=motorway_link]::border,
+{color: @motorway0_border; opacity: 1;}
+
+line|z10-13[highway=trunk]::border,
+line|z10-13[highway=trunk_link]::border,
+{color: @trunk1_border; opacity: 1;}
+
+line|z14-[highway=motorway]::border,
+line|z14-[highway=motorway_link]::border,
+{color: @motorway1_border; opacity: 1;}
+
+line|z14-[highway=trunk]::border,
+line|z14-[highway=trunk_link]::border,
+{color: @trunk1_border; opacity: 1;}
+
+line|z8-10[highway=primary]::border,
+{color: @primary0_border; opacity: 1;}
+line|z11-13[highway=primary]::border,
+line|z11-13[highway=primary_link]::border,
+{color: @primary1_border; opacity: 1;}
+line|z14-[highway=primary]::border,
+line|z14-[highway=primary_link]::border,
+{color: @primary2_border; opacity: 1;}
+
+line|z10-13[highway=secondary]::border,
+line|z13[highway=secondary_link]::border,
+{color: @secondary0_border; opacity: 1;}
+line|z14-[highway=secondary]::border,
+line|z14-[highway=secondary_link]::border,
+{color: @secondary1_border; opacity: 1;}
+
+/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
+
+line|z10[highway=motorway]::border,
+{width: 3.6;}
+line|z11[highway=motorway]::border,
+{width: 4.0;}
+line|z12[highway=motorway]::border,
+{width: 4.6;}
+line|z13[highway=motorway]::border,
+{width: 5.0;}
+line|z14[highway=motorway]::border,
+{width: 5.4;}
+line|z15[highway=motorway]::border,
+{width: 6.6;}
+line|z16[highway=motorway]::border,
+{width: 8.8;}
+line|z17[highway=motorway]::border,
+{width: 10.0;}
+line|z18[highway=motorway]::border,
+{width: 13.0;}
+line|z19-[highway=motorway]::border,
+{width: 17.0;}
+
+line|z6[highway=motorway]::border,
+line|z6[highway=trunk]::border,
+{width: 0;}
+line|z7[highway=motorway]::border,
+line|z7[highway=trunk]::border,
+{width: 0;}
+line|z8[highway=motorway]::border,
+line|z8[highway=trunk]::border,
+{width: 1.7;}
+line|z9[highway=motorway]::border,
+line|z9[highway=trunk]::border,
+{width: 1.8;}
+line|z10[highway=trunk]::border,
+{width: 3.2;}
+line|z11[highway=trunk]::border,
+{width: 3.5;}
+line|z12[highway=trunk]::border,
+{width: 4.0;}
+line|z13[highway=trunk]::border,
+{width: 4.6;}
+line|z14[highway=trunk]::border,
+{width: 5.0;}
+line|z15[highway=trunk]::border,
+{width: 5.8;}
+line|z16[highway=trunk]::border,
+{width: 7.2;}
+line|z17[highway=trunk]::border,
+{width: 9.2;}
+line|z18[highway=trunk]::border,
+{width: 12;}
+line|z19-[highway=trunk]::border,
+{width: 14.5;}
+
+line|z10[highway=motorway_link]::border,
+line|z10[highway=trunk_link]::border,
+{width: 0;}
+line|z11[highway=motorway_link]::border,
+line|z11[highway=trunk_link]::border,
+{width: 1.6;}
+line|z12[highway=motorway_link]::border,
+line|z12[highway=trunk_link]::border,
+{width: 1.9;}
+line|z13[highway=motorway_link]::border,
+line|z13[highway=trunk_link]::border,
+{width: 2.4;}
+line|z14[highway=motorway_link]::border,
+line|z14[highway=trunk_link]::border,
+{width: 3.7;}
+line|z15[highway=motorway_link]::border,
+line|z15[highway=trunk_link]::border,
+{width: 4.7;}
+line|z16[highway=motorway_link]::border,
+line|z16[highway=trunk_link]::border,
+{width: 6.1;}
+line|z17[highway=motorway_link]::border,
+line|z17[highway=trunk_link]::border,
+{width: 7.7;}
+line|z18[highway=motorway_link]::border,
+line|z18[highway=trunk_link]::border,
+{width: 10.5;}
+line|z19-[highway=motorway_link]::border,
+line|z19-[highway=trunk_link]::border,
+{width: 12.7;}
+
+line|z8[highway=primary]::border,
+{width: 0;}
+line|z9[highway=primary]::border,
+{width: 0;}
+line|z10[highway=primary]::border,
+{width: 2.3;}
+line|z11[highway=primary]::border,
+{width: 3.3;}
+line|z12[highway=primary]::border,
+{width: 3.7;}
+line|z13[highway=primary]::border,
+{width: 4.0;}
+line|z14[highway=primary]::border,
+{width: 4.8;}
+line|z15[highway=primary]::border,
+{width: 5.4;}
+line|z16[highway=primary]::border,
+{width: 6.4;}
+line|z17[highway=primary]::border,
+{width: 8;}
+line|z18[highway=primary]::border,
+{width: 11;}
+line|z19-[highway=primary]::border,
+{width: 13;}
+
+line|z11[highway=primary_link]::border,
+{width: 0;}
+line|z12[highway=primary_link]::border,
+{width: 0;}
+line|z13[highway=primary_link]::border,
+{width: 1.8;}
+line|z14[highway=primary_link]::border,
+{width: 2.3;}
+line|z15[highway=primary_link]::border,
+{width: 3.5;}
+line|z16[highway=primary_link]::border,
+{width: 4.2;}
+line|z17[highway=primary_link]::border,
+{width: 5.7;}
+line|z18[highway=primary_link]::border,
+{width: 7.4;}
+line|z19-[highway=primary_link]::border,
+{width: 9.2;}
+
+line|z10[highway=secondary]::border,
+{width: 1.9;}
+line|z11[highway=secondary]::border,
+{width: 3.2;}
+line|z12[highway=secondary]::border,
+{width: 3.5;}
+line|z13[highway=secondary]::border,
+{width: 3.7;}
+line|z14[highway=secondary]::border,
+{width: 4.2;}
+line|z15[highway=secondary]::border,
+{width: 4.8;}
+line|z16[highway=secondary]::border,
+{width: 6;}
+line|z17[highway=secondary]::border,
+{width: 7.6;}
+line|z18[highway=secondary]::border,
+{width: 10.4;}
+line|z19-[highway=secondary]::border,
+{width: 12.6;}
+
+line|z13[highway=secondary_link]::border,
+{width: 1.8;}
+line|z14[highway=secondary_link]::border,
+{width: 2.3;}
+line|z15[highway=secondary_link]::border,
+{width: 3.5;}
+line|z16[highway=secondary_link]::border,
+{width: 4.2;}
+line|z17[highway=secondary_link]::border,
+{width: 5.7;}
+line|z18[highway=secondary_link]::border,
+{width: 7.4;}
+line|z19-[highway=secondary_link]::border,
+{width: 9.2;}
+
+
+/* 8.11 Minor road borders */
+
+line|z11-[highway=tertiary]::border,
+line|z14-[highway=tertiary_link]::border,
+line|z11-[highway=unclassified]::border,
+line|z12-[highway=residential]::border,
+line|z12-[highway=road]::border,
+line|z12-[highway=living_street]::border,
+line|z13-[highway=pedestrian]::border,
+line|z13-[highway=ford]::border,
+line|z15-[highway=service]::border,
+line|z15-[highway=service][service=busway]::border,
+line|z15-[highway=busway]::border,
+line|z15-[highway=footway]::border,
+line|z15-[highway=ladder]::border,
+line|z15-[highway=steps]::border,
+{color: @minor_road_border; opacity: 0.1;}
+
+line|z11-[highway=tertiary][bridge?]::border,
+line|z14-[highway=tertiary_link][bridge?]::border,
+line|z11-[highway=unclassified][bridge?]::border,
+line|z12-[highway=residential][bridge?]::border,
+line|z12-[highway=road][bridge?]::border,
+line|z12-[highway=living_street][bridge?]::border,
+line|z13-[highway=pedestrian][bridge?]::border,
+line|z15-[highway=service][bridge?]::border,
+line|z15-[highway=service][service=busway][bridge?]::border,
+line|z15-[highway=busway][bridge?]::border,
+line|z15-[highway=footway][bridge?]::border,
+line|z15-[highway=steps][bridge?]::border,
+{color: @bridge_minor_road_border; opacity: 1; linecap: butt}
+
+/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
+
+line|z11[highway=tertiary]::border,
+{width: 1.7;}
+line|z12[highway=tertiary]::border,
+{width: 2.1;}
+line|z13[highway=tertiary]::border,
+{width: 2.3;}
+line|z14[highway=tertiary]::border,
+{width: 3.7;}
+line|z15[highway=tertiary]::border,
+{width: 4.8;}
+line|z16[highway=tertiary]::border,
+{width: 6;}
+line|z17[highway=tertiary]::border,
+{width: 7.6;}
+line|z18[highway=tertiary]::border,
+{width: 10.4;}
+line|z19-[highway=tertiary]::border,
+{width: 12.6;}
+
+line|z14[highway=tertiary_link]::border,
+{width: 2.3;}
+line|z15[highway=tertiary_link]::border,
+{width: 3.5;}
+line|z16[highway=tertiary_link]::border,
+{width: 4.2;}
+line|z17[highway=tertiary_link]::border,
+{width: 5.7;}
+line|z18[highway=tertiary_link]::border,
+{width: 7.4;}
+line|z19-[highway=tertiary_link]::border,
+{width: 9.2;}
+
+line|z11[highway=unclassified]::border,
+{width: 0;}
+line|z12[highway=unclassified]::border,
+{width: 0;}
+line|z13[highway=unclassified]::border,
+{width: 1.9;}
+line|z14[highway=unclassified]::border,
+{width: 3.3;}
+line|z15[highway=unclassified]::border,
+{width: 4.2;}
+line|z16[highway=unclassified]::border,
+{width: 5.2;}
+line|z17[highway=unclassified]::border,
+{width: 7;}
+line|z18[highway=unclassified]::border,
+{width: 9;}
+line|z19-[highway=unclassified]::border,
+{width: 11;}
+
+line|z12[highway=residential]::border,
+line|z12[highway=road]::border,
+line|z12[highway=living_street]::border,
+{width: 0;}
+line|z13[highway=residential]::border,
+line|z13[highway=road]::border,
+line|z13[highway=living_street]::border,
+{width: 0;}
+line|z14[highway=residential]::border,
+line|z14[highway=road]::border,
+line|z14[highway=living_street]::border,
+{width: 2.1;}
+line|z15[highway=residential]::border,
+line|z15[highway=road]::border,
+line|z15[highway=living_street]::border,
+{width: 3.4;}
+line|z16[highway=residential]::border,
+line|z16[highway=road]::border,
+line|z16[highway=living_street]::border,
+{width: 4.2;}
+line|z17[highway=residential]::border,
+line|z17[highway=road]::border,
+line|z17[highway=living_street]::border,
+{width: 5.7;}
+line|z18[highway=residential]::border,
+line|z18[highway=road]::border,
+line|z18[highway=living_street]::border,
+{width: 7.4;}
+line|z19-[highway=residential]::border,
+line|z19-[highway=road]::border,
+line|z19-[highway=living_street]::border,
+{width: 9.2;}
+
+line|z13[highway=pedestrian]::border,
+line|z13[highway=ford]::border,
+{width: 0;dashes: 4,1;}
+line|z14[highway=pedestrian]::border,
+line|z14[highway=ford]::border,
+{width: 2.1;dashes: 6,1.3;}
+line|z15[highway=pedestrian]::border,
+line|z15[highway=ford]::border,
+{width: 3;dashes: 8,1.5;}
+line|z16[highway=pedestrian]::border,
+line|z16[highway=ford]::border,
+{width: 3.4;dashes: 8,1.5;}
+line|z17[highway=pedestrian]::border,
+line|z17[highway=ford]::border,
+{width: 4;dashes: 9,1.8;}
+line|z18[highway=pedestrian]::border,
+line|z18[highway=ford]::border,
+{width: 5;dashes: 11,2.3;}
+line|z19-[highway=pedestrian]::border,
+line|z19-[highway=ford]::border,
+{width: 6;dashes: 13,2.7;}
+
+line|z15[highway=service]::border,
+line|z15[highway=service][service=busway]::border,
+line|z15[highway=busway]::border,
+{width: 1.7;}
+line|z15[highway=service][service=driveway]::border,
+{width: 0;}
+line|z16[highway=service]::border,
+line|z16[highway=service][service=busway]::border,
+line|z16[highway=busway]::border,
+{width: 2.1;}
+line|z17[highway=service]::border,
+line|z17[highway=service][service=busway]::border,
+line|z17[highway=busway]::border,
+{width: 3;}
+line|z18[highway=service]::border,
+line|z18[highway=service][service=busway]::border,
+line|z18[highway=busway]::border,
+{width: 4;}
+line|z19-[highway=service]::border,
+line|z19-[highway=service][service=busway]::border,
+line|z19-[highway=busway]::border,
+{width: 5;}
+
+line|z15[highway=footway]::border,
+{width: 2; dashes: 5,1.5;}
+line|z16[highway=footway]::border,
+{width: 3; dashes: 5,1.5;}
+line|z17[highway=footway]::border,
+{width: 3.4; dashes: 6,1.8;}
+line|z18[highway=footway]::border,
+{width: 4.2; dashes: 8,2.3;}
+line|z19-[highway=footway]::border,
+{width: 5.2; dashes: 10,2.7;}
+
+line|z15[highway=footway][bicycle=designated]::border,
+{width: 2; dashes: 6,9;}
+line|z16[highway=footway][bicycle=designated]::border,
+{width: 3; dashes: 8,10;}
+line|z17[highway=footway][bicycle=designated]::border,
+{width: 3.4; dashes: 10,11;}
+line|z18[highway=footway][bicycle=designated]::border,
+{width: 4.2; dashes: 15,15;}
+line|z19-[highway=footway][bicycle=designated]::border,
+{width: 5.2; dashes: 20,20;}
+
+/* Don't display sidewalks and pedestrian crossings on z15. */
+line|z15[highway=footway][footway=sidewalk]::border,
+line|z15[highway=footway][footway=crossing]::border,
+{width: 0;}
+
+line|z15[highway=ladder]::border,
+line|z15[highway=steps]::border,
+{width: 3.4; dashes: 1.5,1.3;}
+line|z16[highway=ladder]::border,
+line|z16[highway=steps]::border,
+{width: 5; dashes: 1.8,1.6;}
+line|z17-[highway=ladder]::border,
+line|z17-[highway=steps]::border,
+{width: 7; dashes: 2.5,2.2;}
+line|z18[highway=ladder]::border,
+line|z18[highway=steps]::border,
+{width: 9; dashes: 3.2,2.8;}
+line|z19-[highway=ladder]::border,
+line|z19-[highway=steps]::border,
+{width: 11; dashes: 4,3.5;}
+
+/* 8.12 Runway 12-22 ZOOM */
 
 line|z12-[aeroway=runway],
 line|z14-[aeroway=taxiway],
@@ -1198,6 +1613,7 @@ line|z15-[railway=preserved],
 line|z16-[railway=miniature],
 line|z16-[railway=disused],
 line|z16-[railway=abandoned],
+line|z17-[railway=turntable],
 {color: @railway; opacity: 0.7;}
 
 line|z13-[railway=light_rail][!tunnel],
@@ -1381,6 +1797,9 @@ line|z15-[railway=construction],
 line|z16-[railway=disused],
 {width: 1;dashes: 1.8,5.4;}
 
+line|z17-[railway=turntable],
+{width: 1.6;}
+
 /* 9.2 Rail tunnel 14-22 ZOOM */
 
 line|z12[railway=rail][tunnel?],

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

@@ -97,8 +97,8 @@ amenity-recycling-centre                            # area z15- (also has icon z
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
-highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -111,7 +111,7 @@ tourism-information-office                          # area z15- (also has icon z
 tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
 === 170
 
-highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
+highway-footway-area                                # area z14- (also has line z15-, line::border z15-, pathtext z15-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160
 

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

@@ -45,10 +45,10 @@ power-line                                          # line z19- (also has line::
 power-line::dash                                    # line::dash z19- (also has line z19-)
 === 340
 
-highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+highway-ladder                                      # line z15- (also has line::border z15-, icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
 hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
@@ -73,23 +73,23 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320
 
-highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310
 
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
 railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
@@ -104,7 +104,7 @@ railway-rail-tourism-bridge::dash                   # line::dash z16- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290
 
-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-)
 # === 289
 
 railway-rail-branch                                 # line z11- (also has line::dash z16-)
@@ -127,88 +127,88 @@ railway-rail-tourism-tunnel                         # line z10- (also has line::
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
 # === 279
 
-highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-)
 # === 269
 
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
 === 250
 
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
 # === 249
 
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
 === 230
 
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
 # === 229
 
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
 # === 227
 
-highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-)
 # === 225
 
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has line::border z13-, pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-)
 === 224
 
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
 === 223
 
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-area                                # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
 === 222
 
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z16- (also has line z11-)
@@ -227,11 +227,11 @@ railway-subway::dash                                # line::dash z16- (also has
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 === 221
 
-highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
+highway-footway-bicycle                             # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-)
 highway-path-bicycle                                # line z15- (also has line::cycleline z14-, pathtext z15-)
 === 220
 
-highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-)
 highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
 === 219
 
@@ -264,23 +264,23 @@ railway-subway-bridge                               # line z13- (also has line::
 # railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
 # === 209
 
-highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has line::border z14-, icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
 === 200
 
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
 # === 199
 
 highway-bridleway                                   # line z14- (also has pathtext z15-)
 highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway                                     # line z15- (also has pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16-
+highway-footway                                     # line z15- (also has line::border z15-, pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has line::border z15-, pathtext z15-)
+highway-footway-crossing                            # line z16- (also has line::border z16-)
 highway-path                                        # line z15- (also has pathtext z15-)
 highway-path-difficult                              # line z15- (also has pathtext z15-)
 highway-path-expert                                 # line z15- (also has pathtext z15-)
@@ -290,7 +290,7 @@ highway-track-area                                  # line z15- (also has pathte
 highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-track-no-access                             # line z15- (also has pathtext z15-)
 highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 180
+=== 190
 
 highway-construction                                # line z13- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
@@ -305,54 +305,173 @@ railway-miniature-tunnel                            # line z16-
 railway-preserved                                   # line z15-
 railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z15-
-=== 160
+railway-turntable                                   # line z17-
+=== 180
 
-highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16- (also has line::border z16-)
+highway-footway-tunnel                              # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-path-horse                                  # line z15- (also has pathtext z15-)
 highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 155
+=== 170
 
 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-)
 highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 154
+=== 169
 
 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
-highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-)
 highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-)
 highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+=== 168
+
+highway-motorway::border                            # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
+highway-trunk::border                               # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
+=== 163
+
+highway-primary::border                             # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-)
+=== 162
+
+highway-secondary::border                           # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-)
+=== 161
+
+highway-motorway_link::border                       # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
+highway-trunk_link::border                          # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
+=== 160
+
+highway-primary_link::border                        # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-)
+=== 159
+
+highway-secondary_link::border                      # line::border z13- (also has line z13-, pathtext z16-)
+=== 158
+
+highway-motorway-bridge::border                     # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge::border                        # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+=== 157
+
+highway-primary-bridge::border                      # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 156
+
+highway-secondary-bridge::border                    # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+=== 155
+
+highway-motorway_link-bridge::border                # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::border                   # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 154
+
+highway-primary_link-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153
 
+highway-secondary_link-bridge::border               # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+=== 152
+
+highway-motorway-tunnel::border                     # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel::border                        # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+=== 151
+
+highway-primary-tunnel::border                      # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+=== 150
+
+highway-secondary-tunnel::border                    # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 149
+
+highway-motorway_link-tunnel::border                # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel::border                   # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 148
+
+highway-primary_link-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 147
+
+highway-secondary_link-tunnel::border               # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-)
+=== 146
+
+highway-busway::border                              # line::border z15- (also has line z15-, pathtext z16-)
+highway-living_street::border                       # line::border z14- (also has line z12-, pathtext z14-)
+highway-residential::border                         # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
+highway-residential-area::border                    # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
+highway-road::border                                # line::border z14- (also has line z12-, pathtext z14-)
+highway-service::border                             # line::border z15- (also has line z15-, pathtext z16-)
+highway-service-area::border                        # line::border z15- (also has line z15-, pathtext z16-)
+highway-service-driveway::border                    # line::border z16- (also has line z16-, pathtext z16-)
+highway-service-parking_aisle::border               # line::border z15- (also has line z15-, pathtext z16-)
+highway-tertiary::border                            # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge::border                     # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link::border                       # line::border z14- (also has line z14-, pathtext z18-)
+highway-unclassified::border                        # line::border z13- (also has line z11-, pathtext z13-)
+highway-unclassified-area::border                   # line::border z13- (also has line z11-, pathtext z13-)
+=== 145
+
+highway-footway::border                             # line::border z15- (also has line z15-, pathtext z15-)
+highway-footway-area::border                        # line::border z15- (also has line z15-, area z14-, pathtext z15-)
+highway-footway-bicycle::border                     # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-)
+highway-footway-crossing::border                    # line::border z16- (also has line z16-)
+highway-footway-sidewalk::border                    # line::border z16- (also has line z16-)
+highway-ford::border                                # line::border z14- (also has line z13-, icon z16-, pathtext z16-)
+highway-ladder::border                              # line::border z15- (also has line z15-, icon z17-, pathtext z17-)
+highway-pedestrian::border                          # line::border z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-area::border                     # line::border z14- (also has line z13-, area z14-, pathtext z14-)
+highway-pedestrian-square::border                   # line::border z14- (also has line z13-, area z14-, pathtext z14-)
+highway-steps::border                               # line::border z15- (also has line z15-, pathtext z16-)
+=== 144
+
+highway-busway-bridge::border                       # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-living_street-bridge::border                # line::border z14- (also has line z12-, pathtext z14-)
+highway-residential-bridge::border                  # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::border                         # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-service-bridge::border                      # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary_link-bridge::border                # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-unclassified-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+=== 143
+
+highway-footway-bridge::border                      # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-pedestrian-bridge::border                   # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-steps-bridge::border                        # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+=== 142
+
+highway-busway-tunnel::border                       # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
+highway-living_street-tunnel::border                # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
+highway-residential-tunnel::border                  # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road-tunnel::border                         # line::border z14- (also has line z12-, pathtext z14-)
+highway-service-tunnel::border                      # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
+highway-tertiary-tunnel::border                     # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-tunnel::border                # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
+highway-unclassified-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
+=== 141
+
+highway-footway-tunnel::border                      # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-pedestrian-tunnel::border                   # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
+highway-steps-tunnel::border                        # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+=== 140
+
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
-highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
-highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
@@ -366,30 +485,30 @@ railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (al
 railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-)
 railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-)
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-=== 150
+=== 135
 
 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
-highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
@@ -403,14 +522,14 @@ railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (al
 railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
 railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-)
 railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-=== 140
+=== 130
 
 building                                            # area z14- (also has caption z17-)
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
 building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
-=== 130
+=== 120
 
 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z14- (also has pathtext z15-)
@@ -424,30 +543,30 @@ piste:type-hike                                     # line z15- (also has pathte
 piste:type-nordic                                   # line z14- (also has pathtext z15-)
 piste:type-skitour                                  # line z14- (also has pathtext z15-)
 piste:type-sled                                     # line z14- (also has pathtext z15-)
-=== 120
+=== 110
 
 building:part                                       # area z16-
-=== 110
+=== 100
 
 barrier-retaining_wall                              # line z16-
 man_made-embankment                                 # line z16- (also has pathtext z18-)
 natural-cliff                                       # line z14- (also has pathtext z16-)
 natural-earth_bank                                  # line z14-
-=== 100
+=== 90
 
 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 90
+=== 80
 
 man_made-cutline                                    # line z14-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
+=== 70
 
 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z16-
-=== 70
+=== 60
 
 isoline-step_10                                     # line z15- (also has pathtext z17-)
 isoline-step_100                                    # line z12- (also has pathtext z14-)
@@ -455,7 +574,7 @@ isoline-step_1000                                   # line z11- (also has pathte
 isoline-step_50                                     # line z14- (also has pathtext z16-)
 isoline-step_500                                    # line z11- (also has pathtext z12-)
 isoline-zero                                        # line z15- (also has pathtext z17-)
-=== 60
+=== 50
 
 man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
 man_made-pier                                       # line z14- and area z12- (also has caption z17-)

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

@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800
 
-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
 === 6740
 
 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250
 
-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-)
 === 6100
 
 barrier-border_control                              # icon z14- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700
 
-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
@@ -581,14 +581,14 @@ shop-supermarket                                    # icon z16- (also has captio
 === 3200
 
 area:highway-pedestrian                             # caption z15- (also has area z14-)
-highway-pedestrian                                  # pathtext z14- (also has line z13-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z13-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -600,10 +600,10 @@ waterway-dam                                        # pathtext z15- (also has li
 waterway-river                                      # pathtext z11- (also has line z10-)
 === 3150
 
-highway-unclassified                                # pathtext z13- (also has line z11-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z17- (also has caption(optional) z18-)
@@ -635,46 +635,46 @@ aerialway-mixed_lift                                # pathtext z15- (also has li
 aerialway-platter                                   # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-rope_tow                                  # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-t-bar                                     # pathtext z15- (also has line z13-, line::dash z13-)
-highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-)
-highway-secondary_link                              # pathtext z16- (also has line z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
+highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
 === 2960
 
 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z15- (also has line z13-)
@@ -683,14 +683,14 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 === 2953
 
 area:highway-footway                                # caption z15- (also has area z14-)
-highway-footway                                     # pathtext z15- (also has line z15-)
-highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
-highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
+highway-footway                                     # pathtext z15- (also has line z15-, line::border z15-)
+highway-footway-area                                # pathtext z15- (also has line z15-, line::border z15-, area z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
+highway-footway-bridge                              # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -707,7 +707,7 @@ waterway-stream-intermittent                        # pathtext z13- (also has li
 waterway-weir                                       # pathtext z15- (also has line z14-)
 === 2900
 
-highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
+highway-ford                                        # icon z16- and pathtext z16- (also has line z13-, line::border z14-)
 natural-rock                                        # icon z17- (also has caption(optional) z17-)
 === 2850
 
@@ -723,9 +723,9 @@ highway-path-horse                                  # pathtext z15- (also has li
 highway-path-tunnel                                 # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
-highway-steps                                       # pathtext z16- (also has line z15-)
-highway-steps-bridge                                # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-steps-bridge                                # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z15- (also has line z15-)
@@ -735,12 +735,12 @@ highway-track-no-access                             # pathtext z15- (also has li
 highway-track-tunnel                                # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
 
-highway-service                                     # pathtext z16- (also has line z15-)
-highway-service-area                                # pathtext z16- (also has line z15-)
-highway-service-bridge                              # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
-highway-service-tunnel                              # pathtext z16- (also has line(casing) z15-, line z15-)
+highway-service                                     # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-area                                # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-bridge                              # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z14-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z14-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z14-)
@@ -823,9 +823,9 @@ attraction-historic                                 # icon z17- (also has captio
 attraction-maze                                     # icon z17- (also has caption(optional) z17-)
 attraction-roller_coaster                           # icon z17- (also has caption(optional) z17-)
 highway-construction                                # pathtext z15- (also has line z13-)
-highway-living_street                               # pathtext z14- (also has line z12-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -892,9 +892,9 @@ barrier-yes                                         # icon z16- (also has captio
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
-highway-busway                                      # pathtext z16- (also has line z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
+highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1162,7 +1162,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
-highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
+highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-, line::border z15-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -2387,6 +2387,7 @@ tourism-information                                 # icon z16- (also has captio
 tourism-information-board                           # icon z16- (also has caption(optional) z16-)
 tourism-information-guidepost                       # icon z16- (also has caption(optional) z16-)
 tourism-information-map                             # icon z16- (also has caption(optional) z16-)
+tourism-information-tactile_map                     # icon z16- (also has caption(optional) z16-)
 === -9940
 
 amenity                                             # caption z19-
@@ -2435,7 +2436,7 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z18-
+natural-tree                                        # icon z18- (also has caption(optional) z18-)
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2473,9 +2474,11 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
+# natural-tree                                      # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)
 # tourism-information-guidepost                     # caption(optional) z16- (also has icon z16-)
 # tourism-information-map                           # caption(optional) z16- (also has icon z16-)
+# tourism-information-tactile_map                   # caption(optional) z16- (also has icon z16-)
 === -10000

data/styles/default/light/colors.mapcss

@@ -161,11 +161,22 @@
 @path: #8E4E1D;
 @path_expert: #3D2617;
 @bridleway: #3D361E;
+@motorway0_border: #C26E00;
+@motorway1_border: #D87A00;
+@trunk0_border: #DA8816;
+@trunk1_border: #DA8F2B;
+@primary0_border: #DDA546;
+@primary1_border: #E1A93A;
+@primary2_border: #E1AF4E;
+@secondary0_border: #E6BA51;
+@secondary1_border: #E6C068;
+@minor_road_border: #000000;
 
 /* 5.2 Bridges */
 
 @bridge_background: #FCF1DE;
 @bridge_casing: #E1D4BE;
+@bridge_minor_road_border: #E3D9C8;
 
 /* 5.3 Tunnels */
 

data/styles/default/light/symbols/subway-vienna-m.svg

@@ -1,7 +1,2 @@
-<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <circle cx="12" cy="12" r="12" fill="#FFF" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#1565C0"/>
-  <path d="m12.7 19.1c-3.6 0.4-6.7-2.5-6.7-6.1v-8h4v7.9c0 0.8 0.5 1.6 1.3 1.9 1.4 0.4 2.7-0.5 2.7-1.8v-8h4v7.8c0 3.1-2.2 5.9-5.3 6.3z" fill="#FFF"/>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#3b87c9"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>

data/styles/default/light/symbols/subway-vienna-s.svg

@@ -1,7 +1,8 @@
-<svg viewBox="0 0 18 18" width="14" height="14" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <circle cx="9" cy="9" r="9" fill="#FFF" opacity=".6"/>
-  <circle cx="9" cy="9" r="8" fill="#1565C0"/>
-  <path d="m5 4h3v6c0 0.57157 0.42843 1 1 1s1-0.42843 1-1v-6h3v6c0 2.2284-1.7716 4-4 4-2.2284 0-4-1.7716-4-4v-6z" fill="#FFF"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g stroke-width=".75">
+  <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
+  <circle cx="9" cy="9" r="8.25" fill="#3b87c9"/>
+  <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#fff"/>
  </g>
 </svg>

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

@@ -0,0 +1 @@
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.70796435.16441116 2.91781369 1.20859801c.45330196.18776383.81344906.54791086 1.00121276 1.00121279l1.208598 2.91781371c.1877638.45330195.1877638.96262671 0 1.41592868l-1.208598 2.91781367c-.1877637.45330198-.5479108.81344908-1.00121276 1.00121278l-2.91781371 1.208598c-.45330195.1877638-.96262671.1877638-1.41592868 0l-2.91781367-1.208598c-.45330195-.1877637-.81344898-.5479108-1.00121281-1.00121276l-1.20859801-2.91781369c-.18776381-.45330196-.18776381-.96262674 0-1.4159287l1.20859801-2.91781369c.18776382-.45330196.54791083-.81344897 1.00121279-1.00121279l2.91781369-1.20859801c.45330196-.18776381.96262674-.18776381 1.4159287 0z" fill="#f5eada" fill-opacity=".5"/><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#a2ba4e" fill-rule="evenodd"/></g></svg>

data/styles/outdoors/include/Icons.mapcss

@@ -353,6 +353,7 @@ node|z15-[tourism=information][information=board],
 node|z15-[tourism=information][information=guidepost],
 {icon-image: guidepost.svg;}
 node|z15-[tourism=information][information=map],
+node|z15-[tourism=information][information=tactile_map],
 {icon-image: map.svg;}
 
 node|z13-[amenity=ranger_station],

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

@@ -97,8 +97,8 @@ amenity-recycling-centre                            # area z15- (also has icon z
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
-highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -111,7 +111,7 @@ tourism-information-office                          # area z15- (also has icon z
 tourism-information-visitor_centre                  # area z13- (also has icon z13-, caption(optional) z14-)
 === 170
 
-highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
+highway-footway-area                                # area z14- (also has line z11-, line::border z15-, pathtext z13-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160
 

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

@@ -47,10 +47,10 @@ power-line::dash                                    # line::dash z13- (also has
 power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340
 
-highway-ladder                                      # line z12- (also has icon z16-, pathtext z17-)
-highway-steps                                       # line z12- (also has pathtext z13-)
-highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-ladder                                      # line z12- (also has line::border z15-, icon z16-, pathtext z17-)
+highway-steps                                       # line z12- (also has line::border z15-, pathtext z13-)
+highway-steps-bridge                                # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-steps-tunnel                                # line z12- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
@@ -75,23 +75,23 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320
 
-highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310
 
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z15- (also has line z10-)
 railway-rail-branch-bridge::dash                    # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z15- (also has line z10-, line(casing) z14-)
@@ -106,7 +106,7 @@ railway-rail-tourism-bridge::dash                   # line::dash z15- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290
 
-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-)
 # === 289
 
 railway-rail-branch                                 # line z10- (also has line::dash z15-)
@@ -129,88 +129,88 @@ railway-rail-tourism-tunnel                         # line z10- (also has line::
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z15-, pathtext z14-)
 # === 279
 
-highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-)
 # === 269
 
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
 === 250
 
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
 # === 249
 
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
 === 230
 
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
 # === 229
 
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
 # === 227
 
-highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-)
 # === 225
 
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has line::border z13-, pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-)
 === 224
 
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
 === 223
 
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z13- (also has pathtext z16-)
-highway-service-area                                # line z13- (also has pathtext z16-)
-highway-service-bridge                              # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z13- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+highway-service                                     # line z13- (also has line::border z15-, pathtext z16-)
+highway-service-area                                # line z13- (also has line::border z15-, pathtext z16-)
+highway-service-bridge                              # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-tunnel                              # line z13- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
 === 222
 
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z13-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z13-, line::border z15-, pathtext z16-)
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z15- (also has line z10-)
@@ -229,11 +229,11 @@ railway-subway::dash                                # line::dash z16- (also has
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 === 221
 
-highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
+highway-footway-bicycle                             # line z11- (also has line::border z15-, line::cycleline z13-, pathtext z13-)
 highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
 === 220
 
-highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
+highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, line::border z15-, pathtext z13-)
 highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
 === 219
 
@@ -266,23 +266,23 @@ railway-subway-bridge                               # line z13- (also has line::
 # railway-rail-utility-tunnel                       # line(casing) z14- (also has line z12-, line::dash z16-)
 # === 209
 
-highway-ford                                        # line z13- (also has icon z14-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has line::border z14-, icon z14-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
 === 200
 
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
 # === 199
 
 highway-bridleway                                   # line z11- (also has pathtext z13-)
 highway-bridleway-bridge                            # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-bridleway-tunnel                            # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway                                     # line z11- (also has pathtext z13-)
-highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
-highway-footway-crossing                            # line z16-
+highway-footway                                     # line z11- (also has line::border z15-, pathtext z13-)
+highway-footway-area                                # line z11- and area z14- (also has line::border z15-, pathtext z13-)
+highway-footway-crossing                            # line z16- (also has line::border z16-)
 highway-path                                        # line z11- (also has pathtext z13-)
 highway-path-difficult                              # line z11- (also has pathtext z13-)
 highway-path-expert                                 # line z11- (also has pathtext z13-)
@@ -292,7 +292,7 @@ highway-track-area                                  # line z11- (also has pathte
 highway-track-bridge                                # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-track-no-access                             # line z11- (also has pathtext z13-)
 highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 180
+=== 190
 
 highway-construction                                # line z11- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
@@ -307,54 +307,173 @@ railway-miniature-tunnel                            # line z13-
 railway-preserved                                   # line z13-
 railway-preserved-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z13-
-=== 160
+railway-turntable                                   # line z17-
+=== 180
 
-highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z13-
-highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-bridge                              # line z11- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-sidewalk                            # line z13- (also has line::border z16-)
+highway-footway-tunnel                              # line z11- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-path-horse                                  # line z11- (also has pathtext z13-)
 highway-path-tunnel                                 # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 155
+=== 170
 
 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-=== 154
+=== 169
 
 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::border z15-, line::tunnelBackground z17-, pathtext z13-)
 highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::border z15-, line::tunnelBackground z17-, pathtext z13-)
 highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+=== 168
+
+highway-motorway::border                            # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
+highway-trunk::border                               # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
+=== 163
+
+highway-primary::border                             # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-)
+=== 162
+
+highway-secondary::border                           # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-)
+=== 161
+
+highway-motorway_link::border                       # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
+highway-trunk_link::border                          # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
+=== 160
+
+highway-primary_link::border                        # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-)
+=== 159
+
+highway-secondary_link::border                      # line::border z13- (also has line z13-, pathtext z16-)
+=== 158
+
+highway-motorway-bridge::border                     # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge::border                        # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+=== 157
+
+highway-primary-bridge::border                      # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 156
+
+highway-secondary-bridge::border                    # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+=== 155
+
+highway-motorway_link-bridge::border                # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::border                   # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 154
+
+highway-primary_link-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153
 
+highway-secondary_link-bridge::border               # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+=== 152
+
+highway-motorway-tunnel::border                     # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel::border                        # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+=== 151
+
+highway-primary-tunnel::border                      # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+=== 150
+
+highway-secondary-tunnel::border                    # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 149
+
+highway-motorway_link-tunnel::border                # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel::border                   # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 148
+
+highway-primary_link-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 147
+
+highway-secondary_link-tunnel::border               # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-)
+=== 146
+
+highway-busway::border                              # line::border z15- (also has line z15-, pathtext z16-)
+highway-living_street::border                       # line::border z14- (also has line z12-, pathtext z14-)
+highway-residential::border                         # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
+highway-residential-area::border                    # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
+highway-road::border                                # line::border z14- (also has line z12-, pathtext z14-)
+highway-service::border                             # line::border z15- (also has line z13-, pathtext z16-)
+highway-service-area::border                        # line::border z15- (also has line z13-, pathtext z16-)
+highway-service-driveway::border                    # line::border z16- (also has line z16-, pathtext z16-)
+highway-service-parking_aisle::border               # line::border z15- (also has line z15-, pathtext z16-)
+highway-tertiary::border                            # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge::border                     # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link::border                       # line::border z14- (also has line z14-, pathtext z18-)
+highway-unclassified::border                        # line::border z13- (also has line z11-, pathtext z13-)
+highway-unclassified-area::border                   # line::border z13- (also has line z11-, pathtext z13-)
+=== 145
+
+highway-footway::border                             # line::border z15- (also has line z11-, pathtext z13-)
+highway-footway-area::border                        # line::border z15- (also has line z11-, area z14-, pathtext z13-)
+highway-footway-bicycle::border                     # line::border z15- (also has line z11-, line::cycleline z13-, pathtext z13-)
+highway-footway-crossing::border                    # line::border z16- (also has line z16-)
+highway-footway-sidewalk::border                    # line::border z16- (also has line z13-)
+highway-ford::border                                # line::border z14- (also has line z13-, icon z14-, pathtext z16-)
+highway-ladder::border                              # line::border z15- (also has line z12-, icon z16-, pathtext z17-)
+highway-pedestrian::border                          # line::border z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-area::border                     # line::border z14- (also has line z13-, area z14-, pathtext z14-)
+highway-pedestrian-square::border                   # line::border z14- (also has line z13-, area z14-, pathtext z14-)
+highway-steps::border                               # line::border z15- (also has line z12-, pathtext z13-)
+=== 144
+
+highway-busway-bridge::border                       # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-living_street-bridge::border                # line::border z14- (also has line z12-, pathtext z14-)
+highway-residential-bridge::border                  # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::border                         # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-service-bridge::border                      # line::border z15- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary_link-bridge::border                # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-unclassified-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+=== 143
+
+highway-footway-bridge::border                      # line::border z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-pedestrian-bridge::border                   # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-steps-bridge::border                        # line::border z15- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+=== 142
+
+highway-busway-tunnel::border                       # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
+highway-living_street-tunnel::border                # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
+highway-residential-tunnel::border                  # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road-tunnel::border                         # line::border z14- (also has line z12-, pathtext z14-)
+highway-service-tunnel::border                      # line::border z15- (also has line z13-, line(casing) z15-, pathtext z16-)
+highway-tertiary-tunnel::border                     # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-tunnel::border                # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
+highway-unclassified-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
+=== 141
+
+highway-footway-tunnel::border                      # line::border z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-pedestrian-tunnel::border                   # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
+highway-steps-tunnel::border                        # line::border z15- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+=== 140
+
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
@@ -368,30 +487,30 @@ railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z14- (al
 railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-, pathtext z14-)
 railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z12-, line::bridgeblack z16-, line::dash z16-)
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-=== 150
+=== 135
 
 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
@@ -405,14 +524,14 @@ railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (al
 railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-, pathtext z14-)
 railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z12-, line::bridgewhite z13-, line::dash z16-)
 railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-=== 140
+=== 130
 
 building                                            # area z14- (also has caption z17-)
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z16-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
 building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
-=== 130
+=== 120
 
 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z12- (also has pathtext z15-)
@@ -426,38 +545,36 @@ piste:type-hike                                     # line z12- (also has pathte
 piste:type-nordic                                   # line z12- (also has pathtext z13-)
 piste:type-skitour                                  # line z12- (also has pathtext z13-)
 piste:type-sled                                     # line z12- (also has pathtext z15-)
-=== 120
+=== 110
 
 building:part                                       # area z16-
-=== 110
+=== 100
 
 barrier-retaining_wall                              # line z16-
 man_made-embankment                                 # line z16- (also has pathtext z18-)
 natural-cliff                                       # line z12- (also has pathtext z14-)
 natural-earth_bank                                  # line z12-
-=== 100
+=== 90
 
 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 90
+=== 80
 
 man_made-cutline                                    # line z13-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
+=== 70
 
 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z15-
-=== 70
-
 isoline-step_10                                     # line z15- (also has pathtext z16-)
 isoline-step_100                                    # line z11- (also has pathtext z13-)
 isoline-step_1000                                   # line z10- (also has pathtext z10-)
 isoline-step_50                                     # line z13- (also has pathtext z15-)
 isoline-step_500                                    # line z10- (also has pathtext z11-)
 isoline-zero                                        # line z15- (also has pathtext z15-)
-=== 60
+=== 50
 
 man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
 man_made-pier                                       # line z14- and area z12- (also has caption z17-)

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

@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800
 
-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
 === 6740
 
 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250
 
-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-)
 === 6100
 
 barrier-border_control                              # icon z12- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700
 
-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z12- (also has caption(optional) z13-)
@@ -581,14 +581,14 @@ shop-supermarket                                    # icon z16- (also has captio
 === 3200
 
 area:highway-pedestrian                             # caption z15- (also has area z14-)
-highway-pedestrian                                  # pathtext z14- (also has line z13-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z11-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -600,10 +600,10 @@ waterway-dam                                        # pathtext z15- (also has li
 waterway-river                                      # pathtext z11- (also has line z10-)
 === 3150
 
-highway-unclassified                                # pathtext z13- (also has line z11-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z12- (also has caption(optional) z14-)
@@ -635,46 +635,46 @@ aerialway-mixed_lift                                # pathtext z15- (also has li
 aerialway-platter                                   # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-rope_tow                                  # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-t-bar                                     # pathtext z15- (also has line z13-, line::dash z13-)
-highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-)
-highway-secondary_link                              # pathtext z16- (also has line z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
+highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
 === 2960
 
 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z13- (also has line z11-)
@@ -683,14 +683,14 @@ highway-cycleway-tunnel                             # pathtext z13- (also has li
 === 2953
 
 area:highway-footway                                # caption z15- (also has area z14-)
-highway-footway                                     # pathtext z13- (also has line z11-)
-highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
-highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
+highway-footway                                     # pathtext z13- (also has line z11-, line::border z15-)
+highway-footway-area                                # pathtext z13- (also has line z11-, line::border z15-, area z14-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
+highway-footway-bridge                              # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -707,7 +707,7 @@ waterway-stream-intermittent                        # pathtext z13- (also has li
 waterway-weir                                       # pathtext z15- (also has line z14-)
 === 2900
 
-highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
+highway-ford                                        # icon z14- and pathtext z16- (also has line z13-, line::border z14-)
 natural-rock                                        # icon z14- (also has caption(optional) z17-)
 === 2850
 
@@ -723,9 +723,9 @@ highway-path-horse                                  # pathtext z13- (also has li
 highway-path-tunnel                                 # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
-highway-steps                                       # pathtext z13- (also has line z12-)
-highway-steps-bridge                                # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z13- (also has line z12-, line::border z15-)
+highway-steps-bridge                                # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z13- (also has line z11-)
@@ -735,12 +735,12 @@ highway-track-no-access                             # pathtext z13- (also has li
 highway-track-tunnel                                # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
 
-highway-service                                     # pathtext z16- (also has line z13-)
-highway-service-area                                # pathtext z16- (also has line z13-)
-highway-service-bridge                              # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z13-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z13-, line::border z15-)
+highway-service-area                                # pathtext z16- (also has line z13-, line::border z15-)
+highway-service-bridge                              # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z12-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z12-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z12-)
@@ -823,9 +823,9 @@ attraction-historic                                 # icon z17- (also has captio
 attraction-maze                                     # icon z17- (also has caption(optional) z17-)
 attraction-roller_coaster                           # icon z17- (also has caption(optional) z17-)
 highway-construction                                # pathtext z15- (also has line z11-)
-highway-living_street                               # pathtext z14- (also has line z12-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -892,9 +892,9 @@ barrier-yes                                         # icon z16- (also has captio
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
-highway-busway                                      # pathtext z16- (also has line z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
+highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1163,7 +1163,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
-highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
+highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-, line::border z15-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -2393,6 +2393,7 @@ tourism-information                                 # icon z15- (also has captio
 tourism-information-board                           # icon z15- (also has caption(optional) z15-)
 tourism-information-guidepost                       # icon z15- (also has caption(optional) z15-)
 tourism-information-map                             # icon z15- (also has caption(optional) z15-)
+tourism-information-tactile_map                     # icon z15- (also has caption(optional) z15-)
 === -9940
 
 amenity                                             # caption z19-
@@ -2441,7 +2442,7 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z18-
+natural-tree                                        # icon z18- (also has caption(optional) z18-)
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2479,9 +2480,11 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
+# natural-tree                                      # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)
 # tourism-information-guidepost                     # caption(optional) z15- (also has icon z15-)
 # tourism-information-map                           # caption(optional) z15- (also has icon z15-)
+# tourism-information-tactile_map                   # caption(optional) z15- (also has icon z15-)
 === -10000

data/styles/vehicle/include/Basemap.mapcss

@@ -352,6 +352,7 @@ area|z13-[landuse=garages],
 
 area|z15-[amenity=charging_station][motorcar?],
 area|z15-[amenity=fuel],
+area|z15-[amenity=recycling][recycling_type=centre],
 area|z17-[amenity=vehicle_inspection],
 area|z17-[amenity=car_wash],
 area|z17-[amenity=motorcycle_parking],

data/styles/vehicle/include/Icons.mapcss

@@ -373,6 +373,7 @@ node|z15-[amenity=university],
 node|z15-[amenity=hospital],
 node|z14-[barrier=toll_booth],
 node|z14-[barrier=border_control],
+node|z16-[amenity=recycling][recycling_type=centre],
 node|z16-[barrier=lift_gate],
 node|z16-[man_made=communications_tower],
 node|z17-[amenity=bank],
@@ -514,6 +515,9 @@ node|z18-[amenity=post_office],
 node|z18-[post_office=post_partner],
 {font-size: 11;}
 
+node|z16-[amenity=recycling][recycling_type=centre],
+{icon-image: recycling-centre-m.svg;}
+
 /* 6. SHOP */
 
 node|z14-[shop=mall],

data/styles/vehicle/include/Roads.mapcss

@@ -722,6 +722,7 @@ line|z16-[railway=disused],
 line|z16-[railway=preserved],
 line|z16-[railway=miniature],
 line|z16-[railway=abandoned],
+line|z17-[railway=turntable],
 {color: @railway; opacity: 0.6;}
 
 line|z13-[railway=light_rail][!tunnel],
@@ -921,6 +922,9 @@ line|z16-[railway=construction],
 line|z16-[railway=disused]
 {width: 1;dashes: 1.8,5.4;}
 
+line|z17-[railway=turntable],
+{width: 1.6;}
+
 /* 9.2 Rail tunnel 14-22 ZOOM */
 
 line|z14-[railway=rail][tunnel?],

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

@@ -36,6 +36,7 @@ amenity-car_wash                                    # area z17- (also has icon z
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
 amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-vehicle_inspection                          # area z17- (also has icon z17-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z14-)
 highway-services                                    # area z13- (also has icon z12-, caption(optional) z13-)

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

@@ -282,6 +282,7 @@ railway-miniature-tunnel                            # line z16-
 railway-preserved                                   # line z16-
 railway-preserved-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-preserved-tunnel                            # line z16-
+railway-turntable                                   # line z17-
 === 120
 
 highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)

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

@@ -220,6 +220,7 @@ railway-level_crossing                              # icon z17-
 === 2700
 
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z17-)
+amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-vehicle_inspection                          # icon z17- (also has area z17-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 shop-car_parts                                      # icon z17-
@@ -820,6 +821,7 @@ entrance-emergency                                  # icon z19- (also has captio
 # === -7250
 
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z17-)
+# amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # tourism-camp_site                                 # caption(optional) z18- (also has icon z18-)

generator/generator_tests/osm_type_test.cpp

@@ -2979,6 +2979,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
       {{"tourism", "information", "board"}, {{"tourism", "information"}, {"information", "board"}}},
       {{"tourism", "information", "guidepost"}, {{"tourism", "information"}, {"information", "guidepost"}}},
       {{"tourism", "information", "map"}, {{"tourism", "information"}, {"information", "map"}}},
+      {{"tourism", "information", "tactile_map"}, {{"tourism", "information"}, {"information", "tactile_map"}}},
       {{"tourism", "information", "office"}, {{"tourism", "information"}, {"information", "office"}}},
       //{{"waterway", "canal", "tunnel"}, {{"waterway", "canal"}, {"tunnel", "any_value"}}},
       //{{"waterway", "river", "tunnel"}, {{"waterway", "river"}, {"tunnel", "any_value"}}},

generator/road_access_generator.cpp

@@ -57,6 +57,8 @@ TagMapping const kMotorCarTagMapping = {
     {OsmElement::Tag("motorcar", "private"), RoadAccess::Type::Private},
     {OsmElement::Tag("motorcar", "destination"), RoadAccess::Type::Destination},
     {OsmElement::Tag("motorcar", "permit"), RoadAccess::Type::Permit},
+    {OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Destination},
+    {OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Destination},
 };
 
 TagMapping const kMotorVehicleTagMapping = {
@@ -134,8 +136,6 @@ TagMapping const kDefaultTagMapping = {
     {OsmElement::Tag("access", "agricultural"), RoadAccess::Type::Private},
     {OsmElement::Tag("access", "forestry"), RoadAccess::Type::Private},
     {OsmElement::Tag("locked", "yes"), RoadAccess::Type::Locked},
-    {OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
-    {OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
 };
 
 // Removed secondary, tertiary from car list. Example https://www.openstreetmap.org/node/8169922700

iphone/CoreApi/CoreApi/Common/MWMGeoUtil.mm

@@ -32,7 +32,7 @@
 */
 
 - (NSString*) valueAsString {
-  auto const outString = measurement_utils::ToStringPrecision(self.value, self.value >= 10.0 ? 0 : 1);
+  auto const outString = measurement_utils::ToStringPrecision(self.value, 0);
   return [NSString stringWithUTF8String:outString.c_str()];
 }
 

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h

@@ -59,6 +59,7 @@ NS_SWIFT_NAME(FrameworkHelper)
 + (void)updatePlacePageData;
 + (void)updateAfterDeleteBookmark;
 + (int)currentZoomLevel;
++ (void)setCarScreenMode:(BOOL)enabled;
 
 @end
 

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm

@@ -241,4 +241,8 @@
   return [[ElevationProfileData alloc] initWithElevationInfo:GetFramework().GetTrackRecordingElevationInfo()];
 }
 
++ (void)setCarScreenMode:(BOOL)enabled {
+  GetFramework().SetCarScreenMode(enabled);
+}
+
 @end

iphone/Maps/Classes/CarPlay/CarPlayService.swift

@@ -62,6 +62,8 @@ final class CarPlayService: NSObject {
       toWindow: window,
       isCarplayActivated: true
     )
+      
+    FrameworkHelper.setCarScreenMode(true)
   }
 
   private var savedInterfaceController: CPInterfaceController?
@@ -126,6 +128,7 @@ final class CarPlayService: NSObject {
         isCarplayActivated: false
       )
     }
+    FrameworkHelper.setCarScreenMode(false)
   }
 
   @objc func destroy() {
@@ -623,22 +626,32 @@ extension CarPlayService: CarPlayRouterListener {
 extension CarPlayService: LocationModeListener {
   func processMyPositionStateModeEvent(_ mode: MWMMyPositionMode) {
     currentPositionMode = mode
-    guard let rootMapTemplate = rootMapTemplate,
-      let info = rootMapTemplate.userInfo as? MapInfo,
-      info.type == CPConstants.TemplateType.main else {
+    
+    // make sure we have a rootMapTemplate
+    guard let rootMapTemplate = rootMapTemplate else {
+      return
+    }
+    
+    // exit if we're navigating
+    guard let info = rootMapTemplate.userInfo as? MapInfo,
+              info.type == CPConstants.TemplateType.main else {
+        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
         return
     }
     switch mode {
     case .follow, .followAndRotate:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
+        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
       }
     case .notFollow:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupRecenterButton(mapTemplate: rootMapTemplate)
+        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
       }
     case .pendingPosition, .notFollowNoPosition:
       rootMapTemplate.leadingNavigationBarButtons = []
+      MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
     }
   }
 }

iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift

@@ -5,6 +5,7 @@ final class MapTemplateBuilder {
     case startPanning
     case zoomIn
     case zoomOut
+    case myPositionMode
   }
   enum BarButtonType {
     case dismissPaning
@@ -69,7 +70,10 @@ final class MapTemplateBuilder {
     let zoomOutButton = buildMapButton(type: .zoomOut) { _ in
       FrameworkHelper.zoomMap(.out)
     }
-    mapTemplate.mapButtons = [panningButton, zoomInButton, zoomOutButton]
+    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
+      FrameworkHelper.switchMyPositionMode()
+    }
+    mapTemplate.mapButtons = [myPositionModeButton, panningButton, zoomInButton, zoomOutButton]
     
     let settingsButton = buildBarButton(type: .settings) { _ in
       let gridTemplate = SettingsTemplateBuilder.buildGridTemplate()
@@ -99,7 +103,10 @@ final class MapTemplateBuilder {
     let panningButton = buildMapButton(type: .startPanning) { _ in
       mapTemplate.showPanningInterface(animated: true)
     }
-    mapTemplate.mapButtons = [panningButton]
+    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
+      FrameworkHelper.switchMyPositionMode()
+    }
+    mapTemplate.mapButtons = [myPositionModeButton, panningButton]
     setupMuteAndRedirectButtons(template: mapTemplate)
     let endButton = buildBarButton(type: .endRoute) { _ in
       CarPlayService.shared.cancelCurrentTrip()
@@ -117,6 +124,28 @@ final class MapTemplateBuilder {
     mapTemplate.leadingNavigationBarButtons = [destinationButton]
   }
   
+  class func updateMyPositionModeButton(mapTemplate: CPMapTemplate, newMode: MWMMyPositionMode) {
+    let button = CPMapButton(handler: { _ in
+      FrameworkHelper.switchMyPositionMode()
+    })
+    
+    switch newMode {
+    case .pendingPosition:
+      button.image = UIImage(systemName: "location.fill")
+    case .notFollowNoPosition:
+      button.image = UIImage(systemName: "location")
+    case .notFollow:
+      button.image = UIImage(systemName: "location")
+    case .follow:
+      button.image = UIImage(systemName: "location.fill")
+    case .followAndRotate:
+      button.image = UIImage(systemName: "location.north.line.fill")
+    }
+    if mapTemplate.mapButtons.count > 0 {
+      mapTemplate.mapButtons[0] = button
+    }
+  }
+  
   class func setupRecenterButton(mapTemplate: CPMapTemplate) {
     let recenterButton = buildBarButton(type: .recenter) { _ in
       FrameworkHelper.switchMyPositionMode()
@@ -166,6 +195,8 @@ final class MapTemplateBuilder {
       button.image = UIImage(systemName: "plus")
     case .zoomOut:
       button.image = UIImage(systemName: "minus")
+    case .myPositionMode:
+      button.image = UIImage(systemName: "location")
     }
     // Remove code below once Apple has fixed its issue with the button background
     if #unavailable(iOS 26) {
@@ -176,6 +207,8 @@ final class MapTemplateBuilder {
         button.focusedImage = UIImage(systemName: "plus.circle.fill")
       case .zoomOut:
         button.focusedImage = UIImage(systemName: "minus.circle.fill")
+      case .myPositionMode:
+        button.image = UIImage(systemName: "location.fill")
       }
     }
     return button

iphone/Maps/Core/Theme/Core/ThemeManager.swift

@@ -41,13 +41,14 @@ final class ThemeManager: NSObject {
       }
     }(actualTheme)
 
-    if Settings.mapAppearance == .light {
+    let isCarPlayActive = CarPlayService.shared.isCarplayActivated
+    if !isCarPlayActive, Settings.mapAppearance == .light {
       if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
           FrameworkHelper.setTheme(.vehicleDay)
       } else {
           FrameworkHelper.setTheme(.day)
       }
-    } else if Settings.mapAppearance == .dark {
+    } else if !isCarPlayActive, Settings.mapAppearance == .dark {
       if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
         FrameworkHelper.setTheme(.vehicleNight)
       } else {

iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.slash.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "speedcamera.slash.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.slash.symbolset/speedcamera.slash.svg

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
+ <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+
+.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2e8828206d0ca565 68627a11f315162f}
+.monochrome-1 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2e8828206d0ca565 _slash}
+.monochrome-2 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2e8828206d0ca565 _slash}
+
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2e8828206d0ca565 68627a11f315162f}
+.multicolor-1:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2e8828206d0ca565 _slash}
+.multicolor-2:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2e8828206d0ca565 _slash}
+
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2e8828206d0ca565 68627a11f315162f}
+.hierarchical-1:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2e8828206d0ca565 _slash}
+.hierarchical-2:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2e8828206d0ca565 _slash}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+  <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+  <g transform="matrix(0.2 0 0 0.2 263 1933)">
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+  </g>
+  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+  </g>
+  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+  </g>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+  <g transform="matrix(0.2 0 0 0.2 776 1933)">
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+  </g>
+  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+  </g>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+  </g>
+  <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+  <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+  </g>
+  <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+  <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+  </g>
+  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2991.9" x2="2991.9" y1="600.785" y2="720.121"/>
+  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2874.9" x2="2874.9" y1="600.785" y2="720.121"/>
+  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1507.07" x2="1507.07" y1="600.785" y2="720.121"/>
+  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1392.62" x2="1392.62" y1="600.785" y2="720.121"/>
+  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="614.281" x2="614.281" y1="600.785" y2="720.121"/>
+  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="505.141" x2="505.141" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+  <g id="Black-S" transform="matrix(1 0 0 1 2874.9 696)">
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M71.85-62C79.1678-62 85.1-56.0901 85.1-48.8L85.1-22.4C85.1-15.1098 79.1678-9.20001 71.85-9.20001L65.225-9.20001L65.225 4L51.975 4L51.975-9.20001L45.35-9.20001C38.0322-9.20001 32.1-15.1098 32.1-22.4L32.1-48.8C32.1-56.0901 38.0322-62 45.35-62L71.85-62ZM41.6-22C39.667-22 38.1-20.433 38.1-18.5C38.1-16.567 39.667-15 41.6-15C43.533-15 45.1-16.567 45.1-18.5C45.1-20.433 43.533-22 41.6-22ZM58.6004-49C51.144-49 45.1-42.9559 45.1-35.5C45.1-28.3424 50.6701-22.4858 57.712-22.0287L58.6004-22C66.056-22 72.1-28.0442 72.1-35.5C72.1-42.9559 66.056-49 58.6004-49ZM71.4333-76C86.1609-76 98.1-63.7624 98.1-48.6667L98.1-35L91.4334-35L91.4334-48.6667C91.4334-59.9885 82.479-69.1667 71.4333-69.1667L44.7667-69.1667C33.721-69.1667 24.7667-59.9885 24.7667-48.6667L24.7667-35L18.1-35L18.1-48.6667C18.1-63.7624 30.0391-76 44.7667-76L71.4333-76Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M102.472-4.48836C106.123-0.837264 106.123 5.09118 102.472 8.74227C98.8207 12.3934 92.8922 12.3934 89.2411 8.74227L14.5282-65.9706C10.8771-69.6217 10.8771-75.5502 14.5282-79.2013C18.1793-82.8524 24.1078-82.8524 27.7589-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M98.3217-0.338247C99.6822 1.02234 99.6822 3.23158 98.3217 4.59217C96.9611 5.95275 94.7518 5.95275 93.3912 4.59217L18.6783-70.1207C17.3178-71.4813 17.3178-73.6906 18.6783-75.0511C20.0389-76.4117 22.2482-76.4117 23.6088-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
+  </g>
+  <g id="Regular-S" transform="matrix(1 0 0 1 1392.62 696)">
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M69.9575-61.1549C76.9038-61.1549 82.5349-55.4998 82.5349-48.524L82.5349-23.262C82.5349-16.2861 76.9038-10.631 69.9575-10.631L63.6687-10.631L63.6687 2L51.0913 2L51.0913-10.631L44.8025-10.631C37.8562-10.631 32.2251-16.2861 32.2251-23.262L32.2251-48.524C32.2251-55.4998 37.8562-61.1549 44.8025-61.1549L69.9575-61.1549ZM41.8589-22.6197C40.0853-22.6197 38.6476-21.182 38.6476-19.4085C38.6476-17.6349 40.0853-16.1972 41.8589-16.1972C43.6324-16.1972 45.0701-17.6349 45.0701-19.4085C45.0701-21.182 43.6324-22.6197 41.8589-22.6197ZM57.9156-48.3099C50.8209-48.3099 45.0701-42.5589 45.0701-35.4648C45.0701-28.6544 50.3701-23.0819 57.0703-22.647L57.9156-22.6197C65.0095-22.6197 70.7603-28.3707 70.7603-35.4648C70.7603-42.5589 65.0095-48.3099 57.9156-48.3099ZM70.0467-74C84.0379-74 95.38-62.4981 95.38-48.3099L95.38-35.4648L89.0467-35.4648L89.0467-48.3099C89.0467-58.9511 80.5401-67.5775 70.0467-67.5775L44.7133-67.5775C34.2199-67.5775 25.7133-58.9511 25.7133-48.3099L25.7133-35.4648L19.38-35.4648L19.38-48.3099C19.38-62.4981 30.7221-74 44.7133-74L70.0467-74Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M98.2783-6.06714C101.56-2.78573 101.56 2.54245 98.2783 5.82386C94.9969 9.10527 89.6688 9.10527 86.3874 5.82386L16.1717-64.3918C12.8902-67.6733 12.8902-73.0014 16.1717-76.2828C19.4531-79.5643 24.7812-79.5643 28.0626-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M94.8119-2.60066C96.1801-1.23245 96.1801 0.98917 94.8119 2.35738C93.4437 3.72558 91.222 3.72558 89.8538 2.35738L19.6381-67.8583C18.2699-69.2265 18.2699-71.4482 19.6381-72.8164C21.0063-74.1846 23.228-74.1846 24.5962-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
+  </g>
+  <g id="Ultralight-S" transform="matrix(1 0 0 1 505.141 696)">
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M66.4435-59.169C72.8414-59.169 78.028-53.9604 78.028-47.5352L78.028-24.2676C78.028-17.8424 72.8414-12.6338 66.4435-12.6338L60.6513-12.6338L60.6513-1L49.0668-1L49.0668-12.6338L43.2745-12.6338C36.8765-12.6338 31.69-17.8424 31.69-24.2676L31.69-47.5352C31.69-53.9604 36.8765-59.169 43.2745-59.169L66.4435-59.169ZM40.5632-23.6761C38.9297-23.6761 37.6055-22.3518 37.6055-20.7183C37.6055-19.0848 38.9297-17.7606 40.5632-17.7606C42.1967-17.7606 43.521-19.0848 43.521-20.7183C43.521-22.3518 42.1967-23.6761 40.5632-23.6761ZM55.3523-47.338C48.8177-47.338 43.521-42.0411 43.521-35.5071C43.521-29.2343 48.4025-24.1018 54.5738-23.7012L55.3523-23.6761C61.8862-23.6761 67.1829-28.973 67.1829-35.5071C67.1829-42.0411 61.8862-47.338 55.3523-47.338ZM66.5257-71C79.4123-71 89.859-60.4062 89.859-47.338L89.859-35.507L84.0257-35.507L84.0257-47.338C84.0257-57.1391 76.1907-65.0845 66.5257-65.0845L43.1923-65.0845C33.5273-65.0845 25.6923-57.1391 25.6923-47.338L25.6923-35.507L19.859-35.507L19.859-47.338C19.859-60.4062 30.3057-71 43.1923-71L66.5257-71Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M92.2562-3.06064C93.7788-1.53808 93.7788 0.934172 92.2562 2.45673C90.7337 3.97929 88.2614 3.97929 86.7389 2.45673L16.8838-67.3983C15.3612-68.9209 15.3612-71.3932 16.8838-72.9157C18.4063-74.4383 20.8786-74.4383 22.4011-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M90.2053-1.00975C90.596-0.619106 90.596 0.0152006 90.2053 0.405845C89.8147 0.796489 89.1804 0.796489 88.7897 0.405845L18.9347-69.4492C18.544-69.8399 18.544-70.4742 18.9347-70.8648C19.3253-71.2555 19.9596-71.2555 20.3503-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
+  </g>
+ </g>
+</svg>