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

regenerated the drules (had an error before...)

Browse source
This commit is contained in:
IsiGebauer 2024-12-17 14:53:07 +01:00
parent 1296279724
commit a977c46339
9 changed files with 10513 additions and 9809 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

704
data/drules_proto.txt
View file

@ -23132,6 +23132,710 @@ cont {
}
}
}
cont {
name: "highway-cycleway-difficult"
element {
scale: 11
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 13
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.1
color: 2572571903
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.2
color: 2153141503
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
path_text {
primary {
height: 8
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 16
lines {
width: 1.3
color: 1716933887
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 17
lines {
width: 1.4
color: 1716933887
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 18
lines {
width: 1.6
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 19
lines {
width: 1.8
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 20
lines {
width: 1.8
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
}
cont {
name: "highway-cycleway-easy"
element {
scale: 11
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 13
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.1
color: 2572571903
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.2
color: 2153141503
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
path_text {
primary {
height: 8
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 16
lines {
width: 1.3
color: 1716933887
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 17
lines {
width: 1.4
color: 1716933887
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 18
lines {
width: 1.6
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 19
lines {
width: 1.8
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 20
lines {
width: 1.8
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
}
cont {
name: "highway-cycleway-expert"
element {
scale: 11
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 13
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.1
color: 2572571903
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.2
color: 2153141503
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
path_text {
primary {
height: 8
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 16
lines {
width: 1.3
color: 1716933887
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 17
lines {
width: 1.4
color: 1716933887
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 18
lines {
width: 1.6
color: 861295871
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 19
lines {
width: 1.8
color: 861295871
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 20
lines {
width: 1.8
color: 861295871
dashdot {
dd: 2.2
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
}
cont {
name: "highway-cycleway-intermediate"
element {
scale: 11
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 13
lines {
width: 0.9
color: 3008779519
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.1
color: 2572571903
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.2
color: 2153141503
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
cap: BUTTCAP
}
path_text {
primary {
height: 8
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 16
lines {
width: 1.3
color: 1716933887
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 17
lines {
width: 1.4
color: 1716933887
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 9
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 18
lines {
width: 1.6
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 19
lines {
width: 1.8
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
element {
scale: 20
lines {
width: 1.8
color: 861295871
dashdot {
dd: 5.0
dd: 2.2
}
priority: 330
}
path_text {
primary {
height: 10
color: 3355443
stroke_color: 872415231
}
priority: 2953
}
}
}
cont {
name: "highway-cycleway-tunnel"
element {

3276
data/drules_proto_default_dark.txt
View file

File diff suppressed because it is too large Load diff

3276
data/drules_proto_default_light.txt
View file

File diff suppressed because it is too large Load diff

4034
data/drules_proto_outdoors_dark.txt
View file

File diff suppressed because it is too large Load diff

4034
data/drules_proto_outdoors_light.txt
View file

File diff suppressed because it is too large Load diff

2498
data/drules_proto_vehicle_dark.txt
View file

File diff suppressed because it is too large Load diff

2498
data/drules_proto_vehicle_light.txt
View file

File diff suppressed because it is too large Load diff

2
generator/osm2type.cpp
View file

@ -820,7 +820,7 @@ string DeterminePathGrade(OsmElement * p)
string DetermineMtbRating(OsmElement * p)
{
if (!p->HasTag("highway", "cycleway"))
if (!p->HasTag("highway", "cycleway") || (!p->HasTag("mtb:scale") && !p->HasTag("mtb:scale:imba") && !p->HasTag("smoothness")))
return {};
enum eMtbRating : int