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

Merge pull request #12 from kshalnev/style_20150924

Browse source 
[styles] Style 20150924
This commit is contained in:
bykoianko 2015-09-24 12:30:09 +03:00
commit 787ef72a52
8 changed files with 1240 additions and 8 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.

42
data/drules_proto.txt
View file

@ -6305,6 +6305,48 @@ cont {
}
cont {
name: "boundary-administrative-4-state"
element {
scale: 4
lines {
width: 0.75
color: 13421772
dashdot {
dd: 2.0
dd: 2.0
}
priority: 1345
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 5
lines {
width: 0.75
color: 13421772
dashdot {
dd: 2.0
dd: 2.0
}
priority: 1345
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 6
lines {
width: 0.75
color: 12303291
dashdot {
dd: 2.0
dd: 2.0
}
priority: 1345
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 10
lines {

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

601
data/drules_proto_clear.txt
View file

@ -5148,6 +5148,16 @@ cont {
}
cont {
name: "highway-cycleway"
element {
scale: 13
lines {
width: 0.1
color: 872384682
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -5201,6 +5211,16 @@ cont {
}
cont {
name: "highway-cycleway-bridge"
element {
scale: 13
lines {
width: 0.1
color: 872384682
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -5254,6 +5274,16 @@ cont {
}
cont {
name: "highway-cycleway-permissive"
element {
scale: 13
lines {
width: 0.1
color: 872384682
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -5307,6 +5337,16 @@ cont {
}
cont {
name: "highway-cycleway-tunnel"
element {
scale: 13
lines {
width: 0.1
color: 872384682
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -33578,6 +33618,24 @@ cont {
}
}
}
cont {
name: "shop"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-alcohol"
element {
@ -33600,7 +33658,456 @@ cont {
scale: 19
symbol {
name: "alcohol-m"
apply_for_type: 1
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-bakery"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-beauty"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-beverages"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-bicycle"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-books"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-butcher"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-car"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-car_repair"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-chemist"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-clothes"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-computer"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-confectionery"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-convenience"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-department_store"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-doityourself"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-electronics"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-florist"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-furniture"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-garden_centre"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-gift"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-greengrocer"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-hairdresser"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-hardware"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-jewelry"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-kiosk"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
@ -33667,7 +34174,78 @@ cont {
scale: 19
symbol {
name: "shop-m"
apply_for_type: 1
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-mobile_phone"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-optician"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-shoes"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-sports"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
@ -33718,7 +34296,24 @@ cont {
scale: 19
symbol {
name: "grocery-m"
apply_for_type: 1
priority: 16000
}
caption {
primary {
height: 10
color: 4473924
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-toys"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

601
data/drules_proto_dark.txt
View file

@ -5148,6 +5148,16 @@ cont {
}
cont {
name: "highway-cycleway"
element {
scale: 13
lines {
width: 0.1
color: 862340147
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -5201,6 +5211,16 @@ cont {
}
cont {
name: "highway-cycleway-bridge"
element {
scale: 13
lines {
width: 0.1
color: 862340147
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -5254,6 +5274,16 @@ cont {
}
cont {
name: "highway-cycleway-permissive"
element {
scale: 13
lines {
width: 0.1
color: 862340147
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -5307,6 +5337,16 @@ cont {
}
cont {
name: "highway-cycleway-tunnel"
element {
scale: 13
lines {
width: 0.1
color: 862340147
priority: 1611
join: ROUNDJOIN
cap: ROUNDCAP
}
}
element {
scale: 15
lines {
@ -33578,6 +33618,24 @@ cont {
}
}
}
cont {
name: "shop"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-alcohol"
element {
@ -33600,7 +33658,456 @@ cont {
scale: 19
symbol {
name: "alcohol-m"
apply_for_type: 1
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-bakery"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-beauty"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-beverages"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-bicycle"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-books"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-butcher"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-car"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-car_repair"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-chemist"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-clothes"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-computer"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-confectionery"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-convenience"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-department_store"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-doityourself"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-electronics"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-florist"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-furniture"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-garden_centre"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-gift"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-greengrocer"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-hairdresser"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-hardware"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-jewelry"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-kiosk"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
@ -33667,7 +34174,78 @@ cont {
scale: 19
symbol {
name: "shop-m"
apply_for_type: 1
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-mobile_phone"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-optician"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-shoes"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-sports"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {
@ -33718,7 +34296,24 @@ cont {
scale: 19
symbol {
name: "grocery-m"
apply_for_type: 1
priority: 16000
}
caption {
primary {
height: 10
color: 5592405
offset_y: 8
}
priority: 15000
}
}
}
cont {
name: "shop-toys"
element {
scale: 19
symbol {
name: "shop-m"
priority: 16000
}
caption {

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

@ -84,7 +84,7 @@ node|z18-[leisure=golf_course], area|z18-[leisure=golf_course] { icon-image: gol
/* SHOPS */
/* node|z19-[shop] { icon-image: shop-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } */
node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16-[shop=mall] { icon-image: shop-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[shop=alcohol] { icon-image: alcohol-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17-[shop=supermarket] { icon-image: grocery-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }

2
data/visibility.txt
View file

@ -126,7 +126,7 @@ world 00000000000000000000 +
2 01111111111111111111 -
3 00001110000000000000 -
4 00001110001100000000 +
state 00000000001111111111 -
state 00001110001111111111 -
{}
5 00000000000000111111 -
6 00000000000000111111 -