Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
253f6095d9 Regenerate 2023-12-03 12:17:05 +02:00
095063cbea Fix outdoors footways labels 2023-12-03 12:14:25 +02:00
ccee04417b WIP [styles] Adjust POIs visibilities
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:57:25 +02:00
bf1d67e5b2 [styles] Add icons
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:57:06 +02:00
b3514dcf93 WIP [styles] Raise visibility of cycle/bridle/foot-ways in outdoors
Add routes to bridleways and footways

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:55:19 +02:00
2d7822d291 WIP [styles] Highlight routed hiking trails
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:39:45 +02:00
ac7117dc10 WIP [classif] Add marked routes
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:38:40 +02:00
ab3bc16613 [generator] Pull route=hiking tag and trail names from relations
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:37:54 +02:00
c3f3f5918b WIP [classif] Add footway crossings and sidewalks
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-12-03 11:20:24 +02:00
46 changed files with 14062 additions and 3257 deletions

View file

@ -404,6 +404,8 @@ world +
bridleway +
bridge -
permissive -
route_major -
route_minor -
tunnel -
{}
bus_stop -
@ -422,12 +424,15 @@ world +
alpine_hiking -
area -
bridge -
crossing -
demanding_alpine_hiking -
demanding_mountain_hiking -
difficult_alpine_hiking -
hiking -
mountain_hiking -
permissive -
route_major -
route_minor -
sidewalk -
tunnel -
{}
ford -
@ -455,6 +460,8 @@ world +
horse -
mountain_hiking -
permissive -
route_major -
route_minor -
tunnel -
{}
pedestrian +
@ -520,6 +527,8 @@ world +
grade5 -
no-access -
permissive -
route_major -
route_minor -
tunnel -
{}
traffic_signals -
@ -757,7 +766,6 @@ world +
scrub -
spring -
strait -
tree -
tree_row -
volcano -
water +
@ -857,7 +865,6 @@ world +
solar -
wind -
{}
pole -
station -
substation -
tower -

View file

@ -1,4 +1,5 @@
0
255
6425
8738
9758
@ -299,6 +300,7 @@
16575614
16579778
16579836
16711680
16728450
16733986
16740096
@ -342,6 +344,7 @@
857282841
857551774
858401322
858466343
858532890
860111940
860447049
@ -365,6 +368,7 @@
869585866
870704341
871230427
872217852
872415231
1074860288
1090519039

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -5577,6 +5577,22 @@ cont {
}
cont {
name: "barrier-border_control"
element {
scale: 14
symbol {
name: "bcontrol-m"
priority: 1950
}
caption {
primary {
height: 11
color: 4473924
offset_y: 1
is_optional: true
}
priority: -8050
}
}
element {
scale: 15
symbol {
@ -6015,7 +6031,7 @@ cont {
element {
scale: 12
symbol {
name: "toll_booth-m"
name: "toll_booth-s"
priority: 2850
min_distance: 8
}
@ -8764,6 +8780,84 @@ cont {
}
}
}
cont {
name: "highway-bridleway-route_major"
element {
scale: 18
lines {
width: 0.9
color: 4011550
dashdot {
dd: 3.6
dd: 1.8
}
priority: 137
}
}
element {
scale: 19
lines {
width: 0.9
color: 4011550
dashdot {
dd: 3.6
dd: 1.8
}
priority: 137
}
}
element {
scale: 20
lines {
width: 0.9
color: 4011550
dashdot {
dd: 3.6
dd: 1.8
}
priority: 137
}
}
}
cont {
name: "highway-bridleway-route_minor"
element {
scale: 18
lines {
width: 0.9
color: 4011550
dashdot {
dd: 3.6
dd: 1.8
}
priority: 135
}
}
element {
scale: 19
lines {
width: 0.9
color: 4011550
dashdot {
dd: 3.6
dd: 1.8
}
priority: 135
}
}
element {
scale: 20
lines {
width: 0.9
color: 4011550
dashdot {
dd: 3.6
dd: 1.8
}
priority: 135
}
}
}
cont {
name: "highway-construction"
element {
@ -9003,10 +9097,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 16579836
width: 1.1
color: 10506258
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9016,10 +9110,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9028,10 +9122,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9115,6 +9209,81 @@ cont {
}
}
}
cont {
name: "highway-footway-crossing"
element {
scale: 17
lines {
width: 9.0
color: 872217852
priority: 244
cap: BUTTCAP
}
lines {
width: 7.0
color: 14934482
dashdot {
dd: 1.0
dd: 1.0
}
priority: 245
}
}
element {
scale: 18
lines {
width: 15.0
color: 872217852
priority: 244
cap: BUTTCAP
}
lines {
width: 13.0
color: 14934482
dashdot {
dd: 2.0
dd: 2.0
}
priority: 245
}
}
element {
scale: 19
lines {
width: 15.0
color: 872217852
priority: 244
cap: BUTTCAP
}
lines {
width: 13.0
color: 14934482
dashdot {
dd: 2.0
dd: 2.0
}
priority: 245
}
}
element {
scale: 20
lines {
width: 15.0
color: 872217852
priority: 244
cap: BUTTCAP
}
lines {
width: 13.0
color: 14934482
dashdot {
dd: 2.0
dd: 2.0
}
priority: 245
}
}
}
cont {
name: "highway-footway-demanding_alpine_hiking"
element {
@ -9132,10 +9301,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 16579836
width: 1.1
color: 10506258
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9145,10 +9314,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9157,10 +9326,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9183,10 +9352,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 16579836
width: 1.1
color: 10506258
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9196,10 +9365,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9208,10 +9377,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9234,10 +9403,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 16579836
width: 1.1
color: 10506258
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9247,10 +9416,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9259,10 +9428,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9285,10 +9454,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 16579836
width: 1.1
color: 10506258
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9298,10 +9467,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9310,10 +9479,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 16579836
color: 10506258
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9333,6 +9502,45 @@ cont {
priority: 130
}
}
element {
scale: 18
lines {
width: 1.1
color: 10506258
dashdot {
dd: 3.5
dd: 2.0
}
priority: 130
}
}
element {
scale: 19
lines {
width: 1.5
color: 10506258
dashdot {
dd: 4.0
dd: 2.5
}
priority: 130
}
}
element {
scale: 20
lines {
width: 1.5
color: 10506258
dashdot {
dd: 4.0
dd: 2.5
}
priority: 130
}
}
}
cont {
name: "highway-footway-route_major"
element {
scale: 18
lines {
@ -9342,7 +9550,7 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 137
}
}
element {
@ -9354,7 +9562,7 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 137
}
}
element {
@ -9366,12 +9574,12 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 137
}
}
}
cont {
name: "highway-footway-permissive"
name: "highway-footway-route_minor"
element {
scale: 18
lines {
@ -9381,9 +9589,36 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 135
}
}
element {
scale: 19
lines {
width: 1.5
color: 16579836
dashdot {
dd: 5.0
dd: 2.0
}
priority: 135
}
}
element {
scale: 20
lines {
width: 1.5
color: 16579836
dashdot {
dd: 5.0
dd: 2.0
}
priority: 135
}
}
}
cont {
name: "highway-footway-sidewalk"
element {
scale: 19
lines {
@ -12688,6 +12923,108 @@ cont {
}
}
}
cont {
name: "highway-path-route_major"
element {
scale: 17
lines {
width: 0.9
color: 10506258
dashdot {
dd: 3.5
dd: 2.0
}
priority: 137
}
}
element {
scale: 18
lines {
width: 1.1
color: 10506258
dashdot {
dd: 3.5
dd: 2.0
}
priority: 137
}
}
element {
scale: 19
lines {
width: 1.5
color: 10506258
dashdot {
dd: 4.0
dd: 2.5
}
priority: 137
}
}
element {
scale: 20
lines {
width: 1.5
color: 10506258
dashdot {
dd: 4.0
dd: 2.5
}
priority: 137
}
}
}
cont {
name: "highway-path-route_minor"
element {
scale: 17
lines {
width: 0.9
color: 10506258
dashdot {
dd: 3.5
dd: 2.0
}
priority: 135
}
}
element {
scale: 18
lines {
width: 1.1
color: 10506258
dashdot {
dd: 3.5
dd: 2.0
}
priority: 135
}
}
element {
scale: 19
lines {
width: 1.5
color: 10506258
dashdot {
dd: 4.0
dd: 2.5
}
priority: 135
}
}
element {
scale: 20
lines {
width: 1.5
color: 10506258
dashdot {
dd: 4.0
dd: 2.5
}
priority: 135
}
}
}
cont {
name: "highway-pedestrian"
element {
@ -20609,6 +20946,132 @@ cont {
}
}
}
cont {
name: "highway-track-route_major"
element {
scale: 16
lines {
width: 1.1
color: 6510384
dashdot {
dd: 6.0
dd: 2.5
}
priority: 137
}
}
element {
scale: 17
lines {
width: 1.4
color: 6510384
dashdot {
dd: 6.0
dd: 2.5
}
priority: 137
}
}
element {
scale: 18
lines {
width: 1.9
color: 6510384
dashdot {
dd: 7.0
dd: 3.0
}
priority: 137
}
}
element {
scale: 19
lines {
width: 2.5
color: 6510384
dashdot {
dd: 7.0
dd: 3.0
}
priority: 137
}
}
element {
scale: 20
lines {
width: 2.5
color: 6510384
dashdot {
dd: 7.0
dd: 3.0
}
priority: 137
}
}
}
cont {
name: "highway-track-route_minor"
element {
scale: 16
lines {
width: 1.1
color: 6510384
dashdot {
dd: 6.0
dd: 2.5
}
priority: 135
}
}
element {
scale: 17
lines {
width: 1.4
color: 6510384
dashdot {
dd: 6.0
dd: 2.5
}
priority: 135
}
}
element {
scale: 18
lines {
width: 1.9
color: 6510384
dashdot {
dd: 7.0
dd: 3.0
}
priority: 135
}
}
element {
scale: 19
lines {
width: 2.5
color: 6510384
dashdot {
dd: 7.0
dd: 3.0
}
priority: 135
}
}
element {
scale: 20
lines {
width: 2.5
color: 6510384
dashdot {
dd: 7.0
dd: 3.0
}
priority: 135
}
}
}
cont {
name: "highway-trunk"
element {

Binary file not shown.

View file

@ -5577,6 +5577,22 @@ cont {
}
cont {
name: "barrier-border_control"
element {
scale: 14
symbol {
name: "bcontrol-m"
priority: 1950
}
caption {
primary {
height: 11
color: 6710886
offset_y: 1
is_optional: true
}
priority: -8050
}
}
element {
scale: 15
symbol {
@ -6015,7 +6031,7 @@ cont {
element {
scale: 12
symbol {
name: "toll_booth-m"
name: "toll_booth-s"
priority: 2850
min_distance: 8
}
@ -8764,6 +8780,84 @@ cont {
}
}
}
cont {
name: "highway-bridleway-route_major"
element {
scale: 18
lines {
width: 0.9
color: 2828327
dashdot {
dd: 3.6
dd: 1.8
}
priority: 137
}
}
element {
scale: 19
lines {
width: 0.9
color: 2828327
dashdot {
dd: 3.6
dd: 1.8
}
priority: 137
}
}
element {
scale: 20
lines {
width: 0.9
color: 2828327
dashdot {
dd: 3.6
dd: 1.8
}
priority: 137
}
}
}
cont {
name: "highway-bridleway-route_minor"
element {
scale: 18
lines {
width: 0.9
color: 2828327
dashdot {
dd: 3.6
dd: 1.8
}
priority: 135
}
}
element {
scale: 19
lines {
width: 0.9
color: 2828327
dashdot {
dd: 3.6
dd: 1.8
}
priority: 135
}
}
element {
scale: 20
lines {
width: 0.9
color: 2828327
dashdot {
dd: 3.6
dd: 1.8
}
priority: 135
}
}
}
cont {
name: "highway-construction"
element {
@ -9003,10 +9097,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 2828327
width: 1.1
color: 9718290
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9016,10 +9110,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9028,10 +9122,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9115,6 +9209,81 @@ cont {
}
}
}
cont {
name: "highway-footway-crossing"
element {
scale: 17
lines {
width: 9.0
color: 858466343
priority: 244
cap: BUTTCAP
}
lines {
width: 7.0
color: 328965
dashdot {
dd: 1.0
dd: 1.0
}
priority: 245
}
}
element {
scale: 18
lines {
width: 15.0
color: 858466343
priority: 244
cap: BUTTCAP
}
lines {
width: 13.0
color: 328965
dashdot {
dd: 2.0
dd: 2.0
}
priority: 245
}
}
element {
scale: 19
lines {
width: 15.0
color: 858466343
priority: 244
cap: BUTTCAP
}
lines {
width: 13.0
color: 328965
dashdot {
dd: 2.0
dd: 2.0
}
priority: 245
}
}
element {
scale: 20
lines {
width: 15.0
color: 858466343
priority: 244
cap: BUTTCAP
}
lines {
width: 13.0
color: 328965
dashdot {
dd: 2.0
dd: 2.0
}
priority: 245
}
}
}
cont {
name: "highway-footway-demanding_alpine_hiking"
element {
@ -9132,10 +9301,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 2828327
width: 1.1
color: 9718290
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9145,10 +9314,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9157,10 +9326,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9183,10 +9352,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 2828327
width: 1.1
color: 9718290
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9196,10 +9365,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9208,10 +9377,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9234,10 +9403,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 2828327
width: 1.1
color: 9718290
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9247,10 +9416,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9259,10 +9428,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9285,10 +9454,10 @@ cont {
element {
scale: 18
lines {
width: 1.5
color: 2828327
width: 1.1
color: 9718290
dashdot {
dd: 5.0
dd: 3.5
dd: 2.0
}
priority: 130
@ -9298,10 +9467,10 @@ cont {
scale: 19
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9310,10 +9479,10 @@ cont {
scale: 20
lines {
width: 1.5
color: 2828327
color: 9718290
dashdot {
dd: 5.0
dd: 2.0
dd: 4.0
dd: 2.5
}
priority: 130
}
@ -9333,6 +9502,45 @@ cont {
priority: 130
}
}
element {
scale: 18
lines {
width: 1.1
color: 9718290
dashdot {
dd: 3.5
dd: 2.0
}
priority: 130
}
}
element {
scale: 19
lines {
width: 1.5
color: 9718290
dashdot {
dd: 4.0
dd: 2.5
}
priority: 130
}
}
element {
scale: 20
lines {
width: 1.5
color: 9718290
dashdot {
dd: 4.0
dd: 2.5
}
priority: 130
}
}
}
cont {
name: "highway-footway-route_major"
element {
scale: 18
lines {
@ -9342,7 +9550,7 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 137
}
}
element {
@ -9354,7 +9562,7 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 137
}
}
element {
@ -9366,12 +9574,12 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 137
}
}
}
cont {
name: "highway-footway-permissive"
name: "highway-footway-route_minor"
element {
scale: 18
lines {
@ -9381,9 +9589,36 @@ cont {
dd: 5.0
dd: 2.0
}
priority: 130
priority: 135
}
}
element {
scale: 19
lines {
width: 1.5
color: 2828327
dashdot {
dd: 5.0
dd: 2.0
}
priority: 135
}
}
element {
scale: 20
lines {
width: 1.5
color: 2828327
dashdot {
dd: 5.0
dd: 2.0
}
priority: 135
}
}
}
cont {
name: "highway-footway-sidewalk"
element {
scale: 19
lines {
@ -12797,6 +13032,108 @@ cont {
}
}
}
cont {
name: "highway-path-route_major"
element {
scale: 17
lines {
width: 0.9
color: 9718290
dashdot {
dd: 3.5
dd: 2.0
}
priority: 137
}
}
element {
scale: 18
lines {
width: 1.1
color: 9718290
dashdot {
dd: 3.5
dd: 2.0
}
priority: 137
}
}
element {
scale: 19
lines {
width: 1.5
color: 9718290
dashdot {
dd: 4.0
dd: 2.5
}
priority: 137
}
}
element {
scale: 20
lines {
width: 1.5
color: 9718290
dashdot {
dd: 4.0
dd: 2.5
}
priority: 137
}
}
}
cont {
name: "highway-path-route_minor"
element {
scale: 17
lines {
width: 0.9
color: 9718290
dashdot {
dd: 3.5
dd: 2.0
}
priority: 135
}
}
element {
scale: 18
lines {
width: 1.1
color: 9718290
dashdot {
dd: 3.5
dd: 2.0
}
priority: 135
}
}
element {
scale: 19
lines {
width: 1.5
color: 9718290
dashdot {
dd: 4.0
dd: 2.5
}
priority: 135
}
}
element {
scale: 20
lines {
width: 1.5
color: 9718290
dashdot {
dd: 4.0
dd: 2.5
}
priority: 135
}
}
}
cont {
name: "highway-pedestrian"
element {
@ -20955,6 +21292,132 @@ cont {
}
}
}
cont {
name: "highway-track-route_major"
element {
scale: 16
lines {
width: 1.1
color: 6247213
dashdot {
dd: 6.0
dd: 2.5
}
priority: 137
}
}
element {
scale: 17
lines {
width: 1.4
color: 6247213
dashdot {
dd: 6.0
dd: 2.5
}
priority: 137
}
}
element {
scale: 18
lines {
width: 1.9
color: 6247213
dashdot {
dd: 7.0
dd: 3.0
}
priority: 137
}
}
element {
scale: 19
lines {
width: 2.5
color: 6247213
dashdot {
dd: 7.0
dd: 3.0
}
priority: 137
}
}
element {
scale: 20
lines {
width: 2.5
color: 6247213
dashdot {
dd: 7.0
dd: 3.0
}
priority: 137
}
}
}
cont {
name: "highway-track-route_minor"
element {
scale: 16
lines {
width: 1.1
color: 6247213
dashdot {
dd: 6.0
dd: 2.5
}
priority: 135
}
}
element {
scale: 17
lines {
width: 1.4
color: 6247213
dashdot {
dd: 6.0
dd: 2.5
}
priority: 135
}
}
element {
scale: 18
lines {
width: 1.9
color: 6247213
dashdot {
dd: 7.0
dd: 3.0
}
priority: 135
}
}
element {
scale: 19
lines {
width: 2.5
color: 6247213
dashdot {
dd: 7.0
dd: 3.0
}
priority: 135
}
}
element {
scale: 20
lines {
width: 2.5
color: 6247213
dashdot {
dd: 7.0
dd: 3.0
}
priority: 135
}
}
}
cont {
name: "highway-trunk"
element {

View file

@ -70,7 +70,8 @@ railway|rail|main;[railway=rail][usage=main][!highspeed][!service];;name;int_nam
landuse|residential;15;
highway|path;16;
highway|bus_stop;17;
natural|tree;18;
# ~4M usages.
highway|footway|sidewalk;[highway=footway][footway=sidewalk];;name;int_name;18;
place|locality;19;
natural|coastline;20;
place|village;21;
@ -109,7 +110,8 @@ natural|water|pond;[natural=water][water=pond];;name;int_name;47;
landuse|farmland;48;
barrier|fence;49;
natural|water|lake;[natural=water][water=lake];;name;int_name;50;
power|pole;51;
# ~3M usages. TODO: consolidate all other footway=link/etc. values into highway-footway-minor.
highway|footway|crossing;[highway=footway][footway=crossing];;name;int_name;51;
waterway|riverbank;52;
highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53;
landuse|meadow;54;
@ -184,8 +186,9 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;
leisure|garden;110;
landuse|commercial;111;
railway|station;112;
highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113;
highway|path|hiking;[highway=path][sac_scale=hiking];;name;int_name;113;
amenity|hospital;114;
# TODO: merge with "intermittent".
waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
amenity|post_office;117;
@ -226,7 +229,7 @@ natural|water|river;[natural=water][water=river];;name;int_name;149;
railway|tram;150;
amenity|toilets;151;
natural|water|basin;[natural=water][water=basin];;name;int_name;152;
highway|footway|permissive;[highway=footway][access=permissive],[highway=footway][foot=permissive];;name;int_name;153;
deprecated:highway|footway|permissive:11.2023;[highway=footway][access=permissive],[highway=footway][foot=permissive];x;name;int_name;153;highway|footway
leisure|picnic_table;154;
landuse|construction;155;
tourism|viewpoint;156;
@ -1679,3 +1682,11 @@ amenity|compressed_air;1592;
leisure|hackerspace;1593;
railway|station|subway|singapore;[railway=station][transport=subway][city=singapore],[railway=station][station=subway][city=singapore];;name;int_name;1594;
railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595;
highway|path|route_major;[highway=path][route?][network=iwn],[highway=path][route?][network=nwn],[highway=path][route?][network=rwn];;name;int_name;1600;
highway|path|route_minor;[highway=path][route?][network=lwn],[highway=path][route?][!network];;name;int_name;1601;
highway|track|route_major;[highway=track][route?][network=iwn],[highway=track][route?][network=nwn],[highway=track][route?][network=rwn];;name;int_name;1603;
highway|track|route_minor;[highway=track][route?][network=lwn],[highway=track][route?][!network];;name;int_name;1604;
highway|footway|route_major;[highway=footway][route?][network=iwn],[highway=footway][route?][network=nwn],[highway=footway][route?][network=rwn];;name;int_name;1605;
highway|footway|route_minor;[highway=footway][route?][network=lwn],[highway=footway][route?][!network];;name;int_name;1606;
highway|bridleway|route_major;[highway=bridleway][route?][network=iwn],[highway=bridleway][route?][network=nwn],[highway=bridleway][route?][network=rwn];;name;int_name;1607;
highway|bridleway|route_minor;[highway=bridleway][route?][network=lwn],[highway=bridleway][route?][!network];;name;int_name;1608;

Can't render this file because it contains an unexpected character in line 7 and column 16.

View file

@ -64,6 +64,10 @@
16.0 16.0
2.7 2.7
4.95 4.95
6.0 1.0
7.0 1.2
9.0 1.7
12.0 2.2
12.0 4.0
6.0 8.5 12.0 2.3
1.0 50.0
@ -72,6 +76,7 @@
2.5 7.0
5.2 5.2
3.5 3.5
1.0 1.0
2.0 1.35
2.2 1.26
3.3 1.8

View file

@ -34,8 +34,8 @@ area|z11-[waterway=waterfall],
node|z12-[natural=cave_entrance],
area|z12-[natural=cave_entrance],
node|z13-[natural=peak][name],
node|z14-[natural=saddle],
area|z14-[natural=saddle],
node|z16-[natural=saddle],
area|z16-[natural=saddle],
node|z14-[mountain_pass],
area|z14-[mountain_pass],
node|z14-[natural=spring],
@ -95,19 +95,26 @@ node|z13[natural=peak][name],
node|z14[natural=peak][name],
{icon-image: peakt-s.svg;font-size: 10;}
node|z15-[natural=peak][name],
node|z15-[natural=rock],
area|z15-[natural=rock],
{icon-image: peakt-m.svg;font-size: 10;}
node|z15-[natural=peak][!name],
{icon-image: peakt-m.svg;font-size: 10;}
/* ToDo: Make the same as natural=peak when we will have -s,-m icons */
node|z14-[natural=saddle],
area|z14-[natural=saddle],
node|z16-[natural=rock],
area|z16-[natural=rock],
{icon-image: peakt-s.svg; font-size: 10;}
node|z14-[mountain_pass],
area|z14-[mountain_pass],
{icon-image: mountain-pass.svg;text-offset: 1;font-size: 10;}
{icon-image: mountain-pass-s.svg;text-offset: 1;font-size: 10;}
node|z15-[mountain_pass],
area|z15-[mountain_pass],
{icon-image: mountain-pass-m.svg;}
node|z16-[natural=saddle],
area|z16-[natural=saddle],
{icon-image: mountain-pass-m.svg;text-offset: 1;font-size: 10;}
node|z16[leisure=beach_resort],
area|z16[leisure=beach_resort]
@ -914,7 +921,7 @@ node|z15-[landuse=quarry],
area|z15-[landuse=quarry],
node|z15-[landuse=industrial][industrial=mine],
area|z15-[landuse=industrial][industrial=mine],
node|z15-[barrier=border_control],
node|z14-[barrier=border_control],
node|z16-[amenity=veterinary],
area|z16-[amenity=veterinary],
node|z16-[amenity=fountain],
@ -1297,8 +1304,8 @@ area|z17-[leisure=swimming_pool]
node|z17-[leisure=swimming_pool][access=private],
area|z17-[leisure=swimming_pool][access=private]
{icon-image: zero-icon.svg;}
node|z17-[leisure=golf_course],
area|z17-[leisure=golf_course]
node|z15-[leisure=golf_course],
area|z15-[leisure=golf_course],
{icon-image: golf-m.svg;icon-min-distance: 10;}
node|z17-[sport],
@ -1527,14 +1534,16 @@ area|z15-[man_made=lighthouse]
{icon-image: lighthouse-m.svg;}
node|z12-14[barrier=toll_booth],
area|z12-14[barrier=toll_booth]
{icon-image: toll_booth-s.svg;icon-min-distance: 8;}
area|z12-14[barrier=toll_booth],
{icon-image: toll_booth-s.svg;}
node|z15-[barrier=toll_booth],
area|z15-[barrier=toll_booth]
{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
area|z15-[barrier=toll_booth],
{icon-image: toll_booth-m.svg;}
node|z15-[barrier=border_control]
{icon-image:bcontrol-m.svg;}
node|z14-[barrier=border_control],
{icon-image: bcontrol-s.svg;}
node|z15-[barrier=border_control],
{icon-image: bcontrol-m.svg;}
node|z16-[barrier=block],
node|z16-[barrier=bollard],

View file

@ -608,14 +608,14 @@ line|z14-[highway=raceway],
{color: @track;opacity: 1;}
line|z15-[leisure=track][!area],
{color: @sport;opacity: 1;}
line|z14-[highway=path],
line|z14-[highway=footway][sac_scale],
{color: @path;opacity: 1;}
line|z14-[highway=bridleway]
{color: @bridleway;opacity: 1;}
line|z15-[highway=footway],
line|z15-[highway=steps]
{color: @footway;opacity: 1;}
line|z14-[highway=path],
line|z14-[highway=footway][sac_scale],
{color: @path;opacity: 1;}
line|z16-[highway=pedestrian][tunnel?]
{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;}
line|z17-[highway=footway][tunnel?]::tunnelBackground,

View file

@ -291,6 +291,11 @@ line|z16-[highway=ford],
line|z16-[highway=raceway],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
/* Don't display names of sidewalks and pedestrian crossings. */
line|z15-[highway=footway][footway=sidewalk],
line|z15-[highway=footway][footway=crossing],
{text: none;}
line|z15[highway=construction],
line|z15[highway=bridleway],
line|z15[highway=path],

View file

@ -63,7 +63,7 @@ leisure-track-area # area z15- (also has captio
aeroway-terminal # area z14- (also has caption z15-)
=== 150
leisure-golf_course # area z12- (also has icon z17-, caption(optional) z17-)
leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-)
=== 140
landuse-flowerbed # area z16-

View file

@ -49,6 +49,7 @@ highway-cycleway # line z13- (also has pathte
highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-cycleway-permissive # line z13- (also has pathtext z15-)
highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-footway-crossing # line z15-
highway-steps # line z15- (also has pathtext z16-)
highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
@ -260,6 +261,18 @@ highway-service-parking_aisle # line z15- (also has pathte
highway-service-tunnel # line z15- (also has pathtext z16-)
=== 190
highway-bridleway-route_major # line z14- (also has pathtext z15-)
highway-footway-route_major # line z15- (also has pathtext z15-)
highway-path-route_major # line z14- (also has pathtext z15-)
highway-track-route_major # line z14- (also has pathtext z15-)
=== 187
highway-bridleway-route_minor # line z14- (also has pathtext z15-)
highway-footway-route_minor # line z15- (also has pathtext z15-)
highway-path-route_minor # line z14- (also has pathtext z15-)
highway-track-route_minor # line z14- (also has pathtext z15-)
=== 185
highway-footway # line z15- (also has pathtext z15-)
highway-footway-alpine_hiking # line z14- (also has pathtext z15-)
highway-footway-area # line z15- and area z14- (also has pathtext z15-)
@ -269,7 +282,7 @@ highway-footway-demanding_mountain_hiking # line z14- (also has pathte
highway-footway-difficult_alpine_hiking # line z14- (also has pathtext z15-)
highway-footway-hiking # line z14- (also has pathtext z15-)
highway-footway-mountain_hiking # line z14- (also has pathtext z15-)
highway-footway-permissive # line z15- (also has pathtext z15-)
highway-footway-sidewalk # line z15-
highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-path # line z14- (also has pathtext z15-)
highway-path-alpine_hiking # line z14- (also has pathtext z15-)

View file

@ -277,7 +277,7 @@ highway-primary_link-bridge # pathtext z11- (also has sh
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
=== 6100
barrier-border_control # icon z15- (also has caption(optional) z15-)
barrier-border_control # icon z14- (also has caption(optional) z14-)
railway-halt # icon z13- (also has caption(optional) z13-)
tourism-alpine_hut # icon z13- (also has caption(optional) z13-)
waterway-waterfall # icon z11- (also has caption(optional) z11-)
@ -341,7 +341,7 @@ natural-hot_spring # icon z14- (also has captio
natural-spring # icon z14- (also has caption(optional) z14-)
=== 4650
natural-saddle # icon z14- (also has caption(optional) z14-)
natural-saddle # icon z16- (also has caption(optional) z16-)
place-islet # caption z14- (also has area z10-)
=== 4500
@ -691,16 +691,27 @@ waterway-weir # pathtext z15- (also has li
=== 2900
highway-ford # icon z16- and pathtext z16- (also has line z13-)
natural-rock # icon z15-
natural-rock # icon z16-
=== 2850
highway-bridleway-route_major # pathtext z15- (also has line z14-)
highway-footway-route_major # pathtext z15- (also has line z15-)
highway-path-route_major # pathtext z15- (also has line z14-)
highway-track-route_major # pathtext z15- (also has line z14-)
=== 2840
highway-bridleway-route_minor # pathtext z15- (also has line z14-)
highway-footway-route_minor # pathtext z15- (also has line z15-)
highway-path-route_minor # pathtext z15- (also has line z14-)
highway-track-route_minor # pathtext z15- (also has line z14-)
=== 2830
highway-footway-alpine_hiking # pathtext z15- (also has line z14-)
highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z14-)
highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z14-)
highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z14-)
highway-footway-hiking # pathtext z15- (also has line z14-)
highway-footway-mountain_hiking # pathtext z15- (also has line z14-)
highway-footway-permissive # pathtext z15- (also has line z15-)
highway-path # pathtext z15- (also has line z14-)
highway-path-alpine_hiking # pathtext z15- (also has line z14-)
highway-path-bicycle # pathtext z15- (also has line z14-)
@ -882,7 +893,7 @@ landuse-military-danger_area # icon z16- (also has captio
=== 2000
amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-)
leisure-golf_course # icon z17- (also has caption(optional) z17-, area z12-)
leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-)
natural-wetland # caption z16- (also has area z11-)
natural-wetland-bog # caption z16- (also has area z11-)
natural-wetland-marsh # caption z16- (also has area z11-)
@ -1405,7 +1416,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-)
# === -3750
# barrier-border_control # caption(optional) z15- (also has icon z15-)
# barrier-border_control # caption(optional) z14- (also has icon z14-)
# railway-halt # caption(optional) z13- (also has icon z13-)
# tourism-alpine_hut # caption(optional) z13- (also has icon z13-)
# waterway-waterfall # caption(optional) z11- (also has icon z11-)
@ -1454,7 +1465,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# natural-spring # caption(optional) z14- (also has icon z14-)
# === -5350
# natural-saddle # caption(optional) z14- (also has icon z14-)
# natural-saddle # caption(optional) z16- (also has icon z16-)
# === -5500
# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-)
@ -1790,7 +1801,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -8000
# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-)
# leisure-golf_course # caption(optional) z17- (also has icon z17-, area z12-)
# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-)
# tourism-picnic_site # caption(optional) z16- (also has icon z16-)
# === -8200

View file

@ -0,0 +1,7 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g>
<circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
<circle cx="8" cy="8" r="7" fill="#664e42"/>
<path d="M7.21864 3.81299L6.51811 4.24137L7.41264 5.70364L4.17957 10.994H3.41137C3.30281 10.9939 3.19866 11.037 3.12177 11.1136C3.04488 11.1902 3.00152 11.2943 3.00122 11.4028C3.0012 11.4567 3.0118 11.51 3.0324 11.5598C3.05301 11.6096 3.08322 11.6548 3.12131 11.6929C3.1594 11.731 3.20462 11.7612 3.25439 11.7818C3.30416 11.8024 3.35751 11.813 3.41137 11.813H12.3854C12.4392 11.813 12.4926 11.8024 12.5424 11.7818C12.5921 11.7612 12.6374 11.731 12.6754 11.6929C12.7135 11.6548 12.7437 11.6096 12.7643 11.5598C12.785 11.51 12.7955 11.4567 12.7955 11.4028C12.7952 11.2943 12.7519 11.1902 12.675 11.1136C12.5981 11.037 12.4939 10.9939 12.3854 10.994H11.6067L8.37364 5.70364L9.26684 4.24137L8.56764 3.81429L7.89317 4.91716L7.21864 3.81299ZM7.89311 8.94452C8.68397 8.94452 9.32797 9.58678 9.32797 10.3781V10.994H6.45951V10.3781C6.45951 9.58685 7.10221 8.94452 7.89311 8.94452Z" fill="white"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -0,0 +1,4 @@
<svg width="5" height="5" viewBox="0 0 5 5" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="2.5" cy="2.5" r="2.2" stroke="#717065" stroke-width="0.6"/>
<circle cx="2.5" cy="2.5" r="1" fill="#717065"/>
</svg>

After

Width:  |  Height:  |  Size: 220 B

View file

@ -0,0 +1,3 @@
<svg width="10" height="5" viewBox="0 0 10 5" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5 3.07151C2.49556 3.07151 2.64106 -0.00591904 0 8.55212e-06V7H10V8.55212e-06C7.54631 -0.00583556 7.50444 3.07151 5 3.07151Z" fill="#717065"/>
</svg>

After

Width:  |  Height:  |  Size: 253 B

View file

@ -0,0 +1,3 @@
<svg width="7" height="4" viewBox="0 0 7 4" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.5 2.19393C1.74689 2.19393 1.84874 -0.00422789 0 6.10866e-06V5H7V6.10866e-06C5.28242 -0.00416826 5.25311 2.19393 3.5 2.19393Z" fill="#717065"/>
</svg>

After

Width:  |  Height:  |  Size: 254 B

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 16 8.3845" xmlns="http://www.w3.org/2000/svg">
<path d="m7.9999 3.6789c-4.0071 0-3.7743-3.6861-8-3.679v8.3845h16v-8.3845c-3.9259-7e-3 -3.9929 3.679-8 3.679z" fill="#717065"/>
</svg>

Before

Width:  |  Height:  |  Size: 254 B

View file

@ -0,0 +1,3 @@
<svg width="12" height="9" viewBox="0 0 12 9" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.09219 1.55848H1.59954V0H10.3999V1.55848H8.81653L9.51605 4.67543H12V5.45467H9.691L10.4051 8.63659L8.84544 8.62949L8.13291 5.45467H3.79117L3.11427 8.52277L1.5546 8.52988L2.23306 5.45467H0V4.67543H2.405L3.09219 1.55848ZM4.65033 1.55848L3.96265 4.67543H7.95759L7.25807 1.55848H4.65033Z" fill="#717065"/>
</svg>

After

Width:  |  Height:  |  Size: 413 B

View file

@ -0,0 +1,5 @@
<svg width="7" height="7" viewBox="0 0 7 7" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0.538574 6.46191L6.46165 0.538837" stroke="#717065"/>
<path d="M0.538574 0.538086L6.46165 6.46116" stroke="#717065"/>
<rect x="0.5" y="0.5" width="6" height="6" stroke="#717065"/>
</svg>

After

Width:  |  Height:  |  Size: 289 B

View file

@ -0,0 +1,12 @@
<svg width="14" height="13" viewBox="0 0 14 13" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_646_4100)">
<path d="M10.752 12.3869V6.74146H3.03735V12.3869" stroke="#717065" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M7.3114 0L6.89473 1.54687M4.3648 2.08333L3.94813 3.6302M10.258 2.08333L9.84133 3.6302M1.41667 4.7318L1 6.27867M13.206 4.7318L12.7893 6.27867" stroke="#717065" stroke-width="0.4" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M1.41675 8.15417L6.89461 3.27344L12.3725 8.15417" stroke="#717065" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
</g>
<defs>
<clipPath id="clip0_646_4100">
<rect width="14" height="13" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 762 B

View file

@ -9,8 +9,8 @@ area|z11-[natural=cave_entrance],
node|z11-[waterway=waterfall],
area|z11-[waterway=waterfall],
node|z11-[natural=peak][name],
node|z12-[natural=saddle],
area|z12-[natural=saddle],
node|z15-[natural=saddle],
area|z15-[natural=saddle],
node|z12-[mountain_pass],
area|z12-[mountain_pass],
node|z14-[natural=spring],
@ -106,17 +106,20 @@ node|z13-15[natural=peak][!name],
node|z16-[natural=peak][!name],
{icon-image: peakt-m.svg;}
/* ToDo: Make the same as natural=peak when we will have -s,-m icons */
node|z11-[natural=saddle],
area|z11-[natural=saddle],
node|z14-[natural=rock],
{icon-image: peakt-s.svg; font-size: 11;}
node|z16-[natural=rock],
{font-size: 12;}
node|z11-[mountain_pass],
area|z11-[mountain_pass],
{icon-image: mountain-pass.svg;}
node|z13-[natural=saddle],
area|z13-[natural=saddle],
{icon-image: mountain-pass-s.svg;}
node|z13-[mountain_pass],
area|z13-[mountain_pass],
{font-size: 11;}
node|z14-[natural=saddle],
area|z14-[natural=saddle],
{icon-image: mountain-pass-m.svg; font-size: 11;}
node|z16-[natural=saddle],
area|z16-[natural=saddle],
node|z16-[mountain_pass],
@ -170,18 +173,18 @@ area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
node|z13-[tourism=viewpoint],
node|z15-[tourism=chalet],
area|z15-[tourism=chalet],
node|z14-[tourism=camp_site],
area|z14-[tourism=camp_site],
node|z14-[tourism=chalet],
area|z14-[tourism=chalet],
node|z13-[tourism=camp_site],
area|z13-[tourism=camp_site],
node|z14-[tourism=picnic_site],
area|z14-[tourism=picnic_site],
node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table],
node|z13-[amenity=shelter],
area|z13-[amenity=shelter],
node|z14-[tourism=caravan_site],
area|z14-[tourism=caravan_site],
node|z13-[tourism=caravan_site],
area|z13-[tourism=caravan_site],
{text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
node|z11-[tourism=alpine_hut],
@ -189,19 +192,19 @@ area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
{icon-image: alpine_hut-s.svg; icon-min-distance: 24;}
node|z11-[tourism=alpine_hut],
area|z11-[tourism=alpine_hut],
node|z13-[tourism=alpine_hut],
area|z13-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
node|z15-[tourism=chalet],
area|z15-[tourism=chalet],
node|z14-[tourism=chalet],
area|z14-[tourism=chalet],
{font-size: 11;}
node|z14-[tourism=alpine_hut],
area|z14-[tourism=alpine_hut],
node|z14-[tourism=wilderness_hut],
area|z14-[tourism=wilderness_hut],
node|z15-[tourism=chalet],
area|z15-[tourism=chalet],
node|z14-[tourism=chalet],
area|z14-[tourism=chalet],
{icon-image: alpine_hut-m.svg;}
node|z16-[tourism=alpine_hut],
area|z16-[tourism=alpine_hut],
@ -211,9 +214,12 @@ node|z16-[tourism=chalet],
area|z16-[tourism=chalet],
{font-size: 12; icon-min-distance: 0;}
node|z13-[tourism=camp_site],
area|z13-[tourism=camp_site],
{icon-image: campsite-s.svg; icon-min-distance: 12; font-size: 11;}
node|z14-[tourism=camp_site],
area|z14-[tourism=camp_site],
{icon-image: campsite-m.svg; icon-min-distance: 12; font-size: 11;}
{icon-image: campsite-m.svg;}
node|z16-[tourism=camp_site],
area|z16-[tourism=camp_site],
{font-size: 12; icon-min-distance: 0;}
@ -232,17 +238,22 @@ node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table],
{font-size: 11;}
/* need a small icon */
node|z13-[amenity=shelter],
area|z13-[amenity=shelter],
{icon-image: shelter-m.svg;icon-min-distance: 10; font-size: 11;}
{icon-image: shelter-s.svg; icon-min-distance: 10; font-size: 11;}
node|z14-[amenity=shelter],
area|z14-[amenity=shelter],
{icon-image: shelter-m.svg;}
node|z16-[amenity=shelter],
area|z16-[amenity=shelter],
{font-size: 12; icon-min-distance: 0;}
node|z13-[tourism=caravan_site],
area|z13-[tourism=caravan_site],
{icon-image: caravan_site-s.svg; font-size: 11; icon-min-distance: 12;}
node|z14-[tourism=caravan_site],
area|z14-[tourism=caravan_site],
{icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;}
{icon-image: caravan_site-m.svg;}
node|z16-[tourism=caravan_site],
area|z16-[tourism=caravan_site],
{font-size: 12; icon-min-distance: 0;}
@ -257,6 +268,11 @@ node|z16-[tourism=viewpoint],
/* 5.5 Others */
area|z13[highway=rest_area],
{icon-image: picnic-s.svg;}
area|z14-[highway=rest_area],
{icon-image: picnic-m.svg;}
node|z11-12[man_made=lighthouse],
area|z11-12[man_made=lighthouse],
{icon-image: lighthouse-s.svg; icon-min-distance: 10;}
@ -267,11 +283,21 @@ node|z16-[man_made=lighthouse],
area|z16-[man_made=lighthouse],
{font-size: 12;}
node|z14-[barrier=border_control]
node|z12-[barrier=border_control],
{icon-image: bcontrol-s.svg;}
node|z14-[barrier=border_control],
{icon-image: bcontrol-m.svg;}
/* TODO need a better icon */
node|z14-[highway=ford],
{icon-image: dot-m.svg;}
node|z14-[power=tower],
{icon-image: power_tower-m.svg;}
node|z12-[man_made=flagpole],
node|z13-[man_made=mast],
{icon-image: dot-m.svg;}
node|z14-[man_made=flagpole],
node|z14-[man_made=mast],
{icon-image: mast-m.svg;}

View file

@ -54,6 +54,26 @@ line|z11-[highway=path],
line|z11-[highway=footway][sac_scale],
{color: @path;opacity: 1;}
line|z11-[highway=footway],
{color: @footway; opacity: 1;}
line|z11-[highway=bridleway],
{color: @bridleway; opacity: 1;} /* TODO: change color */
line|z10-[highway=path][route?][network=iwn],
line|z10-[highway=track][route?][network=iwn],
line|z10-[highway=footway][route?][network=iwn],
line|z10-[highway=bridleway][route?][network=iwn],
{color: red; opacity: 1;}
line|z10-[highway=path][route?][network=lwn],
line|z10-[highway=track][route?][network=lwn],
line|z10-[highway=footway][route?][network=lwn],
line|z10-[highway=bridleway][route?][network=lwn],
{color: blue; opacity: 1;}
line|z11-[highway=cycleway]
{color: @cycleway; opacity: 1;}
/* 8.5 Construction & Proposed 13-22 ZOOM */
line|z11-[highway=construction],
@ -65,7 +85,21 @@ line|z11-12[highway=proposed]
{width: 1.2; dashes: 3.6,1.8;}
/* see base style for other zooms */
/* 8.6 Track & Path 14-22 ZOOM */
line|z11-12[highway=footway],
{width: 1.1; dashes: 3.5,2;}
line|z13[highway=footway],
{width: 1.3; dashes: 4,2.5;}
line|z14[highway=footway],
{width: 1.6; dashes: 4,2.5;}
line|z15[highway=footway],
{width: 2; dashes: 6,3.5;}
line|z16[highway=footway],
{width: 2.6; dashes: 6,3.5;}
line|z17[highway=footway],
{width: 3.3; dashes: 8,4.5;}
line|z18-[highway=footway],
{width: 4; dashes: 8,4.5;}
line|z11[highway=track],
{width: 1.1; dashes: 6,2.5;}
@ -109,6 +143,50 @@ line|z18-[highway=path],
line|z18-[highway=footway][sac_scale],
{width: 4; dashes: 8,4.5;}
line|z11-12[highway=bridleway],
{width: 1.1; dashes: 6,1;}
line|z13[highway=bridleway],
{width: 1.3; dashes: 7,1.2;}
line|z14[highway=bridleway],
{width: 1.6; dashes: 7,1.2;}
line|z15[highway=bridleway],
{width: 2; dashes: 9,1.7;}
line|z16[highway=bridleway],
{width: 2.6; dashes: 9,1.7;}
line|z17[highway=bridleway],
{width: 3.3; dashes: 12,2.2;}
line|z18-[highway=bridleway],
{width: 4; dashes: 12,2.2;}
line|z10-[highway=track][route?][network=iwn],
line|z10-[highway=track][route?][network=lwn],
{width: 2.3; dashes: 7,3;}
line|z10-[highway=path][route?][network=iwn],
line|z10-[highway=path][route?][network=lwn],
line|z10-[highway=footway][route?][network=iwn],
line|z10-[highway=footway][route?][network=lwn],
line|z10-[highway=bridleway][route?][network=iwn],
line|z10-[highway=bridleway][route?][network=lwn],
{width: 2.0; dashes: 4,2.5;}
line|z11[highway=cycleway],
{width: 0.7;}
line|z12[highway=cycleway],
{width: 0.8;}
line|z13[highway=cycleway],
{width: 1.1;}
line|z14[highway=cycleway],
{width: 1.4;}
line|z15[highway=cycleway],
{width: 1.6;}
line|z16[highway=cycleway],
{width: 1.9;}
line|z17[highway=cycleway],
{width: 2.3;}
line|z18-[highway=cycleway],
{width: 2.8;}
/* 9.RAIL 11-22 ZOOM */
line|z10-[railway=rail],

View file

@ -2,12 +2,21 @@
@import("../../clear/include/Roads_label.mapcss");
/* 8.OTHERS ROADS 15-22 ZOOM */
line|z13-[highway=track],
line|z13-[highway=path],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
line|z13-[highway=footway],
line|z13-[highway=bridleway],
line|z13-[highway=cycleway],
{text: name; font-size: 10; text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
line|z13-15[highway=path],
line|z13-15[highway=track],
{font-size: 8;}
line|z16-[highway=path],
line|z16-[highway=track],
line|z16-[highway=footway],
line|z16-[highway=bridleway],
line|z16-[highway=cycleway],
{font-size: 12;}
/* Don't display names of sidewalks and pedestrian crossings. */
line|z13-[highway=footway][footway=sidewalk],
line|z13-[highway=footway][footway=crossing],
{text: none;}

View file

@ -56,14 +56,14 @@ landuse-cemetery-christian # area z14- (also has icon z
highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-)
=== 170
highway-footway-area # area z14- (also has line z15-, pathtext z15-)
highway-footway-area # area z14- (also has line z11-, pathtext z13-)
leisure-track-area # area z15- (also has caption z16-)
=== 160
aeroway-terminal # area z14- (also has caption z15-)
=== 150
leisure-golf_course # area z12- (also has icon z17-, caption(optional) z17-)
leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-)
=== 140
landuse-flowerbed # area z16-

View file

@ -45,10 +45,11 @@ power-line # line z15- (also has line::
power-line::dash # line::dash z15- (also has line z15-)
=== 340
highway-cycleway # line z13- (also has pathtext z15-)
highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-cycleway-permissive # line z13- (also has pathtext z15-)
highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-cycleway # line z11- (also has pathtext z13-)
highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-cycleway-permissive # line z11- (also has pathtext z13-)
highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
highway-footway-crossing # line z11-
highway-steps # line z15- (also has pathtext z16-)
highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
@ -260,17 +261,29 @@ highway-service-parking_aisle # line z15- (also has pathte
highway-service-tunnel # line z13- (also has pathtext z16-)
=== 190
highway-footway # line z15- (also has pathtext z15-)
highway-footway-alpine_hiking # line z11- (also has pathtext z15-)
highway-footway-area # line z15- and area z14- (also has pathtext z15-)
highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z15-)
highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z15-)
highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z15-)
highway-footway-hiking # line z11- (also has pathtext z15-)
highway-footway-mountain_hiking # line z11- (also has pathtext z15-)
highway-footway-permissive # line z15- (also has pathtext z15-)
highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-bridleway-route_major # line z10- (also has pathtext z13-)
highway-footway-route_major # line z10- (also has pathtext z13-)
highway-path-route_major # line z10- (also has pathtext z13-)
highway-track-route_major # line z10- (also has pathtext z13-)
=== 187
highway-bridleway-route_minor # line z10- (also has pathtext z13-)
highway-footway-route_minor # line z10- (also has pathtext z13-)
highway-path-route_minor # line z10- (also has pathtext z13-)
highway-track-route_minor # line z10- (also has pathtext z13-)
=== 185
highway-footway # line z11- (also has pathtext z13-)
highway-footway-alpine_hiking # line z11- (also has pathtext z13-)
highway-footway-area # line z11- and area z14- (also has pathtext z13-)
highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z13-)
highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z13-)
highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z13-)
highway-footway-hiking # line z11- (also has pathtext z13-)
highway-footway-mountain_hiking # line z11- (also has pathtext z13-)
highway-footway-sidewalk # line z11-
highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
highway-path # line z11- (also has pathtext z13-)
highway-path-alpine_hiking # line z11- (also has pathtext z13-)
highway-path-bicycle # line z11- (also has pathtext z13-)
@ -298,10 +311,10 @@ highway-track-tunnel # line z11- (also has line::
leisure-track # line z15- (also has caption z16-)
=== 180
highway-bridleway # line z14- (also has pathtext z15-)
highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-bridleway-permissive # line z14- (also has pathtext z15-)
highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-bridleway # line z11- (also has pathtext z13-)
highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-bridleway-permissive # line z11- (also has pathtext z13-)
highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
=== 170
highway-construction # line z11- (also has pathtext z15-)
@ -315,9 +328,9 @@ railway-preserved-bridge # line z13- (also has line::
railway-preserved-tunnel # line z13-
=== 160
highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
@ -349,9 +362,9 @@ railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (al
railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
=== 150
highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
@ -432,18 +445,18 @@ isoline-step_500 # line z10- (also has pathte
isoline-zero # line z15- (also has pathtext z15-)
=== 60
highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
=== 50
highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)

View file

@ -277,7 +277,7 @@ highway-primary_link-bridge # pathtext z11- (also has sh
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
=== 6100
barrier-border_control # icon z14- (also has caption(optional) z15-)
barrier-border_control # icon z12- (also has caption(optional) z14-)
railway-halt # icon z13- (also has caption(optional) z13-)
tourism-alpine_hut # icon z11- (also has caption(optional) z11-)
waterway-waterfall # icon z10- (also has caption(optional) z11-)
@ -341,7 +341,7 @@ natural-hot_spring # icon z12- (also has captio
natural-spring # icon z12- (also has caption(optional) z14-)
=== 4650
natural-saddle # icon z11- (also has caption(optional) z12-)
natural-saddle # icon z14- (also has caption(optional) z15-)
place-islet # caption z14- (also has area z10-)
=== 4500
@ -402,10 +402,10 @@ amenity-pub # icon z15- (also has captio
tourism-wilderness_hut # icon z13- (also has caption(optional) z13-)
=== 3900
highway-rest_area # icon z15- (also has caption(optional) z15-)
tourism-camp_site # icon z14- (also has caption(optional) z14-)
tourism-caravan_site # icon z14- (also has caption(optional) z14-)
tourism-chalet # icon z15- (also has caption(optional) z15-)
highway-rest_area # icon z13- (also has caption(optional) z15-)
tourism-camp_site # icon z13- (also has caption(optional) z13-)
tourism-caravan_site # icon z13- (also has caption(optional) z13-)
tourism-chalet # icon z14- (also has caption(optional) z14-)
=== 3800
amenity-charging_station # icon z16- (also has caption(optional) z16-)
@ -651,17 +651,17 @@ highway-residential-bridge::shield # shield::shield z15- (also
highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
=== 2955
highway-cycleway # pathtext z15- (also has line z13-)
highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-cycleway-permissive # pathtext z15- (also has line z13-)
highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-cycleway # pathtext z13- (also has line z11-)
highway-cycleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-cycleway-permissive # pathtext z13- (also has line z11-)
highway-cycleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2953
area:highway-footway # caption z15- (also has area z14-)
highway-footway # pathtext z15- (also has line z15-)
highway-footway-area # pathtext z15- (also has line z15-, area z14-)
highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-footway # pathtext z13- (also has line z11-)
highway-footway-area # pathtext z13- (also has line z11-, area z14-)
highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-tertiary_link # pathtext z18- (also has line z15-)
highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-)
@ -691,16 +691,27 @@ waterway-weir # pathtext z15- (also has li
=== 2900
highway-ford # icon z14- and pathtext z16- (also has line z13-)
natural-rock # icon z15-
natural-rock # icon z14-
=== 2850
highway-footway-alpine_hiking # pathtext z15- (also has line z11-)
highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z11-)
highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z11-)
highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z11-)
highway-footway-hiking # pathtext z15- (also has line z11-)
highway-footway-mountain_hiking # pathtext z15- (also has line z11-)
highway-footway-permissive # pathtext z15- (also has line z15-)
highway-bridleway-route_major # pathtext z13- (also has line z10-)
highway-footway-route_major # pathtext z13- (also has line z10-)
highway-path-route_major # pathtext z13- (also has line z10-)
highway-track-route_major # pathtext z13- (also has line z10-)
=== 2840
highway-bridleway-route_minor # pathtext z13- (also has line z10-)
highway-footway-route_minor # pathtext z13- (also has line z10-)
highway-path-route_minor # pathtext z13- (also has line z10-)
highway-track-route_minor # pathtext z13- (also has line z10-)
=== 2830
highway-footway-alpine_hiking # pathtext z13- (also has line z11-)
highway-footway-demanding_alpine_hiking # pathtext z13- (also has line z11-)
highway-footway-demanding_mountain_hiking # pathtext z13- (also has line z11-)
highway-footway-difficult_alpine_hiking # pathtext z13- (also has line z11-)
highway-footway-hiking # pathtext z13- (also has line z11-)
highway-footway-mountain_hiking # pathtext z13- (also has line z11-)
highway-path # pathtext z13- (also has line z11-)
highway-path-alpine_hiking # pathtext z13- (also has line z11-)
highway-path-bicycle # pathtext z13- (also has line z11-)
@ -720,10 +731,10 @@ highway-steps-bridge # pathtext z16- (also has li
highway-steps-tunnel # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2810
highway-bridleway # pathtext z15- (also has line z14-)
highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-bridleway-permissive # pathtext z15- (also has line z14-)
highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-bridleway # pathtext z13- (also has line z11-)
highway-bridleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-bridleway-permissive # pathtext z13- (also has line z11-)
highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2790
highway-track # pathtext z13- (also has line z11-)
@ -882,7 +893,7 @@ landuse-military-danger_area # icon z16- (also has captio
=== 2000
amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-)
leisure-golf_course # icon z17- (also has caption(optional) z17-, area z12-)
leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-)
natural-wetland # caption z16- (also has area z11-)
natural-wetland-bog # caption z16- (also has area z11-)
natural-wetland-marsh # caption z16- (also has area z11-)
@ -1405,7 +1416,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-)
# === -3750
# barrier-border_control # caption(optional) z15- (also has icon z14-)
# barrier-border_control # caption(optional) z14- (also has icon z12-)
# railway-halt # caption(optional) z13- (also has icon z13-)
# tourism-alpine_hut # caption(optional) z11- (also has icon z11-)
# waterway-waterfall # caption(optional) z11- (also has icon z10-)
@ -1454,7 +1465,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# natural-spring # caption(optional) z14- (also has icon z12-)
# === -5350
# natural-saddle # caption(optional) z12- (also has icon z11-)
# natural-saddle # caption(optional) z15- (also has icon z14-)
# === -5500
# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-)
@ -1514,10 +1525,10 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-wilderness_hut # caption(optional) z13- (also has icon z13-)
# === -6100
# highway-rest_area # caption(optional) z15- (also has icon z15-)
# tourism-camp_site # caption(optional) z14- (also has icon z14-)
# tourism-caravan_site # caption(optional) z14- (also has icon z14-)
# tourism-chalet # caption(optional) z15- (also has icon z15-)
# highway-rest_area # caption(optional) z15- (also has icon z13-)
# tourism-camp_site # caption(optional) z13- (also has icon z13-)
# tourism-caravan_site # caption(optional) z13- (also has icon z13-)
# tourism-chalet # caption(optional) z14- (also has icon z14-)
# === -6200
# amenity-charging_station # caption(optional) z16- (also has icon z16-)
@ -1792,7 +1803,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -8000
# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-)
# leisure-golf_course # caption(optional) z17- (also has icon z17-, area z12-)
# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-)
# tourism-picnic_site # caption(optional) z14- (also has icon z14-)
# === -8200

View file

@ -510,7 +510,7 @@ node|z15-[amenity=university],
node|z15-[amenity=hospital],
node|z14-[barrier=toll_booth],
area|z14-[barrier=toll_booth],
node|z15-[barrier=border_control],
node|z14-[barrier=border_control],
node|z16-[barrier=lift_gate],
area|z16-[barrier=lift_gate],
node|z17-[amenity=bank],
@ -633,20 +633,15 @@ node|z18-[amenity=police],
area|z18-[amenity=police]
{icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;}
node|z12-14[barrier=toll_booth],
area|z12-14[barrier=toll_booth]
{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
node|z15-16[barrier=toll_booth],
area|z15-16[barrier=toll_booth]
{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
node|z17-[barrier=toll_booth],
area|z17-[barrier=toll_booth]
{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
node|z12[barrier=toll_booth],
area|z12[barrier=toll_booth],
{icon-image: toll_booth-s.svg; icon-min-distance: 8;}
node|z13-[barrier=toll_booth],
area|z13-[barrier=toll_booth],
{icon-image: toll_booth-m.svg; icon-min-distance: 8;}
node|z15-[barrier=border_control]
{icon-image:bcontrol-m.svg;}
node|z17-[barrier=border_control]
{icon-image:bcontrol-m.svg;}
node|z14-[barrier=border_control],
{icon-image: bcontrol-m.svg;}
node|z16-[barrier=lift_gate],
area|z16-[barrier=lift_gate]

View file

@ -658,6 +658,31 @@ line|z18[highway=construction],
line|z19-[highway=construction],
{width: 6;dashes: 18,6.2;}
/* 8.7 Footway & Steps 18-22 ZOOM */
/* [highway=footway] should be defined before [highway=footway][sac_scale] in 8.6. */
line|z18-[highway=footway],
line|z18-[highway=steps],
line|z17-[highway=footway][footway=crossing],
{color: @footway; opacity: 1; width: 1.5; dashes: 5,2;}
/* Don't display sidewalks z18. */
line|z18[highway=footway][footway=sidewalk],
{width: 0;}
line|z17-[highway=footway][footway=crossing],
{color: @background; casing-width: 1; casing-color: @footway; casing-opacity: 0.8; casing-dashes: none; casing-linecap: butt;}
line|z17[highway=footway][footway=crossing],
{width: 7; dashes: 1,1;}
line|z18[highway=footway][footway=crossing],
{width: 10; dashes: 1.4,1.4;}
line|z18-[highway=footway][footway=crossing],
{width: 13; dashes: 2,2;}
line|z18-[highway=footway][tunnel?],
line|z18-[highway=steps][tunnel?],
{width: 0;}
/* 8.6 Track & Path 16-22 ZOOM */
line|z14-[highway=track][tracktype=grade1],
@ -710,14 +735,6 @@ line|z19-[highway=footway][sac_scale],
line|z17-[highway=path][tunnel?],
{width: 0;}
/* 8.7 Footway & Steps 18-22 ZOOM */
line|z18-[highway=footway],
line|z18-[highway=steps],
{color: @footway; opacity: 1; width: 1.5; dashes: 5,2;}
line|z18-[highway=footway][tunnel?],
line|z18-[highway=steps][tunnel?],
{width: 0;}
/* 8.9 Bridleway 18-22 ZOOM */

View file

@ -290,78 +290,6 @@ line|z18-[highway=service],
line|z18-[highway=road],
{font-size: 15.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
/* 8.OTHERS ROADS 15-22 ZOOM */
/*line|z15-[highway=cycleway],
line|z15-[highway=construction],
line|z15-[highway=proposed],
line|z15-[highway=track],
line|z15-[highway=path],
line|z15-[highway=bridleway],
line|z15-[highway=footway],
line|z16-[leisure=track],
line|z16-[route=hiking],
line|z16-[highway=steps],
line|z16-[highway=ford],
line|z16-[highway=raceway],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
line|z15[highway=construction],
line|z15[highway=proposed],
line|z15[highway=bridleway],
line|z15[highway=path],
line|z15[highway=footway],
line|z15[highway=cycleway],
line|z15[highway=track]
{font-size: 8;}
line|z16-17[highway=ford],
line|z16-17[highway=cycleway],
line|z16-17[highway=construction],
line|z16-17[highway=proposed],
line|z16-17[highway=track],
line|z16-17[highway=raceway],
line|z16-17[leisure=track],
line|z16-17[highway=path],
line|z16-17[route=hiking],
line|z16-17[highway=bridleway],
line|z16-17[highway=footway],
{font-size: 9;}
line|z18-[highway=ford],
line|z18-[highway=cycleway],
line|z18-[highway=construction],
line|z18-[highway=proposed],
line|z18-[highway=track],
line|z18-[highway=raceway],
line|z18-[leisure=track],
line|z18-[highway=path],
line|z18-[route=hiking],
line|z18-[highway=bridleway],
line|z18-[highway=footway],
{font-size: 10;}*/
/* 10.PISTE 15-22 ZOOM */
/*
line[power=line],
line[aerialway=cable_car],
line[aerialway=chair_lift],
line[aerialway=gondola],
line[aerialway=mixed_lift],
line[aerialway=drag_lift],
line[aerialway=j-bar],
line[aerialway=t-bar],
line[aerialway=magic_carpet],
line[aerialway=platter],
line[aerialway=rope_tow],
*/
/* 10.3 Piste & Route 14-22 ZOOM */
/*
line[piste:type=downhill],
line[piste:type=nordic],
line[piste:type=sled]
{color: @piste;opacity: 1;}
line|z14[route=ski],
line|z14[leisure=skiing]
*/
/* 11. FERRY */

View file

@ -57,6 +57,12 @@ highway-world_towns_level # line z6-9
# highway-trunk-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-)
# === 249
highway-footway-crossing # line z17- (also has line(casing) z17-)
=== 245
# highway-footway-crossing # line(casing) z17- (also has line z17-)
# === 244
highway-motorway_link # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-motorway_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-motorway_link-tunnel # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
@ -235,6 +241,18 @@ highway-service-parking_aisle # line z14- (also has pathte
highway-service-tunnel # line z14- (also has pathtext z16-)
=== 140
highway-bridleway-route_major # line z18-
highway-footway-route_major # line z18-
highway-path-route_major # line z17-
highway-track-route_major # line z16-
=== 137
highway-bridleway-route_minor # line z18-
highway-footway-route_minor # line z18-
highway-path-route_minor # line z17-
highway-track-route_minor # line z16-
=== 135
highway-bridleway # line z18-
highway-bridleway-bridge # line z18-
highway-bridleway-permissive # line z18-
@ -250,7 +268,7 @@ highway-footway-demanding_mountain_hiking # line z17-
highway-footway-difficult_alpine_hiking # line z17-
highway-footway-hiking # line z17-
highway-footway-mountain_hiking # line z17-
highway-footway-permissive # line z18-
highway-footway-sidewalk # line z19-
highway-path # line z17-
highway-path-alpine_hiking # line z17-
highway-path-bicycle # line z17-

View file

@ -422,7 +422,7 @@ railway-station-subway-yerevan # icon z13- (also has captio
railway-station-subway-yokohama # icon z13- (also has caption(optional) z13-)
=== 2000
barrier-border_control # icon z15- (also has caption(optional) z15-)
barrier-border_control # icon z14- (also has caption(optional) z14-)
historic-city_gate # icon z13- (also has caption(optional) z15-)
historic-monument # icon z13- (also has caption(optional) z15-)
=== 1950
@ -940,7 +940,7 @@ entrance-main # icon z18- (also has captio
# railway-station-subway-yokohama # caption(optional) z13- (also has icon z13-)
# === -8000
# barrier-border_control # caption(optional) z15- (also has icon z15-)
# barrier-border_control # caption(optional) z14- (also has icon z14-)
# historic-city_gate # caption(optional) z15- (also has icon z13-)
# historic-monument # caption(optional) z15- (also has icon z13-)
# === -8050

View file

@ -15,7 +15,7 @@
*landuse|residential
*highway|path
*highway|bus_stop
*natural|tree
*highway|footway|sidewalk
*place|locality
*natural|coastline
*place|village
@ -48,7 +48,7 @@
*landuse|farmland
*barrier|fence
*natural|water|lake
*power|pole
*highway|footway|crossing
*waterway|riverbank
*highway|path|bicycle
*landuse|meadow
@ -150,7 +150,7 @@ leisure|pitch
*railway|tram
*amenity|toilets
*natural|water|basin
*highway|footway|permissive
highway|footway
*leisure|picnic_table
*landuse|construction
*tourism|viewpoint
@ -1593,3 +1593,16 @@ amenity|recycling|container
*leisure|hackerspace
*railway|station|subway|singapore
*railway|subway_entrance|singapore
mapswithme
mapswithme
mapswithme
mapswithme
*highway|path|route_major
*highway|path|route_minor
mapswithme
*highway|track|route_major
*highway|track|route_minor
*highway|footway|route_major
*highway|footway|route_minor
*highway|bridleway|route_major
*highway|bridleway|route_minor

View file

@ -198,7 +198,7 @@ world 000000000000000000000 +
barrier 000000000000000000000 +
block 000000000000000000000 -
bollard 000000000000000000000 -
border_control 000000000000000111111 -
border_control 000000000000001111111 -
cattle_grid 000000000000000000000 -
chain 000000000000000000000 -
city_wall 000000000000000111111 -
@ -404,6 +404,8 @@ world 000000000000000000000 +
bridleway 000000000000000000111 +
bridge 000000000000000000111 -
permissive 000000000000000000111 -
route_major 000000000000000000111 -
route_minor 000000000000000000111 -
tunnel 000000000000000000000 -
{}
bus_stop 000000000000000000000 -
@ -422,12 +424,15 @@ world 000000000000000000000 +
alpine_hiking 000000000000000001111 -
area 000000000000000000111 -
bridge 000000000000000000111 -
crossing 000000000000000001111 -
demanding_alpine_hiking 000000000000000001111 -
demanding_mountain_hiking 000000000000000001111 -
difficult_alpine_hiking 000000000000000001111 -
hiking 000000000000000001111 -
mountain_hiking 000000000000000001111 -
permissive 000000000000000000111 -
route_major 000000000000000000111 -
route_minor 000000000000000000111 -
sidewalk 000000000000000000011 -
tunnel 000000000000000000000 -
{}
ford 000000000000001111111 -
@ -455,6 +460,8 @@ world 000000000000000000000 +
horse 000000000000000001111 -
mountain_hiking 000000000000000001111 -
permissive 000000000000000001111 -
route_major 000000000000000001111 -
route_minor 000000000000000001111 -
tunnel 000000000000000000000 -
{}
pedestrian 000000000000000000111 +
@ -520,6 +527,8 @@ world 000000000000000000000 +
grade5 000000000000000011111 -
no-access 000000000000000011111 -
permissive 000000000000000011111 -
route_major 000000000000000011111 -
route_minor 000000000000000011111 -
tunnel 000000000000000000000 -
{}
traffic_signals 000000000000000000000 -
@ -757,7 +766,6 @@ world 000000000000000000000 +
scrub 000000000000001111111 -
spring 000000000000000000000 -
strait 000000000000000000000 -
tree 000000000000000000000 -
tree_row 000000000000000000000 -
volcano 000000000000000000000 -
water 111111111111111111111 +
@ -857,7 +865,6 @@ world 000000000000000000000 +
solar 000000000000000000000 -
wind 000000000000000000000 -
{}
pole 000000000000000000000 -
station 000000000000000000000 -
substation 000000000000000000000 -
tower 000000000000000000000 -

View file

@ -144,7 +144,28 @@ void RelationTagsWay::Process(RelationElement const & e)
if (route == "bicycle")
Base::AddCustomTag({"bicycle", "yes"});
else if (route == "foot" || route == "hiking")
{
Base::AddCustomTag({"foot", "yes"});
if (route == "hiking")
{
auto const hwValue = m_current->GetTag("highway");
if (hwValue == "path" || hwValue == "track")
{
Base::AddCustomTag({"route", "hiking"});
std::string network(e.GetTagValue("network"));
if (!network.empty())
Base::AddCustomTag({"network", std::move(network)});
if (!Base::IsKeyTagExists("name"))
{
std::string name(e.GetTagValue("name"));
if (!name.empty()) //pastk: prefer name from the most local network
Base::AddCustomTag({"name", std::move(name)});
}
}
}
}
}
if (!fetchTags)