Remove sponsored from strings & styles

Signed-off-by: dbf <dbf256@gmail.com>
This commit is contained in:
dbf 2021-12-03 23:25:50 +03:00 committed by Alexander Borsuk
parent 9948d1e8dd
commit d50873ec8c
5 changed files with 25 additions and 385 deletions

View file

@ -1107,8 +1107,8 @@ leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;11
amenity|public_bookcase;1109;
tourism|apartment;1110;
tourism|resort;[tourism=resort],[leisure=resort],[leisure=summer_camp];;name;int_name;1111;
sponsored;[sponsored];;name;int_name;1112;
sponsored|booking;1113;
deprecated|deprecated;1112;x
deprecated|deprecated;1113;x
hwtag|nobicycle;1114;
hwtag|yesbicycle;1115;
hwtag|bidir_bicycle;1116;
@ -1134,7 +1134,7 @@ deprecated|deprecated;1135;x
deprecated|deprecated;1136;x
deprecated|deprecated;1137;x
deprecated|deprecated;1138;x
sponsored|opentable;1139;
deprecated|deprecated;1139;x
deprecated|deprecated;1140;x
deprecated|deprecated;1141;x
deprecated|deprecated;1142;x
@ -1196,31 +1196,31 @@ shop|video;1197;
tourism|theme_park;1198;
tourism|wilderness_hut;1199;
deprecated|deprecated;1200;x
sponsored|holiday;1201;
deprecated|deprecated;1201;x
deprecated|deprecated;1202;x
sponsored|partner1;1203;
sponsored|partner2;1204;
sponsored|partner3;1205;
sponsored|partner4;1206;
sponsored|partner5;1207;
deprecated|deprecated;1203;x
deprecated|deprecated;1204;x
deprecated|deprecated;1205;x
deprecated|deprecated;1206;x
deprecated|deprecated;1207;x
deprecated|deprecated;1208;x
deprecated|deprecated;1209;x
shop|money_lender;1210;
sponsored|partner6;1211;
sponsored|partner7;1212;
sponsored|partner8;1213;
sponsored|partner9;1214;
sponsored|partner10;1215;
sponsored|partner11;1216;
sponsored|partner12;1217;
sponsored|partner13;1218;
sponsored|partner14;1219;
sponsored|partner15;1220;
sponsored|partner16;1221;
sponsored|partner17;1222;
sponsored|partner18;1223;
sponsored|partner19;1224;
sponsored|partner20;1225;
deprecated|deprecated;1211;x
deprecated|deprecated;1212;x
deprecated|deprecated;1213;x
deprecated|deprecated;1214;x
deprecated|deprecated;1215;x
deprecated|deprecated;1216;x
deprecated|deprecated;1217;x
deprecated|deprecated;1218;x
deprecated|deprecated;1219;x
deprecated|deprecated;1220;x
deprecated|deprecated;1221;x
deprecated|deprecated;1222;x
deprecated|deprecated;1223;x
deprecated|deprecated;1224;x
deprecated|deprecated;1225;x
place|square;1226;
tourism|artwork|architecture;[tourism=artwork][artwork_type=architecture],[tourism=artwork][type=architecture];;name;int_name;1227;
tourism|artwork|sculpture;[tourism=artwork][artwork_type=sculpture],[tourism=artwork][type=sculpture];;name;int_name;1228;
@ -1319,7 +1319,7 @@ cuisine|peruvian;1320;
cuisine|fine_dining;1321;
cuisine|tea;1322;
natural|geyser;1323;
sponsored|promo_catalog;1324;
deprecated|deprecated;1324;x
natural|hot_spring;1325;
amenity|parking_space;1326;
amenity|parking_space|underground;[amenity=parking_space][parking=underground];;name;int_name;1327;

Can't render this file because it has a wrong number of fields in line 11.

View file

@ -18863,88 +18863,6 @@
zh-Hans = 酒品商店
zh-Hant = 販酒處
[type.sponsored]
en = sponsored
pt = Patrocinado
pt-BR = Patrocinado
[type.sponsored.booking]
en = sponsored-booking
[type.sponsored.holiday]
en = Christmas or New Year Celebrations
el = Χριστούγεννα ή Ρεβεγιόν πρωτοχρονιάς
pl = Obchody świąt Bożego Narodzenia lub Nowego Roku
pt = Celebrações de natal ou ano novo
pt-BR = Celebrações de natal ou ano novo
ru = Празднование Рождества или Нового года
[type.sponsored.opentable]
en = sponsored-opentable
[type.sponsored.partner1]
en = sponsored-partner1
[type.sponsored.partner10]
en = sponsored-partner10
[type.sponsored.partner11]
en = sponsored-partner11
[type.sponsored.partner12]
en = sponsored-partner12
[type.sponsored.partner13]
en = sponsored-partner13
[type.sponsored.partner14]
en = sponsored-partner14
[type.sponsored.partner15]
en = sponsored-partner15
[type.sponsored.partner16]
en = sponsored-partner16
[type.sponsored.partner17]
en = sponsored-partner17
[type.sponsored.partner18]
en = MegaFon
ru = МегаФон
[type.sponsored.partner19]
en = MegaFon
ru = МегаФон
[type.sponsored.partner2]
en = sponsored-partner2
[type.sponsored.partner20]
en = MegaFon
ru = МегаФон
[type.sponsored.partner3]
en = sponsored-partner3
[type.sponsored.partner4]
en = sponsored-partner4
[type.sponsored.partner5]
en = sponsored-partner5
[type.sponsored.partner6]
en = sponsored-partner6
[type.sponsored.partner7]
en = sponsored-partner7
[type.sponsored.partner8]
en = sponsored-partner8
[type.sponsored.partner9]
en = sponsored-partner9
[type.sport]
en = sport
fi = Urheilu

View file

@ -387,193 +387,6 @@ node[tourism=hotel],
area[tourism=hotel]
{z-index: 2818;}
node[sponsored=booking],
area[sponsored=booking]
{z-index: 2820;}
/* Booking Hotel Rating >=5 */
node[sponsored=booking][rating>=5],
area[sponsored=booking][rating>=5]
{z-index: 2822;}
node[sponsored=booking][tourism=apartment][rating>=5],
area[sponsored=booking][tourism=apartment][rating>=5],
node[sponsored=booking][tourism=chalet][rating>=5],
area[sponsored=booking][tourism=chalet][rating>=5],
node[sponsored=booking][tourism=guest_house][rating>=5],
area[sponsored=booking][tourism=guest_house][rating>=5]
{z-index: 2823;}
node[sponsored=booking][tourism=alpine_hut][rating>=5],
area[sponsored=booking][tourism=alpine_hut][rating>=5],
node[sponsored=booking][tourism=wilderness_hut][rating>=5],
area[sponsored=booking][tourism=wilderness_hut][rating>=5]
{z-index: 2824;}
node[sponsored=booking][tourism=hostel][rating>=5],
area[sponsored=booking][tourism=hostel][rating>=5]
{z-index: 2825;}
node[sponsored=booking][tourism=motel][rating>=5],
area[sponsored=booking][tourism=motel][rating>=5]
{z-index: 2826;}
node[sponsored=booking][tourism=resort][rating>=5],
area[sponsored=booking][tourism=resort][rating>=5]
{z-index: 2827;}
node[sponsored=booking][tourism=hotel][rating>=5],
area[sponsored=booking][tourism=hotel][rating>=5]
{z-index: 2828;}
/* Booking Hotel Rating >=6 */
node[sponsored=booking][rating>=6],
area[sponsored=booking][rating>=6]
{z-index: 2830;}
node[sponsored=booking][tourism=apartment][rating>=6],
area[sponsored=booking][tourism=apartment][rating>=6],
node[sponsored=booking][tourism=chalet][rating>=6],
area[sponsored=booking][tourism=chalet][rating>=6],
node[sponsored=booking][tourism=guest_house][rating>=6],
area[sponsored=booking][tourism=guest_house][rating>=6]
{z-index: 2831;}
node[sponsored=booking][tourism=alpine_hut][rating>=6],
area[sponsored=booking][tourism=alpine_hut][rating>=6],
node[sponsored=booking][tourism=wilderness_hut][rating>=6],
area[sponsored=booking][tourism=wilderness_hut][rating>=6]
{z-index: 2832;}
node[sponsored=booking][tourism=hostel][rating>=6],
area[sponsored=booking][tourism=hostel][rating>=6]
{z-index: 2833;}
node[sponsored=booking][tourism=motel][rating>=6],
area[sponsored=booking][tourism=motel][rating>=6]
{z-index: 2834;}
node[sponsored=booking][tourism=resort][rating>=6],
area[sponsored=booking][tourism=resort][rating>=6]
{z-index: 2835;}
node[sponsored=booking][tourism=hotel][rating>=6],
area[sponsored=booking][tourism=hotel][rating>=6]
{z-index: 2836;}
/* Booking Hotel Rating >=7 */
node[sponsored=booking][rating>=7],
area[sponsored=booking][rating>=7]
{z-index: 2840;}
node[sponsored=booking][tourism=apartment][rating>=7],
area[sponsored=booking][tourism=apartment][rating>=7],
node[sponsored=booking][tourism=chalet][rating>=7],
area[sponsored=booking][tourism=chalet][rating>=7],
node[sponsored=booking][tourism=guest_house][rating>=7],
area[sponsored=booking][tourism=guest_house][rating>=7]
{z-index: 2841;}
node[sponsored=booking][tourism=alpine_hut][rating>=7],
area[sponsored=booking][tourism=alpine_hut][rating>=7],
node[sponsored=booking][tourism=wilderness_hut][rating>=7],
area[sponsored=booking][tourism=wilderness_hut][rating>=7]
{z-index: 2842;}
node[sponsored=booking][tourism=hostel][rating>=7],
area[sponsored=booking][tourism=hostel][rating>=7]
{z-index: 2843;}
node[sponsored=booking][tourism=motel][rating>=7],
area[sponsored=booking][tourism=motel][rating>=7]
{z-index: 2844;}
node[sponsored=booking][tourism=resort][rating>=7],
area[sponsored=booking][tourism=resort][rating>=7]
{z-index: 2845;}
node[sponsored=booking][tourism=hotel][rating>=7],
area[sponsored=booking][tourism=hotel][rating>=7]
{z-index: 2846;}
/* Booking Hotel Rating >=8 */
node[sponsored=booking][rating>=8],
area[sponsored=booking][rating>=8]
{z-index: 2850;}
node[sponsored=booking][tourism=apartment][rating>=8],
area[sponsored=booking][tourism=apartment][rating>=8],
node[sponsored=booking][tourism=chalet][rating>=8],
area[sponsored=booking][tourism=chalet][rating>=8],
node[sponsored=booking][tourism=guest_house][rating>=8],
area[sponsored=booking][tourism=guest_house][rating>=8]
{z-index: 2851;}
node[sponsored=booking][tourism=alpine_hut][rating>=8],
area[sponsored=booking][tourism=alpine_hut][rating>=8],
node[sponsored=booking][tourism=wilderness_hut][rating>=8],
area[sponsored=booking][tourism=wilderness_hut][rating>=8]
{z-index: 2852;}
node[sponsored=booking][tourism=hostel][rating>=8],
area[sponsored=booking][tourism=hostel][rating>=8]
{z-index: 2853;}
node[sponsored=booking][tourism=motel][rating>=8],
area[sponsored=booking][tourism=motel][rating>=8]
{z-index: 2854;}
node[sponsored=booking][tourism=resort][rating>=8],
area[sponsored=booking][tourism=resort][rating>=8]
{z-index: 2855;}
node[sponsored=booking][tourism=hotel][rating>=8],
area[sponsored=booking][tourism=hotel][rating>=8]
{z-index: 2856;}
/* Booking Hotel Rating >=9 */
node[sponsored=booking][rating>=7],
area[sponsored=booking][rating>=7]
{z-index: 2860;}
node[sponsored=booking][tourism=apartment][rating>=9],
area[sponsored=booking][tourism=apartment][rating>=9],
node[sponsored=booking][tourism=chalet][rating>=9],
area[sponsored=booking][tourism=chalet][rating>=9],
node[sponsored=booking][tourism=guest_house][rating>=9],
area[sponsored=booking][tourism=guest_house][rating>=9]
{z-index: 2861;}
node[sponsored=booking][tourism=alpine_hut][rating>=9],
area[sponsored=booking][tourism=alpine_hut][rating>=9],
node[sponsored=booking][tourism=wilderness_hut][rating>=9],
area[sponsored=booking][tourism=wilderness_hut][rating>=9]
{z-index: 2862;}
node[sponsored=booking][tourism=hostel][rating>=9],
area[sponsored=booking][tourism=hostel][rating>=9]
{z-index: 2863;}
node[sponsored=booking][tourism=motel][rating>=9],
area[sponsored=booking][tourism=motel][rating>=9]
{z-index: 2864;}
node[sponsored=booking][tourism=resort][rating>=9],
area[sponsored=booking][tourism=resort][rating>=9]
{z-index: 2865;}
node[sponsored=booking][tourism=hotel][rating>=9],
area[sponsored=booking][tourism=hotel][rating>=9]
{z-index: 2866;}
node[amenity=place_of_worship],
area[amenity=place_of_worship]
{z-index: 2872;}
@ -1416,71 +1229,6 @@ node|z18-[tourism=apartment],
area|z18-[tourism=apartment]
{icon-image: apartment-m.svg;icon-min-distance: 16;}
node|z14[sponsored=booking][tourism=hotel][rating>=8],
area|z14[sponsored=booking][tourism=hotel][rating>=8],
node|z14[sponsored=booking][tourism=resort][rating>=8],
area|z14[sponsored=booking][tourism=resort][rating>=8]
{icon-image: hotel-s.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;text-optional: true;}
node|z14[sponsored=booking][rating<8],
area|z14[sponsored=booking][rating<8]
{icon-image: zero-icon.svg;text: none;}
node|z15[sponsored=booking][tourism=hotel][rating>=7],
area|z15[sponsored=booking][tourism=hotel][rating>=7],
node|z15[sponsored=booking][tourism=resort][rating>=7],
area|z15[sponsored=booking][tourism=resort][rating>=7],
node|z15[sponsored=booking][tourism=motel][rating>=7],
area|z15[sponsored=booking][tourism=motel][rating>=7]
{icon-image: hotel-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z15[sponsored=booking][tourism=alpine_hut][rating>=7],
area|z15[sponsored=booking][tourism=alpine_hut][rating>=7],
node|z15[sponsored=booking][tourism=wilderness_hut][rating>=7],
area|z15[sponsored=booking][tourism=wilderness_hut][rating>=7]
{icon-image:alpine_hut-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z15[sponsored=booking][rating<7],
area|z15[sponsored=booking][rating<7]
{icon-image: zero-icon.svg;text: none;}
node|z16- [sponsored=booking][tourism=hotel],
area|z16- [sponsored=booking][tourism=hotel],
node|z16- [sponsored=booking][tourism=resort],
area|z16- [sponsored=booking][tourism=resort],
node|z16- [sponsored=booking][tourism=motel],
area|z16- [sponsored=booking][tourism=motel]
{icon-image: hotel-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z16- [sponsored=booking][tourism=alpine_hut],
area|z16- [sponsored=booking][tourism=alpine_hut],
node|z16- [sponsored=booking][tourism=wilderness_hut],
area|z16- [sponsored=booking][tourism=wilderness_hut]
{icon-image: alpine_hut-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z16- [sponsored=booking][tourism=hostel],
area|z16- [sponsored=booking][tourism=hostel]
{icon-image: hostel-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z16- [sponsored=booking][tourism=chalet],
area|z16- [sponsored=booking][tourism=chalet]
{icon-image: alpine_hut-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z16- [sponsored=booking][tourism=apartment],
area|z16- [sponsored=booking][tourism=apartment],
node|z16- [sponsored=booking][tourism=guest_house],
area|z16- [sponsored=booking][tourism=guest_house]
{icon-image: apartment-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z17-[sponsored=booking],
area|z17-[sponsored=booking]
{icon-min-distance: 16;}
node|z18- [sponsored=booking][tourism=hostel],
area|z18- [sponsored=booking][tourism=hostel]
{icon-image: hostel-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z18- [sponsored=booking][tourism=chalet],
area|z18- [sponsored=booking][tourism=chalet]
{icon-image: alpine_hut-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z18- [sponsored=booking][tourism=apartment],
area|z18- [sponsored=booking][tourism=apartment],
node|z18- [sponsored=booking][tourism=guest_house],
area|z18- [sponsored=booking][tourism=guest_house]
{icon-image: apartment-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
node|z15-[tourism=camp_site],
area|z15-[tourism=camp_site]
{icon-image: campsite-m.svg;icon-min-distance: 12;}

View file

@ -1801,30 +1801,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"shop", "variety_store"},
{"shop", "video"},
{"shop", "wine"},
{"sponsored", "booking"},
{"sponsored", "holiday"},
{"sponsored", "opentable"},
{"sponsored", "partner1"},
{"sponsored", "partner10"},
{"sponsored", "partner11"},
{"sponsored", "partner12"},
{"sponsored", "partner13"},
{"sponsored", "partner14"},
{"sponsored", "partner15"},
{"sponsored", "partner16"},
{"sponsored", "partner17"},
{"sponsored", "partner18"},
{"sponsored", "partner19"},
{"sponsored", "partner2"},
{"sponsored", "partner20"},
{"sponsored", "partner3"},
{"sponsored", "partner4"},
{"sponsored", "partner5"},
{"sponsored", "partner6"},
{"sponsored", "partner7"},
{"sponsored", "partner8"},
{"sponsored", "partner9"},
{"sponsored", "promo_catalog"},
{"sport", "american_football"},
{"sport", "archery"},
{"sport", "athletics"},
@ -2191,7 +2167,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
{{"shop", "clothes"}, {{"shop", "clothes"}}},
{{"shop", "clothes"}, {{"shop", "fashion"}}},
{{"shop"}, {{"shop", "any_value"}}},
{{"sponsored"}, {{"sponsored", "any_value"}}},
{{"sport", "golf"}, {{"sport", "golf"}}},
{{"sport", "golf"}, {{"sport", "miniature_golf"}}},
{{"tourism", "artwork", "architecture"}, {{"tourism", "artwork"}, {"artwork_type", "architecture"}}},

View file

@ -89,7 +89,6 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
{"amenity-charging_station", {kml::BookmarkIcon::Gas, BookmarkBaseType::Gas}},
{"amenity-fuel", {kml::BookmarkIcon::Gas, BookmarkBaseType::Gas}},
{"sponsored-booking", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
{"tourism-alpine_hut", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
{"tourism-camp_site", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
{"tourism-chalet", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},