Merge pull request #4850 from Zverik/banners_array

[banners] Add data for the first batch of advertisers

android/src/com/mapswithme/maps/bookmarks/data/Metadata.java

@@ -39,7 +39,8 @@ public class Metadata implements Parcelable
     FMD_BUILDING_LEVELS(22),
     FMD_SPONSORED_ID(24),
     FMD_PRICE_RATE(25),
-    FMD_RATING(26);
+    FMD_RATING(26),
+    FMD_BANNER_URL(27);
 
     private final int mMetaType;
 
@@ -49,7 +50,7 @@ public class Metadata implements Parcelable
     }
 
     @NonNull
-    public static MetadataType fromInt(@IntRange(from = 1, to = 26) int metaType)
+    public static MetadataType fromInt(@IntRange(from = 1, to = 27) int metaType)
     {
       for (MetadataType type : values())
         if (type.mMetaType == metaType)

data/banners.txt

@@ -1,10 +1,34 @@
-[deliveryclub_ru]
-start = 2016-12-01
+# List of banner types.
+#
+# Each section in [square_quotes] corresponds to classificator type sponsored|banner|section_name.
+# Inside a section, use following variables:
+# - start=YYYY-MM-DD and end=YYYY-MM-DD: banner visibility period.
+# - url=http://...: default banner URL, use templated vars in {quotes}.
+# - icon: icon URL.
+# - messages: base substring for messages, default is "banner_sectionname".
+# Other variables can be used in URL templates.
+
+[lamoda_ru]
 end = 2017-01-15
-icon =
-url = http://fas.st/VtumFw
-aux = test
+url = http://fas.st/l1YJbD
 
 [lamoda_ua]
-start = 2016-12-01
+end = 2017-01-15
+url = http://fas.st/naNtn
+
+[deliveryclub]
+end = 2017-01-15
+url = http://fas.st/VtumFw
+
+[tutu]
+end = 2017-01-15
+url = http://fas.st/S9AciK
+
+[geerbest]
+end = 2017-01-15
+
+[rentalcars]
+end = 2017-01-15
+
+[viator]
 end = 2017-01-15

data/classificator.txt

@@ -806,6 +806,15 @@ world  +
         wine  -
         {}
     sponsored  +
+        banner  +
+            deliveryclub  -
+            geerbest  -
+            lamoda_ru  -
+            lamoda_ua  -
+            rentalcars  -
+            tutu  -
+            viator  -
+            {}
         booking  -
         opentable  -
         {}

data/drules_proto.txt

@@ -75484,53 +75484,6 @@ cont {
     }
   }
 }
-cont {
-  name: "sponsored"
-  element {
-    scale: 18
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "sponsored-booking"
-  element {
-    scale: 18
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "sponsored-opentable"
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant"
-      apply_for_type: 1
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant"
-      apply_for_type: 1
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant"
-      apply_for_type: 1
-      priority: 16000
-    }
-  }
-}
 cont {
   name: "sport-american_football"
   element {

data/drules_proto_legacy.txt

@@ -64980,73 +64980,6 @@ cont {
     }
   }
 }
-cont {
-  name: "sponsored"
-  element {
-    scale: 18
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "sponsored-booking"
-  element {
-    scale: 18
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "sponsored-opentable"
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant"
-      apply_for_type: 1
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant"
-      apply_for_type: 1
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel"
-      priority: 16000
-    }
-  }
-}
 cont {
   name: "sport-american_football"
   element {

data/mapcss-mapping.csv

@@ -1137,3 +1137,10 @@ olympics|stadium;1136;
 olympics|water_sport;1137;
 olympics|bike_sport;1138;
 sponsored|opentable;1139;
+sponsored|banner|lamoda_ru;1140;
+sponsored|banner|lamoda_ua;1141;
+sponsored|banner|deliveryclub;1142;
+sponsored|banner|tutu;1143;
+sponsored|banner|geerbest;1144;
+sponsored|banner|rentalcars;1145;
+sponsored|banner|viator;1146;

data/styles/legacy/include/base_other.mapcss

@@ -602,8 +602,7 @@ line|z16[man_made=pipeline][location=overground]
   linecap: butt;
 }
 area|z16-[amenity=restaurant],
-node|z16-[amenity=restaurant],
-node|z16-[sponsored=opentable]
+node|z16-[amenity=restaurant]
 {
   icon-image: restaurant.svg;
 }
@@ -729,8 +728,6 @@ node|z16-[tourism=hostel]
 area|z16-[tourism=hotel],
 area|z16-[tourism=motel],
 node|z16-[tourism=hotel],
-area|z18-[sponsored],
-node|z18-[sponsored],
 node|z16-[tourism=motel]
 {
   icon-image: hotel.svg;

data/types.txt

@@ -1137,3 +1137,10 @@ olympics|stadium
 olympics|water_sport
 olympics|bike_sport
 sponsored|opentable
+sponsored|banner|lamoda_ru
+sponsored|banner|lamoda_ua
+sponsored|banner|deliveryclub
+sponsored|banner|tutu
+sponsored|banner|geerbest
+sponsored|banner|rentalcars
+sponsored|banner|viator

data/visibility.txt

@@ -805,9 +805,18 @@ world  00000000000000000000  +
         tyres  00000000000000000111  -
         wine  00000000000000000111  -
         {}
-    sponsored  00000000000000000011  +
-        booking  00000000000000000011  -
-        opentable  00000000000000001111  -
+    sponsored  00000000000000000000  +
+        banner  00000000000000000000  +
+            deliveryclub  00000000000000000000  -
+            geerbest  00000000000000000000  -
+            lamoda_ru  00000000000000000000  -
+            lamoda_ua  00000000000000000000  -
+            rentalcars  00000000000000000000  -
+            tutu  00000000000000000000  -
+            viator  00000000000000000000  -
+            {}
+        booking  00000000000000000000  -
+        opentable  00000000000000000000  -
         {}
     sport  00000000000000000000  +
         american_football  00000000000000000111  -

indexer/feature_visibility.cpp

@@ -214,6 +214,7 @@ namespace
     static const uint32_t hwtag = classif().GetTypeByPath({ "hwtag" });
     static const uint32_t psurface = classif().GetTypeByPath({ "psurface" });
     static const uint32_t wheelchair = classif().GetTypeByPath({ "wheelchair" });
+    static const uint32_t sponsored = classif().GetTypeByPath({ "sponsored" });
 
     // Caching type length to exclude generic [wheelchair].
     uint8_t const typeLength = ftype::GetLevel(type);
@@ -236,6 +237,9 @@ namespace
     if (wheelchair == type && typeLength == 2)
       return true;
 
+    if (sponsored == type)
+      return true;
+
     return false;
   }
 }