[iOS] Improve confirmed existence format

Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
2026-01-09 13:54:37 +00:00 · 2026-01-06 11:58:56 -03:00
24 changed files with 59 additions and 204 deletions
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
@@ -42,7 +42,6 @@ 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,7 +77,6 @@ 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,7 +61,6 @@ 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,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
  android:orientation="vertical"
+  android:background="?cardBackground"
  android:minWidth="@dimen/bookmark_purchase_img_width"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">
@@ -27,11 +21,9 @@
    android:layout_marginEnd="@dimen/margin_base_plus"
    android:layout_marginStart="@dimen/margin_base_plus"
    tools:text="Select list"/>
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
+  <include
    android:layout_marginTop="@dimen/margin_base"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    android:scrollbars="vertical"/>
+    layout="@layout/recycler_default"/>
 </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,6 +9,7 @@
    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/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -947,9 +947,6 @@
    <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>
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -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;
-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;635;x
+deprecated|deprecated;636;x
+deprecated|deprecated;637;x
 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
@@ -1,108 +0,0 @@
-{
-"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_Label_Colors.mapcss
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -70,16 +70,8 @@ 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,7 +1195,6 @@ 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;}
@@ -1215,14 +1214,12 @@ 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;}

@@ -1373,7 +1370,6 @@ 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;}

@@ -1423,27 +1419,23 @@ 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;}

@@ -1451,21 +1443,18 @@ 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,9 +299,6 @@ 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-
@@ -355,7 +352,6 @@ 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-)
@@ -392,7 +388,6 @@ 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/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -552,17 +552,14 @@ 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,9 +301,6 @@ 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-
@@ -357,7 +354,6 @@ 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-)
@@ -394,7 +390,6 @@ 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/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -720,7 +720,6 @@ 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;}

@@ -741,7 +740,6 @@ 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;}
@@ -749,7 +747,6 @@ 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;}
@@ -913,7 +910,6 @@ 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;}

@@ -949,21 +945,18 @@ 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;}

@@ -971,21 +964,18 @@ 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_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -276,9 +276,6 @@ 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-
@@ -298,7 +295,6 @@ 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-)
@@ -325,7 +321,6 @@ 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/docs/TEAMS.md
+++ b/docs/TEAMS.md
@@ -18,13 +18,7 @@ Owners of the CoMaps team and repositories on Codeberg

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

-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.
+- Administrators of different repositories on Codeberg

 ## Android

--- 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,7 +163,6 @@ 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 timeZoneWithAbbreviation:@"UTC"];
+    dateFormatter.timeZone = [NSTimeZone localTimeZone];
  });
  
  return [dateFormatter dateFromString:dateString];
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -1040,9 +1040,6 @@
 "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";
--- 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 = "../../data/mapcss-mapping.csv"; sourceTree = SOURCE_ROOT; };
+		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "/Users/yannikbloscheck/Apps/CoMaps/Code/data/mapcss-mapping.csv"; sourceTree = "<absolute>"; };
 		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,10 +85,27 @@ class OpeningHoursViewController: UIViewController {
        }

        if let checkDate = self.openingHoursCheckDate, self.expanded {
-          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))
+          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)

          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,11 +458,28 @@ class PlacePageInfoViewController: UIViewController {
    setupOpenWithAppView()

    if let checkDate = placePageInfoData.checkDate {
-      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
+      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
      NSLayoutConstraint.activate([checkDateLabelLayoutConstraint])
    } else {
      checkDateLabel.text = String()
--- 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>, 43> constexpr kLanguageList = {{
+std::array<std::pair<std::string_view, std::string_view>, 42> constexpr kLanguageList = {{
    {"en", "English"},
    {"id", "Bahasa Indonesia"},
    {"ca", "Català"},
@@ -82,6 +82,5 @@ std::array<std::pair<std::string_view, std::string_view>, 43> constexpr kLanguag
 #endif
    {"ja", "日本語"},
    {"ko", "한국어"},
-    {"ta", "தமிழ்"},
 }};
 }  // namespace routing::turns::sound
--- a/tools/python/maps_generator/var/etc/map_generator.ini.prod
+++ b/tools/python/maps_generator/var/etc/map_generator.ini.prod
@@ -99,7 +99,7 @@ DIFF_VERSION_DEPTH: 2

 [Common]
 # Default parallelism level for the most of jobs. Set to 0 for auto detection.
-THREADS_COUNT: 56
+THREADS_COUNT: 0


 [Stats]