From 66acff73acb3208bb4d9b80343b6c3614a79fecf Mon Sep 17 00:00:00 2001 From: map-per Date: Fri, 3 Jan 2025 18:15:21 +0100 Subject: [PATCH] Replace desert with sand Signed-off-by: map-per --- data/mapcss-mapping.csv | 2 +- data/replaced_tags.txt | 5 -- data/strings/types_strings.txt | 74 +++++++++++-------- data/styles/default/dark/colors.mapcss | 2 +- data/styles/default/include/Basemap.mapcss | 10 +-- .../default/include/Basemap_label.mapcss | 6 +- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../include/priorities_4_overlays.prio.txt | 2 +- data/styles/default/light/colors.mapcss | 2 +- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../include/priorities_4_overlays.prio.txt | 2 +- data/styles/vehicle/dark/colors.mapcss | 2 +- data/styles/vehicle/include/Basemap.mapcss | 10 +-- .../vehicle/include/Basemap_label.mapcss | 6 +- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../include/priorities_4_overlays.prio.txt | 2 +- data/styles/vehicle/light/colors.mapcss | 2 +- generator/generator_tests/osm_type_test.cpp | 3 +- 18 files changed, 71 insertions(+), 65 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index da9e25558b..a697a35e2b 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1336,7 +1336,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|sand;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 3181b79797..8bd18b2e24 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -92,11 +92,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/strings/types_strings.txt b/data/strings/types_strings.txt index e979959e07..5e8175c74a 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -19805,37 +19805,49 @@ zh-Hans = 海岸线 zh-Hant = 海岸線 - [type.natural.desert] - en = Desert - af = Woestyn - ar = صحراء - be = Пустыня - bg = Пустинен - cs = Poušť - da = Ørken - de = Wüste - el = Ερημος - es = Desierto - et = Kõrb - eu = Basamortua - fa = ﺮﯾﻮﮐ - fi = Aavikko - fr = Désert - he = מדבר - hi = मरुस्थल - hu = Sivatag - id = Gurun - it = Deserto - ja = 荒野 - ko = 사막 - nb = Ørken - nl = Woestijn - pl = Pustynia - pt = Deserto - ru = Пустыня - sk = Púšť - sr = Пустиња - uk = Пустиня + [type.natural.sand] + en = Sand + af = Sand + ar = الرمال + az = Qum + be = Пясок + bg = Пясък + ca = Sorra + cs = Písek + da = Sand + de = Sand + el = Άμμος + es = Arena + et = Liiv + eu = Harea + fa = شن و ماسه + fi = Hiekka + fr = Sable + he = חוֹל + hi = रेत + hu = Homok + id = Pasir + it = Sabbia + ja = 砂 + ko = 모래 + lt = Smėlis + lv = Smiltis + mr = वाळू + nb = Sand + nl = Zand + pl = Piasek + pt = Areia + ro = Nisip + ru = Песок + sk = Piesok + sv = Sand + sw = Mchanga + th = ทราย + tr = Kum + uk = Пісок + vi = Cát + zh-Hans = 沙子 + zh-Hant = 沙 [type.natural.geyser] en = Geyser diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 7c367088f6..eaf01066a1 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -46,7 +46,7 @@ @beach: #28281A; @barerock: #302A2A; @scree: #242020; -@desert: #191007; +@sand: #191007; /*3.2 Vegetation*/ diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index b5b20ce5dc..2a75d4dcae 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -7,7 +7,7 @@ 3.2 Region 3.3 Military 4.VEGETATION -5.BEACH, GLACIER, DESERT, etc. +5.BEACH, GLACIER, SAND, etc. 6.WATER 6.1 Area water(lake,pond etc.) 6.2 Line water(river,canal etc.) @@ -205,11 +205,11 @@ area|z12-[natural=shingle], area|z12-[natural=bare_rock], {fill-color: @barerock;} -/* 5.BEACH, GLACIER, DESERT, etc. */ +/* 5.BEACH, GLACIER, SAND, etc. */ area|z0-[natural=glacier], area|z10-[natural=beach], -area|z0-[natural=desert], +area|z0-[natural=sand], area|z10-[leisure=beach_resort], {fill-opacity: 1;} @@ -220,8 +220,8 @@ area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;} -area|z0-[natural=desert], -{fill-color: @desert;} +area|z0-[natural=sand], +{fill-color: @sand;} /* 6.WATER */ diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index 6dfe31f0c2..bed665e3e8 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -10,7 +10,7 @@ 4.4 Districts & Small localities 5.VEGETATION, BEACH & GLACIER 5.1 Vegetation - 5.2 Beach, Glacier, Desert, etc. + 5.2 Beach, Glacier, Sand, etc. 6.WATER 6.1 Area water(lake,pond etc.) 6.2 Line water(river,canal etc.) @@ -467,9 +467,9 @@ node|z17-[landuse=orchard], node|z17-[landuse=vineyard], {text: name;font-size: 10;text-color: @poi_label;} -/* 5.2 Beach, Glacier, Desert, etc. */ +/* 5.2 Beach, Glacier, Sand, etc. */ -area|z14-[natural=desert], +area|z14-[natural=sand], area|z15-[natural=beach], 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 13b4ba4c8b..3246cdb5a9 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 @@ -154,8 +154,8 @@ leisure-beach_resort # area z10- (also has icon z natural-beach # area z10- (also has caption z15-) natural-beach-gravel # area z10- (also has caption z15-) 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 z14-) === 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 d9cb980cdc..60acd67c29 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -561,7 +561,7 @@ natural-beach # caption z15- (also has are natural-beach-gravel # caption z15- (also has area z10-) natural-beach-sand # caption z15- (also has area z10-) natural-cape # caption z14- -natural-desert # caption z14- (also has area z1-) +natural-sand # caption z14- (also has area z1-) === 3250 shop-supermarket # icon z16- (also has caption(optional) z16-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index a453550ec3..247220ccd9 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -46,7 +46,7 @@ @beach: #FCEC7E; @barerock: #D9D2BF; @scree: #CCC7BA; -@desert: #EEE5B2; +@sand: #EEE5B2; /*3.2 Vegetation*/ 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 02c8a21411..8294444fe4 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 @@ -154,8 +154,8 @@ leisure-beach_resort # area z10- (also has icon z natural-beach # area z10- (also has caption z14-) natural-beach-gravel # area z10- (also has caption z14-) 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 z14-) === 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 63a973fdb9..c6b731d4f5 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -561,7 +561,7 @@ natural-beach # caption z14- (also has are natural-beach-gravel # caption z14- (also has area z10-) natural-beach-sand # caption z14- (also has area z10-) natural-cape # caption z14- -natural-desert # caption z14- (also has area z1-) +natural-sand # caption z14- (also has area z1-) === 3250 shop-supermarket # icon z16- (also has caption(optional) z16-) diff --git a/data/styles/vehicle/dark/colors.mapcss b/data/styles/vehicle/dark/colors.mapcss index 9deaa0d151..82fa286534 100644 --- a/data/styles/vehicle/dark/colors.mapcss +++ b/data/styles/vehicle/dark/colors.mapcss @@ -44,7 +44,7 @@ @wetland: #001919; @beach: #28281A; @barerock: #302A2A; -@desert: #191007; +@sand: #191007; /*3.2 Vegetation*/ diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index e6319ef284..10792b14e1 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -6,7 +6,7 @@ 3.1 Countries 3.2 Region 4.VEGETATION -5.BEACH, GLACIER, DESERT, etc. +5.BEACH, GLACIER, SAND, etc. 6.WATER 6.1 Area water(lake,pond etc.) 6.2 Line water(river,canal etc.) @@ -179,11 +179,11 @@ area|z12-[amenity=prison] {fill-opacity: 0.5; fill-color: @prison;} /* End of hardcoded */ -/* 5.BEACH, GLACIER, DESERT, etc. */ +/* 5.BEACH, GLACIER, SAND, etc. */ area|z0-[natural=glacier], area|z10-[natural=beach], -area|z0-[natural=desert], +area|z0-[natural=sand], area|z10-[leisure=beach_resort], {fill-opacity: 1;} @@ -194,8 +194,8 @@ area|z10-[natural=beach], area|z10-[leisure=beach_resort], {fill-color: @beach;fill-opacity: 0.35;} -area|z0-[natural=desert], -{fill-color: @desert;} +area|z0-[natural=sand], +{fill-color: @sand;} /* 6.WATER */ diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index ebaa6df1e3..517501b8c8 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -10,7 +10,7 @@ 4.4 Districts & Small localities 5.VEGETATION, BEACH & GLACIER 5.1 Vegetation - 5.2 Beach, Glacier, Desert, etc. + 5.2 Beach, Glacier, Sand, etc. 6.WATER 6.1 Area water(lake,pond etc.) 6.2 Line water(river,canal etc.) @@ -365,9 +365,9 @@ area|z18-[leisure=park][!name] {text: none; icon-image: park-m.svg;} -/* 5.2 Beach, Glacier, Desert, etc. */ +/* 5.2 Beach, Glacier, Sand, etc. */ -area|z14-[natural=desert], +area|z14-[natural=sand], area|z15-[leisure=beach_resort], area|z15-[natural=beach], node|z17-[leisure=beach_resort], 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 236f695f39..6a7453fff4 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 @@ -102,8 +102,8 @@ leisure-beach_resort # area z10- (also has captio natural-beach # area z10- (also has caption z15-) natural-beach-gravel # area z10- (also has caption z15-) 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 z14-) === 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 bb6b63850a..2c59b52722 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -459,7 +459,7 @@ natural-water-pond # caption z10- (also has are shop-mall # icon z14- (also has caption(optional) z14-) === 1500 -natural-desert # caption z14- (also has area z1-) +natural-sand # caption z14- (also has area z1-) === 1450 natural-bay # caption z14- diff --git a/data/styles/vehicle/light/colors.mapcss b/data/styles/vehicle/light/colors.mapcss index 24beb0fc84..a3be7f2a0c 100644 --- a/data/styles/vehicle/light/colors.mapcss +++ b/data/styles/vehicle/light/colors.mapcss @@ -84,7 +84,7 @@ @natpark: #C8DBAD; @beach: #FCEC7E; @barerock: #D9D2BF; -@desert: #EEE5B2; +@sand: #EEE5B2; /*forest-park*/ @green0: #C6D9AB; diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 1316eba69c..b61c55f4c0 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2517,7 +2517,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"natural", "cave_entrance"}, {"natural", "cliff"}, {"natural", "coastline"}, - {"natural", "desert"}, + {"natural", "sand"}, {"natural", "earth_bank"}, {"natural", "geyser"}, {"natural", "glacier"}, @@ -2914,7 +2914,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"leisure", "sports_centre"}, {{"leisure", "sports_centre"}}}, {{"leisure", "track", "area"}, {{"leisure", "track"}, {"area", "any_value"}}}, {{"mountain_pass"}, {{"mountain_pass", "any_value"}}}, - {{"natural", "desert"}, {{"natural", "sand"}, {"desert", "erg"}}}, {{"natural", "water", "pond"}, {{"natural", "water"}, {"water", "pond"}}}, {{"natural", "water", "lake"}, {{"natural", "water"}, {"water", "lake"}}}, {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}},