From eb15739389d740aa569859f5b91d4a0c33c85b31 Mon Sep 17 00:00:00 2001 From: map-per Date: Sat, 8 Nov 2025 12:26:33 +0100 Subject: [PATCH] [styles] Add natural=sand Signed-off-by: map-per --- android/sdk/src/main/res/values/types_strings.xml | 1 + data/mapcss-mapping.csv | 4 ++-- data/replaced_tags.txt | 5 ----- data/styles/default/include/Basemap.mapcss | 2 ++ data/styles/default/include/Basemap_label.mapcss | 1 + data/styles/default/include/priorities_1_BG-by-size.prio.txt | 1 + data/styles/default/include/priorities_4_overlays.prio.txt | 1 + .../styles/outdoors/include/priorities_1_BG-by-size.prio.txt | 1 + data/styles/outdoors/include/priorities_4_overlays.prio.txt | 1 + data/styles/vehicle/include/Basemap.mapcss | 2 ++ data/styles/vehicle/include/Basemap_label.mapcss | 1 + data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt | 1 + data/styles/vehicle/include/priorities_4_overlays.prio.txt | 1 + .../Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 1 + 14 files changed, 16 insertions(+), 7 deletions(-) diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 8e98ddf2d..b034ee350 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -776,6 +776,7 @@ Embankment Coastline Desert + Sand Geyser Glacier Grassland diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 6f2f30e1a..87d969254 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -113,7 +113,7 @@ highway|service|driveway;[highway=service][service=driveway];;name;int_name;42; addr:interpolation|even;43; highway|motorway_link;44; waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45; -deprecated:highway|track|grade4:04.2024;[highway=track][tracktype=grade4];x;name;int_name;46;highway|track +natural|sand;46; natural|water|pond;[natural=water][water=pond];;name;int_name;47; landuse|farmland;48; barrier|fence;49; @@ -1348,7 +1348,7 @@ railway|subway_entrance|warszawa;[railway=subway_entrance][city=warszawa];;name; shop|bed;1221; shop|outpost;1222; shop|gas;1223; -natural|desert;[natural=desert],[natural=sand][desert=erg];;name;int_name;1224; +natural|desert;1224; natural|water|tunnel;[natural=water][tunnel?];;name;int_name;1225; place|square;1226; tourism|artwork|architecture;[tourism=artwork][artwork_type=architecture],[tourism=artwork][type=architecture];;name;int_name;1227; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index a34d37455..c68923195 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -91,11 +91,6 @@ natural=forest : natural=wood natural=shrubbery : natural=scrub cliff=yes : natural=cliff -desert=sand : desert=erg -desert=yes : desert=erg -desert=semi_arid : desert=erg -desert=dune : desert=erg - office=notary : office=lawyer office=administrative : office=government diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 40538888a..9da7df33f 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -254,6 +254,7 @@ area|z11-[natural=bare_rock], /* 5.BEACH, GLACIER, DESERT, etc. */ area|z0-[natural=glacier], +area|z0-[natural=sand], area|z10-[natural=beach], area|z0-[natural=desert], area|z10-[leisure=beach_resort], @@ -262,6 +263,7 @@ area|z10-[leisure=beach_resort], area|z0-[natural=glacier] {fill-color: @glacier;} +area|z0-[natural=sand], area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;} diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index 5ebc25f4c..c69da61f9 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -468,6 +468,7 @@ area|z17-[landuse=plant_nursery], /* 5.2 Beach, Glacier, Desert, etc. */ area|z14-[natural=desert], +area|z15-[natural=sand], node|z15-[natural=beach], {text: name;font-size: 10;text-color: @poi_label;} 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 5fb9b7151..611e3813c 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 @@ -242,6 +242,7 @@ natural-beach-gravel # area z10- (also has captio natural-beach-sand # area z10- (also has caption z15-) natural-desert # area z1- (also has caption z14-) natural-glacier # area z1- +natural-sand # area z1- (also has caption z15-) === 30 natural-land # area z1- diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index d7835ef6d..aef1d5843 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -574,6 +574,7 @@ natural-beach-gravel # caption z15- (also has are natural-beach-sand # caption z15- (also has area z10-) natural-cape # caption z14- natural-desert # caption z14- (also has area z1-) +natural-sand # caption z15- (also has area z1-) === 3250 shop-supermarket # icon z16- (also has caption(optional) z16-) 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 491a6a56f..9bbf1a277 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 @@ -242,6 +242,7 @@ natural-beach-gravel # area z10- (also has captio natural-beach-sand # area z10- (also has caption z14-) natural-desert # area z1- (also has caption z14-) natural-glacier # area z1- +natural-sand # area z1- (also has caption z15-) === 30 natural-land # area z1- diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index fdb704653..632bb3a3e 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -574,6 +574,7 @@ natural-beach-gravel # caption z14- (also has are natural-beach-sand # caption z14- (also has area z10-) natural-cape # caption z14- natural-desert # caption z14- (also has area z1-) +natural-sand # caption z15- (also has area z1-) === 3250 shop-supermarket # icon z16- (also has caption(optional) z16-) diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 82aac515b..e8420936c 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -178,6 +178,7 @@ area|z12-[amenity=prison] /* 5.BEACH, GLACIER, DESERT, etc. */ area|z0-[natural=glacier], +area|z0-[natural=sand], area|z10-[natural=beach], area|z0-[natural=desert], area|z10-[leisure=beach_resort], @@ -186,6 +187,7 @@ area|z10-[leisure=beach_resort], area|z0-[natural=glacier] {fill-color: @glacier;} +area|z0-[natural=sand], area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;fill-opacity: 0.35;} diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 70b6c969a..6ab33a11d 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -363,6 +363,7 @@ area|z18-[leisure=park][!name] area|z14-[natural=desert], area|z15-[leisure=beach_resort], +area|z15-[natural=sand], area|z15-[natural=beach], node|z17-[leisure=beach_resort], node|z17-[natural=beach] 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 d13ca4644..725d467a9 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 @@ -133,6 +133,7 @@ natural-beach-gravel # area z10- (also has captio natural-beach-sand # area z10- (also has caption z15-) natural-desert # area z1- (also has caption z14-) natural-glacier # area z1- +natural-sand # area z1- (also has caption z15-) === 30 natural-land # area z1- diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index f93063b30..3ebe94a48 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -473,6 +473,7 @@ shop-mall # icon z14- (also has captio === 1500 natural-desert # caption z14- (also has area z1-) +natural-sand # caption z15- (also has area z1-) === 1450 natural-bay # caption z14- diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 8f7464d80..e2b27fd49 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -862,6 +862,7 @@ "type.man_made.embankment" = "Embankment"; "type.natural.coastline" = "Coastline"; "type.natural.desert" = "Desert"; +"type.natural.sand" = "Sand"; "type.natural.geyser" = "Geyser"; "type.natural.glacier" = "Glacier"; "type.natural.grassland" = "Grassland";