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

[styles] Set z-index to -1 for landuse-residential. This area should not overlap inner parks, forests, water.

Browse source
This commit is contained in:
vng 2014-02-18 12:19:00 +03:00 • committed by Alex Zolotarev
parent aa9c0f4226
commit fc2eebe9df
5 changed files with 4982 additions and 5110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto-bw.bin
View file

Binary file not shown.

128
data/drules_proto-bw.txt
View file

@ -8985,10 +8985,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9006,10 +9002,6 @@ cont {
lines {
width: 5.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9038,10 +9030,6 @@ cont {
lines {
width: 9.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9070,10 +9058,6 @@ cont {
lines {
width: 17.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9154,10 +9138,6 @@ cont {
lines {
width: 1.2
color: 255
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9175,10 +9155,6 @@ cont {
lines {
width: 0.8
color: 255
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9196,10 +9172,6 @@ cont {
lines {
width: 0.8
color: 255
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9217,10 +9189,6 @@ cont {
lines {
width: 0.8
color: 255
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9424,10 +9392,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9459,10 +9423,6 @@ cont {
lines {
width: 5.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9505,10 +9465,6 @@ cont {
lines {
width: 9.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -9551,10 +9507,6 @@ cont {
lines {
width: 17.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10057,10 +10009,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10078,10 +10026,6 @@ cont {
lines {
width: 0.8
color: 16711680
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10099,10 +10043,6 @@ cont {
lines {
width: 0.8
color: 16711680
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10120,10 +10060,6 @@ cont {
lines {
width: 0.8
color: 16711680
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10329,10 +10265,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10350,10 +10282,6 @@ cont {
lines {
width: 5.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10382,10 +10310,6 @@ cont {
lines {
width: 9.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10414,10 +10338,6 @@ cont {
lines {
width: 17.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10498,10 +10418,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10519,10 +10435,6 @@ cont {
lines {
width: 5.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10551,10 +10463,6 @@ cont {
lines {
width: 9.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10583,10 +10491,6 @@ cont {
lines {
width: 17.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10667,10 +10571,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10688,10 +10588,6 @@ cont {
lines {
width: 5.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10720,10 +10616,6 @@ cont {
lines {
width: 9.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10752,10 +10644,6 @@ cont {
lines {
width: 17.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10854,10 +10742,6 @@ cont {
lines {
width: 2.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10900,10 +10784,6 @@ cont {
lines {
width: 5.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -10950,10 +10830,6 @@ cont {
lines {
width: 9.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP
@ -11000,10 +10876,6 @@ cont {
lines {
width: 17.0
color: 14535867
dashdot {
dd: 4.0
dd: 4.0
}
priority: 1026
join: ROUNDJOIN
cap: ROUNDCAP

BIN
data/drules_proto.bin
View file

Binary file not shown.

9958
data/drules_proto.txt
View file

File diff suppressed because it is too large Load diff

6
data/styles/include/base_landuse.mapcss
View file

@ -77,17 +77,17 @@ area|z12-[landuse=conservation]
area|z12-[landuse=residential]
{
fill-color: #ede8d2;
z-index: 5;
z-index: -2;
}
area|z12-[landuse=residential][residential=urban]
{
fill-color: #eeeeee;
z-index: 6;
z-index: -1;
}
area|z12-[landuse=residential][residential=rural]
{
fill-color: #FFFFCC;
z-index: 6;
z-index: -1;
}
area|z12-[landuse=retail]
{