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

[styles] Regenerate for scree, shingle, bare_rock

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2024-03-31 22:19:21 +03:00
parent 418e61887c
commit a656253348
18 changed files with 824 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/classificator.txt
View file

@ -755,7 +755,9 @@ world +
peak -
rock -
saddle -
scree -
scrub -
shingle -
spring -
strait -
tree_row -

4
data/colors.txt
View file

@ -59,6 +59,7 @@
2236962
2301728
2302755
2367520
2374579
2399474
2496790
@ -232,6 +233,7 @@
13224123
13229526
13407549
13420474
13484259
13538264
13615592
@ -241,6 +243,7 @@
13942770
13947850
14209512
14275263
14802147
14934482
14951168
@ -256,7 +259,6 @@
15214341
15260347
15263452
15590876
15591638
15592411
15592899

BIN
data/drules_proto.bin
View file

Binary file not shown.

171
data/drules_proto.txt
View file

@ -57220,21 +57220,21 @@ cont {
element {
scale: 12
area {
color: 15590876
color: 14275263
priority: -1920
}
}
element {
scale: 13
area {
color: 15590876
color: 14275263
priority: -1920
}
}
element {
scale: 14
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57249,7 +57249,7 @@ cont {
element {
scale: 15
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57264,7 +57264,7 @@ cont {
element {
scale: 16
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57279,7 +57279,7 @@ cont {
element {
scale: 17
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57294,7 +57294,7 @@ cont {
element {
scale: 18
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57309,7 +57309,7 @@ cont {
element {
scale: 19
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57324,7 +57324,7 @@ cont {
element {
scale: 20
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -59757,8 +59757,95 @@ cont {
}
}
}
cont {
name: "natural-scree"
element {
scale: 11
area {
color: 13420474
priority: -1920
}
}
element {
scale: 12
area {
color: 13420474
priority: -1920
}
}
element {
scale: 13
area {
color: 13420474
priority: -1920
}
}
element {
scale: 14
area {
color: 13420474
priority: -1920
}
}
element {
scale: 15
area {
color: 13420474
priority: -1920
}
}
element {
scale: 16
area {
color: 13420474
priority: -1920
}
}
element {
scale: 17
area {
color: 13420474
priority: -1920
}
}
element {
scale: 18
area {
color: 13420474
priority: -1920
}
}
element {
scale: 19
area {
color: 13420474
priority: -1920
}
}
element {
scale: 20
area {
color: 13420474
priority: -1920
}
}
}
cont {
name: "natural-scrub"
element {
scale: 10
area {
color: 13620648
priority: -1870
}
}
element {
scale: 11
area {
color: 13620648
priority: -1870
}
}
element {
scale: 12
area {
@ -59823,6 +59910,72 @@ cont {
}
}
}
cont {
name: "natural-shingle"
element {
scale: 12
area {
color: 13420474
priority: -1920
}
}
element {
scale: 13
area {
color: 13420474
priority: -1920
}
}
element {
scale: 14
area {
color: 13420474
priority: -1920
}
}
element {
scale: 15
area {
color: 13420474
priority: -1920
}
}
element {
scale: 16
area {
color: 13420474
priority: -1920
}
}
element {
scale: 17
area {
color: 13420474
priority: -1920
}
}
element {
scale: 18
area {
color: 13420474
priority: -1920
}
}
element {
scale: 19
area {
color: 13420474
priority: -1920
}
}
element {
scale: 20
area {
color: 13420474
priority: -1920
}
}
}
cont {
name: "natural-spring"
element {

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

171
data/drules_proto_clear.txt
View file

@ -54499,21 +54499,21 @@ cont {
element {
scale: 12
area {
color: 15590876
color: 14275263
priority: -1920
}
}
element {
scale: 13
area {
color: 15590876
color: 14275263
priority: -1920
}
}
element {
scale: 14
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -54528,7 +54528,7 @@ cont {
element {
scale: 15
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -54543,7 +54543,7 @@ cont {
element {
scale: 16
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -54558,7 +54558,7 @@ cont {
element {
scale: 17
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -54573,7 +54573,7 @@ cont {
element {
scale: 18
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -54588,7 +54588,7 @@ cont {
element {
scale: 19
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -54603,7 +54603,7 @@ cont {
element {
scale: 20
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -56765,8 +56765,95 @@ cont {
}
}
}
cont {
name: "natural-scree"
element {
scale: 11
area {
color: 13420474
priority: -1920
}
}
element {
scale: 12
area {
color: 13420474
priority: -1920
}
}
element {
scale: 13
area {
color: 13420474
priority: -1920
}
}
element {
scale: 14
area {
color: 13420474
priority: -1920
}
}
element {
scale: 15
area {
color: 13420474
priority: -1920
}
}
element {
scale: 16
area {
color: 13420474
priority: -1920
}
}
element {
scale: 17
area {
color: 13420474
priority: -1920
}
}
element {
scale: 18
area {
color: 13420474
priority: -1920
}
}
element {
scale: 19
area {
color: 13420474
priority: -1920
}
}
element {
scale: 20
area {
color: 13420474
priority: -1920
}
}
}
cont {
name: "natural-scrub"
element {
scale: 10
area {
color: 13620648
priority: -1870
}
}
element {
scale: 11
area {
color: 13620648
priority: -1870
}
}
element {
scale: 12
area {
@ -56831,6 +56918,72 @@ cont {
}
}
}
cont {
name: "natural-shingle"
element {
scale: 12
area {
color: 13420474
priority: -1920
}
}
element {
scale: 13
area {
color: 13420474
priority: -1920
}
}
element {
scale: 14
area {
color: 13420474
priority: -1920
}
}
element {
scale: 15
area {
color: 13420474
priority: -1920
}
}
element {
scale: 16
area {
color: 13420474
priority: -1920
}
}
element {
scale: 17
area {
color: 13420474
priority: -1920
}
}
element {
scale: 18
area {
color: 13420474
priority: -1920
}
}
element {
scale: 19
area {
color: 13420474
priority: -1920
}
}
element {
scale: 20
area {
color: 13420474
priority: -1920
}
}
}
cont {
name: "natural-spring"
element {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

153
data/drules_proto_dark.txt
View file

@ -56991,8 +56991,95 @@ cont {
}
}
}
cont {
name: "natural-scree"
element {
scale: 11
area {
color: 2367520
priority: -1920
}
}
element {
scale: 12
area {
color: 2367520
priority: -1920
}
}
element {
scale: 13
area {
color: 2367520
priority: -1920
}
}
element {
scale: 14
area {
color: 2367520
priority: -1920
}
}
element {
scale: 15
area {
color: 2367520
priority: -1920
}
}
element {
scale: 16
area {
color: 2367520
priority: -1920
}
}
element {
scale: 17
area {
color: 2367520
priority: -1920
}
}
element {
scale: 18
area {
color: 2367520
priority: -1920
}
}
element {
scale: 19
area {
color: 2367520
priority: -1920
}
}
element {
scale: 20
area {
color: 2367520
priority: -1920
}
}
}
cont {
name: "natural-scrub"
element {
scale: 10
area {
color: 988160
priority: -1870
}
}
element {
scale: 11
area {
color: 988160
priority: -1870
}
}
element {
scale: 12
area {
@ -57057,6 +57144,72 @@ cont {
}
}
}
cont {
name: "natural-shingle"
element {
scale: 12
area {
color: 2367520
priority: -1920
}
}
element {
scale: 13
area {
color: 2367520
priority: -1920
}
}
element {
scale: 14
area {
color: 2367520
priority: -1920
}
}
element {
scale: 15
area {
color: 2367520
priority: -1920
}
}
element {
scale: 16
area {
color: 2367520
priority: -1920
}
}
element {
scale: 17
area {
color: 2367520
priority: -1920
}
}
element {
scale: 18
area {
color: 2367520
priority: -1920
}
}
element {
scale: 19
area {
color: 2367520
priority: -1920
}
}
element {
scale: 20
area {
color: 2367520
priority: -1920
}
}
}
cont {
name: "natural-spring"
element {

BIN
data/drules_proto_outdoors_clear.bin
View file

Binary file not shown.

187
data/drules_proto_outdoors_clear.txt
View file

@ -57862,14 +57862,14 @@ cont {
element {
scale: 12
area {
color: 15590876
color: 14275263
priority: -1920
}
}
element {
scale: 13
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57885,7 +57885,7 @@ cont {
element {
scale: 13
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -57893,7 +57893,7 @@ cont {
element {
scale: 14
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57909,7 +57909,7 @@ cont {
element {
scale: 14
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -57917,7 +57917,7 @@ cont {
element {
scale: 15
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57933,7 +57933,7 @@ cont {
element {
scale: 15
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -57941,7 +57941,7 @@ cont {
element {
scale: 16
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57957,7 +57957,7 @@ cont {
element {
scale: 16
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -57965,7 +57965,7 @@ cont {
element {
scale: 17
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -57981,7 +57981,7 @@ cont {
element {
scale: 17
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -57989,7 +57989,7 @@ cont {
element {
scale: 18
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -58005,7 +58005,7 @@ cont {
element {
scale: 18
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -58013,7 +58013,7 @@ cont {
element {
scale: 19
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -58029,7 +58029,7 @@ cont {
element {
scale: 19
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -58037,7 +58037,7 @@ cont {
element {
scale: 20
area {
color: 15590876
color: 14275263
priority: -1920
}
caption {
@ -58053,7 +58053,7 @@ cont {
element {
scale: 20
area {
color: 15590876
color: 14275263
priority: -1920
}
apply_if: "!name"
@ -60528,8 +60528,95 @@ cont {
}
}
}
cont {
name: "natural-scree"
element {
scale: 11
area {
color: 13420474
priority: -1920
}
}
element {
scale: 12
area {
color: 13420474
priority: -1920
}
}
element {
scale: 13
area {
color: 13420474
priority: -1920
}
}
element {
scale: 14
area {
color: 13420474
priority: -1920
}
}
element {
scale: 15
area {
color: 13420474
priority: -1920
}
}
element {
scale: 16
area {
color: 13420474
priority: -1920
}
}
element {
scale: 17
area {
color: 13420474
priority: -1920
}
}
element {
scale: 18
area {
color: 13420474
priority: -1920
}
}
element {
scale: 19
area {
color: 13420474
priority: -1920
}
}
element {
scale: 20
area {
color: 13420474
priority: -1920
}
}
}
cont {
name: "natural-scrub"
element {
scale: 10
area {
color: 13620648
priority: -1870
}
}
element {
scale: 11
area {
color: 13620648
priority: -1870
}
}
element {
scale: 12
area {
@ -60594,6 +60681,72 @@ cont {
}
}
}
cont {
name: "natural-shingle"
element {
scale: 12
area {
color: 13420474
priority: -1920
}
}
element {
scale: 13
area {
color: 13420474
priority: -1920
}
}
element {
scale: 14
area {
color: 13420474
priority: -1920
}
}
element {
scale: 15
area {
color: 13420474
priority: -1920
}
}
element {
scale: 16
area {
color: 13420474
priority: -1920
}
}
element {
scale: 17
area {
color: 13420474
priority: -1920
}
}
element {
scale: 18
area {
color: 13420474
priority: -1920
}
}
element {
scale: 19
area {
color: 13420474
priority: -1920
}
}
element {
scale: 20
area {
color: 13420474
priority: -1920
}
}
}
cont {
name: "natural-spring"
element {

BIN
data/drules_proto_outdoors_dark.bin
View file

Binary file not shown.

153
data/drules_proto_outdoors_dark.txt
View file

@ -60754,8 +60754,95 @@ cont {
}
}
}
cont {
name: "natural-scree"
element {
scale: 11
area {
color: 2367520
priority: -1920
}
}
element {
scale: 12
area {
color: 2367520
priority: -1920
}
}
element {
scale: 13
area {
color: 2367520
priority: -1920
}
}
element {
scale: 14
area {
color: 2367520
priority: -1920
}
}
element {
scale: 15
area {
color: 2367520
priority: -1920
}
}
element {
scale: 16
area {
color: 2367520
priority: -1920
}
}
element {
scale: 17
area {
color: 2367520
priority: -1920
}
}
element {
scale: 18
area {
color: 2367520
priority: -1920
}
}
element {
scale: 19
area {
color: 2367520
priority: -1920
}
}
element {
scale: 20
area {
color: 2367520
priority: -1920
}
}
}
cont {
name: "natural-scrub"
element {
scale: 10
area {
color: 988160
priority: -1870
}
}
element {
scale: 11
area {
color: 988160
priority: -1870
}
}
element {
scale: 12
area {
@ -60820,6 +60907,72 @@ cont {
}
}
}
cont {
name: "natural-shingle"
element {
scale: 12
area {
color: 2367520
priority: -1920
}
}
element {
scale: 13
area {
color: 2367520
priority: -1920
}
}
element {
scale: 14
area {
color: 2367520
priority: -1920
}
}
element {
scale: 15
area {
color: 2367520
priority: -1920
}
}
element {
scale: 16
area {
color: 2367520
priority: -1920
}
}
element {
scale: 17
area {
color: 2367520
priority: -1920
}
}
element {
scale: 18
area {
color: 2367520
priority: -1920
}
}
element {
scale: 19
area {
color: 2367520
priority: -1920
}
}
element {
scale: 20
area {
color: 2367520
priority: -1920
}
}
}
cont {
name: "natural-spring"
element {

BIN
data/drules_proto_vehicle_clear.bin
View file

Binary file not shown.

18
data/drules_proto_vehicle_clear.txt
View file

@ -32154,63 +32154,63 @@ cont {
element {
scale: 12
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 13
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 14
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 15
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 16
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 17
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 18
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 19
area {
color: 15590876
color: 14275263
priority: -1930
}
}
element {
scale: 20
area {
color: 15590876
color: 14275263
priority: -1930
}
}

6
data/styles/clear/include/priorities_1_BG-by-size.prio.txt
View file

@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z
=== 140
landuse-flowerbed # area z16-
natural-scrub # area z12-
natural-scrub # area z10-
=== 130
landuse-grass # area z12-
@ -116,8 +116,8 @@ landuse-village_green # area z12-
landuse-vineyard # area z12- (also has caption z15-)
leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-)
natural-bare_rock # area z12- (also has caption z14-)
natural-shingle
natural-scree
natural-scree # area z11-
natural-shingle # area z12-
=== 80
leisure-garden # area z12- (also has icon z16-, caption(optional) z16-)

6
data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
View file

@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z
=== 140
landuse-flowerbed # area z16-
natural-scrub # area z12-
natural-scrub # area z10-
=== 130
landuse-grass # area z12-
@ -116,8 +116,8 @@ landuse-village_green # area z12-
landuse-vineyard # area z12- (also has caption z15-)
leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-)
natural-bare_rock # area z12- (also has caption z13-)
natural-shingle
natural-scree
natural-scree # area z11-
natural-shingle # area z12-
=== 80
leisure-garden # area z12- (also has icon z16-, caption(optional) z16-)

4
data/types.txt
View file

@ -436,8 +436,8 @@ mapswithme
*sport|australian_football
*leisure|bowling_alley
*healthcare|speech_therapist
mapswithme
mapswithme
*natural|scree
*natural|shingle
*aerialway|t-bar
*amenity|parking|lane|fee
*amenity|parking|street_side|fee

2
data/visibility.txt
View file

@ -755,7 +755,9 @@ world 000000000000000000000 +
peak 000000000000000000000 -
rock 000000000000000000000 -
saddle 000000000000000000000 -
scree 000000000000000000000 -
scrub 000000000000001111111 -
shingle 000000000000000000000 -
spring 000000000000000000000 -
strait 000000000000000000000 -
tree_row 000000000000000000000 -