diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 50535a7e3..7fb4438d2 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -96,6 +96,7 @@ highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int place|hamlet;30; moved:highway|road:05.2024;31;highway|road deprecated:highway|track|grade2:04.2024;[highway=track][tracktype=grade2];x;name;int_name;32;highway|track +# ~1.5M usages w/o a more specific wetland=* natural|wetland;33; deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track # ~1M usages. @@ -304,7 +305,8 @@ amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;in leisure|golf_course;202; highway|service|bridge;[highway=service][bridge?];;name;int_name;203; deprecated:power|minor_line:01.2017;204;x -natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=marsh];;name;int_name;205; +# Marsh 500K usages, wet_meadow 160K +natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205; leisure|stadium;206; amenity|doctors;207; railway|disused;208; @@ -424,7 +426,8 @@ highway|path|horse;[highway=path][horse?];;name;int_name;317; deprecated:landuse|field:06.2025;318;x hwtag|nocycleway;319; leisure|water_park;320; -natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321; +# 1M usages +natural|wetland|bog;[natural=wetland][wetland=bog],[natural=wetland][wetland=string_bog];;;;321; man_made|windmill;322; military|bunker;323; aerialway|chair_lift;324; @@ -774,13 +777,13 @@ deprecated|deprecated;654;x deprecated|deprecated;655;x deprecated|deprecated;656;x deprecated:boundary|administrative|municipality:04.2024;[boundary=administrative][border_type=municipality];x;name;int_name;657; -deprecated|deprecated;658;x -deprecated|deprecated;659;x -deprecated|deprecated;660;x -deprecated|deprecated;661;x -deprecated|deprecated;662;x -deprecated|deprecated;663;x -deprecated|deprecated;664;x +natural|wetland|saltmarsh;[natural=wetland][wetland=saltmarsh];;;;658; +natural|wetland|saltmarsh|tidal;[natural=wetland][wetland=saltmarsh][tidal=yes];;;;659; +natural|wetland|fen;[natural=wetland][wetland=fen];;;;660; +natural|wetland|reedbed;[natural=wetland][wetland=reedbed];;;;661; +natural|wetland|swamp;[natural=wetland][wetland=swamp];;;;662; +natural|wetland|mangrove;[natural=wetland][wetland=mangrove];;;;663; +natural|wetland|tidalflat;[natural=wetland][wetland=tidalflat];;;;664; deprecated|railway|yard|bridge:06.2023;665;x deprecated|deprecated;666;x deprecated|deprecated;667;x 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 f4e991a9d..81d05016a 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 @@ -119,6 +119,13 @@ amenity-parking-street_side-private # area z17- (also has icon z natural-wetland # area z11- (also has caption z16-) natural-wetland-bog # area z11- (also has caption z16-) natural-wetland-marsh # area z11- (also has caption z16-) +natural-wetland-saltmarsh +natural-wetland-saltmarsh-tidal +natural-wetland-fen +natural-wetland-reedbed +natural-wetland-swamp +natural-wetland-mangrove +natural-wetland-tidalflat === 90 landuse-farmyard # area z10- (also has caption z15-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 61b224d16..98774755c 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -895,6 +895,13 @@ leisure-miniature_golf # icon z17- (also has captio natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) +natural-wetland-saltmarsh +natural-wetland-saltmarsh-tidal +natural-wetland-fen +natural-wetland-reedbed +natural-wetland-swamp +natural-wetland-mangrove +natural-wetland-tidalflat tourism-picnic_site # icon z16- (also has caption(optional) z16-) === 1800 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 cca075827..7b3e8d4ff 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 @@ -119,6 +119,13 @@ amenity-parking-street_side-private # area z17- (also has icon z natural-wetland # area z11- (also has caption z16-) natural-wetland-bog # area z11- (also has caption z16-) natural-wetland-marsh # area z11- (also has caption z16-) +natural-wetland-saltmarsh +natural-wetland-saltmarsh-tidal +natural-wetland-fen +natural-wetland-reedbed +natural-wetland-swamp +natural-wetland-mangrove +natural-wetland-tidalflat === 90 landuse-farmyard # area z10- (also has caption z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index e0773d3d9..da2b8a278 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -895,6 +895,13 @@ leisure-miniature_golf # icon z17- (also has captio natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) +natural-wetland-saltmarsh +natural-wetland-saltmarsh-tidal +natural-wetland-fen +natural-wetland-reedbed +natural-wetland-swamp +natural-wetland-mangrove +natural-wetland-tidalflat tourism-picnic_site # icon z14- (also has caption(optional) z14-) === 1800 diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 4b1bcb1dc..dbee7766e 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -51,6 +51,13 @@ leisure-miniature_golf # area z12- natural-wetland # area z11- (also has caption z16-) natural-wetland-bog # area z11- (also has caption z16-) natural-wetland-marsh # area z11- (also has caption z16-) +natural-wetland-saltmarsh +natural-wetland-saltmarsh-tidal +natural-wetland-fen +natural-wetland-reedbed +natural-wetland-swamp +natural-wetland-mangrove +natural-wetland-tidalflat === 90 landuse-grass # area z12- diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 9cae97d60..d5cbc63d0 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -694,6 +694,13 @@ emergency-emergency_ward_entrance # icon z18- (also has captio natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) +natural-wetland-saltmarsh +natural-wetland-saltmarsh-tidal +natural-wetland-fen +natural-wetland-reedbed +natural-wetland-swamp +natural-wetland-mangrove +natural-wetland-tidalflat === 450 railway-tram_stop # icon z17- (also has caption(optional) z17-)