diff --git a/data/classificator.txt b/data/classificator.txt index 84fdc265aa..644ab24ebd 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -438,6 +438,7 @@ world + tunnel - {} ford - + ladder - living_street + bridge - tunnel - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a38049abc8..385b92a919 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 8001306a03..3264e64907 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -25919,6 +25919,89 @@ cont { } } } +cont { + name: "highway-ladder" + element { + scale: 16 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 17 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 18 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 19 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 20 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } +} cont { name: "highway-living_street" element { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index c3d886cffb..d5d352662b 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 1d9579e7df..ba92877244 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -23978,6 +23978,73 @@ cont { } } } +cont { + name: "highway-ladder" + element { + scale: 17 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 18 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 19 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 20 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } +} cont { name: "highway-living_street" element { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e979141227..d3124a8d78 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 746f61f01e..2a533a2889 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -23978,6 +23978,73 @@ cont { } } } +cont { + name: "highway-ladder" + element { + scale: 17 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 18 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 19 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } + element { + scale: 20 + symbol { + name: "ladder-m" + priority: 850 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9150 + } + } +} cont { name: "highway-living_street" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 81804c3104..5778d59835 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 2183650c31..cda4649f6c 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -25455,6 +25455,80 @@ cont { } } } +cont { + name: "highway-ladder" + element { + scale: 16 + symbol { + name: "ladder-m" + priority: 2810 + } + } + element { + scale: 17 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } + element { + scale: 18 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } + element { + scale: 19 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } + element { + scale: 20 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } +} cont { name: "highway-living_street" element { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 12c4d5840c..a8e804d444 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 6d8275b3dc..f451b7f00d 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -25455,6 +25455,80 @@ cont { } } } +cont { + name: "highway-ladder" + element { + scale: 16 + symbol { + name: "ladder-m" + priority: 2810 + } + } + element { + scale: 17 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } + element { + scale: 18 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } + element { + scale: 19 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } + element { + scale: 20 + symbol { + name: "ladder-m" + priority: 2810 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7190 + } + } +} cont { name: "highway-living_street" element { diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index afd3033126..da8bb6d88d 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1082,6 +1082,7 @@ amenity-nursing_home # icon z17- (also has captio amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-) amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-) +highway-ladder # icon z17- (also has caption(optional) z17-) historic-ruins # icon z17- (also has caption(optional) z17-) landuse-farmland # caption z15- (also has area z10-) landuse-orchard # caption z15- (also has area z12-) @@ -1093,7 +1094,6 @@ man_made-flagpole # icon z15- man_made-flare # icon z16- (also has caption(optional) z18-) man_made-tower # icon z16- (also has caption(optional) z18-) man_made-tower-communication # icon z16- (also has caption(optional) z18-) -highway-ladder === 850 junction # caption z17- @@ -2018,6 +2018,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) # amenity-social_facility # caption(optional) z17- (also has icon z17-) # amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-) +# highway-ladder # caption(optional) z17- (also has icon z17-) # historic-ruins # caption(optional) z17- (also has icon z17-) # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index f43ac5ad0b..b03ed3862b 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -712,8 +712,8 @@ highway-path-horse # pathtext z13- (also has li highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 +highway-ladder # icon z16- (also has caption(optional) z17-) highway-steps # pathtext z13- (also has line z12-) -highway-ladder highway-steps-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) highway-steps-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2810 @@ -1712,6 +1712,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # natural-rock # caption(optional) z17- (also has icon z14-) # === -7150 +# highway-ladder # caption(optional) z17- (also has icon z16-) +# === -7190 + # amenity-townhall # caption(optional) z16- (also has icon z16-) # leisure-resort # caption(optional) z16- (also has icon z16-) # tourism-hotel # caption(optional) z16- (also has icon z16-) diff --git a/data/types.txt b/data/types.txt index b0f8eb9b81..dd33c5cedc 100644 --- a/data/types.txt +++ b/data/types.txt @@ -476,7 +476,7 @@ mapswithme *emergency|mountain_rescue *aerialway|platter *man_made|flare -mapswithme +*highway|ladder *railway|preserved|tunnel *boundary|protected_area|1 *boundary|protected_area|2 diff --git a/data/visibility.txt b/data/visibility.txt index 97bf8f6020..df382e04ba 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -438,6 +438,7 @@ world 000000000000000000000 + tunnel 000000000000000000000 - {} ford 000000000000001111111 - + ladder 000000000000000000000 - living_street 000000000000111111111 + bridge 000000000000111111111 - tunnel 000000000000111111111 -