[classificator]

- Added “amenity-waste_disposal”
- Replaced “amenity-restaurant-hotel” with 2 separate types
- Fixed “ink” styles according to current “normal”
This commit is contained in:
vng 2014-09-09 02:25:53 +03:00 committed by Alex Zolotarev
parent 9e1acfd593
commit cf856a71bf
12 changed files with 1106 additions and 209 deletions

View file

@ -1358,7 +1358,7 @@ ar:البريد
da:3post
tr:3postane|posta
amenity-recycling
amenity-recycling|amenity-waste_disposal
en:recycling|trash|bin|garbage
ru:мусорка
uk:сміттєвий бак|сміття|корзина

View file

@ -71,7 +71,6 @@ world +
pub -
recycling -
restaurant +
hotel -
vegan -
vegetarian -
{}
@ -84,6 +83,7 @@ world +
toilets -
townhall -
university -
waste_disposal -
{}
area:highway +
cycleway -

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -4267,64 +4267,6 @@ cont {
}
}
}
cont {
name: "amenity-restaurant-hotel"
element {
scale: 16
symbol {
name: "hotel_and_restaurant"
priority: 16000
}
}
element {
scale: 17
symbol {
name: "hotel_and_restaurant"
priority: 16002
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
symbol {
name: "hotel_and_restaurant"
priority: 16002
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
symbol {
name: "hotel_and_restaurant"
priority: 16002
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "amenity-restaurant-vegan"
element {
@ -5032,6 +4974,60 @@ cont {
}
}
}
cont {
name: "amenity-waste_disposal"
element {
scale: 17
symbol {
name: "recycling"
apply_for_type: 1
priority: 16002
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 18
symbol {
name: "recycling"
apply_for_type: 1
priority: 16002
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
element {
scale: 19
symbol {
name: "recycling"
apply_for_type: 1
priority: 16002
}
caption {
primary {
height: 11
color: 4473924
stroke_color: 16777215
offset_y: 10
}
priority: 15002
}
}
}
cont {
name: "area:highway-footway"
element {

View file

@ -299,7 +299,7 @@ railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;
man_made|lighthouse;[man_made=lighthouse];;name;int_name;299;
highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300;
highway|primary|motorroad;[highway=primary][motorroad?];x;name;int_name;301;highway|primary
amenity|restaurant|hotel;[amenity=restaurant][hotel];;name;int_name;302;
amenity|restaurant|hotel;[amenity=restaurant][hotel];x;name;int_name;302;tourism|hotel
power|generator;[power=generator];;name;int_name;303;
highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;
man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305;
@ -983,3 +983,4 @@ craft|painter;[craft=painter];;name;int_name;982;
craft|gardener;[craft=gardener];;name;int_name;983;
internet_access;[internet_access=yes];;name;int_name;984;
internet_access|wlan;[internet_access=wlan];;name;int_name;985;
amenity|waste_disposal;[amenity=waste_disposal];;name;int_name;986;

Can't render this file because it has a wrong number of fields in line 371.

View file

@ -767,7 +767,6 @@ line|z16[highway=trunk_link]
line|z16[highway=steps]
{
width: 4;
z-index: 687;
color: #d0ccac;
linecap: butt;
dashes: 2.4,0.8;
@ -1131,6 +1130,9 @@ line|z19-[highway=living_street]
{
width: 41;
}
/* Define priorities and area fill color for highways */
area|z15-[area:highway=footway],
area|z15-[area:highway=path],
area|z15-[area:highway=steps]
@ -1140,47 +1142,92 @@ area|z15-[area:highway=steps]
line[highway=footway],
line[highway=pedestrian],
line[highway=path],
line[highway=steps]
{
z-index: 50;
}
line[highway=steps],
{
z-index: 50.6;
}
line[highway=cycleway],
line[highway=track]
line[highway=track],
{
z-index: 50.5;
}
line[highway=steps],
{
z-index: 50.75;
}
area|z15-[area:highway=service],
area|z15-[area:highway=residential],
area|z15-[area:highway=unclassified],
area|z15-[area:highway=living_street]
{
fill-color: white;
}
line[highway=service],
line[highway=residential],
line[highway=unclassified]
line[highway=unclassified],
{
z-index: 51;
}
area|z15-[area:highway=living_street]
area|z15-[area:highway=living_street]
{
fill-color: #707070;
}
line[highway=living_street] {z-index: 50}
area|z15-[area:highway=primary] {fill-color: #FDE066}
line[highway=primary], line[highway=primary_link]{z-index: 54}
area|z15-[area:highway=secondary]{fill-color: #fffb80}
line[highway=secondary], line[highway=secondary_link]{z-index: 53}
area|z15-[area:highway=tertiary]{fill-color: #fffb80}
line[highway=tertiary], line[highway=tertiary_link]{z-index: 52}
area|z15-[area:highway=motorway]{fill-color: #f08800}
line[highway=motorway], line[highway=motorway_link]{z-index: 55}
area|z15-[area:highway=trunk]{fill-color: #ffc444}
line[highway=trunk], line[highway=trunk_link]{z-index: 56}
line[highway=living_street]
{
z-index: 50;
}
area|z15-[area:highway=primary]
{
fill-color: #FDE066
}
line[highway=primary],
line[highway=primary_link]
{
z-index: 54;
}
area|z15-[area:highway=secondary]
{
fill-color: #fffb80;
}
line[highway=secondary],
line[highway=secondary_link]
{
z-index: 53;
}
area|z15-[area:highway=tertiary]
{
fill-color: #fffb80;
}
line[highway=tertiary],
line[highway=tertiary_link]
{
z-index: 52;
}
area|z15-[area:highway=motorway]
{
fill-color: #f08800;
}
line[highway=motorway],
line[highway=motorway_link]
{
z-index: 55;
}
area|z15-[area:highway=trunk]
{
fill-color: #ffc444;
}
line[highway=trunk],
line[highway=trunk_link]
{
z-index: 56;
}
area[area:highway]
{
z-index: 400;

View file

@ -45,7 +45,9 @@ area::* {
*[man_made],
*[natural],
*[power],
*[landuse]
*[landuse],
*[craft],
*[internet_access],
{
text-position: center
}
@ -500,7 +502,11 @@ line|z12[railway=disused]
opacity: 0.5;
}
area|z12-13[natural=peak],
node|z12-13[natural=peak]
node|z12-13[natural=peak],
area|z12-13[natural=rock],
node|z12-13[natural=rock],
area|z13-15[natural=bare_rock],
node|z13-15[natural=bare_rock],
{
icon-image: peak-mini.svg;
}
@ -652,7 +658,11 @@ node|z13[aerialway=station]
symbol-size: 2;
}
area|z13-15[natural=peak],
node|z13-15[natural=peak]
node|z13-15[natural=peak],
area|z13-15[natural=rock],
node|z13-15[natural=rock],
area|z13-15[natural=bare_rock],
node|z13-15[natural=bare_rock],
{
text-offset: 10;
text: name;
@ -801,10 +811,12 @@ line|z14[railway=yard]
width: 1.6;
z-index: 208;
}
area|z14-15[natural=cave_entrance],
area|z14-15[natural=volcano],
node|z14-15[natural=volcano],
node|z14-15[natural=cave_entrance],
node|z14-15[natural=volcano]
area|z14-15[natural=cave_entrance],
node|z14-15[natural=cape],
area|z14-15[natural=cape],
{
text-offset: 10;
text: name;
@ -821,7 +833,11 @@ line|z14[railway=abandoned]::d1p3
dashes: 4.5,4.5;
}
area|z14-[natural=peak],
node|z14-[natural=peak]
node|z14-[natural=peak],
area|z14-[natural=rock],
node|z14-[natural=rock],
area|z14-[natural=bare_rock],
node|z14-[natural=bare_rock],
{
icon-image: peak.svg;
}
@ -981,10 +997,16 @@ line|z14[boundary=administrative][border_type=country]
z-index: 533;
-x-kot-layer: top;
}
area|z15-[tourism=alpine_hut],
node|z15-[tourism=alpine_hut]
area|z14-[tourism=alpine_hut],
node|z14-[tourism=alpine_hut],
{
icon-image: alpine_hut.svg;
text-offset: 10;
font-size: 12;
text-halo-radius: 2;
text: name;
text-color: black;
text-halo-color: white;
}
line|z14[boundary=national_park]
{
@ -1528,7 +1550,7 @@ node|z16[amenity=parking]
area|z15-[tourism=viewpoint],
node|z15-[tourism=viewpoint],
area|z15-[tourism=artwork],
node|z15-[tourism=artwork]
node|z15-[tourism=artwork],
{
icon-image: viewpoint.svg;
}
@ -2115,10 +2137,14 @@ area|z17-[amenity],
area|z17-[historic],
area|z17-[office][office!=no],
area|z17-[tourism],
area|z17-[craft],
area|z17-[internet_access],
node|z17-[amenity],
node|z17-[historic],
node|z17-[office][office!=no],
node|z17-[tourism]
node|z17-[tourism],
node|z17-[craft],
node|z17-[internet_access],
{
font-size: 11;
text-halo-radius: 2;
@ -2217,7 +2243,11 @@ node|z16-[power=pole]
icon-image: power-pole.svg;
}
area|z16-[natural=peak],
node|z16-[natural=peak]
node|z16-[natural=peak],
area|z16-[natural=rock],
node|z16-[natural=rock],
area|z16-[natural=bare_rock],
node|z16-[natural=bare_rock],
{
text-offset: 10;
text: name;
@ -2333,11 +2363,6 @@ line|z16[barrier=hedge]
width: 0.4;
z-index: 879;
}
area|z16-[amenity=restaurant][hotel],
node|z16-[amenity=restaurant][hotel]
{
icon-image: hotel_and_restaurant.svg;
}
line|z16[boundary=administrative][border_type=county]
{
color: #f9574b;
@ -2395,10 +2420,12 @@ line|z16[boundary=administrative][border_type=suburb]
z-index: 936;
dashes: 4,20;
}
area|z16-[natural=cave_entrance],
node|z16-[natural=volcano],
area|z16-[natural=volcano],
node|z16-[natural=cave_entrance],
node|z16-[natural=volcano]
area|z16-[natural=cave_entrance],
node|z16-[natural=cape],
area|z16-[natural=cape],
{
text-offset: 10;
text: name;
@ -2766,10 +2793,6 @@ node|z17-[amenity=hospital]
{
icon-image: hospital.svg;
}
node|z16-[natural=tree]
{
icon-image: tree.svg;
}
line|z16[boundary=administrative][type=nation]
{
color: yellow;
@ -3309,7 +3332,8 @@ node|z17-[tourism=information][information=guidepost]
{
icon-image: information-guidepost.svg;
}
line|z16-[barrier=fence]
line|z16-[barrier=fence],
line|z16-[historic=citywalls],
{
color: #b0b0b0;
width: .1;
@ -3670,7 +3694,8 @@ node|z16-[amenity=pub]
{
icon-image: pub.svg;
}
node|z17-[amenity=recycling]
node|z17-[amenity=recycling],
node|z17-[amenity=waste_disposal],
{
icon-image: recycling.svg;
}
@ -3701,11 +3726,12 @@ node|z16-[railway=station]
@import("include/base_publictransport.mapcss");
/* Eval magic */
line[railway]
{
text-position: line;
}
/* Process bridge and tunnel */
line|z15-[bridge?]::bridgewhite,
line|z15-[tunnel?]::tunnelwhite
{
@ -3729,6 +3755,7 @@ line|z15-[tunnel?]::tunnelblack
casing-color: #707070;
casing-dashes: 5,5;
}
line|z16-[oneway?]::arrows
{
pattern-offset: 200;

View file

@ -1034,7 +1034,7 @@ line|z14[boundary=administrative][border_type=country]
-x-kot-layer: top;
}
area|z14-[tourism=alpine_hut],
node|z14-[tourism=alpine_hut]
node|z14-[tourism=alpine_hut],
{
icon-image: alpine_hut.svg;
text-offset: 10;
@ -2411,11 +2411,6 @@ line|z16[barrier=hedge]
width: 0.4;
z-index: 879;
}
area|z16-[amenity=restaurant][hotel],
node|z16-[amenity=restaurant][hotel]
{
icon-image: hotel_and_restaurant.svg;
}
line|z16[boundary=administrative][border_type=county]
{
color: #f9574b;
@ -3411,7 +3406,7 @@ node|z17-[tourism=information][information=guidepost]
icon-image: information-guidepost.svg;
}
line|z16-[barrier=fence],
line|z16-[historic=citywalls]
line|z16-[historic=citywalls],
{
color: #b0b0b0;
width: .1;
@ -3777,7 +3772,8 @@ node|z16-[amenity=pub]
{
icon-image: pub.svg;
}
node|z17-[amenity=recycling]
node|z17-[amenity=recycling],
node|z17-[amenity=waste_disposal],
{
icon-image: recycling.svg;
}
@ -3808,11 +3804,12 @@ node|z16-[railway=station]
@import("include/base_publictransport.mapcss");
/* Eval magic */
line[railway]
{
text-position: line;
}
/* Process bridge and tunnel */
line|z15-[bridge?]::bridgewhite,
line|z15-[tunnel?]::tunnelwhite
{
@ -3836,6 +3833,7 @@ line|z15-[tunnel?]::tunnelblack
casing-color: #707070;
casing-dashes: 5,5;
}
line|z16-[oneway?]::arrows
{
pattern-offset: 200;
@ -3843,6 +3841,7 @@ line|z16-[oneway?]::arrows
pattern-image: arrow.svg;
pattern-spacing: 234;
}
line|z16-[natural=tree_row]
{
pattern-image: tree.svg;

View file

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.0"
width="13.98"
height="13.98"
viewBox="0 0 115 115"
id="symbol-restaurant">
<defs
id="defs10" />
<path
d="M 61.175133,-37.847215 L -18.558221,23.122331 L -0.15821111,23.122331 L -0.15821111,115.12234 L 116.37516,115.12234 L 116.37516,23.122331 L 134.77517,23.122331 L 61.175133,-37.847215 z "
style="fill:black;stroke:none"
id="path1949" />
<g
transform="matrix(0.519844,0,0,0.519844,53.35435,9.564348)"
style="fill:white"
id="g3">
<path
d="M 94,4 C 90,0 74,18 67,26 C 65,28 62,32 68,38 C 15,89 5,96 12,103 C 19,110 26,100 76,46 C 82,52 87,49 89,47 C 97,40 114,24 110,20 C 106,16 91,40 87,37 C 83,24 106,16 102,12 C 98,8 81,33 77,29 C 73,25 98,8 94,4 z "
style="fill:white"
id="path5" />
<path
d="M 35,33 C 79,81 98,96 90,103 C 81,111 70,91 26,42 C 6,57 -9,16 1,6 C 11,-6 55,13 35,33 z "
style="fill:white"
id="path7" />
</g>
<path
d="M 6.9973827,85.556519 C 6.9973827,89.618914 15.122182,89.618914 15.122182,85.556519 L 15.122182,77.43172 L 35.434179,93.681314 L 35.434179,105.86851 C 35.434179,109.93091 43.558978,109.93091 43.558978,105.86851 L 43.558978,93.681314 L 67.933373,93.681314 L 67.933373,105.86851 C 67.933373,109.93091 76.058173,109.93091 76.058173,105.86851 L 76.058173,85.556519 L 39.496579,85.556519 L 11.059785,61.182122 C 14.309703,53.057323 43.558978,53.057323 47.621377,57.119723 L 47.621377,44.932525 C 47.621377,40.870128 39.496579,40.870128 39.496579,44.932525 L 39.496579,48.994924 L 15.122182,48.994924 L 15.122182,44.932525 C 15.122182,40.870128 6.9973827,40.870128 6.9973827,44.932525 C 6.9973827,44.932525 6.9973827,85.556519 6.9973827,85.556519 z M 15.122182,65.24452 C 19.184583,57.119723 43.558978,57.119723 51.683777,65.24452 L 76.058173,85.556519 C 67.933373,77.43172 39.496579,77.43172 39.496579,85.556519 L 15.122182,65.24452 z "
style="fill:white"
id="path1998" />
</svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB

View file

@ -299,7 +299,7 @@ railway|abandoned|bridge
man_made|lighthouse
highway|path|demanding_mountain_hiking
highway|primary
amenity|restaurant|hotel
tourism|hotel
power|generator
highway|pedestrian|bridge
man_made|pipeline|overground
@ -983,3 +983,4 @@ craft|painter
craft|gardener
internet_access
internet_access|wlan
amenity|waste_disposal