diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index bac0e256e..cbadf0b85 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -1337,6 +1337,7 @@ Tourist Map Tourist Office Visitor Centre + Ranger Station Motel Museum Picnic Site diff --git a/data/categories.txt b/data/categories.txt index 6b49373ee..85e257496 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -13463,7 +13463,7 @@ vi:Bao vây động vật zh-Hans:动物围栏 zh-Hant:動物圍欄 -tourism-information-office|@category_tourism +tourism-information-office|amenity-ranger_station|@category_tourism en:4Tourist Office ru:3Туристический офис|туристическая информация bg:3Туристически офис|туризъм|информация @@ -13501,7 +13501,7 @@ sk:3Turistické informačné centrum fa:دفتر گردشگری mr:पर्यटन कार्यालय -tourism-information-visitor_centre|@category_tourism +tourism-information-visitor_centre|amenity-ranger_station|@category_tourism en:3Visitor Centre ar:مركز الزوار be:Цэнтр для наведвальнікаў diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index f761d44cf..b3480e558 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1748,3 +1748,4 @@ railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao] railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624; amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; post_office|post_partner;1626; +amenity|ranger_station;1627; diff --git a/data/styles/default/dark/symbols/ranger-station-m.svg b/data/styles/default/dark/symbols/ranger-station-m.svg new file mode 100644 index 000000000..21396fc7a --- /dev/null +++ b/data/styles/default/dark/symbols/ranger-station-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 3de83e846..03f9fcbba 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -395,6 +395,7 @@ node|z15-[historic=ship], node|z16-[tourism=information], node|z15-[tourism=information][information=office], node|z15-[tourism=information][information=visitor_centre], +node|z15-[amenity=ranger_station], node|z16-[historic=aircraft], node|z16-[historic=tank], node|z16-[historic=wreck], @@ -549,6 +550,9 @@ node|z16-[tourism=information][information=guidepost] node|z16-[tourism=information][information=map] {icon-image: map.svg;text-offset: 1;icon-min-distance: 10;} +node|z15-[amenity=ranger_station], +{icon-image: ranger-station-m.svg; icon-min-distance: 10;} + node|z16-[historic=boundary_stone], node|z16-[historic=gallows], node|z16-[historic=pillory], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 85326a153..ba922e010 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -360,6 +360,7 @@ railway-subway_entrance-spb # icon z15- (also has captio historic-monument # icon z13- (also has caption(optional) z13-) tourism-information-office # icon z15- (also has caption(optional) z15-) tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-) +amenity-ranger_station === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1515,6 +1516,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-monument # caption(optional) z13- (also has icon z13-) # tourism-information-office # caption(optional) z15- (also has icon z15-) # tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-) +# amenity-ranger_station # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) diff --git a/data/styles/default/light/symbols/ranger-station-m.svg b/data/styles/default/light/symbols/ranger-station-m.svg new file mode 100644 index 000000000..e061beae6 --- /dev/null +++ b/data/styles/default/light/symbols/ranger-station-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index dc4ae7c19..e148a774c 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -25,6 +25,7 @@ area|z14-[man_made=water_well], node|z15-[tourism=information], node|z14-[tourism=information][information=office], node|z14-[tourism=information][information=visitor_centre], +node|z14-[amenity=ranger_station], node|z14-[man_made=flagpole], node|z14-[man_made=mast], node|z14-[man_made=silo], @@ -334,6 +335,9 @@ node|z15-[tourism=information][information=guidepost], node|z15-[tourism=information][information=map], {icon-image: map.svg;} +node|z14-[amenity=ranger_station], +{icon-image: ranger-station-m.svg; icon-min-distance: 10;} + node|z14-[man_made=survey_point], {icon-image: survey_point-m.svg; font-size: 11;} node|z16-[man_made=survey_point], diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 3f1e1d094..e4d28b82c 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -360,6 +360,7 @@ railway-subway_entrance-spb # icon z15- (also has captio historic-monument # icon z13- (also has caption(optional) z13-) tourism-information-office # icon z13- (also has caption(optional) z14-) tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-) +amenity-ranger_station === 4400 amenity-community_centre # icon z15- (also has caption(optional) z15-) @@ -1518,6 +1519,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-monument # caption(optional) z13- (also has icon z13-) # tourism-information-office # caption(optional) z14- (also has icon z13-) # tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-) +# amenity-ranger_station # === -5600 # amenity-community_centre # caption(optional) z15- (also has icon z15-) diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp index 44c3e6c79..5d3331f1e 100644 --- a/indexer/indexer_tests/checker_test.cpp +++ b/indexer/indexer_tests/checker_test.cpp @@ -137,15 +137,17 @@ UNIT_TEST(IsAttractionsChecker) Classificator const & c = classif(); auto const & checker = ftypes::AttractionsChecker::Instance(); - auto const isTourismInfo = [ethalon = c.GetTypeByPath({"tourism", "information"})](uint32_t t) - { - ftype::TruncValue(t, 2); - return t == ethalon; + base::StringIL arrExceptions[] = { + {"tourism", "information"}, + {"amenity", "ranger_station"}, }; + std::vector exceptions; + for (auto e : arrExceptions) + exceptions.push_back(c.GetTypeByPath(e)); for (uint32_t const t : search::GetCategoryTypes("sights", "en", GetDefaultCategories())) { - if (!isTourismInfo(t)) + if (!base::IsExist(exceptions, ftype::Trunc(t, 2))) TEST(checker(t), (c.GetFullObjectName(t))); } } diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index a6c700320..816d9e04a 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1436,6 +1436,7 @@ "type.tourism.information.map" = "Tourist Map"; "type.tourism.information.office" = "Tourist Office"; "type.tourism.information.visitor_centre" = "Visitor Centre"; +"type.amenity.ranger_station" = "Ranger Station"; "type.tourism.motel" = "Motel"; "type.tourism.museum" = "Museum"; "type.tourism.picnic_site" = "Picnic Site";