[generator] Reduce CDN upload script logging verbosity

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[android] Force Cornish language to be used in the app
2026-01-08 21:37:58 +00:00 · 2026-01-08 16:11:00 +07:00 · 2026-01-08 11:02:05 +07:00 · 2026-01-07 18:32:54 +01:00 · 2026-01-07 17:59:46 +01:00 · 2026-01-07 12:28:51 +01:00
40 changed files with 371 additions and 70 deletions
--- a/android/app/build.gradle
+++ b/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",
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
@@ -42,6 +42,7 @@ public class ChooseBookmarkCategoryFragment
  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
  {
    View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
    mRecycler = root.findViewById(R.id.recycler);
    mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
    return root;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -77,6 +77,7 @@ public class ChooseBookmarksSortingTypeFragment
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    final Bundle args = getArguments();
    if (args == null)
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
@@ -61,6 +61,7 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
    setCancelable(mCancelable);
    setOnCancelListener(mCancelListener);
    setContentView(R.layout.dialog_stacked_buttons);
+    getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    TextView title = findViewById(R.id.tv__title);
    UiUtils.setTextAndHideIfEmpty(title, mTitle);
--- a/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
+++ b/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  style="@style/Widget.Material3.CardView.Filled"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
  android:orientation="vertical"
-  android:background="?cardBackground"
  android:minWidth="@dimen/bookmark_purchase_img_width"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">
@@ -21,9 +27,11 @@
    android:layout_marginEnd="@dimen/margin_base_plus"
    android:layout_marginStart="@dimen/margin_base_plus"
    tools:text="Select list"/>
-  <include
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
    android:layout_marginTop="@dimen/margin_base"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    layout="@layout/recycler_default"/>
+    android:scrollbars="vertical"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -9,7 +9,6 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:padding="@dimen/margin_half"
-    android:background="?cardBackground"
    android:paddingStart="@dimen/margin_half_plus"
    android:paddingEnd="@dimen/margin_half_plus">

--- a/android/app/src/main/res/xml/locales_config.xml
+++ b/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" />
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -947,6 +947,9 @@
    <string name="type.railway.monorail">Monorail</string>
    <string name="type.railway.monorail.bridge">Monorail Bridge</string>
    <string name="type.railway.monorail.tunnel">Monorail Tunnel</string>
+    <string name="type.railway.miniature">Miniature Railway</string>
+    <string name="type.railway.miniature.bridge">Miniature Railway Bridge</string>
+    <string name="type.railway.miniature.tunnel">Miniature Railway Tunnel</string>
    <string name="type.railway.narrow_gauge">Narrow Gauge Rail</string>
    <string name="type.railway.narrow_gauge.bridge">Narrow Gauge Rail Bridge</string>
    <string name="type.railway.narrow_gauge.tunnel">Narrow Gauge Rail Tunnel</string>
@@ -1421,6 +1424,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>
--- a/data/categories-strings/en.json/localize.json
+++ b/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",
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -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;
@@ -757,9 +757,9 @@ highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permiss
 lateral|port;[seamark:buoy_lateral:category=port],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;632;
 lateral|starboard;[seamark:buoy_lateral:category=starboard],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;633;
 highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634;
-deprecated|deprecated;635;x
-deprecated|deprecated;636;x
-deprecated|deprecated;637;x
+railway|miniature;635;
+railway|miniature|bridge;[railway=miniature][bridge?];;name;int_name;636;
+railway|miniature|tunnel;[railway=miniature][tunnel?];;name;int_name;637;
 deprecated|deprecated;638;x
 deprecated|deprecated;639;x
 deprecated|deprecated;640;x
--- a/data/sound-strings/ta.json/localize.json
+++ b/data/sound-strings/ta.json/localize.json
@@ -0,0 +1,108 @@
+{
+"make_a_slight_right_turn":"லேசாக வலதுபுறம் திரும்புங்கள்.",
+"make_a_slight_right_turn_street":"NULL",
+"make_a_slight_right_turn_street_verb":"NULL",
+"make_a_right_turn":"வலதுபுறமாக திரும்புங்கள்.",
+"make_a_right_turn_street":"NULL",
+"make_a_sharp_right_turn":"கூர்மையாக வலதுபுறம் திரும்புங்கள்.",
+"make_a_sharp_right_turn_street":"NULL",
+"enter_the_roundabout":"ரவுண்டபௌட்டை நுழையுங்கள்.",
+"enter_the_roundabout_street":"NULL",
+"enter_the_roundabout_street_verb":"NULL",
+"leave_the_roundabout":"ரவுண்டபௌட்டை வெளியேறுங்கள்.",
+"leave_the_roundabout_street":"NULL",
+"leave_the_roundabout_street_verb":"NULL",
+"make_a_slight_left_turn":"லேசாக இடதுபுறம் திரும்புங்கள்.",
+"make_a_slight_left_turn_street":"NULL",
+"make_a_slight_left_turn_street_verb":"NULL",
+"make_a_left_turn":"இடதுபுறமாக திரும்புங்கள்.",
+"make_a_left_turn_street":"NULL",
+"make_a_sharp_left_turn":"கூர்மையாக இடதுபுறம் திரும்புங்கள்.",
+"make_a_sharp_left_turn_street":"NULL",
+"make_a_u_turn":"U-வழியில் திரும்புங்கள்.",
+"make_a_u_turn_street":"NULL",
+"make_a_u_turn_street_verb":"NULL",
+"go_straight":"நேரா போங்க.",
+"exit":"வெளியேறுங்கள்.",
+"onto":"நோக்கி",
+"take_exit_number":"வெளியேறும் வழி எடுங்கள்",
+"take_exit_number_street_verb":"NULL",
+"route_recalculating":"வழி மறுபடி கணிக்கிறது",
+"destination":"நீங்கள் வருவீர்கள்.",
+"you_have_reached_the_destination":"நீங்கள் வந்துவிட்டீர்கள்..",
+"in_50_meters":"ஐம்பது மீட்டரில்",
+"in_100_meters":"நூறு மீட்டரில்",
+"in_200_meters":"இருநூறு மீட்டரில்",
+"in_250_meters":"இருநூற்று ஐம்பது மீட்டரில்",
+"in_300_meters":"முன்னூறு மீட்டரில்",
+"in_400_meters":"நானூறு மீட்டரில்",
+"in_500_meters":"ஐநூறு மீட்டரில்",
+"in_600_meters":"அறுநூறு மீட்டரில்",
+"in_700_meters":"எழுநூறு மீட்டரில்",
+"in_750_meters":"எழுநூறு ஐம்பது மீட்டரில்",
+"in_800_meters":"எண்ணூறு மீட்டரில்",
+"in_900_meters":"தொள்ளாயிரம் மீட்டரில்",
+"in_1_kilometer":"ஒரு கிலோமீட்டரில்",
+"in_1_5_kilometers":"ஒன்றரை கிலோமீட்டரில்",
+"in_2_kilometers":"இரண்டு கிலோமீட்டரில்",
+"in_2_5_kilometers":"இரண்டரை கிலோமீட்டரில்",
+"in_3_kilometers":"மூன்று கிலோமீட்டரில்",
+"then":"அடுத்தது",
+"dist_direction_onto_street":"%1$s %4$s %3$s %5$s %2$s",
+"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_street":"NULL",
+"take_the_2_exit_street_verb":"NULL",
+"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_street":"NULL",
+"take_the_4_exit_street_verb":"NULL",
+"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_street":"NULL",
+"take_the_6_exit_street_verb":"NULL",
+"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_street":"NULL",
+"take_the_8_exit_street_verb":"NULL",
+"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_street":"NULL",
+"take_the_10_exit_street_verb":"NULL",
+"take_the_11_exit":"பதினொன்றாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_11_exit_street":"NULL",
+"take_the_11_exit_street_verb":"NULL",
+"in_50_feet":"ஐம்பது அடியில்",
+"in_100_feet":"நூறு அடியில்",
+"in_200_feet":"இருநூறு அடியில்",
+"in_300_feet":"முன்னூறு அடியில்",
+"in_400_feet":"நானூறு அடியில்",
+"in_500_feet":"ஐநூறு அடியில்",
+"in_600_feet":"அறுநூறு அடியில்",
+"in_700_feet":"எழுநூறு அடியில்",
+"in_800_feet":"எண்ணூறு அடியில்",
+"in_900_feet":"தொள்ளாயிரம் அடியில்",
+"in_1000_feet":"ஆயிரம் அடியில்",
+"in_1500_feet":"ஆயிரம் ஐநூறு அடியில்",
+"in_2000_feet":"இரண்டு ஆயிரம் அடியில்",
+"in_2500_feet":"இரண்டு ஆயிரம் ஐநூறு அடியில்",
+"in_3000_feet":"மூன்று ஆயிரம் அடியில்",
+"in_3500_feet":"மூன்று ஆயிரம் ஐநூறு அடியில்",
+"in_4000_feet":"நான்கு ஆயிரம் அடியில்",
+"in_4500_feet":"நான்கு ஆயிரம் ஐநூறு அடியில்",
+"in_5000_feet":"ஐந்து ஆயிரம் அடியில்",
+"in_1_mile":"ஒன்று மைலில்",
+"in_1_5_miles":"ஒன்றரை மைலில்",
+"in_2_miles":"இரண்டு மைலில்",
+"unknown_camera":"கேமரா முன்னால் இருக்கிறது"
+}
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -766,7 +766,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],
--- a/data/styles/default/include/Icons_Label_Colors.mapcss
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -70,8 +70,16 @@ node[amenity=arts_centre],
 node[amenity=community_centre],
 node[amenity=conference_centre],
 node[amenity=exhibition_centre],
-node[amenity=place_of_worship]
+node[amenity=place_of_worship],
 node[amenity=social_facility],
+node[historic=castle][castle_type=castrum],
+node[historic=castle][castle_type=defensive],
+node[historic=castle][castle_type=fortified_church],
+node[historic=castle][castle_type=fortress],
+node[historic=castle][castle_type=hillfort],
+node[historic=castle][castle_type=kremlin],
+node[historic=castle][castle_type=shiro],
+node[historic=fortress],
 node[historic=ship],
 node[leisure=hackerspace],
 node[social_facility],
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -1195,6 +1195,7 @@ line|z14-[railway=monorail],
 line|z15-[railway=narrow_gauge],
 line|z15-[railway=construction],
 line|z15-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=disused],
 line|z16-[railway=abandoned],
 {color: @railway; opacity: 0.7;}
@@ -1214,12 +1215,14 @@ line|z13-[railway=rail][bridge?]::bridgewhite,
 line|z13-[railway=subway][bridge?]::bridgewhite,
 line|z13-[railway=light_rail][bridge?]::bridgewhite,
 line|z15-[railway=preserved][bridge?]::bridgewhite,
+line|z16-[railway=miniature][bridge?]::bridgewhite,
 line|z16-[railway=abandoned][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
 line|z16-[railway=rail][bridge?]::bridgeblack,
 line|z16-[railway=subway][bridge?]::bridgeblack,
 line|z16-[railway=light_rail][bridge?]::bridgeblack,
 line|z16-[railway=preserved][bridge?]::bridgeblack,
+line|z16-[railway=miniature][bridge?]::bridgeblack,
 line|z16-[railway=abandoned][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}

@@ -1370,6 +1373,7 @@ line|z18-[railway=light_rail][!tunnel]::dash,


 line|z15-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned],
 {width: 1.6;dashes: 6.3,6.3;}

@@ -1419,23 +1423,27 @@ line|z13-15[railway=rail][bridge?]::bridgewhite,
 line|z13-15[railway=subway][bridge?]::bridgewhite,
 line|z13-15[railway=light_rail][bridge?]::bridgewhite,
 line|z15[railway=preserved][bridge?]::bridgewhite,
+line|z16[railway=miniature][bridge?]::bridgewhite,
 {casing-width-add: 1.2;}
 line|z16[railway=rail][bridge?]::bridgewhite,
 line|z16[railway=subway][bridge?]::bridgewhite,
 line|z16[railway=light_rail][bridge?]::bridgewhite,
 line|z16[railway=preserved][bridge?]::bridgewhite,
+line|z16[railway=miniature][bridge?]::bridgewhite,
 line|z16[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 1.6;}
 line|z17[railway=rail][bridge?]::bridgewhite,
 line|z17[railway=subway][bridge?]::bridgewhite,
 line|z17[railway=light_rail][bridge?]::bridgewhite,
 line|z17[railway=preserved][bridge?]::bridgewhite,
+line|z17[railway=miniature][bridge?]::bridgewhite,
 line|z17[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 2.3;}
 line|z18-[railway=rail][bridge?]::bridgewhite,
 line|z18-[railway=subway][bridge?]::bridgewhite,
 line|z18-[railway=light_rail][bridge?]::bridgewhite,
 line|z18-[railway=preserved][bridge?]::bridgewhite,
+line|z18-[railway=miniature][bridge?]::bridgewhite,
 line|z18-[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}

@@ -1443,18 +1451,21 @@ line|z16[railway=rail][bridge?]::bridgeblack,
 line|z16[railway=subway][bridge?]::bridgeblack,
 line|z16[railway=light_rail][bridge?]::bridgeblack,
 line|z16[railway=preserved][bridge?]::bridgeblack,
+line|z16[railway=miniature][bridge?]::bridgeblack,
 line|z16[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 2.2;}
 line|z17[railway=rail][bridge?]::bridgeblack,
 line|z17[railway=subway][bridge?]::bridgeblack,
 line|z17[railway=light_rail][bridge?]::bridgeblack,
 line|z17[railway=preserved][bridge?]::bridgeblack,
+line|z17[railway=miniature][bridge?]::bridgeblack,
 line|z17[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 3;}
 line|z18-[railway=rail][bridge?]::bridgeblack,
 line|z18-[railway=subway][bridge?]::bridgeblack,
 line|z18-[railway=light_rail][bridge?]::bridgeblack,
 line|z18-[railway=preserved][bridge?]::bridgeblack,
+line|z18-[railway=miniature][bridge?]::bridgeblack,
 line|z18-[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 4.4;}

--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -299,6 +299,9 @@ railway-abandoned-bridge                            # line z16- (also has line::
 railway-abandoned-tunnel                            # line z16-
 railway-construction                                # line z15-
 railway-disused                                     # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+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-
@@ -352,6 +355,7 @@ highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (al
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, 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-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
 railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
 railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
@@ -388,6 +392,7 @@ highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (al
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, 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-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
 railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
 railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -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-
@@ -2478,4 +2479,5 @@ entrance-service                                    # icon z19- (also has captio
 # 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
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/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],
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -552,14 +552,17 @@ line|z18-[railway=rail][service=service]::dash,

 line|z13-[railway=construction],
 line|z13-[railway=preserved],
+line|z13-[railway=miniature],
 line|z13-[railway=disused],
 line|z13-[railway=abandoned],
 {color: @railway; opacity:1;}

 line|z13-[railway=preserved],
+line|z13-[railway=miniature],
 line|z13-[railway=abandoned]
 {width: 1.6; dashes: 6.3,6.3;}
 line|z16-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned]
 {width: 2.2; dashes: 8,8;}

--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -301,6 +301,9 @@ railway-abandoned-bridge                            # line z13- (also has line::
 railway-abandoned-tunnel                            # line z13-
 railway-construction                                # line z13-
 railway-disused                                     # line z13-
+railway-miniature                                   # line z13-
+railway-miniature-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+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-
@@ -354,6 +357,7 @@ highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (al
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, 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-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-)
 railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
 railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
@@ -390,6 +394,7 @@ highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (al
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, 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-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-)
 railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
 railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -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-
@@ -2484,4 +2485,5 @@ entrance-service                                    # icon z19- (also has captio
 # 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
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/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],
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/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],
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -720,6 +720,7 @@ line|z15-[railway=narrow_gauge],
 line|z16-[railway=construction],
 line|z16-[railway=disused],
 line|z16-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned],
 {color: @railway; opacity: 0.6;}

@@ -740,6 +741,7 @@ line|z14-[railway=rail][bridge?]::bridgewhite,
 line|z14-[railway=subway][bridge?]::bridgewhite,
 line|z14-[railway=light_rail][bridge?]::bridgewhite,
 line|z16-[railway=preserved][bridge?]::bridgewhite,
+line|z16-[railway=miniature][bridge?]::bridgewhite,
 line|z16-[railway=abandoned][bridge?]::bridgewhite,
 line|z16-[railway=tram][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;}
@@ -747,6 +749,7 @@ line|z16-[railway=rail][bridge?]::bridgeblack,
 line|z16-[railway=subway][bridge?]::bridgeblack,
 line|z16-[railway=light_rail][bridge?]::bridgeblack,
 line|z16-[railway=preserved][bridge?]::bridgeblack,
+line|z16-[railway=miniature][bridge?]::bridgeblack,
 line|z16-[railway=abandoned][bridge?]::bridgeblack,
 line|z16-[railway=tram][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;}
@@ -910,6 +913,7 @@ line|z19-[railway=light_rail][!tunnel]::dash,


 line|z16-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned]
 {width: 1.6;dashes: 6.3,6.3;}

@@ -945,18 +949,21 @@ line|z16[railway=rail][bridge?]::bridgewhite,
 line|z16[railway=subway][bridge?]::bridgewhite,
 line|z16[railway=light_rail][bridge?]::bridgewhite,
 line|z16[railway=preserved][bridge?]::bridgewhite,
+line|z16[railway=miniature][bridge?]::bridgewhite,
 line|z16[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 1.6;}
 line|z17[railway=rail][bridge?]::bridgewhite,
 line|z17[railway=subway][bridge?]::bridgewhite,
 line|z17[railway=light_rail][bridge?]::bridgewhite,
 line|z17[railway=preserved][bridge?]::bridgewhite,
+line|z17[railway=miniature][bridge?]::bridgewhite,
 line|z17[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 2.3;}
 line|z18-[railway=rail][bridge?]::bridgewhite,
 line|z18-[railway=subway][bridge?]::bridgewhite,
 line|z18-[railway=light_rail][bridge?]::bridgewhite,
 line|z18-[railway=preserved][bridge?]::bridgewhite,
+line|z18-[railway=miniature][bridge?]::bridgewhite,
 line|z18-[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}

@@ -964,18 +971,21 @@ line|z16[railway=rail][bridge?]::bridgeblack,
 line|z16[railway=subway][bridge?]::bridgeblack,
 line|z16[railway=light_rail][bridge?]::bridgeblack,
 line|z16[railway=preserved][bridge?]::bridgeblack,
+line|z16[railway=miniature][bridge?]::bridgeblack,
 line|z16[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 2.2;}
 line|z17[railway=rail][bridge?]::bridgeblack,
 line|z17[railway=subway][bridge?]::bridgeblack,
 line|z17[railway=light_rail][bridge?]::bridgeblack,
 line|z17[railway=preserved][bridge?]::bridgeblack,
+line|z17[railway=miniature][bridge?]::bridgeblack,
 line|z17[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 3;}
 line|z18-[railway=rail][bridge?]::bridgeblack,
 line|z18-[railway=subway][bridge?]::bridgeblack,
 line|z18-[railway=light_rail][bridge?]::bridgeblack,
 line|z18-[railway=preserved][bridge?]::bridgeblack,
+line|z18-[railway=miniature][bridge?]::bridgeblack,
 line|z18-[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 4.4;}

--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/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-)
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -276,6 +276,9 @@ railway-abandoned-bridge                            # line z16- (also has line::
 railway-abandoned-tunnel                            # line z16-
 railway-construction                                # line z16-
 railway-disused                                     # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+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-
@@ -295,6 +298,7 @@ highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (al
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
 railway-rail-bridge::bridgewhite                    # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
@@ -321,6 +325,7 @@ highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (al
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-)
 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 z14-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)
 railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/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-)
--- a/docs/TEAMS.md
+++ b/docs/TEAMS.md
@@ -18,7 +18,13 @@ Owners of the CoMaps team and repositories on Codeberg

 - [@comaps/admins](https://codeberg.org/org/comaps/teams/admins)

- Administrators of different repositories on Codeberg
+Administrators of different repositories on Codeberg
+
+## Mergers
+
+- [compaps/mergers](https://codeberg.org/org/comaps/teams/mergers)
+
+Contributors who have merge permissions on CoMaps repositories, can do "official reviews" (those that count towards PR approvals), and can create branches/tags.

 ## Android

--- a/generator/generator_tests/osm_type_test.cpp
+++ b/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"}}},
--- a/generator/maxspeeds_builder.cpp
+++ b/generator/maxspeeds_builder.cpp
@@ -151,7 +151,7 @@ public:
      // Set speed as-is from parent link.
      if (parentHwType == hwType)
        return {{s.GetForward(), s.GetUnits()}};
-
+      /* Commenting this part out as an attempt to solve displayed (and inexistent) max speed in highway links (https://codeberg.org/comaps/comaps/issues/1000)
      using routing::HighwayType;
      if ((*parentHwType == HighwayType::HighwayMotorway && hwType == HighwayType::HighwayMotorwayLink) ||
          (*parentHwType == HighwayType::HighwayTrunk && hwType == HighwayType::HighwayTrunkLink) ||
@@ -163,6 +163,7 @@ public:
        return converter.ClosestValidMacro(
            {base::asserted_cast<MaxspeedType>(std::lround(s.GetForward() * kLinkToMainSpeedFactor)), s.GetUnits()});
      }
+      */

      return {};
    };
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
@@ -32,7 +32,7 @@ NSDate * _Nullable ParseDateString(NSString * _Nullable dateString) {
    dateFormatter = [[NSDateFormatter alloc] init];
    dateFormatter.dateFormat = @"yyyy-MM-dd";
    dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-    dateFormatter.timeZone = [NSTimeZone localTimeZone];
+    dateFormatter.timeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"];
  });
  
  return [dateFormatter dateFromString:dateString];
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.slash.symbolset/Contents.json
+++ b/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"
+    }
+  ]
+}
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.slash.symbolset/speedcamera.slash.svg
+++ b/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>
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -1040,6 +1040,9 @@
 "type.railway.monorail" = "Monorail";
 "type.railway.monorail.bridge" = "Monorail Bridge";
 "type.railway.monorail.tunnel" = "Monorail Tunnel";
+"type.railway.miniature" = "Miniature Railway";
+"type.railway.miniature.bridge" = "Miniature Railway Bridge";
+"type.railway.miniature.tunnel" = "Miniature Railway Tunnel";
 "type.railway.narrow_gauge" = "Narrow Gauge Rail";
 "type.railway.narrow_gauge.bridge" = "Narrow Gauge Rail Bridge";
 "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail Tunnel";
@@ -1519,6 +1522,7 @@
 "type.tourism.information.board" = "Information Board";
 "type.tourism.information.guidepost" = "Guidepost";
 "type.tourism.information.map" = "Tourist Map";
+"type.tourism.information.tactile_map" = "Tactile Map";
 "type.tourism.information.office" = "Tourist Office";
 "type.tourism.information.visitor_centre" = "Visitor Centre";
 "type.amenity.ranger_station" = "Ranger Station";
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -790,7 +790,7 @@
 		27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerSavingMode.swift; sourceTree = "<group>"; };
 		27AF18572E1DB63900CD41E2 /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncingSpeedTrapsWhileVoiceRouting.swift; sourceTree = "<group>"; };
-		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "/Users/yannikbloscheck/Apps/CoMaps/Code/data/mapcss-mapping.csv"; sourceTree = "<absolute>"; };
+		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "../../data/mapcss-mapping.csv"; sourceTree = SOURCE_ROOT; };
 		28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; path = main.mm; sourceTree = "<group>"; tabWidth = 2; };
 		30034C5C2B3F0B74005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/Localizable.strings; sourceTree = "<group>"; };
--- a/iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift
@@ -85,27 +85,10 @@ class OpeningHoursViewController: UIViewController {
        }

        if let checkDate = self.openingHoursCheckDate, self.expanded {
-          let dateString: String
-                
-          // Check if the date is strictly "Today" or "Yesterday"
-          if Calendar.current.isDateInToday(checkDate) || Calendar.current.isDateInYesterday(checkDate) {
-            // Case 1: Today/Yesterday -> Use "today" / "yesterday"
-            let df = DateFormatter()
-            df.dateStyle = .medium
-            df.timeStyle = .none
-            df.doesRelativeDateFormatting = true
-          
-            let rawString = df.string(from: checkDate)
-            // Lowercase first letter: "Today" -> "today"
-            dateString = rawString.prefix(1).lowercased() + rawString.dropFirst()
-          } else {
-            // Case 2: Older -> Use "2 years ago"
-            let rdf = RelativeDateTimeFormatter()
-            rdf.unitsStyle = .spellOut
-            dateString = rdf.localizedString(for: checkDate, relativeTo: Date())
-          }
-
-          self.checkDateLabel.text = String(format: L("hours_confirmed_time_ago"), dateString)
+          let checkDateFormatter = RelativeDateTimeFormatter()
+          checkDateFormatter.unitsStyle = .spellOut
+          checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
+          self.checkDateLabel.text = String(format: L("hours_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))

          NSLayoutConstraint.activate([self.checkDateLabelTopLayoutConstraint])
          NSLayoutConstraint.activate([self.checkDateLabelBottomLayoutConstraint])
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -458,28 +458,11 @@ class PlacePageInfoViewController: UIViewController {
    setupOpenWithAppView()

    if let checkDate = placePageInfoData.checkDate {
-      let dateString: String
-        
-      // Check if the date is strictly "Today" or "Yesterday"
-      if Calendar.current.isDateInToday(checkDate) || Calendar.current.isDateInYesterday(checkDate) {
-        // Case 1: Today/Yesterday -> Use "today" / "yesterday"
-        let df = DateFormatter()
-        df.dateStyle = .medium
-        df.timeStyle = .none
-        df.doesRelativeDateFormatting = true // Generates "Today"
-          
-        let rawString = df.string(from: checkDate)
-        // Lowercase first letter: "Today" -> "today"
-        dateString = rawString.prefix(1).lowercased() + rawString.dropFirst()
-      } else {
-        // Case 2: Older -> Use "2 years ago"
-        let rdf = RelativeDateTimeFormatter()
-        rdf.unitsStyle = .spellOut
-        dateString = rdf.localizedString(for: checkDate, relativeTo: Date())
-      }
-        
-      self.checkDateLabel.text = String(format: L("existence_confirmed_time_ago"), dateString)
-      checkDateLabel.isHidden = false
+      let checkDateFormatter = RelativeDateTimeFormatter()
+      checkDateFormatter.unitsStyle = .spellOut
+      checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
+      self.checkDateLabel.text = String(format: L("existence_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
+        checkDateLabel.isHidden = false
      NSLayoutConstraint.activate([checkDateLabelLayoutConstraint])
    } else {
      checkDateLabel.text = String()
--- a/libs/drape_frontend/user_event_stream.cpp
+++ b/libs/drape_frontend/user_event_stream.cpp
@@ -31,8 +31,8 @@ namespace df
 {
 namespace
 {
-uint64_t constexpr kDoubleTapPauseMs = 250;
-uint64_t constexpr kLongTouchMs = 500;
+uint64_t constexpr kDoubleTapPauseMs = 220;
+uint64_t constexpr kLongTouchMs = 700;
 uint64_t constexpr kKineticDelayMs = 500;

 float constexpr kForceTapThreshold = 0.75;
--- a/libs/platform/languages.hpp
+++ b/libs/platform/languages.hpp
@@ -27,7 +27,7 @@ namespace routing::turns::sound
 * - All other variants default to `zh-Hans` (Simplified Chinese).
 *
 */
-std::array<std::pair<std::string_view, std::string_view>, 42> constexpr kLanguageList = {{
+std::array<std::pair<std::string_view, std::string_view>, 43> constexpr kLanguageList = {{
    {"en", "English"},
    {"id", "Bahasa Indonesia"},
    {"ca", "Català"},
@@ -82,5 +82,6 @@ std::array<std::pair<std::string_view, std::string_view>, 42> constexpr kLanguag
 #endif
    {"ja", "日本語"},
    {"ko", "한국어"},
+    {"ta", "தமிழ்"},
 }};
 }  // namespace routing::turns::sound
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -127,6 +127,8 @@ PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework)

    QStringList languagesList = QStringList();
    std::vector<size_t> sortedIndices;
+    languagesList << QString::fromStdString("Local Language");
+    sortedIndices.push_back(0);
    for (auto const & pair : languageNameIndexPairs)
    {
      languagesList << QString::fromStdString(pair.first);
@@ -143,6 +145,11 @@ PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework)
        QString::fromStdString(std::string(StringUtf8Multilang::GetLangNameByCode(languageIndex))));
    connect(mapLanguageComboBox, &QComboBox::activated, [&framework, &supportedLanguages, sortedIndices](int index)
    {
+      if (index == 0)
+      {
+        framework.SetMapLanguageCode("default");
+        return;
+      }
      auto const & mapLanguageCode = std::string(supportedLanguages[sortedIndices[index]].m_code);
      framework.SetMapLanguageCode(mapLanguageCode);
    });
--- a/tools/unix/maps/upload_to_cdn.sh
+++ b/tools/unix/maps/upload_to_cdn.sh
@@ -48,7 +48,7 @@ OLD_VERSIONS_RU1=$(rclone lsd ru1:comaps-maps/maps --max-depth 1 | awk '{print $
 for version in $OLD_VERSIONS_RU1; do
  if [ $version -gt 250101 ]; then
    echo "  Deleting ru1:comaps-maps/maps/$version/"
-    rclone purge -v ru1:comaps-maps/maps/$version/
+    rclone purge ru1:comaps-maps/maps/$version/
  fi
 done

@@ -58,7 +58,7 @@ OLD_VERSIONS_FI1=$(rclone lsd fi1:/var/www/html/maps --max-depth 1 | awk '{print
 for version in $OLD_VERSIONS_FI1; do
  if [ $version -gt 250101 ]; then
    echo "  Deleting fi1:/var/www/html/maps/$version/"
-    rclone purge -v fi1:/var/www/html/maps/$version/
+    rclone purge fi1:/var/www/html/maps/$version/
  fi
 done

@@ -68,7 +68,7 @@ OLD_VERSIONS_DE1=$(rclone lsd de1:/var/www/html/comaps-cdn/maps --max-depth 1 |
 for version in $OLD_VERSIONS_DE1; do
  if [ $version -gt 250101 ]; then
    echo "  Deleting de1:/var/www/html/comaps-cdn/maps/$version/"
-    rclone purge -v de1:/var/www/html/comaps-cdn/maps/$version/
+    rclone purge de1:/var/www/html/comaps-cdn/maps/$version/
  fi
 done

@@ -78,7 +78,7 @@ OLD_VERSIONS_FR1=$(rclone lsd fr1:/data/maps --max-depth 1 | awk '{print $5}' |
 for version in $OLD_VERSIONS_FR1; do
  if [ $version -gt 250101 ]; then
    echo "  Deleting fr1:/data/maps/$version/"
-    rclone purge -v fr1:/data/maps/$version/
+    rclone purge fr1:/data/maps/$version/
  fi
 done

@@ -89,19 +89,19 @@ echo "Old version cleanup complete"

 echo "Uploading to us2"
 # An explicit mwm/txt filter is used to skip temp files when run for an unfinished generation
-rclone copy -v --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS &

 echo "Uploading to ru1"
-rclone copy -v --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS &

 echo "Uploading to fi1"
-rclone copy -v --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS &

 echo "Uploading to de1"
-rclone copy -v --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS &

 echo "Uploading to fr1"
-rclone copy -v --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS &

 # us1 is not used for maps atm
 # rclone lsd us1:/home/dh_zzxxrk/cdn-us-1.comaps.app/maps
Author	SHA1	Message	Date
Konstantin Pastbin	11546c895c	[generator] Reduce CDN upload script logging verbosity Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-08 16:11:00 +07:00
Jean-Baptiste	7d56fc6ba6	[android] Force Cornish language to be used in the app Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-08 11:02:05 +07:00
x7z4w	153e75175d	[drape] Adjust double- and long-tap delays Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-07 18:32:54 +01:00
Chris H. Meyer	4899a12d33	[styles] Add recycling centre to vehicle style Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-07 17:59:46 +01:00
Yannik Bloscheck	4a64bf05be	[ios] Add missing speedcamera icon version Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-07 12:28:51 +01:00
Dobri Dabar	381c1e3979	[desktop] Added Local Language option Signed-off-by: Dobri Dabar <dobridabar@noreply.codeberg.org>	2026-01-07 12:12:32 +01:00
Chris H. Meyer	aa9ee3cbbf	[styles] Add tactile maps Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-07 11:02:50 +01:00
matheusgomesms	20d9185c79	Removing maxspeed estimate from generator Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-06 14:54:00 +01:00
Chris H. Meyer	90c18f4983	[types] Add miniature railway Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-06 14:47:40 +01:00
Viktor Govako	fe5d4f5286	[classifier] Added railway=miniature. Signed-off-by: Viktor Govako <viktor.govako@gmail.com> Co-authored-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-06 14:47:40 +01:00
Yannik Bloscheck	13d7def519	[ios] Fix file path Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-06 00:31:44 +01:00
Chris H. Meyer	93b35454eb	[styles] Fix missing comma Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-05 18:26:16 +01:00
Chris H. Meyer	de1c0a061d	[styles] Set text color of fortress and other castles Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-05 18:24:48 +01:00
gedankenstuecke	18ce55afa3	incorp review feedback	2026-01-05 13:27:42 +01:00
gedankenstuecke	43ffd199a4	[docs] Update CB teams description Keeps the docs up to date on the currently existing teams Signed-off-by: gedankenstuecke <gedankenstuecke@noreply.codeberg.org>	2026-01-05 13:23:29 +01:00
thesupertechie	3e75e5e802	[core] Add Tamil TTS support This PR adds TTS voice instruction support for the Tamil language. Co-authored-by: thesupertechie <thesupertechie1@gmail.com> Co-committed-by: thesupertechie <thesupertechie1@gmail.com>	2026-01-05 10:42:53 +01:00
Jean-Baptiste	fc96d17ed7	[android] Remove background apply on item phone view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-04 19:33:18 +01:00
Jean-Baptiste	e869fe1da1	[android] Fix custom dialog styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-04 19:32:11 +01:00
matheusgomesms	f38953458d	[ios] Fix project.pbxproj Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-committed-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-04 19:31:56 +01:00