Compare commits

..

2 Commits

Author SHA1 Message Date
Jean-Baptiste
59b2f813c7 [android] Add a new alert dialog when we remove the last list
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2025-12-29 18:05:48 +01:00
Bastian Greshake Tzovaras
aa34159ce8 [taginfo] update tags
Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
2025-12-28 17:38:17 -03:00
5 changed files with 25 additions and 27 deletions

View File

@@ -197,10 +197,8 @@ 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)));
// Disallow deleting the last category
if (getAdapter().getBookmarkCategories().size() > 1)
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
() -> onDeleteActionSelected(mSelectedCategory)));
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
() -> onDeleteActionSelected(mSelectedCategory)));
}
return items;
}
@@ -297,8 +295,19 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
private void onDeleteActionSelected(@NonNull BookmarkCategory category)
{
BookmarkManager.INSTANCE.deleteCategory(category.getId());
getAdapter().notifyDataSetChanged();
// 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();
}
}
private void onSettingsActionSelected(@NonNull BookmarkCategory category)

View File

@@ -974,4 +974,5 @@
<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>

View File

@@ -1361,7 +1361,7 @@ historic|memorial|plaque;[historic=memorial][memorial=plaque],[historic=memorial
historic|castle|defensive;[historic=castle][castle_type=defensive];;name;int_name;1234;
historic|castle|stately;[historic=castle][castle_type=stately];;name;int_name;1235;
attraction|animal;1236;
disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar],[disused:amenity=ice_cream],[disused:amenity=pharmacy],[disused:amenity=post_office],[disused:amenity=bank],[disused:amenity=bureau_de_change],[disused:amenity=car_rental],[disused:amenity=motorcycle_rental],[disused:amenity=casino],[disused:amenity=gambling],[disused:amenity=internet_cafe],[disused:craft=confectionery],[disused:craft=electronics_repair],[disused:craft=shoemaker],[disused:craft=tailor],[disused:craft=key_cutter],[disused:craft=locksmith],[disused:office=estate_agent],[disused:office=insurance];;;;1237;
disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar];;;;1237;
cuisine|regional;1238;
cuisine|pizza;1239;
cuisine|burger;1240;
Can't render this file because it contains an unexpected character in line 7 and column 16.

View File

@@ -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",

View File

@@ -104,24 +104,6 @@ bool EditableMapObject::CanMarkPlaceAsDisused() const
"amenity-cafe",
"amenity-pub",
"amenity-bar",
"amenity-ice_cream",
"amenity-pharmacy",
"amenity-post_office",
"amenity-bank",
"amenity-bureau_de_change",
"amenity-car_rental",
"amenity-motorcycle_rental",
"amenity-casino",
"amenity-gambling",
"amenity-internet_cafe",
"craft-confectionery",
"craft-electronics_repair",
"raft-shoemaker",
"craft-tailor",
"craft-key_cutter",
"craft-locksmith",
"office-estate_agent",
"office-insurance",
};
for (auto const & typePrefix : typePrefixes)