From 9666660b84740e6bbe0585e59fccd1347c4c793f Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Fri, 6 Apr 2018 16:39:02 +0300 Subject: [PATCH] [fc2018] More tags for fc2018 objects --- data/categories.txt | 4 +-- data/mixed_nodes.txt | 63 +++++++++++++++++++++++++++++++++++++++ data/mixed_tags.txt | 34 ++++++++++++++++++++- generator/tag_admixer.hpp | 2 +- 4 files changed, 99 insertions(+), 4 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 02c3170583..e7185032fd 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -9169,8 +9169,8 @@ sponsored-partner2 en:^Luggage Storage|Luggage Hero|3luggagehero event-fc2018 -en:^3Football Cup 2018|2FIFA|championship|fc2018 -ru:^2ЧМ 2018 по футболу|1ФИФА|футбол|кубок +en:3^Football Cup 2018|2FIFA|championship|fc2018 +ru:2^ЧМ 2018 по футболу|1ФИФА|футбол|кубок event-fc2018_city en:^Football City 2018 diff --git a/data/mixed_nodes.txt b/data/mixed_nodes.txt index a2b1322773..34de1f191c 100644 --- a/data/mixed_nodes.txt +++ b/data/mixed_nodes.txt @@ -1,3 +1,66 @@ +# FC 2018 + +lat=54.1817 +lon=45.2037 +leisure=stadium +event=fc2018 +name=Мордовия Арена +name:ru=Мордовия Арена +name:en=Mordovia Arena +name:de=Mordwinien-Arena +name:fr=Stade de Mordovie +name:es=Mordovia Arena + +lat=48.7344 +lon=44.5486 +leisure=stadium +event=fc2018 +name=Волгоград Арена +name:ru=Волгоград Арена +name:en=Volgograd Arena +name:de=Wolgograd-Arena +name:fr=Volgograd Arena +name:es=Volgogrado Arena + +lat=54.6981 +lon=20.5338 +leisure=stadium +event=fc2018 +name=Стадион Калининград +name:ru=Стадион Калининград +name:en=Kaliningrad Stadium +name:de=Kaliningrad-Stadion +name:fr=Stade de Kaliningrad +name:es=Estadio de Kaliningrado + +lat=56.3375 +lon=43.9633 +leisure=stadium +event=fc2018 +name=Стадион Нижний Новгород +name:ru=Стадион Нижний Новгород +name:en=Nizhny Novgorod Stadium +name:de=Nischni-Nowgorod-Stadion +name:fr=Stade de Nijni-Novgorod +name:es=Estadio de Nizhni Nóvgorod + + +lat=55.72187 +lon=37.56318 +event=fc2018 +olympics=official_building +name=Паспорт болельщика +name:en=FAN ID + +lat=55.76019 +lon=37.62489 +event=fc2018 +shop=gift +name=Атрибутика ЧМ 2018 + + +# Luggage Hero + lat=40.7051423 lon=-73.8092278 name=LuggageHero @ Sutphin Business Center diff --git a/data/mixed_tags.txt b/data/mixed_tags.txt index e97d0b3391..91dd73be26 100644 --- a/data/mixed_tags.txt +++ b/data/mixed_tags.txt @@ -2,18 +2,50 @@ # Format: type,id,key1=value1,key2=value2,... # Example: way,34306743,olympics=stadium -# FC2018 Cities +# FC2018: city, stadium, other amenities +# Moscow node,1686293227,event=fc2018,event=fc2018_city +relation,162802,event=fc2018,name:ru=Стадион Лужники,int_name=Stadion Luzniki,name:en=Luzhniki Stadium,name:de=Luzhniki-Stadion,name:fr=Stade Loujniki,name:es=Estadio Luzhniki +relation,4006864,event=fc2018,name:ru=Открытие Арена / Стадион Спартак,int_name=Otkrytie Arena / Stadion Spartac,name:en=Spartak Stadium,name:de=Spartak-Stadion,name:fr=Stade du Spartak,name:es=Estadio Spartak + +# Saint-Petersburg node,27490597,event=fc2018,event=fc2018_city +way,217387802,event=fc2018,name:ru=Стадион Санкт-Петербург,int_name=Sankt Peterburg Stadion,name:en=Saint Petersburg Stadium,name:de=Sankt-Petersburg-Stadion,name:fr=Stade de Saint-Pétersbourg,name:es=Estadio de San Petersburgo + +# Kazan node,27504067,event=fc2018,event=fc2018_city +relation,3840572,event=fc2018,name:ru=Казань Арена,name:en=Kazan Arena,name:de=Kasan-Arena,name:fr=Kazan Arena,name:es=Kazan Arena + +# Ekaterinburg node,27503892,event=fc2018,event=fc2018_city +relation,55833,event=fc2018,name:ru=Екатеринбург Арена,name:en=Ekaterinburg Arena,name:de=Jekaterinburg-Arena,name:fr=Iekaterinbourg Arena,name:es=Ekaterimburgo Arena + +# Saransk node,191651581,event=fc2018,event=fc2018_city +# under construction,name:ru=Мордовия Арена,name:en=Mordovia Arena,name:de=Mordwinien-Arena,name:fr=Stade de Mordovie,name:es=Mordovia Arena + +# Samara node,27503945,event=fc2018,event=fc2018_city +way,572625474,event=fc2018,name:ru=Самара Арена,name:en=Samara Arena,name:de=Samara-Arena,name:fr=Samara Arena,name:es=Samara Arena + +# Sochi node,34043670,event=fc2018,event=fc2018_city +relation,3405854,event=fc2018,name:ru=Стадион Фишт,name:en=Fisht Stadium,name:de=Fischt-Stadion,name:fr=Stade Ficht,name:es=Estadio Fisht + +# Volgograd node,27504363,event=fc2018,event=fc2018_city +# under construction,name:ru=Волгоград Арена,name:en=Volgograd Arena,name:de=Wolgograd-Arena,name:fr=Volgograd Arena,name:es=Volgogrado Arena + +# Rostov-on-Don node,160569651,event=fc2018,event=fc2018_city +way,137831707,event=fc2018,name:ru=Ростов Арена,name:en=Rostov Arena,name:de=Rostow-Arena,name:fr=Rostov Arena,name:es=Rostov Arena + +# Kaliningrad node,27048976,event=fc2018,event=fc2018_city +# under construction,name:ru=Стадион Калининград,name:en=Kaliningrad Stadium,name:de=Kaliningrad-Stadion,name:fr=Stade de Kaliningrad,name:es=Estadio de Kaliningrado + +# Nizhny Novgorod node,27505889,event=fc2018,event=fc2018_city # under construction,name:ru=Стадион Нижний Новгород,name:en=Nizhny Novgorod Stadium,name:de=Nischni-Nowgorod-Stadion,name:fr=Stade de Nijni-Novgorod,name:es=Estadio de Nizhni Nóvgorod diff --git a/generator/tag_admixer.hpp b/generator/tag_admixer.hpp index 8a8d94b22f..b151117b50 100644 --- a/generator/tag_admixer.hpp +++ b/generator/tag_admixer.hpp @@ -230,7 +230,7 @@ public: if (elements != m_elements.end()) { for (OsmElement::Tag tag : elements->second) - p->AddTag(tag.key, tag.value); + p->UpdateTag(tag.key, [&tag](std::string & v) { v = tag.value; }); } } };