diff --git a/data/classificator.txt b/data/classificator.txt index c60bc3caae..dd00d18336 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -718,6 +718,7 @@ world + tower + communication - {} + utility_pole - wastewater_plant - water_tap + drinking_water_no - @@ -882,6 +883,7 @@ world + solar - wind - {} + pole - station - substation - tower - diff --git a/data/colors.txt b/data/colors.txt index f970ee2285..5801c34d74 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -412,6 +412,7 @@ 1294740506 1295200045 1295200561 +1295201075 1295397940 1295429823 1295523604 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3e0b3a9640..493c2011fa 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 5fb3a8f910..6ab30dcd7c 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -56970,6 +56970,51 @@ cont { } } } +cont { + name: "man_made-utility_pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "man_made-water_tap" element { @@ -73637,6 +73682,40 @@ cont { } cont { name: "power-line" + element { + scale: 13 + lines { + width: 4.0 + color: 2157352326 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 2576782726 + priority: 350 + } + } + element { + scale: 14 + lines { + width: 4.0 + color: 2157352326 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 2576782726 + priority: 350 + } + } element { scale: 15 lines { @@ -73740,6 +73819,123 @@ cont { } } } +cont { + name: "power-minor_line" + element { + scale: 15 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } +} cont { name: "power-plant" element { @@ -73999,6 +74195,51 @@ cont { } } } +cont { + name: "power-pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "power-station" element { @@ -74103,6 +74344,13 @@ cont { } cont { name: "power-tower" + element { + scale: 13 + symbol { + name: "dot-m" + priority: 450 + } + } element { scale: 14 symbol { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 16cc5a2f80..e7f2200fbc 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 372276a8a4..ef07ca7d85 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -57222,6 +57222,51 @@ cont { } } } +cont { + name: "man_made-utility_pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "man_made-water_tap" element { @@ -74214,9 +74259,9 @@ cont { cont { name: "power-line" element { - scale: 15 + scale: 13 lines { - width: 4.0 + width: 3.4 color: 2150839091 dashdot { dd: 1.0 @@ -74226,33 +74271,161 @@ cont { cap: BUTTCAP } lines { - width: 1.0 + width: 0.8 color: 2150839091 priority: 350 cap: BUTTCAP } } + element { + scale: 14 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 50.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + } + } + element { + scale: 17 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + } + } + element { + scale: 18 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + } + } + element { + scale: 19 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + } + } + element { + scale: 20 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + } + } +} +cont { + name: "power-minor_line" + element { + scale: 15 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + cap: BUTTCAP + } + } element { scale: 16 lines { width: 4.0 - color: 2150839091 - dashdot { - dd: 1.0 - dd: 50.0 - } - priority: 340 - } - lines { - width: 1.0 - color: 2150839091 - priority: 350 - } - } - element { - scale: 17 - lines { - width: 4.5 color: 1714631475 dashdot { dd: 1.0 @@ -74261,7 +74434,24 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 + color: 1714631475 + priority: 350 + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 color: 1714631475 priority: 350 } @@ -74269,7 +74459,7 @@ cont { element { scale: 18 lines { - width: 4.5 + width: 4.0 color: 1714631475 dashdot { dd: 1.0 @@ -74278,7 +74468,7 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 color: 1714631475 priority: 350 } @@ -74286,7 +74476,7 @@ cont { element { scale: 19 lines { - width: 4.5 + width: 4.0 color: 1714631475 dashdot { dd: 1.0 @@ -74295,7 +74485,7 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 color: 1714631475 priority: 350 } @@ -74303,7 +74493,7 @@ cont { element { scale: 20 lines { - width: 4.5 + width: 4.0 color: 1714631475 dashdot { dd: 1.0 @@ -74312,7 +74502,7 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 color: 1714631475 priority: 350 } @@ -74577,6 +74767,51 @@ cont { } } } +cont { + name: "power-pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "power-station" element { @@ -74681,6 +74916,13 @@ cont { } cont { name: "power-tower" + element { + scale: 13 + symbol { + name: "mast-m" + priority: 450 + } + } element { scale: 14 symbol { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index f96035dfd4..2c2bf4205e 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 207546f5ed..1e40751dc0 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -56976,6 +56976,51 @@ cont { } } } +cont { + name: "man_made-utility_pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "man_made-water_tap" element { @@ -73999,9 +74044,9 @@ cont { cont { name: "power-line" element { - scale: 15 + scale: 13 lines { - width: 4.0 + width: 3.4 color: 2157352326 dashdot { dd: 1.0 @@ -74011,33 +74056,161 @@ cont { cap: BUTTCAP } lines { - width: 1.0 + width: 0.8 color: 2157352326 priority: 350 cap: BUTTCAP } } + element { + scale: 14 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 50.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 4.5 + color: 1301714310 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 1301714310 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 4.5 + color: 1301714310 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1301714310 + priority: 350 + } + } + element { + scale: 17 + lines { + width: 4.5 + color: 1301714310 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1301714310 + priority: 350 + } + } + element { + scale: 18 + lines { + width: 4.5 + color: 1301714310 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1301714310 + priority: 350 + } + } + element { + scale: 19 + lines { + width: 4.5 + color: 1301714310 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1301714310 + priority: 350 + } + } + element { + scale: 20 + lines { + width: 4.5 + color: 1301714310 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.3 + color: 1301714310 + priority: 350 + } + } +} +cont { + name: "power-minor_line" + element { + scale: 15 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } element { scale: 16 lines { width: 4.0 - color: 2157352326 - dashdot { - dd: 1.0 - dd: 50.0 - } - priority: 340 - } - lines { - width: 1.0 - color: 2157352326 - priority: 350 - } - } - element { - scale: 17 - lines { - width: 4.5 color: 1721144710 dashdot { dd: 1.0 @@ -74046,7 +74219,24 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 + color: 1721144710 + priority: 350 + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 color: 1721144710 priority: 350 } @@ -74054,7 +74244,7 @@ cont { element { scale: 18 lines { - width: 4.5 + width: 4.0 color: 1721144710 dashdot { dd: 1.0 @@ -74063,7 +74253,7 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 color: 1721144710 priority: 350 } @@ -74071,7 +74261,7 @@ cont { element { scale: 19 lines { - width: 4.5 + width: 4.0 color: 1721144710 dashdot { dd: 1.0 @@ -74080,7 +74270,7 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 color: 1721144710 priority: 350 } @@ -74088,7 +74278,7 @@ cont { element { scale: 20 lines { - width: 4.5 + width: 4.0 color: 1721144710 dashdot { dd: 1.0 @@ -74097,7 +74287,7 @@ cont { priority: 340 } lines { - width: 1.3 + width: 1.0 color: 1721144710 priority: 350 } @@ -74362,6 +74552,51 @@ cont { } } } +cont { + name: "power-pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "power-station" element { @@ -74466,6 +74701,13 @@ cont { } cont { name: "power-tower" + element { + scale: 13 + symbol { + name: "mast-m" + priority: 450 + } + } element { scale: 14 symbol { diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 92b9c65aac..3087ba444f 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -39,12 +39,12 @@ aerialway-t-bar # line z13- (also has line:: historic-citywalls # line z14- === 360 -power-line # line z15- (also has line::dash z15-) -power-minor_line +power-line # line z13- (also has line::dash z13-) +power-minor_line # line z15- (also has line::dash z15-) === 350 -power-line::dash # line::dash z15- (also has line z15-) -power-minor_line::dash +power-line::dash # line::dash z13- (also has line z13-) +power-minor_line::dash # line::dash z15- (also has line z15-) === 340 highway-cycleway # line z11- (also has pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index f0ba45ef99..37900b11f9 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1169,7 +1169,7 @@ man_made-mast # icon z13- (also has captio man_made-silo # icon z13- (also has caption(optional) z14-) man_made-storage_tank # icon z13- (also has caption(optional) z14-) man_made-water_tower # icon z13- (also has caption(optional) z14-) -power-tower # icon z14- +power-tower # icon z13- === 450 amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) @@ -1192,14 +1192,14 @@ emergency-emergency_ward_entrance # icon z18- (also has captio building # caption z16- (also has area z14-) building-garage # caption z16- (also has area z14-) building-has_parts # caption z16- (also has area z14-) -man_made-utility_pole +man_made-utility_pole # icon z15- power-plant # icon z17- power-plant-coal # icon z17- power-plant-gas # icon z17- power-plant-hydro # icon z17- power-plant-solar # icon z17- power-plant-wind # icon z13- (also has caption(optional) z16-) -power-pole +power-pole # icon z15- power-station # icon z17- (also has caption(optional) z17-) === 230 diff --git a/data/types.txt b/data/types.txt index fa0f076c4a..5d02c0649d 100644 --- a/data/types.txt +++ b/data/types.txt @@ -32,10 +32,10 @@ highway|road highway|track *natural|wetland highway|track -mapswithme +*power|minor_line *amenity|school *highway|cycleway -landuse|farmland +*power|pole amenity|place_of_worship highway|track *addr:interpolation|odd @@ -201,7 +201,7 @@ landuse|forest|deciduous *amenity|charging_station|motorcar *leisure|golf_course *highway|service|bridge -*power|minor_line +mapswithme *natural|wetland|marsh *leisure|stadium *amenity|doctors @@ -518,7 +518,7 @@ mapswithme mapswithme mapswithme *sport|diving -mapswithme +*man_made|utility_pole mapswithme mapswithme *railway|monorail|tunnel diff --git a/data/visibility.txt b/data/visibility.txt index 896e9b5287..6deca780c7 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -718,6 +718,7 @@ world 000000000000000000000 + tower 000000000000000000000 + communication 000000000000000000000 - {} + utility_pole 000000000000000000000 - wastewater_plant 000000000000000000000 - water_tap 000000000000000000000 + drinking_water_no 000000000000000000000 - @@ -882,6 +883,7 @@ world 000000000000000000000 + solar 000000000000000000000 - wind 000000000000000000000 - {} + pole 000000000000000000000 - station 000000000000000000000 - substation 000000000000000000000 - tower 000000000000000000000 -