[editor] More reliable check for deprecated and moved features

Signed-off-by: map-per <map-per@gmx.de>

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java

@@ -197,8 +197,10 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
       items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
-      items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
-                                        () -> onDeleteActionSelected(mSelectedCategory)));
+      // Disallow deleting the last category
+      if (getAdapter().getBookmarkCategories().size() > 1)
+        items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
+                                          () -> onDeleteActionSelected(mSelectedCategory)));
     }
     return items;
   }
@@ -295,19 +297,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 
   private void onDeleteActionSelected(@NonNull BookmarkCategory category)
   {
-    // Disallow deleting the last category
-    if ((getAdapter().getBookmarkCategories().size() > 1))
-    {
-        BookmarkManager.INSTANCE.deleteCategory(category.getId());
-        getAdapter().notifyDataSetChanged();
-    }
-    else
-    {
-        new MaterialAlertDialogBuilder(requireActivity())
-                .setMessage(R.string.unable_to_delete_list)
-                .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss())
-                .show();
-    }
+    BookmarkManager.INSTANCE.deleteCategory(category.getId());
+    getAdapter().notifyDataSetChanged();
   }
 
   private void onSettingsActionSelected(@NonNull BookmarkCategory category)

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

@@ -974,5 +974,4 @@
     <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
-    <string name="unable_to_delete_list">The last list cannot be deleted. Create a new list to remove it</string>
 </resources>

data/mapcss-mapping.csv

@@ -45,8 +45,9 @@
 #
 # 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 app doesn't use this file directly, it loads a data/types.txt
+# The rendering engine in 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": "20251228T203737Z",
+    "data_updated": "20251120T121118Z",
     "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,12 +431,6 @@
             "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,24 +35,31 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
     getline(s, line);
     strings::Trim(line);
 
-    // skip empty lines, comments, deprecated and moved types
-    if (line.empty() || line.front() == '#' || line.starts_with("deprecated") || line.starts_with("moved") ||
-        line.back() != ';')
+    // skip empty lines and comments
+    if (line.empty() || line.front() == '#')
       continue;
 
-    std::vector<std::string_view> const rowTokens = strings::Tokenize(line, ";");
-    if (rowTokens.size() < 2)
+    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)
     {
       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() == 2)
+    if (rowTokens.size() == 3)
     {
       // Derive OSM tags from type name
       ASSERT(featureTypeTokens.size() <= 2, ("OSM tags can not be inferred from name:", line));
@@ -77,6 +84,11 @@ 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