[android] Use M3 top bar in settings

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

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

@@ -6,7 +6,7 @@
   android:orientation="vertical">
 
   <include
-    layout="@layout/toolbar_default"/>
+    layout="@layout/mtoolbar_default"/>
 
   <FrameLayout
     android:id="@+id/fragment_container"

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

@@ -8,7 +8,7 @@
   android:orientation="vertical">
   <include
     android:id="@+id/toolbar"
-    layout="@layout/toolbar_default" />
+    layout="@layout/mtoolbar_default" />
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.MaterialToolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    style="@style/MwmWidget.M3.ToolbarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/actionBarSize" />

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

@@ -396,4 +396,11 @@
         <item name="cornerSizeTopLeft">50%</item>
         <item name="cornerSizeTopRight">50%</item>
     </style>
+
+    <style name="MwmWidget.M3.ToolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="android:background">?android:attr/colorBackground</item>
+        <item name="android:displayOptions">homeAsUp|showTitle</item>
+        <item name="contentInsetStart">0dp</item>
+        <item name="buttonGravity">center_vertical</item>
+    </style>
 </resources>

data/countries_meta.txt

@@ -1,4 +1,10 @@
 {
+"World": {
+ "languages": ["int_name", "en", "default"]
+},
+"WorldCoasts": {
+ "languages": ["int_name", "en", "default"]
+},
 "Abkhazia": {
  "languages": ["ab", "ru"]
 },

data/mapcss-mapping.csv

@@ -45,9 +45,8 @@
 #
 # A C++ parser implementation used by the generator is in generator/utils.cpp::ParseMapCSS().
 # A python parser implementation used to compile *.mapcss style files is in tools/kothic/src/libkomwm.py::komap_mapswithme().
-# The rendering engine in the app doesn't use this file directly, it loads a data/types.txt
+# The app doesn't use this file directly, it loads a data/types.txt
 # which is derived from this file during style files compilation.
-# A C++ parser for matching types to OSM tags is implemented in editor/feature_type_to_osm.cpp.
 #
 # Types that don't have any style defined are discarded by the generator.
 # To prevent discarding, add them to the exceptions in indexer/feature_visibility.cpp::IsUsefulNondrawableType()

data/taginfo.json

@@ -1,7 +1,7 @@
 {
     "data_format": 1,
     "data_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/taginfo.json",
-    "data_updated": "20251120T121118Z",
+    "data_updated": "20251228T203737Z",
     "project": {
         "name": "CoMaps",
         "description": "CoMaps is a community-focused privacy navigation iOS & Android app for travelers - drivers, hikers, and cyclists.",
@@ -176,7 +176,7 @@
             "description": "amenity=car_pooling",
             "key": "amenity",
             "value": "car_pooling",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking-pooling-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking_pooling-m.svg"
         },
         {
             "description": "amenity=car_rental",
@@ -431,6 +431,12 @@
             "value": "hunting_stand",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hunting-tower-m.svg"
         },
+        {
+            "description": "amenity=hydrant",
+            "key": "amenity",
+            "value": "hydrant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hydrant-m.svg"
+        },
         {
             "description": "amenity=ice_cream",
             "key": "amenity",

libs/editor/feature_type_to_osm.cpp

@@ -35,31 +35,24 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
     getline(s, line);
     strings::Trim(line);
 
-    // skip empty lines and comments
-    if (line.empty() || line.front() == '#')
+    // skip empty lines, comments, deprecated and moved types
+    if (line.empty() || line.front() == '#' || line.starts_with("deprecated") || line.starts_with("moved") ||
+        line.back() != ';')
       continue;
 
-    std::vector<std::string> rowTokens;
-    strings::ParseCSVRow(line, ';', rowTokens);
-
-    // make sure entry is in full or short format
-    if (rowTokens.size() != 3 && rowTokens.size() != 7)
+    std::vector<std::string_view> const rowTokens = strings::Tokenize(line, ";");
+    if (rowTokens.size() < 2)
     {
       ASSERT(false, ("Invalid feature type definition:", line));
       continue;
     }
 
-    // skip deprecated and moved types
-    if ((rowTokens.size() == 3 && !rowTokens[2].empty()) || (rowTokens.size() == 7 && rowTokens[2] == "x"))
-      continue;
-
     // Get internal feature type
-    ASSERT(!rowTokens[0].empty(), ("No feature type found:", line));
     std::vector<std::string_view> const featureTypeTokens = strings::Tokenize(rowTokens[0], "|");
     uint32_t const type = classif().GetTypeByPathSafe(featureTypeTokens);
     ASSERT(type != IndexAndTypeMapping::INVALID_TYPE, ("Feature with invalid type:", line));
 
-    if (rowTokens.size() == 3)
+    if (rowTokens.size() == 2)
     {
       // Derive OSM tags from type name
       ASSERT(featureTypeTokens.size() <= 2, ("OSM tags can not be inferred from name:", line));
@@ -84,11 +77,6 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
     else
     {
       // OSM tags are listed in the feature type entry
-      if (rowTokens[1].empty())
-      {
-        ASSERT(false, ("No OSM tags found:", line));
-        continue;
-      }
       std::vector<std::string_view> const osmTagTokens = strings::Tokenize(rowTokens[1], ",");
 
       // First entry is the best practice way to tag a feature