kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Add FC2018 types and cities

Browse source
This commit is contained in:
Ilya Zverev 2018-03-27 19:47:01 +03:00 • committed by Roman Kuznetsov
parent ad9ff2358c
commit a001313025
8 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/categories.txt
View file

@ -9167,3 +9167,11 @@ ru:^Празднование Рождества или Нового года
sponsored-partner2
en:^Luggage Storage|Luggage Hero|3luggagehero
event-fc2018
en:^3Football Cup 2018|2FIFA|championship|fc2018
ru:^2ЧМ 2018 по футболу|1ФИФА|футбол|кубок
event-fc2018_city
en:^Football City 2018
ru:^Город ЧМ 2018 по футболу

4
data/classificator.txt
View file

@ -214,6 +214,10 @@ world +
phone -
{}
entrance -
event +
fc2018 -
fc2018_city -
{}
highway +
bridleway +
bridge -

2
data/mapcss-mapping.csv
View file

@ -1205,3 +1205,5 @@ sponsored|partner2;1204;
sponsored|partner3;1205;
sponsored|partner4;1206;
sponsored|partner5;1207;
event|fc2018;1208;
event|fc2018_city;1209;

1 building;[building];;addr:housenumber;name;1;
1205 sponsored|partner3;1205;
1206 sponsored|partner4;1206;
1207 sponsored|partner5;1207;
1208 event|fc2018;1208;
1209 event|fc2018_city;1209;

14
data/mixed_tags.txt
View file

@ -2,6 +2,20 @@
# Format: type,id,key1=value1,key2=value2,...
# Example: way,34306743,olympics=stadium
# FC2018 Cities
node,1686293227,event=fc2018,event=fc2018_city
node,27490597,event=fc2018,event=fc2018_city
node,27504067,event=fc2018,event=fc2018_city
node,27503892,event=fc2018,event=fc2018_city
node,191651581,event=fc2018,event=fc2018_city
node,27503945,event=fc2018,event=fc2018_city
node,34043670,event=fc2018,event=fc2018_city
node,27504363,event=fc2018,event=fc2018_city
node,160569651,event=fc2018,event=fc2018_city
node,27048976,event=fc2018,event=fc2018_city
node,27505889,event=fc2018,event=fc2018_city
# Megabonus
way,503035526,sponsored=partner1,banner_url=https://megabonus.com/shop/aliexpress?utm_source=maps.me&utm_medium=special&utm_campaign=button&utm_term=offline&utm_content=aliexpress&w=31000
node,517598383,sponsored=partner1,banner_url=https://megabonus.com/shop/mts?utm_source=maps.me&utm_medium=special&utm_campaign=button&utm_term=offline&utm_content=mts&w=31002

2
data/types.txt
View file

@ -1205,3 +1205,5 @@ sponsored|partner2
sponsored|partner3
sponsored|partner4
sponsored|partner5
event|fc2018
event|fc2018_city

4
data/visibility.txt
View file

@ -214,6 +214,10 @@ world 00000000000000000000 +
phone 00000000000000000000 -
{}
entrance 00000000000000000000 -
event 00000000000000000000 +
fc2018 00000000000000000000 -
fc2018_city 00000000000000000000 -
{}
highway 00000000000000000000 +
bridleway 00000000000000000000 +
bridge 00000000000000000000 -

3
indexer/feature_visibility.cpp
View file

@ -227,6 +227,7 @@ namespace
static const uint32_t psurface = classif().GetTypeByPath({ "psurface" });
static const uint32_t wheelchair = classif().GetTypeByPath({ "wheelchair" });
static const uint32_t sponsored = classif().GetTypeByPath({ "sponsored" });
static const uint32_t event = classif().GetTypeByPath({ "event" });
static const uint32_t internet = classif().GetTypeByPath({ "internet_access" });
// Caching type length to exclude generic [wheelchair].
@ -250,7 +251,7 @@ namespace
if (wheelchair == type && typeLength == 2)
return true;
if (sponsored == type || internet == type)
if (sponsored == type || internet == type || event == type)
return true;
return false;

2
indexer/ftypes_matcher.cpp
View file

@ -381,6 +381,8 @@ IsInvisibleIndexedChecker::IsInvisibleIndexedChecker() : BaseChecker(1 /* level
{
m_types.push_back(classif().GetTypeByPath({"internet_access"}));
m_types.push_back(classif().GetTypeByPath({"wheelchair"}));
m_types.push_back(classif().GetTypeByPath({"sponsored"}));
m_types.push_back(classif().GetTypeByPath({"event"}));
}
IsCityChecker::IsCityChecker()