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

[styles] Regenerate for outdoors streams and fences

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-12-25 13:08:45 +02:00 • committed by Alexander Borsuk
parent 2c71e8e23d
commit 0fa8050dbf
10 changed files with 113 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/colors.txt
View file

@ -317,7 +317,6 @@
669903835
670628088
671088639
856039462
856756480
856756497
856822290
@ -328,7 +327,6 @@
858401322
858532890
858992429
859222207
859519289
860111940
860571203
@ -494,12 +492,14 @@
1943327690
2147483648
2147812613
2147885094
2148602112
2149069336
2149720610
2150246954
2150377008
2150839091
2151067839
2151296832
2151365435
2151493928

BIN
data/drules_proto.bin
View file

Binary file not shown.

60
data/drules_proto.txt
View file

@ -14777,6 +14777,18 @@ cont {
}
cont {
name: "barrier-ditch"
element {
scale: 15
lines {
width: 1.8
color: 1301043238
dashdot {
dd: 0.9
dd: 0.9
}
priority: 70
}
}
element {
scale: 16
lines {
@ -14923,6 +14935,14 @@ cont {
}
cont {
name: "barrier-fence"
element {
scale: 15
lines {
width: 1.0
color: 2156431496
priority: 320
}
}
element {
scale: 16
lines {
@ -15728,6 +15748,14 @@ cont {
}
cont {
name: "barrier-wall"
element {
scale: 15
lines {
width: 1.0
color: 2156431496
priority: 320
}
}
element {
scale: 16
lines {
@ -128402,22 +128430,6 @@ cont {
}
cont {
name: "waterway-canal"
element {
scale: 11
lines {
width: 0.7
color: 1295429823
priority: -990
cap: BUTTCAP
}
path_text {
primary {
height: 10
color: 4495803
}
priority: 2900
}
}
element {
scale: 12
lines {
@ -129669,22 +129681,6 @@ cont {
}
cont {
name: "waterway-stream"
element {
scale: 11
lines {
width: 0.7
color: 1295429823
priority: -990
cap: BUTTCAP
}
path_text {
primary {
height: 10
color: 4495803
}
priority: 2900
}
}
element {
scale: 12
lines {

BIN
data/drules_proto_outdoors_clear.bin
View file

Binary file not shown.

65
data/drules_proto_outdoors_clear.txt
View file

@ -14653,6 +14653,19 @@ cont {
}
cont {
name: "barrier-ditch"
element {
scale: 15
lines {
width: 1.8
color: 864835622
dashdot {
dd: 0.9
dd: 0.9
}
priority: 70
cap: BUTTCAP
}
}
element {
scale: 16
lines {
@ -14799,6 +14812,15 @@ cont {
}
cont {
name: "barrier-fence"
element {
scale: 15
lines {
width: 1.0
color: 1300793480
priority: 320
cap: BUTTCAP
}
}
element {
scale: 16
lines {
@ -15604,6 +15626,15 @@ cont {
}
cont {
name: "barrier-wall"
element {
scale: 15
lines {
width: 1.0
color: 1300793480
priority: 320
cap: BUTTCAP
}
}
element {
scale: 16
lines {
@ -128980,21 +129011,11 @@ cont {
}
cont {
name: "waterway-canal"
element {
scale: 11
lines {
width: 1.0
color: 1714860223
priority: -990
join: BEVELJOIN
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 1.0
color: 1714860223
color: 2151067839
priority: -990
join: BEVELJOIN
cap: BUTTCAP
@ -129004,7 +129025,7 @@ cont {
scale: 13
lines {
width: 1.3
color: 859222207
color: 1295429823
priority: -990
cap: BUTTCAP
}
@ -129636,7 +129657,7 @@ cont {
scale: 13
lines {
width: 1.3
color: 859222207
color: 1295429823
priority: -990
cap: BUTTCAP
}
@ -130271,21 +130292,11 @@ cont {
}
cont {
name: "waterway-stream"
element {
scale: 11
lines {
width: 1.0
color: 1714860223
priority: -990
join: BEVELJOIN
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 1.0
color: 1714860223
color: 2151067839
priority: -990
join: BEVELJOIN
cap: BUTTCAP
@ -130295,7 +130306,7 @@ cont {
scale: 13
lines {
width: 1.3
color: 859222207
color: 1295429823
priority: -990
cap: BUTTCAP
}
@ -130429,7 +130440,7 @@ cont {
scale: 13
lines {
width: 1.0
color: 859222207
color: 1295429823
dashdot {
dd: 2.7
dd: 2.7
@ -130595,7 +130606,7 @@ cont {
scale: 13
lines {
width: 1.0
color: 859222207
color: 1295429823
dashdot {
dd: 2.7
dd: 2.7

BIN
data/drules_proto_outdoors_dark.bin
View file

Binary file not shown.

65
data/drules_proto_outdoors_dark.txt
View file

@ -14653,6 +14653,19 @@ cont {
}
cont {
name: "barrier-ditch"
element {
scale: 15
lines {
width: 1.8
color: 863850275
dashdot {
dd: 0.9
dd: 0.9
}
priority: 70
cap: BUTTCAP
}
}
element {
scale: 16
lines {
@ -14799,6 +14812,15 @@ cont {
}
cont {
name: "barrier-fence"
element {
scale: 15
lines {
width: 1.0
color: 1296319556
priority: 320
cap: BUTTCAP
}
}
element {
scale: 16
lines {
@ -15604,6 +15626,15 @@ cont {
}
cont {
name: "barrier-wall"
element {
scale: 15
lines {
width: 1.0
color: 1296319556
priority: 320
cap: BUTTCAP
}
}
element {
scale: 16
lines {
@ -129195,21 +129226,11 @@ cont {
}
cont {
name: "waterway-canal"
element {
scale: 11
lines {
width: 1.0
color: 1711677478
priority: -990
join: BEVELJOIN
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 1.0
color: 1711677478
color: 2147885094
priority: -990
join: BEVELJOIN
cap: BUTTCAP
@ -129219,7 +129240,7 @@ cont {
scale: 13
lines {
width: 1.3
color: 856039462
color: 1292247078
priority: -990
cap: BUTTCAP
}
@ -129851,7 +129872,7 @@ cont {
scale: 13
lines {
width: 1.3
color: 856039462
color: 1292247078
priority: -990
cap: BUTTCAP
}
@ -130486,21 +130507,11 @@ cont {
}
cont {
name: "waterway-stream"
element {
scale: 11
lines {
width: 1.0
color: 1711677478
priority: -990
join: BEVELJOIN
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 1.0
color: 1711677478
color: 2147885094
priority: -990
join: BEVELJOIN
cap: BUTTCAP
@ -130510,7 +130521,7 @@ cont {
scale: 13
lines {
width: 1.3
color: 856039462
color: 1292247078
priority: -990
cap: BUTTCAP
}
@ -130644,7 +130655,7 @@ cont {
scale: 13
lines {
width: 1.0
color: 856039462
color: 1292247078
dashdot {
dd: 2.7
dd: 2.7
@ -130810,7 +130821,7 @@ cont {
scale: 13
lines {
width: 1.0
color: 856039462
color: 1292247078
dashdot {
dd: 2.7
dd: 2.7

4
data/styles/outdoors/include/priorities_2_BG-top.prio.txt
View file

@ -36,12 +36,12 @@ waterway-riverbank # line z10- and area z1- (al
=== 20
natural-strait # line z11- (also has caption z13-)
waterway-canal # line z11- (also has pathtext z13-)
waterway-canal # line z12- (also has pathtext z13-)
waterway-ditch # line z13-
waterway-drain # line z13-
waterway-fish_pass # line z13- (also has pathtext z13-)
waterway-river # line z10- (also has pathtext z11-)
waterway-stream # line z11- (also has pathtext z13-)
waterway-stream # line z12- (also has pathtext z13-)
waterway-stream-ephemeral # line z13- (also has pathtext z13-)
waterway-stream-intermittent # line z13- (also has pathtext z13-)
=== 10

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

@ -57,9 +57,9 @@ waterway-weir # line z14- (also has pathte
=== 330
barrier-city_wall # line z14-
barrier-fence # line z16-
barrier-fence # line z15-
barrier-hedge # line z16-
barrier-wall # line z16-
barrier-wall # line z15-
railway-funicular # line z12-
railway-funicular-bridge # line z12-
railway-funicular-tunnel # line z12-
@ -421,7 +421,7 @@ route-ferry # line z7- (also has pathtex
aeroway-runway # line z12-
aeroway-taxiway # line z14-
barrier-ditch # line z16-
barrier-ditch # line z15-
=== 70
isoline-step_10 # line z15- (also has pathtext z16-)

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

@ -682,9 +682,9 @@ natural-water-drain # caption z17- (also has are
natural-water-lock # caption z10- (also has area z1-)
natural-water-moat # caption z17- (also has area z1-)
natural-water-wastewater # caption z17- (also has area z12-)
waterway-canal # pathtext z13- (also has line z11-)
waterway-canal # pathtext z13- (also has line z12-)
waterway-fish_pass # pathtext z13- (also has line z13-)
waterway-stream # pathtext z13- (also has line z11-)
waterway-stream # pathtext z13- (also has line z12-)
waterway-stream-ephemeral # pathtext z13- (also has line z13-)
waterway-stream-intermittent # pathtext z13- (also has line z13-)
waterway-weir # pathtext z15- (also has line z14-)