WIP: WIP Make major trails more visible than regular ones #5415
27 changed files with 6554 additions and 246 deletions
|
|
@ -454,7 +454,10 @@ world +
|
|||
hiking -
|
||||
horse -
|
||||
mountain_hiking -
|
||||
named -
|
||||
permissive -
|
||||
route -
|
||||
surface_good -
|
||||
tunnel -
|
||||
{}
|
||||
pedestrian +
|
||||
|
|
@ -518,8 +521,11 @@ world +
|
|||
grade3 -
|
||||
grade4 -
|
||||
grade5 -
|
||||
named -
|
||||
no-access -
|
||||
permissive -
|
||||
route -
|
||||
surface_good -
|
||||
tunnel -
|
||||
{}
|
||||
traffic_signals -
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
0
|
||||
255
|
||||
6425
|
||||
8738
|
||||
9758
|
||||
|
|
@ -10,6 +11,7 @@
|
|||
21569
|
||||
26316
|
||||
26972
|
||||
32768
|
||||
34815
|
||||
39468
|
||||
42380
|
||||
|
|
@ -299,6 +301,7 @@
|
|||
16575614
|
||||
16579778
|
||||
16579836
|
||||
16711680
|
||||
16728450
|
||||
16733986
|
||||
16740096
|
||||
|
|
|
|||
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.
|
|
@ -12637,6 +12637,57 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-path-named"
|
||||
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-path-permissive"
|
||||
element {
|
||||
|
|
@ -12688,6 +12739,146 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-path-route"
|
||||
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-surface_good"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.4
|
||||
color: 16579836
|
||||
dashdot {
|
||||
dd: 2.0
|
||||
dd: 1.35
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16579836
|
||||
dashdot {
|
||||
dd: 2.2
|
||||
dd: 1.26
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 2.6
|
||||
color: 16579836
|
||||
dashdot {
|
||||
dd: 3.3
|
||||
dd: 1.8
|
||||
}
|
||||
priority: 135
|
||||
}
|
||||
}
|
||||
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 {
|
||||
|
|
@ -20483,6 +20674,69 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-track-named"
|
||||
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-track-no-access"
|
||||
element {
|
||||
|
|
@ -20609,6 +20863,158 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-track-route"
|
||||
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-surface_good"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.4
|
||||
color: 16579836
|
||||
dashdot {
|
||||
dd: 2.0
|
||||
dd: 1.35
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16579836
|
||||
dashdot {
|
||||
dd: 2.2
|
||||
dd: 1.26
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
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.
|
|
@ -12746,6 +12746,57 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-path-named"
|
||||
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-path-permissive"
|
||||
element {
|
||||
|
|
@ -12797,6 +12848,146 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-path-route"
|
||||
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-surface_good"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.4
|
||||
color: 5064516
|
||||
dashdot {
|
||||
dd: 2.0
|
||||
dd: 1.35
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 5064516
|
||||
dashdot {
|
||||
dd: 2.2
|
||||
dd: 1.26
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 2.6
|
||||
color: 5064516
|
||||
dashdot {
|
||||
dd: 3.3
|
||||
dd: 1.8
|
||||
}
|
||||
priority: 135
|
||||
}
|
||||
}
|
||||
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 {
|
||||
|
|
@ -20829,6 +21020,69 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-track-named"
|
||||
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-track-no-access"
|
||||
element {
|
||||
|
|
@ -20955,6 +21209,158 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-track-route"
|
||||
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-surface_good"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.4
|
||||
color: 5064516
|
||||
dashdot {
|
||||
dd: 2.0
|
||||
dd: 1.35
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 5064516
|
||||
dashdot {
|
||||
dd: 2.2
|
||||
dd: 1.26
|
||||
}
|
||||
priority: 135
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
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 {
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ 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;
|
||||
waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
|
||||
highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
|
||||
|
|
@ -1677,3 +1677,9 @@ 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;[highway=path][route?];;name;int_name;1600;
|
||||
highway|path|named;[highway=path][_named];;name;int_name;1601;
|
||||
highway|path|surface_good;[highway=path][psurface=unpaved_good];;name;int_name;1602;
|
||||
highway|track|route;[highway=track][route?];;name;int_name;1603;
|
||||
highway|track|named;[highway=track][_named];;name;int_name;1604;
|
||||
highway|track|surface_good;[highway=track][psurface=unpaved_good],[highway=track][psurface=paved_good],[highway=track][psurface=paved_bad],[highway=track][tracktype=grade1],[highway=track][tracktype=grade2];;name;int_name;1605;
|
||||
|
|
|
|||
|
Can't render this file because it contains an unexpected character in line 7 and column 16.
|
|
|
@ -611,6 +611,17 @@ line|z15-[leisure=track][!area],
|
|||
line|z14-[highway=path],
|
||||
line|z14-[highway=footway][sac_scale],
|
||||
{color: @path;opacity: 1;}
|
||||
|
||||
line|z12-[highway=path][route?],
|
||||
line|z12-[highway=track][route?],
|
||||
{color: red;opacity: 1;}
|
||||
line|z12-[highway=path][psurface=unpaved_good],
|
||||
line|z12-[highway=track][psurface=unpaved_good],
|
||||
{color: green;opacity: 1;}
|
||||
line|z12-[highway=path][_named],
|
||||
line|z12-[highway=track][_named],
|
||||
{color: blue;opacity: 1;}
|
||||
|
||||
line|z14-[highway=bridleway]
|
||||
{color: @bridleway;opacity: 1;}
|
||||
line|z15-[highway=footway],
|
||||
|
|
@ -773,6 +784,14 @@ line|z15[highway=track],
|
|||
{width: 1.4; dashes: 6,2.5;}
|
||||
line|z16[highway=track],
|
||||
{width: 1.9; dashes: 7,3;}
|
||||
|
||||
line|z14-15[highway=track],
|
||||
{width: 1.7;}
|
||||
line|z12-[highway=track][route?],
|
||||
line|z12-[highway=track][psurface=unpaved_good],
|
||||
line|z12-[highway=track][_named],
|
||||
{width: 2.3; dashes: 7,3;}
|
||||
|
||||
line|z17[highway=track],
|
||||
{width: 2.5; dashes: 7,3;}
|
||||
line|z18[highway=track],
|
||||
|
|
@ -792,9 +811,21 @@ line|z16[highway=footway][sac_scale],
|
|||
line|z17[highway=path],
|
||||
line|z17[highway=footway][sac_scale],
|
||||
{width: 2; dashes: 4,2.5;}
|
||||
|
||||
line|z14-15[highway=path],
|
||||
{width: 1.5;}
|
||||
line|z12-[highway=path][route?],
|
||||
line|z12-[highway=path][_named],
|
||||
line|z12-[highway=path][psurface=unpaved_good],
|
||||
{width: 2.0; dashes: 4,2.5;}
|
||||
|
||||
line|z18[highway=path][_named],
|
||||
line|z18[highway=path][psurface=unpaved_good],
|
||||
line|z18[highway=path],
|
||||
line|z18[highway=footway][sac_scale],
|
||||
{width: 3; dashes: 6,3.5;}
|
||||
line|z19-[highway=path][_named],
|
||||
line|z19-[highway=path][psurface=unpaved_good],
|
||||
line|z19-[highway=path],
|
||||
line|z19-[highway=footway][sac_scale],
|
||||
{width: 4; dashes: 8,4.5;}
|
||||
|
|
|
|||
|
|
@ -260,6 +260,16 @@ highway-service-parking_aisle # line z15- (also has pathte
|
|||
highway-service-tunnel # line z15- (also has pathtext z16-)
|
||||
=== 190
|
||||
|
||||
highway-path-route # line z12- (also has pathtext z15-)
|
||||
highway-track-route # line z12- (also has pathtext z15-)
|
||||
=== 187
|
||||
|
||||
highway-path-named # line z12- (also has pathtext z15-)
|
||||
highway-path-surface_good # line z12- (also has pathtext z15-)
|
||||
highway-track-named # line z12- (also has pathtext z15-)
|
||||
highway-track-surface_good # line z12- (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-)
|
||||
|
|
|
|||
|
|
@ -751,6 +751,16 @@ amenity-shelter # icon z16- (also has captio
|
|||
highway-ford # icon z16- and pathtext z16- (also has line z13-)
|
||||
=== 2850
|
||||
|
||||
highway-path-route # pathtext z15- (also has line z12-)
|
||||
highway-track-route # pathtext z15- (also has line z12-)
|
||||
=== 2820
|
||||
|
||||
highway-path-named # pathtext z15- (also has line z12-)
|
||||
highway-path-surface_good # pathtext z15- (also has line z12-)
|
||||
highway-track-named # pathtext z15- (also has line z12-)
|
||||
highway-track-surface_good # pathtext z15- (also has line z12-)
|
||||
=== 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-)
|
||||
|
|
|
|||
|
|
@ -260,6 +260,16 @@ highway-service-parking_aisle # line z15- (also has pathte
|
|||
highway-service-tunnel # line z13- (also has pathtext z16-)
|
||||
=== 190
|
||||
|
||||
highway-path-route # line z11- (also has pathtext z13-)
|
||||
highway-track-route # line z11- (also has pathtext z13-)
|
||||
=== 187
|
||||
|
||||
highway-path-named # line z11- (also has pathtext z13-)
|
||||
highway-path-surface_good # line z11- (also has pathtext z13-)
|
||||
highway-track-named # line z11- (also has pathtext z13-)
|
||||
highway-track-surface_good # line z11- (also has pathtext z13-)
|
||||
=== 185
|
||||
|
||||
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-)
|
||||
|
|
|
|||
|
|
@ -136,6 +136,7 @@ railway-station-subway-paris # icon z12- (also has captio
|
|||
railway-station-subway-roma # icon z12- (also has caption(optional) z14-)
|
||||
railway-station-subway-sf # icon z12- (also has caption(optional) z14-)
|
||||
railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-)
|
||||
railway-station-subway-singapore # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-)
|
||||
railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-)
|
||||
railway-station-subway-vienna # icon z12- (also has caption(optional) z14-)
|
||||
|
|
@ -244,7 +245,6 @@ railway-station-subway-saopaulo # icon z13- (also has captio
|
|||
railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-sendai # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-singapore # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-sofia # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-)
|
||||
railway-station-subway-taipei # icon z13- (also has caption(optional) z14-)
|
||||
|
|
@ -751,6 +751,16 @@ amenity-shelter # icon z13- (also has captio
|
|||
highway-ford # icon z14- and pathtext z16- (also has line z13-)
|
||||
=== 2850
|
||||
|
||||
highway-path-route # pathtext z13- (also has line z11-)
|
||||
highway-track-route # pathtext z13- (also has line z11-)
|
||||
=== 2820
|
||||
|
||||
highway-path-named # pathtext z13- (also has line z11-)
|
||||
highway-path-surface_good # pathtext z13- (also has line z11-)
|
||||
highway-track-named # pathtext z13- (also has line z11-)
|
||||
highway-track-surface_good # pathtext z13- (also has line z11-)
|
||||
=== 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-)
|
||||
|
|
@ -1360,6 +1370,7 @@ amenity-parking_entrance-private # icon z19- (also has captio
|
|||
# railway-station-subway-roma # caption(optional) z14- (also has icon z12-)
|
||||
# railway-station-subway-sf # caption(optional) z14- (also has icon z12-)
|
||||
# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-)
|
||||
# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-)
|
||||
# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-)
|
||||
# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-)
|
||||
|
|
@ -1464,7 +1475,6 @@ amenity-parking_entrance-private # icon z19- (also has captio
|
|||
# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-)
|
||||
# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-)
|
||||
|
|
|
|||
|
|
@ -235,6 +235,16 @@ highway-service-parking_aisle # line z14- (also has pathte
|
|||
highway-service-tunnel # line z14- (also has pathtext z16-)
|
||||
=== 140
|
||||
|
||||
highway-path-route # line z17-
|
||||
highway-track-route # line z16-
|
||||
=== 137
|
||||
|
||||
highway-path-named # line z17-
|
||||
highway-path-surface_good # line z14-
|
||||
highway-track-named # line z16-
|
||||
highway-track-surface_good # line z14-
|
||||
=== 135
|
||||
|
||||
highway-bridleway # line z18-
|
||||
highway-bridleway-bridge # line z18-
|
||||
highway-bridleway-permissive # line z18-
|
||||
|
|
|
|||
|
|
@ -1593,3 +1593,13 @@ amenity|recycling|container
|
|||
*leisure|hackerspace
|
||||
*railway|station|subway|singapore
|
||||
*railway|subway_entrance|singapore
|
||||
mapswithme
|
||||
mapswithme
|
||||
mapswithme
|
||||
mapswithme
|
||||
*highway|path|route
|
||||
*highway|path|named
|
||||
*highway|path|surface_good
|
||||
*highway|track|route
|
||||
*highway|track|named
|
||||
*highway|track|surface_good
|
||||
|
|
|
|||
|
|
@ -454,7 +454,10 @@ world 000000000000000000000 +
|
|||
hiking 000000000000000001111 -
|
||||
horse 000000000000000001111 -
|
||||
mountain_hiking 000000000000000001111 -
|
||||
named 000000000000000001111 -
|
||||
permissive 000000000000000001111 -
|
||||
route 000000000000000001111 -
|
||||
surface_good 000000000000001111111 -
|
||||
tunnel 000000000000000000000 -
|
||||
{}
|
||||
pedestrian 000000000000000000111 +
|
||||
|
|
@ -518,8 +521,11 @@ world 000000000000000000000 +
|
|||
grade3 000000000000000011111 -
|
||||
grade4 000000000000000011111 -
|
||||
grade5 000000000000000011111 -
|
||||
named 000000000000000011111 -
|
||||
no-access 000000000000000011111 -
|
||||
permissive 000000000000000011111 -
|
||||
route 000000000000000011111 -
|
||||
surface_good 000000000000001111111 -
|
||||
tunnel 000000000000000000000 -
|
||||
{}
|
||||
traffic_signals 000000000000000000000 -
|
||||
|
|
|
|||
|
|
@ -1174,6 +1174,8 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
|
|||
NamesExtractor namesExtractor(params);
|
||||
ForEachTag(p, namesExtractor);
|
||||
namesExtractor.Finish();
|
||||
if (!params.name.IsEmpty())
|
||||
p->AddTag("_named", "yes");
|
||||
|
||||
// Stage3: Process base feature tags.
|
||||
std::string houseName, houseNumber, conscriptionHN, streetHN, addrPostcode;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,25 @@ 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"});
|
||||
|
||||
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)
|
||||
|
|
|
|||
Reference in a new issue