diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 9b75bbe68a..83c223a583 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -616,8 +616,7 @@ highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;i deprecated|deprecated;530;x deprecated|deprecated;531;x deprecated|deprecated;532;x -# TODO: deprecated, replaced by leisure=nature_reserve -leisure|landscape_reserve;533; +deprecated:leisure|landscape_reserve:01.2024;533;leisure|nature_reserve deprecated|deprecated;534;x deprecated|deprecated;535;x boundary|administrative|state;[boundary=administrative][border_type=state];;name;int_name;536; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index e725e6023d..8f47ee579c 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -16710,21 +16710,6 @@ uk = Каток zh-Hans = 滑冰场 - [type.leisure.landscape_reserve] - en = Landscape Reserve - af = Landskapreservaat - az = Landşaft Qoruğu - es = Reserva natural - et = Maastikukaitseala - ja = 自然保護区 - nl = Landschapsreservaat - pl = Rezerwat krajobrazu - pt = Reserva natural - pt-BR = Reserva natural - ru = Ландшафтный заповедник - tr = Peyzaj Rezervi - uk = Ландшафтний заповідник - [type.leisure.marina] en = Marina af = Jaghawe diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index fa27f10d3c..05fa2b0a4c 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -547,7 +547,6 @@ highway-motorway_junction # caption z15- leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) === 3300 -leisure-landscape_reserve # caption z17- natural-bare_rock # caption z14- (also has area z12-) natural-bay # caption z14- natural-beach # caption z15- (also has area z10-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 54653b8c17..c9ef7c80f2 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -547,7 +547,6 @@ highway-motorway_junction # caption z15- leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) === 3300 -leisure-landscape_reserve # caption z17- natural-bare_rock # caption z13- (also has area z12-) natural-bay # caption z14- natural-beach # caption z14- (also has area z10-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index faf7948ad9..6fd57898bf 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2485,7 +2485,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"leisure", "garden"}, {"leisure", "golf_course"}, {"leisure", "ice_rink"}, - {"leisure", "landscape_reserve"}, {"leisure", "marina"}, {"leisure", "nature_reserve"}, {"leisure", "park"}, diff --git a/search/ranking_info.cpp b/search/ranking_info.cpp index b5e4f75ca7..8a224df71c 100644 --- a/search/ranking_info.cpp +++ b/search/ranking_info.cpp @@ -158,7 +158,6 @@ public: base::StringIL const types[] = { {"leisure", "beach_resort"}, {"leisure", "garden"}, - {"leisure", "landscape_reserve"}, {"leisure", "marina"}, {"leisure", "nature_reserve"}, {"leisure", "park"},