pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] Regenerate for power towers and lines

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2025-02-18 23:38:14 +07:00
parent 952f7860a2
commit f9af1f82a7
12 changed files with 802 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/classificator.txt
View file

@ -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 -

1
data/colors.txt
View file

@ -412,6 +412,7 @@
1294740506
1295200045
1295200561
1295201075
1295397940
1295429823
1295523604

BIN
data/drules_proto.bin
View file

Binary file not shown.

248
data/drules_proto.txt
View file

@ -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 {

BIN
data/drules_proto_outdoors_dark.bin
View file

Binary file not shown.

296
data/drules_proto_outdoors_dark.txt
View file

@ -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 {

BIN
data/drules_proto_outdoors_light.bin
View file

Binary file not shown.

296
data/drules_proto_outdoors_light.txt
View file

@ -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 {

8
data/styles/outdoors/include/priorities_3_FG.prio.txt
View file

@ -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-)

6
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -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

8
data/types.txt
View file

@ -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

2
data/visibility.txt
View file

@ -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 -