diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java index 9127a723d..19c26ad49 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java @@ -95,7 +95,8 @@ public class Icon implements Parcelable R.drawable.ic_bookmark_none, // ChargingStation R.drawable.ic_bookmark_none, // BicycleParking R.drawable.ic_bookmark_none, // BicycleParkingCovered - R.drawable.ic_bookmark_none // BicycleRental + R.drawable.ic_bookmark_none, // BicycleRental + R.drawable.ic_bookmark_none // FastFood }; @PredefinedColor diff --git a/data/styles/default/dark/symbols/bookmark-fast_food-m.svg b/data/styles/default/dark/symbols/bookmark-fast_food-m.svg new file mode 100644 index 000000000..183bb960b --- /dev/null +++ b/data/styles/default/dark/symbols/bookmark-fast_food-m.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/bookmark-fast_food-m.svg b/data/styles/default/light/symbols/bookmark-fast_food-m.svg new file mode 100644 index 000000000..c2d70bd86 --- /dev/null +++ b/data/styles/default/light/symbols/bookmark-fast_food-m.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/Contents.json new file mode 100644 index 000000000..dce5ccacf --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_bm_fastfood.svg" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/ic_bm_fastfood.svg b/iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/ic_bm_fastfood.svg new file mode 100644 index 000000000..828ce706d --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/ic_bm_fastfood.svg @@ -0,0 +1,4 @@ + + + + diff --git a/kml/types.hpp b/kml/types.hpp index 64957bc62..b65b73353 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -188,6 +188,7 @@ enum class BookmarkIcon : uint16_t BicycleParking, BicycleParkingCovered, BicycleRental, + FastFood, Count }; @@ -234,6 +235,7 @@ inline std::string ToString(BookmarkIcon icon) case BicycleParking: return "BicycleParking"; case BicycleParkingCovered: return "BicycleParkingCovered"; case BicycleRental: return "BicycleRental"; + case FastFood: return "FastFood"; case Count: return {}; } UNREACHABLE(); diff --git a/map/bookmark.cpp b/map/bookmark.cpp index 9f379dfcb..1418330cc 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -51,6 +51,7 @@ std::string GetBookmarkIconType(kml::BookmarkIcon const & icon) case kml::BookmarkIcon::BicycleParking: return "bicycle_parking"; case kml::BookmarkIcon::BicycleParkingCovered: return "bicycle_parking_covered"; case kml::BookmarkIcon::BicycleRental: return "bicycle_rental"; + case kml::BookmarkIcon::FastFood: return "fast_food"; case kml::BookmarkIcon::Count: ASSERT(false, ("Invalid bookmark icon type")); return {}; diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp index 8d1e67203..6d1b83e24 100644 --- a/map/bookmark_helpers.cpp +++ b/map/bookmark_helpers.cpp @@ -48,6 +48,14 @@ std::map const kFeatureTypeToBookmarkMatchInfo = {"amenity-pub", {kml::BookmarkIcon::Pub, BookmarkBaseType::Food}}, {"amenity-cafe", {kml::BookmarkIcon::Cafe, BookmarkBaseType::Food}}, + {"amenity-bbq", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, + {"amenity-food_court", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, + {"amenity-restaurant", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, + {"leisure-picnic_table", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, + {"tourism-picnic_site", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, + + {"amenity-fast_food", {kml::BookmarkIcon::FastFood, BookmarkBaseType::Food}}, + {"amenity-place_of_worship-buddhist", {kml::BookmarkIcon::Buddhism, BookmarkBaseType::ReligiousPlace}}, {"amenity-college", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}}, @@ -80,14 +88,6 @@ std::map const kFeatureTypeToBookmarkMatchInfo = {"amenity-bureau_de_change", {kml::BookmarkIcon::Exchange, BookmarkBaseType::Exchange}}, - {"amenity-bbq", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"amenity-cafe", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"amenity-fast_food", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"amenity-food_court", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"amenity-restaurant", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"leisure-picnic_table", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"tourism-picnic_site", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}}, - {"amenity-charging_station", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}}, {"amenity-charging_station-bicycle", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}}, {"amenity-charging_station-motorcar", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},