diff options
author | Ilya Zverev <zverik@textual.ru> | 2016-12-01 16:55:31 +0300 |
---|---|---|
committer | Ilya Zverev <zverik@textual.ru> | 2016-12-01 18:48:44 +0300 |
commit | 1e7b4269714de433bbc3694f45eaac968f69ee95 (patch) | |
tree | 9ed78f4b25c076280fc813ec471417f3b977bcf8 /data | |
parent | 961d4749e3a622b5027af9fe53441e01741170ff (diff) |
[banners] Make sponsored types always visible, add banner categories
Diffstat (limited to 'data')
-rw-r--r-- | data/banners.txt | 36 | ||||
-rw-r--r-- | data/mapcss-mapping.csv | 7 | ||||
-rw-r--r-- | data/mixed_tags.txt | 2 | ||||
-rw-r--r-- | data/styles/legacy/include/base_other.mapcss | 5 |
4 files changed, 39 insertions, 11 deletions
diff --git a/data/banners.txt b/data/banners.txt index f202ac1ed6..651837c9cd 100644 --- a/data/banners.txt +++ b/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 diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index ba14da09a9..71d86de93c 100644 --- a/data/mapcss-mapping.csv +++ b/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; diff --git a/data/mixed_tags.txt b/data/mixed_tags.txt index b86547d45f..c506e55518 100644 --- a/data/mixed_tags.txt +++ b/data/mixed_tags.txt @@ -1,3 +1,3 @@ # List of additional categories for OSM objects. -# Format: type,id,category +# Format: type,id,key1=value1,key2=value2,... # Example: way,34306743,olympics=stadium diff --git a/data/styles/legacy/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss index a47228526c..d9584b5417 100644 --- a/data/styles/legacy/include/base_other.mapcss +++ b/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; |