[styles] Add fast_food search result icons & bookmark icons

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

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

data/styles/default/dark/symbols/bookmark-fast_food-m.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+  </linearGradient>
+ </defs>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
+ <path d="m15.75 8.4508c0.01046-2.1-2.247-3.15-5.25-3.15-2.9977 0-5.25 1.05-5.25 3.15 0 0.28875 0.23625 0.525 0.525 0.525h9.45c0.28875 0 0.52504-0.23625 0.52504-0.525zm-10.5 5.25c0 0.5775 0.4725 1.05 1.05 1.05h8.4c0.5775 0 1.05-0.4725 1.05-1.05v-0.525c0-0.5775-0.4725-1.05-1.05-1.05h-8.4c-0.5775 0-1.05 0.4725-1.05 1.05zm0.71925-2.478c0.41475-0.15225 0.61425-0.4095 1.0448-0.4095 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.42525 0 0.61425 0.2415 1.0132 0.399 0.35175 0.1365 0.72975-0.13125 0.72975-0.504 0-0.22575-0.147-0.42525-0.36225-0.504-0.50925-0.18375-0.6405-0.43575-1.3912-0.43575-1.0238 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-1.0237 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-0.81375 0-1.029 0.33075-1.407 0.46725-0.20475 0.0735-0.34125 0.273-0.34125 0.4935 0 0.36225 0.3675 0.6195 0.714 0.4935z" fill="#fff"/>
+</svg>

data/styles/default/light/symbols/bookmark-fast_food-m.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#fff" stop-opacity=".125" offset="0"/>
+   <stop stop-color="#080808" stop-opacity=".125" offset="1"/>
+  </linearGradient>
+ </defs>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
+ <path d="m15.75 8.4508c0.01046-2.1-2.247-3.15-5.25-3.15-2.9977 0-5.25 1.05-5.25 3.15 0 0.28875 0.23625 0.525 0.525 0.525h9.45c0.28875 0 0.52504-0.23625 0.52504-0.525zm-10.5 5.25c0 0.5775 0.4725 1.05 1.05 1.05h8.4c0.5775 0 1.05-0.4725 1.05-1.05v-0.525c0-0.5775-0.4725-1.05-1.05-1.05h-8.4c-0.5775 0-1.05 0.4725-1.05 1.05zm0.71925-2.478c0.41475-0.15225 0.61425-0.4095 1.0448-0.4095 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.42525 0 0.61425 0.2415 1.0132 0.399 0.35175 0.1365 0.72975-0.13125 0.72975-0.504 0-0.22575-0.147-0.42525-0.36225-0.504-0.50925-0.18375-0.6405-0.43575-1.3912-0.43575-1.0238 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-1.0237 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-0.81375 0-1.029 0.33075-1.407 0.46725-0.20475 0.0735-0.34125 0.273-0.34125 0.4935 0 0.36225 0.3675 0.6195 0.714 0.4935z" fill="#fff"/>
+</svg>

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"
+  }
+}

iphone/Maps/Images.xcassets/Bookmarks/ic_bm_fastfood.imageset/ic_bm_fastfood.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="19" height="19" version="1.1" viewBox="0 0 19 19" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ 
+<path d="m17.375 7.1375c0.0157-3.15-3.3705-4.725-7.875-4.725-4.4966 0-7.875 1.575-7.875 4.725 0 0.43312 0.35438 0.7875 0.7875 0.7875h14.175c0.43312 0 0.78756-0.35438 0.78756-0.7875zm-15.75 7.875c0 0.86625 0.70875 1.575 1.575 1.575h12.6c0.86625 0 1.575-0.70875 1.575-1.575v-0.7875c0-0.86625-0.70875-1.575-1.575-1.575h-12.6c-0.86625 0-1.575 0.70875-1.575 1.575zm1.0789-3.717c0.62212-0.22838 0.92138-0.61425 1.5671-0.61425 0.93712 0 1.1182 0.7875 2.6224 0.7875 1.5356 0 1.6459-0.7875 2.6224-0.7875 0.93712 0 1.1182 0.7875 2.6224 0.7875 1.5356 0 1.6459-0.7875 2.6224-0.7875 0.63788 0 0.92138 0.36225 1.5199 0.5985 0.52762 0.20475 1.0946-0.19688 1.0946-0.756 0-0.33862-0.2205-0.63788-0.54338-0.756-0.76388-0.27562-0.96075-0.65362-2.0869-0.65362-1.5356 0-1.6459 0.7875-2.6224 0.7875-0.93712 0-1.1182-0.7875-2.6224-0.7875-1.5356 0-1.6459 0.7875-2.6224 0.7875-0.93712 0-1.1182-0.7875-2.6224-0.7875-1.2206 0-1.5435 0.49612-2.1105 0.70088-0.30712 0.11025-0.51188 0.4095-0.51188 0.74025 0 0.54338 0.55125 0.92925 1.071 0.74025z" fill="#fff"/></svg>

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();

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 {};

map/bookmark_helpers.cpp

@@ -48,6 +48,14 @@ std::map<std::string, BookmarkMatchInfo> 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<std::string, BookmarkMatchInfo> 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}},