diff --git a/data/classificator.txt b/data/classificator.txt index 693e60daef..e0f582f8d0 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -69,18 +69,12 @@ world + nursing_home - parking + fee - - multi-storey + - fee - - {} + multi-storey - no-access - park_and_ride - - permissive + - fee - - {} + permissive - private - - underground + - fee - - {} + underground - {} parking_space + permissive - @@ -396,11 +390,7 @@ world + service + area - bridge - - driveway + - area - - bridge - - tunnel - - {} + driveway - parking_aisle - tunnel - {} @@ -423,18 +413,9 @@ world + bridge - grade1 - grade2 - - grade3 + - no-access - - permissive - - {} - grade4 + - no-access - - permissive - - {} - grade5 + - no-access - - permissive - - {} + grade3 - + grade4 - + grade5 - no-access - permissive - tunnel - @@ -555,9 +536,7 @@ world + permissive - private - {} - pitch + - tennis - - {} + pitch - playground - recreation_ground - sauna - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a947ce9eb1..9bea2008cd 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 d3c40c52ed..18de1e574f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5321,79 +5321,6 @@ cont { } } } -cont { - name: "amenity-parking-multi-storey-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-s" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking-no-access" element { @@ -5613,79 +5540,6 @@ cont { } } } -cont { - name: "amenity-parking-permissive-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "zero-icon" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "zero-icon" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking-private" element { @@ -5832,79 +5686,6 @@ cont { } } } -cont { - name: "amenity-parking-underground-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-s" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking_space" element { @@ -23396,399 +23177,6 @@ cont { } } } -cont { - name: "highway-service-driveway-area" - element { - scale: 14 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } -} -cont { - name: "highway-service-driveway-bridge" - element { - scale: 14 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - lines { - width: 3.2 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 3.6 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - lines { - width: 3.2 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 3.6 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - lines { - width: 3.2 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 3.6 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16316664 - priority: 1240 - } - lines { - width: 4.0 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 4.4 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16316664 - priority: 1240 - } - lines { - width: 6.0 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - priority: 1240 - } - lines { - width: 8.0 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 8.4 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } -} -cont { - name: "highway-service-driveway-tunnel" - element { - scale: 14 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } -} cont { name: "highway-service-parking_aisle" element { @@ -26058,240 +25446,6 @@ cont { } } } -cont { - name: "highway-track-grade3-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade3-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} cont { name: "highway-track-grade4" element { @@ -26409,240 +25563,6 @@ cont { } } } -cont { - name: "highway-track-grade4-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade4-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} cont { name: "highway-track-grade5" element { @@ -26760,240 +25680,6 @@ cont { } } } -cont { - name: "highway-track-grade5-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade5-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} cont { name: "highway-track-no-access" element { @@ -36737,86 +35423,6 @@ cont { } } } -cont { - name: "leisure-pitch-tennis" - element { - scale: 15 - area { - color: 13749671 - priority: -15549 - } - } - element { - scale: 16 - area { - color: 13749671 - priority: -15549 - } - } - element { - scale: 17 - area { - color: 13749671 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 16000 - } - } - element { - scale: 18 - area { - color: 13749671 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 16000 - } - } - element { - scale: 19 - area { - color: 13749671 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 16000 - } - } -} cont { name: "leisure-playground" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 57c7e65921..64a3b534a7 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 fbf4ce2ef8..036874199f 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5287,79 +5287,6 @@ cont { } } } -cont { - name: "amenity-parking-multi-storey-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-s" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking-no-access" element { @@ -5579,79 +5506,6 @@ cont { } } } -cont { - name: "amenity-parking-permissive-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "zero-icon" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "zero-icon" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking-private" element { @@ -5798,79 +5652,6 @@ cont { } } } -cont { - name: "amenity-parking-underground-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-s" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 15921870 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking_space" element { @@ -23257,271 +23038,6 @@ cont { } } } -cont { - name: "highway-service-driveway-area" - element { - scale: 16 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } -} -cont { - name: "highway-service-driveway-bridge" - element { - scale: 16 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - lines { - width: 3.2 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 3.6 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16316664 - priority: 1240 - } - lines { - width: 4.0 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 4.4 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16316664 - priority: 1240 - } - lines { - width: 6.0 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - priority: 1240 - } - lines { - width: 8.0 - color: 15592411 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 8.4 - color: 8421504 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } -} -cont { - name: "highway-service-driveway-tunnel" - element { - scale: 16 - lines { - width: 1.6 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 16240 - } - } -} cont { name: "highway-service-parking_aisle" element { @@ -25722,240 +25238,6 @@ cont { } } } -cont { - name: "highway-track-grade3-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade3-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} cont { name: "highway-track-grade4" element { @@ -26073,240 +25355,6 @@ cont { } } } -cont { - name: "highway-track-grade4-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade4-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} cont { name: "highway-track-grade5" element { @@ -26424,240 +25472,6 @@ cont { } } } -cont { - name: "highway-track-grade5-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade5-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16233 - } - } -} cont { name: "highway-track-no-access" element { @@ -36393,86 +35207,6 @@ cont { } } } -cont { - name: "leisure-pitch-tennis" - element { - scale: 15 - area { - color: 13749671 - priority: -15549 - } - } - element { - scale: 16 - area { - color: 13749671 - priority: -15549 - } - } - element { - scale: 17 - area { - color: 13749671 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 16000 - } - } - element { - scale: 18 - area { - color: 13749671 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 16000 - } - } - element { - scale: 19 - area { - color: 13749671 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 16000 - } - } -} cont { name: "leisure-playground" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 660abf549a..469544960d 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 6fe737fee1..35ad65ad4a 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -5287,79 +5287,6 @@ cont { } } } -cont { - name: "amenity-parking-multi-storey-fee" - element { - scale: 15 - area { - color: 2038555 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-s" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking-no-access" element { @@ -5579,79 +5506,6 @@ cont { } } } -cont { - name: "amenity-parking-permissive-fee" - element { - scale: 15 - area { - color: 2038555 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "zero-icon" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "zero-icon" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking-private" element { @@ -5798,79 +5652,6 @@ cont { } } } -cont { - name: "amenity-parking-underground-fee" - element { - scale: 15 - area { - color: 2038555 - priority: -15963 - } - } - element { - scale: 16 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-s" - priority: 16037 - min_distance: 25 - } - } - element { - scale: 17 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - } - element { - scale: 18 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } - element { - scale: 19 - area { - color: 2038555 - priority: -15963 - } - symbol { - name: "parking-m" - priority: 16037 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15037 - } - } -} cont { name: "amenity-parking_space" element { @@ -23365,271 +23146,6 @@ cont { } } } -cont { - name: "highway-service-driveway-area" - element { - scale: 16 - lines { - width: 1.6 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16240 - } - } -} -cont { - name: "highway-service-driveway-bridge" - element { - scale: 16 - lines { - width: 1.6 - color: 2828327 - priority: 1240 - } - lines { - width: 3.2 - color: 2236945 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 3.6 - color: 4473924 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - priority: 1240 - } - lines { - width: 4.0 - color: 2236945 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 4.4 - color: 4473924 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - priority: 1240 - } - lines { - width: 6.0 - color: 2236945 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 4473924 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - priority: 1240 - } - lines { - width: 8.0 - color: 2236945 - dashdot { - } - priority: 1209 - cap: BUTTCAP - } - lines { - width: 8.4 - color: 4473924 - dashdot { - } - priority: 1202 - cap: BUTTCAP - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16240 - } - } -} -cont { - name: "highway-service-driveway-tunnel" - element { - scale: 16 - lines { - width: 1.6 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16240 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16240 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16240 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - priority: 1240 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 16240 - } - } -} cont { name: "highway-service-parking_aisle" element { @@ -25846,240 +25362,6 @@ cont { } } } -cont { - name: "highway-track-grade3-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade3-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } -} cont { name: "highway-track-grade4" element { @@ -26197,240 +25479,6 @@ cont { } } } -cont { - name: "highway-track-grade4-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade4-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } -} cont { name: "highway-track-grade5" element { @@ -26548,240 +25596,6 @@ cont { } } } -cont { - name: "highway-track-grade5-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } -} -cont { - name: "highway-track-grade5-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1233 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1233 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1233 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1233 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16233 - } - } -} cont { name: "highway-track-no-access" element { @@ -36544,86 +35358,6 @@ cont { } } } -cont { - name: "leisure-pitch-tennis" - element { - scale: 15 - area { - color: 2171163 - priority: -15549 - } - } - element { - scale: 16 - area { - color: 2171163 - priority: -15549 - } - } - element { - scale: 17 - area { - color: 2171163 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 16000 - } - } - element { - scale: 18 - area { - color: 2171163 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 16000 - } - } - element { - scale: 19 - area { - color: 2171163 - priority: -15527 - } - symbol { - name: "tennis-m" - apply_for_type: 1 - priority: 16473 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 16000 - } - } -} cont { name: "leisure-playground" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index b81d7c3f41..6cc70eedb8 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index f0ad4d99f4..7c0cd1b8ef 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -1724,101 +1724,6 @@ cont { } } } -cont { - name: "amenity-parking-multi-storey-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15965 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 15 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 10 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 6 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } -} cont { name: "amenity-parking-no-access" element { @@ -2104,101 +2009,6 @@ cont { } } } -cont { - name: "amenity-parking-permissive-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15035 - } - symbol { - name: "zero-icon" - priority: 16965 - min_distance: 3 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15035 - } - symbol { - name: "zero-icon" - priority: 16965 - min_distance: 3 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15965 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -15942 - } - symbol { - name: "zero-icon" - priority: 16058 - min_distance: 7 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15058 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "zero-icon" - priority: 16906 - min_distance: 10 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 6 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } -} cont { name: "amenity-parking-private" element { @@ -2389,101 +2199,6 @@ cont { } } } -cont { - name: "amenity-parking-underground-fee" - element { - scale: 15 - area { - color: 15921870 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - } - element { - scale: 16 - area { - color: 15921870 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15965 - } - } - element { - scale: 17 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 15 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 18 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 10 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 19 - area { - color: 16579778 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 6 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15906 - } - } -} cont { name: "amenity-parking_space" element { @@ -13463,234 +13178,6 @@ cont { } } } -cont { - name: "highway-service-driveway-area" - element { - scale: 14 - lines { - width: 1.0 - color: 16579836 - priority: 1348 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16348 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16348 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16348 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16348 - } - } -} -cont { - name: "highway-service-driveway-bridge" - element { - scale: 14 - lines { - width: 1.0 - color: 16579836 - priority: 1348 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16348 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16348 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16348 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16348 - } - } -} -cont { - name: "highway-service-driveway-tunnel" - element { - scale: 14 - lines { - width: 1.0 - color: 16579836 - priority: 1348 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16348 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 872415231 - } - priority: 16348 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16348 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 16579836 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 3355443 - stroke_color: 16777215 - } - priority: 16348 - } - } -} cont { name: "highway-service-parking_aisle" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 5ea52501ba..d7dee2c29e 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 7ba4b91a88..72b8bbdf73 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -1724,101 +1724,6 @@ cont { } } } -cont { - name: "amenity-parking-multi-storey-fee" - element { - scale: 15 - area { - color: 1643785 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15965 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 15 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 10 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 6 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } -} cont { name: "amenity-parking-no-access" element { @@ -2104,101 +2009,6 @@ cont { } } } -cont { - name: "amenity-parking-permissive-fee" - element { - scale: 15 - area { - color: 1643785 - priority: -15035 - } - symbol { - name: "zero-icon" - priority: 16965 - min_distance: 3 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -15035 - } - symbol { - name: "zero-icon" - priority: 16965 - min_distance: 3 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15965 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -15942 - } - symbol { - name: "zero-icon" - priority: 16058 - min_distance: 7 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15058 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "zero-icon" - priority: 16906 - min_distance: 10 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 6 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } -} cont { name: "amenity-parking-private" element { @@ -2389,101 +2199,6 @@ cont { } } } -cont { - name: "amenity-parking-underground-fee" - element { - scale: 15 - area { - color: 1643785 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - } - element { - scale: 16 - area { - color: 1643785 - priority: -15035 - } - symbol { - name: "parking-m" - priority: 16965 - min_distance: 3 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15965 - } - } - element { - scale: 17 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 15 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 18 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 10 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } - element { - scale: 19 - area { - color: 2038026 - priority: -15094 - } - symbol { - name: "parking-m" - priority: 16906 - min_distance: 6 - } - caption { - primary { - height: 11 - color: 6710886 - offset_y: 1 - } - priority: 15906 - } - } -} cont { name: "amenity-parking_space" element { @@ -13730,234 +13445,6 @@ cont { } } } -cont { - name: "highway-service-driveway-area" - element { - scale: 14 - lines { - width: 1.0 - color: 3354929 - priority: 1348 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16348 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16348 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16348 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16348 - } - } -} -cont { - name: "highway-service-driveway-bridge" - element { - scale: 14 - lines { - width: 1.0 - color: 3354929 - priority: 1348 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16348 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16348 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16348 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16348 - } - } -} -cont { - name: "highway-service-driveway-tunnel" - element { - scale: 14 - lines { - width: 1.0 - color: 3354929 - priority: 1348 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 3.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16348 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 856756480 - } - priority: 16348 - } - } - element { - scale: 18 - lines { - width: 7.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16348 - } - } - element { - scale: 19 - lines { - width: 8.0 - color: 3354929 - priority: 1348 - } - path_text { - primary { - height: 15 - color: 9211020 - stroke_color: 1118464 - } - priority: 16348 - } - } -} cont { name: "highway-service-parking_aisle" element { diff --git a/data/types.txt b/data/types.txt index 507992474b..6e5f079830 100644 --- a/data/types.txt +++ b/data/types.txt @@ -138,7 +138,7 @@ highway|secondary amenity|fire_station landuse|retail leisure|nature_reserve -leisure|pitch|tennis +leisure|pitch tourism|information highway|motorway_link|bridge railway|abandoned @@ -335,7 +335,7 @@ sport|cricket sport|bowls highway|path|tunnel man_made|breakwater -amenity|parking|permissive|fee +amenity|parking|permissive mapswithme tourism|zoo sport|gymnastics @@ -353,14 +353,14 @@ sport|scuba_diving highway|cycleway|permissive highway|unclassified|area natural|volcano -amenity|parking|underground|fee +amenity|parking|underground amenity|parking|underground man_made|pipeline amenity|parking|multi-storey leisure|recreation_ground highway|footway|mountain_hiking -highway|service|driveway|bridge -amenity|parking|multi-storey|fee +highway|service|driveway +amenity|parking|multi-storey mapswithme highway|track piste:type|downhill|novice @@ -376,14 +376,14 @@ amenity|bureau_de_change power|generator|photovoltaic highway|motorway_link highway|bridleway|bridge -highway|service|driveway|tunnel +highway|service|driveway highway|track natural|water railway|narrow_gauge|tunnel mapswithme waterway|dock natural|wood -highway|service|driveway|area +highway|service|driveway man_made|pipeline place|city|capital aerialway|cable_car @@ -588,7 +588,7 @@ aerialway|mixed_lift mapswithme highway|footway power|line -highway|track|grade3|permissive +highway|track|grade3 highway|track|grade4 highway|track mapswithme @@ -628,7 +628,7 @@ highway|footway|difficult_alpine_hiking mapswithme mapswithme highway|primary_link -highway|track|grade5|permissive +highway|track|grade5 natural|water aeroway|aerodrome highway|tertiary_link|tunnel @@ -672,7 +672,7 @@ mapswithme mapswithme highway|unclassified mapswithme -highway|track|grade4|permissive +highway|track|grade4 mapswithme mapswithme mapswithme @@ -818,9 +818,9 @@ highway|tertiary_link highway|tertiary_link highway|tertiary_link highway|tertiary_link -highway|track|grade3|no-access -highway|track|grade4|no-access -highway|track|grade5|no-access +highway|track|grade3 +highway|track|grade4 +highway|track|grade5 highway|track|no-access mapswithme highway|trunk diff --git a/data/visibility.txt b/data/visibility.txt index 531a7bcab7..1b9afa9a94 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -69,18 +69,12 @@ world 00000000000000000000 + nursing_home 00000000000000000000 - parking 00000000000000011111 + fee 00000000000000011111 - - multi-storey 00000000000000011111 + - fee 00000000000000011111 - - {} + multi-storey 00000000000000011111 - no-access 00000000000000011111 - park_and_ride 00000000000000011111 - - permissive 00000000000000011111 + - fee 00000000000000011111 - - {} + permissive 00000000000000011111 - private 00000000000000011111 - - underground 00000000000000011111 + - fee 00000000000000011111 - - {} + underground 00000000000000011111 - {} parking_space 00000000000000011111 + permissive 00000000000000011111 - @@ -396,11 +390,7 @@ world 00000000000000000000 + service 00000000000000111111 + area 00000000000000111111 - bridge 00000000000000111111 - - driveway 00000000000000101111 + - area 00000000000000101111 - - bridge 00000000000000101111 - - tunnel 00000000000000101111 - - {} + driveway 00000000000000101111 - parking_aisle 00000000000000111111 - tunnel 00000000000000111111 - {} @@ -423,18 +413,9 @@ world 00000000000000000000 + bridge 00000000000000000000 - grade1 00000000000000111111 - grade2 00000000000000000000 - - grade3 00000000000000000000 + - no-access 00000000000000000000 - - permissive 00000000000000000000 - - {} - grade4 00000000000000000000 + - no-access 00000000000000000000 - - permissive 00000000000000000000 - - {} - grade5 00000000000000000000 + - no-access 00000000000000000000 - - permissive 00000000000000000000 - - {} + grade3 00000000000000000000 - + grade4 00000000000000000000 - + grade5 00000000000000000000 - no-access 00000000000000000000 - permissive 00000000000000000000 - tunnel 00000000000000000000 - @@ -555,9 +536,7 @@ world 00000000000000000000 + permissive 00000000001111111111 - private 00000000001111111111 - {} - pitch 00000000000000000000 + - tennis 00000000000000000000 - - {} + pitch 00000000000000000000 - playground 00000000000000000000 - recreation_ground 00000000000000000000 - sauna 00000000000000000000 -