diff --git a/data/classificator.txt b/data/classificator.txt index e52ae842ec..df5f3b42f8 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -671,7 +671,6 @@ world + golf_course - hackerspace - ice_rink - - landscape_reserve - marina - nature_reserve - outdoor_seating - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 81a1dd1c1c..f17c09632b 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 5b56a64d8c..db7d0ba09e 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -52823,53 +52823,6 @@ cont { } } } -cont { - name: "leisure-landscape_reserve" - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 19 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 20 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } -} cont { name: "leisure-marina" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 103ca45563..33f618ddba 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index f3a2cd2c38..763090777f 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -50406,53 +50406,6 @@ cont { } } } -cont { - name: "leisure-landscape_reserve" - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 19 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 20 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } -} cont { name: "leisure-marina" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 9a46f51749..719c53f769 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index d8d25f4d3c..26bf2fb934 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -50670,53 +50670,6 @@ cont { } } } -cont { - name: "leisure-landscape_reserve" - element { - scale: 17 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 19 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 20 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } -} cont { name: "leisure-marina" element { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 32529e2fe4..d95de931e0 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 8218b853f4..14e8c4481d 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -53324,53 +53324,6 @@ cont { } } } -cont { - name: "leisure-landscape_reserve" - element { - scale: 17 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 19 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 20 - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 3250 - } - } -} cont { name: "leisure-marina" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index c0d022c497..a48b40cedb 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index ee6ff32fb7..2d52ce9d82 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -53588,53 +53588,6 @@ cont { } } } -cont { - name: "leisure-landscape_reserve" - element { - scale: 17 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 18 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 19 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } - element { - scale: 20 - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 3250 - } - } -} cont { name: "leisure-marina" element { diff --git a/data/types.txt b/data/types.txt index 25ff811712..5c1f2a8d5c 100644 --- a/data/types.txt +++ b/data/types.txt @@ -530,7 +530,7 @@ mapswithme mapswithme mapswithme mapswithme -*leisure|landscape_reserve +leisure|nature_reserve mapswithme mapswithme *boundary|administrative|state diff --git a/data/visibility.txt b/data/visibility.txt index 8cf946d1a9..d265ca7662 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -671,7 +671,6 @@ world 000000000000000000000 + golf_course 000000000000001111111 - hackerspace 000000000000000000000 - ice_rink 000000000000000000000 - - landscape_reserve 000000000000000000000 - marina 000000000000000000000 - nature_reserve 000000000011111111111 - outdoor_seating 000000000000000000000 -