[types] Supported type parking_space. Fixed Zaryadye park problem.

This commit is contained in:
Maksim Andrianov 2019-09-24 14:20:25 +03:00 committed by Roman Kuznetsov
parent 33cee65f2d
commit 965c9cf50c
6 changed files with 85 additions and 17 deletions

View file

@ -1323,3 +1323,7 @@ cuisine|tea;1322;
natural|geyser;1323;
sponsored|promo_catalog;1324;
natural|hot_spring;1325;
amenity|parking_space;1326;
amenity|parking_space|underground;[amenity=parking_space][parking=underground];;name;int_name;1327;
amenity|parking_space|private;[amenity=parking_space][access=private];;name;int_name;1328;
amenity|parking_space|permissive;[amenity=parking_space][access=permissive];;name;int_name;1329;

1 building;[building];;addr:housenumber;name;1;
1323 natural|geyser;1323;
1324 sponsored|promo_catalog;1324;
1325 natural|hot_spring;1325;
1326 amenity|parking_space;1326;
1327 amenity|parking_space|underground;[amenity=parking_space][parking=underground];;name;int_name;1327;
1328 amenity|parking_space|private;[amenity=parking_space][access=private];;name;int_name;1328;
1329 amenity|parking_space|permissive;[amenity=parking_space][access=permissive];;name;int_name;1329;

View file

@ -39,7 +39,6 @@ diet=vegan : cuisine=vegan
aerodrome:type=international : aerodrome=international
amenity=parking_entrance : amenity=parking
amenity=parking_space : amenity=parking
amenity=garages : building=garage
amenity=garage : building=garage
building=garages : building=garage

View file

@ -1955,6 +1955,18 @@
sk = Parkovisko
fa = پارکینگ
[type.amenity.parking_space]
en = Parking space
[type.amenity.parking_space.permissive]
en = Parking space
[type.amenity.parking_space.private]
en = Parking space
[type.amenity.parking_space.underground]
en = Parking space
[type.amenity.payment_terminal]
en = Payment Terminal
ru = Терминал оплаты

View file

@ -30,7 +30,9 @@
node|z17-[leisure],
node|z16[amenity=parking],
area|z16[amenity=parking]
area|z16[amenity=parking],
node|z16[amenity=parking_space],
area|z16[amenity=parking_space]
{z-index: 6;}
node|z17-[leisure=golf_course],
@ -2650,6 +2652,8 @@ node|z17-[amenity=car_wash],
area|z17-[amenity=car_wash],
node|z18-[amenity=parking],
area|z18-[amenity=parking],
node|z18-[amenity=parking_space],
area|z18-[amenity=parking_space],
node|z18-[amenity=car_rental],
area|z18-[amenity=car_rental],
node|z18-[amenity=car_sharing],
@ -2703,20 +2707,35 @@ area|z18-[amenity=car_sharing]
/* 7.1 Parking */
node|z16[amenity=parking],
area|z16[amenity=parking]
area|z16[amenity=parking],
node|z16[amenity=parking_space],
area|z16[amenity=parking_space]
{icon-image: parking-s.svg;icon-min-distance: 25;}
node|z16[amenity=parking][access=permissive],
node|z16[amenity=parking][access=private]
node|z16[amenity=parking][access=private],
node|z16[amenity=parking_space][access=permissive],
area|z16[amenity=parking_space][access=permissive],
node|z16[amenity=parking_space][access=private],
area|z16[amenity=parking_space][access=private]
{icon-image: zero-icon.svg;}
node|z17[amenity=parking], area|z17[amenity=parking]
node|z17[amenity=parking],
area|z17[amenity=parking],
node|z17[amenity=parking_space],
area|z17[amenity=parking_space]
{icon-image: parking-m.svg;}
node|z17[amenity=parking][access=permissive],
node|z17[amenity=parking][access=private]
node|z17[amenity=parking][access=private],
node|z17[amenity=parking_space][access=permissive],
area|z17[amenity=parking_space][access=permissive],
node|z17[amenity=parking_space][access=private],
area|z17[amenity=parking_space][access=private]
{icon-image: zero-icon.svg;}
node|z18-[amenity=parking],
area|z18-[amenity=parking]
area|z18-[amenity=parking],
node|z18-[amenity=parking_space],
area|z18-[amenity=parking_space]
{icon-image: parking-m.svg;font-size: 11;text-optional: true;}
node|z17-[amenity=bicycle_parking],
@ -2735,6 +2754,9 @@ node|z18-[amenity=motorcycle_parking],
area|z18-[amenity=motorcycle_parking]
{icon-image: motorcycle-parking-m.svg;icon-min-distance: 20;text-optional: true;}
node|z16-[amenity=parking_space][parking=underground],
area|z16-[amenity=parking_space][parking=underground]
{icon-image: zero-icon.svg;}
/* 8 Sponsored */

View file

@ -161,6 +161,7 @@ line[barrier=fence],
line[barrier=hedge],
line[historic=citywalls],
area[amenity=parking],
area[amenity=parking_space]
{z-index: 950;}
/* 2.LAND */
@ -431,6 +432,7 @@ area|z15-[landuse=railway],
area|z15-[landuse=quarry],
area|z15-[leisure=stadium],
area|z15-[amenity=parking],
area|z15-[amenity=parking_space],
area|z16-[public_transport=platform],
area|z16-[amenity=place_of_worship],
area|z16-[railway=platform],
@ -511,9 +513,11 @@ area|z15-19[aeroway=aerodrome]
/* Parking */
area|z15-[amenity=parking]
area|z15-[amenity=parking],
area|z15-[amenity=parking_space]
{fill-color: @parking;fill-opacity: 1;}
area|z17-[amenity=parking]
area|z17-[amenity=parking],
area|z17-[amenity=parking_space]
{fill-color: @parking_l;fill-opacity: 1;}
/* 8.BUILDINGS */

View file

@ -194,6 +194,8 @@ node[aeroway=airport],
node[aeroway=aerodrome],
node[amenity=parking],
area[amenity=parking],
node[amenity=parking_space],
area[amenity=parking_space],
node[railway=station][transport=subway],
{z-index: 3100;}
@ -977,6 +979,8 @@ node|z17-[amenity=car_wash],
area|z17-[amenity=car_wash],
node|z16-[amenity=parking],
area|z16-[amenity=parking],
node|z16-[amenity=parking_space],
area|z16-[amenity=parking_space],
node|z18-[amenity=car_rental],
area|z18-[amenity=car_rental],
node|z18-[amenity=car_sharing],
@ -1051,34 +1055,57 @@ area|z18-[amenity=car_sharing]
/* 7.1 Parking */
node|z15-16[amenity=parking],
area|z15-16[amenity=parking]
area|z15-16[amenity=parking],
node|z15-16[amenity=parking_space],
area|z15-16[amenity=parking_space]
{icon-image: parking-m.svg;icon-min-distance: 3;z-index: 20000;}
node|z15-16[amenity=parking][access=permissive],
node|z15-16[amenity=parking][access=private]
node|z15-16[amenity=parking][access=private],
node|z15-16[amenity=parking_space][access=permissive],
area|z15-16[amenity=parking_space][access=permissive],
node|z15-16[amenity=parking_space][access=private],
area|z15-16[amenity=parking_space][access=private]
{icon-image: zero-icon.svg; icon-min-distance: 3;z-index: 20000;}
node|z17[amenity=parking],
area|z17[amenity=parking]
area|z17[amenity=parking],
node|z17[amenity=parking_space],
area|z17[amenity=parking_space]
{icon-image: parking-m.svg;icon-min-distance: 15;}
node|z17[amenity=parking][access=permissive],
node|z17[amenity=parking][access=private]
node|z17[amenity=parking][access=private],
node|z17[amenity=parking_space][access=permissive],
area|z17[amenity=parking_space][access=permissive],
node|z17[amenity=parking_space][access=private],
area|z17[amenity=parking_space][access=private]
{icon-image: zero-icon.svg;z-index: 6;icon-min-distance: 7;}
node|z18[amenity=parking], area|z18[amenity=parking]
node|z18[amenity=parking],
area|z18[amenity=parking],
node|z18[amenity=parking_space],
area|z18[amenity=parking_space]
{icon-image: parking-m.svg;icon-min-distance: 10;}
node|z18[amenity=parking][access=permissive],
node|z18[amenity=parking][access=private]
node|z18[amenity=parking][access=private],
node|z18[amenity=parking_space][access=permissive],
area|z18[amenity=parking_space][access=permissive],
node|z18[amenity=parking_space][access=private],
area|z18[amenity=parking_space][access=private]
{icon-image: zero-icon.svg;}
node|z19-[amenity=parking],
area|z19-[amenity=parking]
area|z19-[amenity=parking],
node|z19-[amenity=parking_space],
area|z19-[amenity=parking_space]
{icon-image: parking-m.svg;icon-min-distance: 6;}
/*node|z17-[amenity=bicycle_parking],
area|z17-[amenity=bicycle_parking]
{icon-image: bike-parking-m.svg;icon-min-distance: 20;}*/
node|z15-[amenity=parking_space][parking=underground],
area|z15-[amenity=parking_space][parking=underground]
{icon-image: zero-icon.svg;}
/* 8 Sponsored */