pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Replace desert with sand

Browse source 
Signed-off-by: map-per <map-per@gmx.de>
This commit is contained in:
map-per 2025-01-03 18:15:21 +01:00
parent 4a1897caca
commit 66acff73ac
18 changed files with 71 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/mapcss-mapping.csv
View file

@ -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;

Can't render this file because it contains an unexpected character in line 7 and column 16.

5
data/replaced_tags.txt
View file

@ -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

74
data/strings/types_strings.txt
View file

@ -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

2
data/styles/default/dark/colors.mapcss
View file

@ -46,7 +46,7 @@
@beach: #28281A;
@barerock: #302A2A;
@scree: #242020;
@desert: #191007;
@sand: #191007;
/*3.2 Vegetation*/

10
data/styles/default/include/Basemap.mapcss
View file

@ -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 */

6
data/styles/default/include/Basemap_label.mapcss
View file

@ -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;}

2
data/styles/default/include/priorities_1_BG-by-size.prio.txt
View file

@ -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-

2
data/styles/default/include/priorities_4_overlays.prio.txt
View file

@ -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-)

2
data/styles/default/light/colors.mapcss
View file

@ -46,7 +46,7 @@
@beach: #FCEC7E;
@barerock: #D9D2BF;
@scree: #CCC7BA;
@desert: #EEE5B2;
@sand: #EEE5B2;
/*3.2 Vegetation*/

2
data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
View file

@ -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-

2
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -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-)

2
data/styles/vehicle/dark/colors.mapcss
View file

@ -44,7 +44,7 @@
@wetland: #001919;
@beach: #28281A;
@barerock: #302A2A;
@desert: #191007;
@sand: #191007;
/*3.2 Vegetation*/

10
data/styles/vehicle/include/Basemap.mapcss
View file

@ -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 */

6
data/styles/vehicle/include/Basemap_label.mapcss
View file

@ -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],

2
data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
View file

@ -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-

2
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View file

@ -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-

2
data/styles/vehicle/light/colors.mapcss
View file

@ -84,7 +84,7 @@
@natpark: #C8DBAD;
@beach: #FCEC7E;
@barerock: #D9D2BF;
@desert: #EEE5B2;
@sand: #EEE5B2;
/*forest-park*/
@green0: #C6D9AB;

3
generator/generator_tests/osm_type_test.cpp
View file

@ -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"}}},