diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index e67e0ae91..a2c9dfd05 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -819,6 +819,7 @@ Embankment Coastline Desert + Sand Geyser Glacier Grassland diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 0477e12e4..3c8c29693 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 e9f70d6e9..e9ec1379f 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -93,11 +93,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..ed0b76d17 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|z10-[natural=sand], area|z10-[natural=beach], area|z0-[natural=desert], area|z10-[leisure=beach_resort], @@ -262,11 +263,13 @@ area|z10-[leisure=beach_resort], area|z0-[natural=glacier] {fill-color: @glacier;} +area|z10-[natural=sand], area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;} area|z0-[natural=desert], +area|z0-9[natural=sand], {fill-color: @desert;} /* 6.WATER */ diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index 051512eab..9745081a0 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 e31bb2d3c..27271eaba 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 e5752f4b1..931bae702 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..17c22f369 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,11 +187,13 @@ area|z10-[leisure=beach_resort], area|z0-[natural=glacier] {fill-color: @glacier;} +area|z10-[natural=sand], area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;fill-opacity: 0.35;} area|z0-[natural=desert], +area|z0-9[natural=sand], {fill-color: @desert;} /* 6.WATER */ 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 00167234a..071efc7cc 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 238daa682..d237179fe 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -905,6 +905,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";