forked from organicmaps/organicmaps
[styles] Added shop=furniture, moved shop=* to separate include, tweaked colors for yota
This commit is contained in:
Darafei Praliaskouski
Alex Zolotarev
parent
3d26142396
commit
c17f0919b2
11 changed files with 1947 additions and 1826 deletions
|
|
@ -633,6 +633,7 @@ world +
|
|||
doityourself -
|
||||
electronics -
|
||||
florist -
|
||||
furniture -
|
||||
garden_centre -
|
||||
gift -
|
||||
greengrocer -
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -952,3 +952,4 @@ landuse|residential|rural;[landuse=residential][residential=rural];;name;int_nam
|
|||
landuse|residential|urban;[landuse=residential][residential=urban];;name;int_name;952;
|
||||
amenity|ferry_terminal;[amenity=ferry_terminal];;name;int_name;953;
|
||||
amenity;[amenity];;name;int_name;954;
|
||||
shop|furniture;[shop=furniture];;name;int_name;955;
|
||||
|
|
|
|||
|
|
|
@ -1,7 +1,7 @@
|
|||
line[highway]
|
||||
{
|
||||
casing-color: #B5944C;
|
||||
casing-width: 0.5;
|
||||
casing-width: 0.8;
|
||||
}
|
||||
line[highway=pedestrian],
|
||||
line[highway=footway],
|
||||
|
|
|
|||
76
data/styles/include/base_shop.mapcss
Normal file
76
data/styles/include/base_shop.mapcss
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
*|z16-[shop]
|
||||
{
|
||||
text-position: center
|
||||
}
|
||||
|
||||
area|z17-[shop][shop!=no],
|
||||
node|z17-[shop][shop!=no],
|
||||
{
|
||||
font-size: 11;
|
||||
text-halo-radius: 2;
|
||||
text: name;
|
||||
text-color: #404040;
|
||||
text-offset: 10;
|
||||
text-halo-color: white;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
area|z16-[shop=car_repair],
|
||||
node|z16-[shop=car_repair]
|
||||
{
|
||||
icon-image: car_repair.svg;
|
||||
}
|
||||
|
||||
area|z16-[shop=kiosk],
|
||||
node|z16-[shop=kiosk]
|
||||
{
|
||||
icon-image: kiosk.svg;
|
||||
}
|
||||
|
||||
area|z16-[shop=bakery],
|
||||
node|z16-[shop=bakery]
|
||||
{
|
||||
icon-image: bakery.svg;
|
||||
}
|
||||
|
||||
area|z16-[shop=convenience],
|
||||
area|z16-[shop=mall],
|
||||
area|z17-[shop=florist],
|
||||
area|z17-[shop=butcher],
|
||||
area|z16-[shop=doityourself],
|
||||
area|z16-[shop=supermarket],
|
||||
area|z16-[shop=bicycle],
|
||||
area|z17-[shop=alcohol],
|
||||
area|z17-[shop=books],
|
||||
area|z17-[shop=electronics],
|
||||
area|z17-[shop=shoes],
|
||||
area|z16-[shop=department_store],
|
||||
node|z16-[shop=convenience],
|
||||
node|z16-[shop=mall],
|
||||
node|z17-[shop=florist],
|
||||
node|z17-[shop=butcher],
|
||||
node|z17-[shop=doityourself],
|
||||
node|z16-[shop=supermarket],
|
||||
node|z16-[shop=bicycle],
|
||||
node|z17-[shop=alcohol],
|
||||
node|z17-[shop=books],
|
||||
node|z17-[shop=electronics],
|
||||
node|z17-[shop=shoes],
|
||||
node|z16-[shop=department_store],
|
||||
area|z16-[shop=furniture],
|
||||
node|z16-[shop=furniture]
|
||||
{
|
||||
icon-image: supermarket.svg;
|
||||
}
|
||||
|
||||
area|z16-[shop=hairdresser],
|
||||
node|z16-[shop=hairdresser]
|
||||
{
|
||||
icon-image: hairdresser.svg;
|
||||
}
|
||||
|
||||
area|z16-[shop=clothes],
|
||||
node|z16-[shop=clothes]
|
||||
{
|
||||
icon-image: clothes.svg;
|
||||
}
|
||||
|
|
@ -42,7 +42,6 @@ area[natural=coastline]
|
|||
}
|
||||
|
||||
*[amenity],
|
||||
*[shop],
|
||||
*[office],
|
||||
*[historic],
|
||||
*[tourism],
|
||||
|
|
@ -68,6 +67,7 @@ area[tourism],
|
|||
}
|
||||
|
||||
@import("include/base_roads.mapcss");
|
||||
@import("include/base_shop.mapcss");
|
||||
|
||||
line[highway=bus_stop],
|
||||
line[highway=motorway_junction]
|
||||
|
|
@ -2746,8 +2746,8 @@ node|z15-[leisure=nature_reserve]
|
|||
|
||||
area|z15-[building]
|
||||
{
|
||||
fill-color: #1;
|
||||
z-index: 500;
|
||||
fill-color: #3;
|
||||
z-index: 900;
|
||||
}
|
||||
|
||||
line|z15[railway=narrow_gauge]
|
||||
|
|
@ -2886,12 +2886,10 @@ line|z16[boundary=administrative][border_type=country]
|
|||
}
|
||||
area|z17-[amenity],
|
||||
area|z17-[historic],
|
||||
area|z17-[shop][shop!=no],
|
||||
area|z17-[office][office!=no],
|
||||
area|z17-[tourism],
|
||||
node|z17-[amenity],
|
||||
node|z17-[historic],
|
||||
node|z17-[shop][shop!=no],
|
||||
node|z17-[office][office!=no],
|
||||
node|z17-[tourism]
|
||||
{
|
||||
|
|
@ -2977,11 +2975,6 @@ node|z16-[amenity=fast_food]
|
|||
{
|
||||
icon-image: fastfood.svg;
|
||||
}
|
||||
area|z16-[shop=car_repair],
|
||||
node|z16-[shop=car_repair]
|
||||
{
|
||||
icon-image: car_repair.svg;
|
||||
}
|
||||
line|z16[boundary=administrative][border_type=country]::d2p2
|
||||
{
|
||||
color: #f9574b;
|
||||
|
|
@ -3228,11 +3221,6 @@ line|z16[boundary=administrative][admin_level=8]
|
|||
z-index: 929;
|
||||
dashes: 12,4,4,4;
|
||||
}
|
||||
area|z16-[shop=kiosk],
|
||||
node|z16-[shop=kiosk]
|
||||
{
|
||||
icon-image: kiosk.svg;
|
||||
}
|
||||
line|z16[boundary=administrative][admin_level=6]
|
||||
{
|
||||
color: #f9574b;
|
||||
|
|
@ -3358,11 +3346,6 @@ line|z16[railway=construction]::d1p3
|
|||
dashes: 4,4,4,12;
|
||||
linecap: butt;
|
||||
}
|
||||
area|z16-[shop=bakery],
|
||||
node|z16-[shop=bakery]
|
||||
{
|
||||
icon-image: bakery.svg;
|
||||
}
|
||||
area|z16[amenity=taxi],
|
||||
area|z17-[amenity=taxi],
|
||||
node|z16[amenity=taxi],
|
||||
|
|
@ -3445,31 +3428,7 @@ line|z16[railway=funicular]::d1p3
|
|||
z-index: 651;
|
||||
}
|
||||
area|z16-[amenity=marketplace],
|
||||
area|z16-[shop=convenience],
|
||||
area|z16-[shop=mall],
|
||||
area|z17-[shop=florist],
|
||||
area|z17-[shop=butcher],
|
||||
area|z16-[shop=doityourself],
|
||||
area|z16-[shop=supermarket],
|
||||
area|z16-[shop=bicycle],
|
||||
area|z17-[shop=alcohol],
|
||||
area|z17-[shop=books],
|
||||
area|z17-[shop=electronics],
|
||||
area|z17-[shop=shoes],
|
||||
area|z16-[shop=department_store],
|
||||
node|z16-[amenity=marketplace],
|
||||
node|z16-[shop=convenience],
|
||||
node|z16-[shop=mall],
|
||||
node|z17-[shop=florist],
|
||||
node|z17-[shop=butcher],
|
||||
node|z17-[shop=doityourself],
|
||||
node|z16-[shop=supermarket],
|
||||
node|z16-[shop=bicycle],
|
||||
node|z17-[shop=alcohol],
|
||||
node|z17-[shop=books],
|
||||
node|z17-[shop=electronics],
|
||||
node|z17-[shop=shoes],
|
||||
node|z16-[shop=department_store],
|
||||
node|z16-[amenity=marketplace]
|
||||
{
|
||||
icon-image: supermarket.svg;
|
||||
}
|
||||
|
|
@ -3523,11 +3482,6 @@ line|z16[waterway=river]
|
|||
color: #0;
|
||||
width: 8;
|
||||
}
|
||||
area|z16-[shop=hairdresser],
|
||||
node|z16-[shop=hairdresser]
|
||||
{
|
||||
icon-image: hairdresser.svg;
|
||||
}
|
||||
area|z16-[railway=crossing],
|
||||
node|z16-[railway=crossing]
|
||||
{
|
||||
|
|
@ -3823,11 +3777,6 @@ node|z16-[amenity=library],
|
|||
{
|
||||
icon-image: library.svg;
|
||||
}
|
||||
area|z16-[shop=clothes],
|
||||
node|z16-[shop=clothes]
|
||||
{
|
||||
icon-image: clothes.svg;
|
||||
}
|
||||
line|z16[aerialway=gondola]
|
||||
{
|
||||
color: #202020;
|
||||
|
|
@ -5110,8 +5059,12 @@ line[highway=steps]
|
|||
text-color: #f;
|
||||
}
|
||||
|
||||
node[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][natural!=peak],
|
||||
area[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][natural!=peak]
|
||||
*[place]
|
||||
{
|
||||
text-halo-color: #7;
|
||||
}
|
||||
|
||||
*[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][natural!=peak]
|
||||
{
|
||||
symbol-shape: eval(cond(prop("icon-image"), "circle", ""));
|
||||
symbol-size: 13;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ area[natural=coastline]
|
|||
fill-color: #f1eee8;
|
||||
}
|
||||
*[amenity],
|
||||
*[shop],
|
||||
*[office],
|
||||
*[historic],
|
||||
*[tourism],
|
||||
|
|
@ -63,6 +62,7 @@ area[tourism],
|
|||
}
|
||||
|
||||
@import("include/base_roads.mapcss");
|
||||
@import("include/base_shop.mapcss");
|
||||
|
||||
line[highway=bus_stop],
|
||||
line[highway=motorway_junction]
|
||||
|
|
@ -3280,12 +3280,10 @@ line|z16[boundary=administrative][border_type=country]
|
|||
}
|
||||
area|z17-[amenity],
|
||||
area|z17-[historic],
|
||||
area|z17-[shop][shop!=no],
|
||||
area|z17-[office][office!=no],
|
||||
area|z17-[tourism],
|
||||
node|z17-[amenity],
|
||||
node|z17-[historic],
|
||||
node|z17-[shop][shop!=no],
|
||||
node|z17-[office][office!=no],
|
||||
node|z17-[tourism]
|
||||
{
|
||||
|
|
@ -3389,11 +3387,7 @@ node|z16-[amenity=fast_food]
|
|||
{
|
||||
icon-image: fastfood.svg;
|
||||
}
|
||||
area|z16-[shop=car_repair],
|
||||
node|z16-[shop=car_repair]
|
||||
{
|
||||
icon-image: car_repair.svg;
|
||||
}
|
||||
|
||||
line|z16[boundary=administrative][border_type=country]::d2p2
|
||||
{
|
||||
color: #f9574b;
|
||||
|
|
@ -3642,11 +3636,7 @@ line|z16[boundary=administrative][admin_level=8]
|
|||
z-index: 929;
|
||||
dashes: 12,4,4,4;
|
||||
}
|
||||
area|z16-[shop=kiosk],
|
||||
node|z16-[shop=kiosk]
|
||||
{
|
||||
icon-image: kiosk.svg;
|
||||
}
|
||||
|
||||
line|z16[boundary=administrative][admin_level=6]
|
||||
{
|
||||
color: #f9574b;
|
||||
|
|
@ -3804,11 +3794,7 @@ line|z16[railway=construction]::d1p3
|
|||
dashes: 4,4,4,12;
|
||||
linecap: butt;
|
||||
}
|
||||
area|z16-[shop=bakery],
|
||||
node|z16-[shop=bakery]
|
||||
{
|
||||
icon-image: bakery.svg;
|
||||
}
|
||||
|
||||
area|z16[amenity=taxi],
|
||||
area|z17-[amenity=taxi],
|
||||
node|z16[amenity=taxi],
|
||||
|
|
@ -3899,31 +3885,7 @@ line|z16[railway=funicular]::d1p3
|
|||
z-index: 651;
|
||||
}
|
||||
area|z16-[amenity=marketplace],
|
||||
area|z16-[shop=convenience],
|
||||
area|z16-[shop=mall],
|
||||
area|z17-[shop=florist],
|
||||
area|z17-[shop=butcher],
|
||||
area|z16-[shop=doityourself],
|
||||
area|z16-[shop=supermarket],
|
||||
area|z16-[shop=bicycle],
|
||||
area|z17-[shop=alcohol],
|
||||
area|z17-[shop=books],
|
||||
area|z17-[shop=electronics],
|
||||
area|z17-[shop=shoes],
|
||||
area|z16-[shop=department_store],
|
||||
node|z16-[amenity=marketplace],
|
||||
node|z16-[shop=convenience],
|
||||
node|z16-[shop=mall],
|
||||
node|z17-[shop=florist],
|
||||
node|z17-[shop=butcher],
|
||||
node|z17-[shop=doityourself],
|
||||
node|z16-[shop=supermarket],
|
||||
node|z16-[shop=bicycle],
|
||||
node|z17-[shop=alcohol],
|
||||
node|z17-[shop=books],
|
||||
node|z17-[shop=electronics],
|
||||
node|z17-[shop=shoes],
|
||||
node|z16-[shop=department_store],
|
||||
node|z16-[amenity=marketplace]
|
||||
{
|
||||
icon-image: supermarket.svg;
|
||||
}
|
||||
|
|
@ -3985,11 +3947,6 @@ line|z16[waterway=river]
|
|||
color: #B9D4D4;
|
||||
width: 8;
|
||||
}
|
||||
area|z16-[shop=hairdresser],
|
||||
node|z16-[shop=hairdresser]
|
||||
{
|
||||
icon-image: hairdresser.svg;
|
||||
}
|
||||
area|z16-[railway=crossing],
|
||||
node|z16-[railway=crossing]
|
||||
{
|
||||
|
|
@ -4293,11 +4250,7 @@ node|z16-[amenity=library],
|
|||
{
|
||||
icon-image: library.svg;
|
||||
}
|
||||
area|z16-[shop=clothes],
|
||||
node|z16-[shop=clothes]
|
||||
{
|
||||
icon-image: clothes.svg;
|
||||
}
|
||||
|
||||
line|z16[aerialway=gondola]
|
||||
{
|
||||
color: #202020;
|
||||
|
|
|
|||
|
|
@ -952,3 +952,4 @@ landuse|residential|rural
|
|||
landuse|residential|urban
|
||||
amenity|ferry_terminal
|
||||
amenity
|
||||
shop|furniture
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue