diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 35b77b7cb..6727e4c4b 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -810,7 +810,7 @@ deprecated|deprecated;690;x deprecated:boundary|administrative|country:04.2024;[boundary=administrative][border_type=country];x;name;int_name;691; man_made|cross;692; natural|orchard;693;landuse|orchard -deprecated|deprecated;694;x +landuse|plant_nursery;694; deprecated|deprecated;695;x deprecated|deprecated;696;x deprecated|deprecated;697;x diff --git a/data/styles/default/dark/symbols/plant_nursery-m.svg b/data/styles/default/dark/symbols/plant_nursery-m.svg new file mode 100644 index 000000000..8dddc48f5 --- /dev/null +++ b/data/styles/default/dark/symbols/plant_nursery-m.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index b5b20ce5d..312aae720 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -92,6 +92,7 @@ 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], @@ -165,6 +166,11 @@ 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], diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index b284c5009..341058042 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -419,10 +419,12 @@ 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;} @@ -433,6 +435,7 @@ 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], @@ -449,19 +452,24 @@ 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] @@ -470,7 +478,8 @@ 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], diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 13b4ba4c8..f99140827 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -118,6 +118,7 @@ natural-scree # area z11- natural-shingle # area z12- === 80 +landuse-plant_nursery # area z12- (also has icon z16-, caption(optional) z16-) leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) leisure-garden-residential # area z12- leisure-park # area z10- (also has icon z14-, caption(optional) z14-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 2f7063ee5..7b7a9aad3 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -816,6 +816,7 @@ highway-living_street-bridge # pathtext z14- (also has li highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) +landuse-plant_nursery leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 2450 diff --git a/data/styles/default/light/symbols/plant_nursery-m.svg b/data/styles/default/light/symbols/plant_nursery-m.svg new file mode 100644 index 000000000..22c385c23 --- /dev/null +++ b/data/styles/default/light/symbols/plant_nursery-m.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 02c8a2141..e7f9acd34 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -118,6 +118,7 @@ natural-scree # area z11- natural-shingle # area z12- === 80 +landuse-plant_nursery # area z12- (also has icon z16-, caption(optional) z16-) leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) leisure-garden-residential # area z12- leisure-park # area z10- (also has icon z14-, caption(optional) z14-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index a0743b8cc..424df10a8 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -816,6 +816,7 @@ highway-living_street-bridge # pathtext z14- (also has li highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) +landuse-plant_nursery leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 2450