[styles] Rework plant-nursery

Make it similar to orchard.
Remove unnecessary secondary caption and extra complexity of named vs nameless.

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-05-29 21:51:43 +07:00
committed by Konstantin Pastbin
parent 5f4e41348c
commit 59e21ebac4
3 changed files with 7 additions and 22 deletions

View File

@@ -92,7 +92,6 @@ line|z10-[boundary=administrative][admin_level=4]
area|z10-[landuse=forest],
area|z10-[leisure=park],
area|z12-[leisure=garden],
area|z12-[landuse=plant_nursery],
area|z12-[landuse=grass],
area|z12-[natural=grassland],
area|z12-[leisure=golf_course],
@@ -102,6 +101,7 @@ area|z12-[natural=bare_rock],
area|z12-[natural=shingle],
area|z11-[natural=scree],
area|z12-[landuse=orchard],
area|z12-[landuse=plant_nursery],
area|z12-[landuse=vineyard],
area|z12-[landuse=meadow],
area|z12-[landuse=recreation_ground],
@@ -134,6 +134,7 @@ area|z14-[leisure=miniature_golf],
area|z14-[natural=heath],
area|z14-[landuse=allotments],
area|z14-[landuse=orchard],
area|z14-[landuse=plant_nursery],
area|z14-[landuse=vineyard],
area|z14-15[landuse=meadow],
area|z14-[landuse=recreation_ground],
@@ -166,17 +167,13 @@ area|z16-[leisure=garden][garden:type=residential],
area|z17-[leisure=garden][garden:type=residential],
{fill-color: @green2;}
area|z12-13[landuse=plant_nursery],
{fill-color: @green5;}
area|z14-[landuse=plant_nursery],
{fill-color: @forest;}
area|z12-13[landuse=grass],
area|z12-13[natural=grassland],
area|z12-13[leisure=golf_course],
area|z12-13[natural=heath],
area|z12-13[landuse=allotments],
area|z12-13[landuse=orchard],
area|z12-13[landuse=plant_nursery],
area|z12-13[landuse=vineyard],
area|z12-13[landuse=meadow],
area|z12-13[landuse=recreation_ground],

View File

@@ -419,12 +419,10 @@ area|z17-[leisure],
area|z14-[leisure=park][name],
area|z14-[landuse=forest][name],
area|z17-[landuse=plant_nursery][name],
area|z16-[leisure=garden][garden:type!=residential][name]
{text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 8;text-offset: 1;font-size: 10;}
area|z16-[leisure=park][name]::int_name,
area|z16-[landuse=forest][name]::int_name,
area|z17-[landuse=plant_nursery][name]::int_name,
area|z16-[leisure=garden][garden:type!=residential][name]::int_name
{text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;text-offset: 1;font-size: 10;}
@@ -435,7 +433,6 @@ area|z16-[leisure=garden][garden:type!=residential][name]::int_name
*/
area|z14-[leisure=park][!name],
area|z14-[landuse=forest][!name],
area|z17-[landuse=plant_nursery][!name],
area|z16-[leisure=garden][garden:type!=residential][!name],
{text: none}
area|z16-[leisure=garden][garden:type=residential],
@@ -452,24 +449,19 @@ area|z15-[leisure=park][name]
{icon-image: park-outline-m.svg;font-size: 11;}
area|z16-[leisure=garden][garden:type!=residential][name]
{icon-image: garden-outline-m.svg;text-offset: 1;font-size: 11;}
area|z17-[landuse=plant_nursery][name]
{icon-image: plant_nursery-m.svg;text-offset: 1;font-size: 11;}
area|z17[landuse=forest][name],
area|z17[leisure=park][name],
area|z17[landuse=plant_nursery][name],
area|z17[leisure=garden][garden:type!=residential][name],
{font-size: 12;}
area|z18-[landuse=forest][name],
area|z18-[leisure=park][name],
area|z18-[landuse=plant_nursery][name],
area|z18-[leisure=garden][garden:type!=residential][name],
{font-size: 13;}
area|z18-[leisure=park][name]::int_name,
area|z18-[leisure=garden][garden:type!=residential][name]::int_name,
area|z18-[landuse=forest][name]::int_name,
area|z18-[landuse=plant_nursery][name]::int_name,
{font-size: 11;}
area|z18-[landuse=forest][!name]
@@ -478,8 +470,6 @@ area|z18-[leisure=park][!name]
{text: none; icon-image: park-m.svg;}
area|z18-[leisure=garden][garden:type!=residential][!name]
{text: none; icon-image: garden-m.svg;}
area|z18-[landuse=plant_nursery][!name]
{text: none; icon-image: plant_nursery-m.svg;}
area|z15-[landuse=farmland],
area|z15-[landuse=farmyard],
@@ -487,12 +477,7 @@ area|z15-[landuse=allotments],
area|z15-[landuse=recreation_ground],
area|z15-[landuse=orchard],
area|z15-[landuse=vineyard],
node|z17-[landuse=farmland],
node|z17-[landuse=farmyard],
node|z17-[landuse=allotments],
node|z17-[landuse=recreation_ground],
node|z17-[landuse=orchard],
node|z17-[landuse=vineyard],
area|z17-[landuse=plant_nursery],
{text: name;font-size: 10;text-color: @poi_label;}
/* 5.2 Beach, Glacier, Desert, etc. */

View File

@@ -171,6 +171,9 @@ area|z15-[landuse=forest][name],
area|z13-[landuse=forest][!name],
{}
area|z17-[landuse=plant_nursery],
{icon-image: plant_nursery-m.svg; text-offset: 1;}
node|z14-[natural=spring],
node|z14-[natural=hot_spring],
{icon-image: drinking-water-s.svg; font-size: 10;}