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

Merge pull request #406 from kshalnev/fix_gardens

Browse source 
[styles] Fix gardens
This commit is contained in:
Lev Dragunov 2015-10-29 12:00:21 +03:00
commit a8ed97ff1a
6 changed files with 634 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

435
data/drules_proto_clear.txt
View file

@ -23355,6 +23355,52 @@ cont {
apply_if: "bbox_area<10000000"
}
}
cont {
name: "leisure-common"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
name: "leisure-dog_park"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
name: "leisure-dog_park-tennis"
element {
@ -23504,19 +23550,15 @@ cont {
name: "garden-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "garden-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -23528,19 +23570,15 @@ cont {
name: "garden-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "garden-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -23551,6 +23589,13 @@ cont {
name: "golf-l"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
@ -23558,6 +23603,36 @@ cont {
name: "golf-l"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
name: "leisure-landscape_reserve"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
@ -23706,6 +23781,15 @@ cont {
name: "nparkf-l"
priority: 16603
}
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 12
}
priority: 15603
}
}
element {
scale: 19
@ -23717,6 +23801,15 @@ cont {
name: "nparkf-l"
priority: 16603
}
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 12
}
priority: 15603
}
}
}
cont {
@ -23875,19 +23968,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -23899,19 +23988,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24070,19 +24155,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -24094,19 +24175,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24265,19 +24342,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -24289,19 +24362,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24460,19 +24529,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -24484,19 +24549,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 11189094
priority: 1143
caption {
primary {
height: 10
color: 4473924
stroke_color: 2583691263
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24526,6 +24587,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15222
}
}
element {
scale: 19
@ -24538,6 +24606,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15222
}
}
}
cont {
@ -24630,6 +24705,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15222
}
}
element {
scale: 19
@ -24642,6 +24724,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15222
}
}
}
cont {
@ -24758,6 +24847,52 @@ cont {
}
}
}
cont {
name: "leisure-recreation_ground"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
name: "leisure-slipway"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
name: "leisure-sports_centre"
element {
@ -24930,6 +25065,13 @@ cont {
name: "swimming-l"
priority: 16269
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15269
}
}
element {
scale: 19
@ -24941,6 +25083,59 @@ cont {
name: "swimming-l"
priority: 16269
}
caption {
primary {
height: 10
color: 4473924
}
priority: 15269
}
}
}
cont {
name: "leisure-track"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {
name: "leisure-water_park"
element {
scale: 18
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 4473924
}
priority: 15000
}
}
}
cont {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

435
data/drules_proto_dark.txt
View file

@ -23355,6 +23355,52 @@ cont {
apply_if: "bbox_area<10000000"
}
}
cont {
name: "leisure-common"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
name: "leisure-dog_park"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
name: "leisure-dog_park-tennis"
element {
@ -23504,19 +23550,15 @@ cont {
name: "garden-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "garden-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -23528,19 +23570,15 @@ cont {
name: "garden-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "garden-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -23551,6 +23589,13 @@ cont {
name: "golf-l"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
@ -23558,6 +23603,36 @@ cont {
name: "golf-l"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
name: "leisure-landscape_reserve"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
@ -23706,6 +23781,15 @@ cont {
name: "nparkf-l"
priority: 16603
}
caption {
primary {
height: 10
color: 5592405
stroke_color: 2568032512
offset_y: 12
}
priority: 15603
}
}
element {
scale: 19
@ -23717,6 +23801,15 @@ cont {
name: "nparkf-l"
priority: 16603
}
caption {
primary {
height: 10
color: 5592405
stroke_color: 2568032512
offset_y: 12
}
priority: 15603
}
}
}
cont {
@ -23875,19 +23968,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -23899,19 +23988,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24070,19 +24155,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -24094,19 +24175,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24265,19 +24342,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -24289,19 +24362,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24460,19 +24529,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 18
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
element {
scale: 19
@ -24484,19 +24549,15 @@ cont {
name: "park-l"
priority: 16142
}
apply_if: "name"
}
element {
scale: 19
area {
color: 1122816
priority: 1143
caption {
primary {
height: 10
color: 5592405
stroke_color: 2571387972
offset_y: 10
}
priority: 15142
}
symbol {
name: "park-l"
priority: 16142
}
apply_if: "!name"
}
}
cont {
@ -24526,6 +24587,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15222
}
}
element {
scale: 19
@ -24538,6 +24606,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15222
}
}
}
cont {
@ -24630,6 +24705,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15222
}
}
element {
scale: 19
@ -24642,6 +24724,13 @@ cont {
apply_for_type: 1
priority: 16222
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15222
}
}
}
cont {
@ -24758,6 +24847,52 @@ cont {
}
}
}
cont {
name: "leisure-recreation_ground"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
name: "leisure-slipway"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
name: "leisure-sports_centre"
element {
@ -24930,6 +25065,13 @@ cont {
name: "swimming-l"
priority: 16269
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15269
}
}
element {
scale: 19
@ -24941,6 +25083,59 @@ cont {
name: "swimming-l"
priority: 16269
}
caption {
primary {
height: 10
color: 5592405
}
priority: 15269
}
}
}
cont {
name: "leisure-track"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {
name: "leisure-water_park"
element {
scale: 18
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 10
color: 5592405
}
priority: 15000
}
}
}
cont {

2
data/styles/clear/include/POI.mapcss
View file

@ -209,7 +209,7 @@ node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycl
/* LEISURE */
/* node|z18-[leisure] { } */
node|z18-[leisure], area|z18-[leisure] { font-size: 10; text: tourism; text-color: @poi_label; }
node|z18-[leisure], area|z18-[leisure] { font-size: 10; text: name; text-color: @poi_label; }
node|z16[leisure=stadium] { icon-image: pitch-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }

11
data/styles/clear/include/labels.mapcss
View file

@ -1137,7 +1137,7 @@ area|z17[leisure=park][!name] {
area|z17[leisure=garden][!name] {
}
area|z18-[leisure=park][name] {
area|z18-[leisure=park] {
icon-image: park-l.svg;
text-offset: 10;
text: name;
@ -1147,7 +1147,7 @@ area|z18-[leisure=park][name] {
text-halo-color: @label_halo_light;
text-halo-radius: 0.5;
}
area|z18-[leisure=garden][name] {
area|z18-[leisure=garden] {
icon-image: garden-l.svg;
text-offset: 10;
text: name;
@ -1157,12 +1157,7 @@ area|z18-[leisure=garden][name] {
text-halo-color: @label_halo_light;
text-halo-radius: 0.5;
}
area|z18-[leisure=park][!name] {
icon-image: park-l.svg;
}
area|z18-[leisure=garden][!name] {
icon-image: garden-l.svg;
}
/* BEACH LABELS */
area|z15-[leisure=beach_resort],