forked from organicmaps/organicmaps
[classifier] Added natural-desert.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
parent
71576805f8
commit
10c885bb4c
12 changed files with 61 additions and 11 deletions
|
|
@ -1219,7 +1219,7 @@ railway|subway_entrance|warszawa;[railway=subway_entrance][city=warszawa];;name;
|
|||
deprecated|deprecated;1221;x
|
||||
deprecated|deprecated;1222;x
|
||||
deprecated|deprecated;1223;x
|
||||
deprecated|deprecated;1224;x
|
||||
natural|desert;[natural=desert],[natural=sand][desert=erg];;name;int_name;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 has a wrong number of fields in line 11.
|
|
|
@ -79,6 +79,11 @@ 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
|
||||
|
||||
|
|
|
|||
|
|
@ -13766,6 +13766,33 @@
|
|||
zh-Hans = 海岸线
|
||||
zh-Hant = 海岸線
|
||||
|
||||
[type.natural.desert]
|
||||
en = Desert
|
||||
ar = ءﺍﺮﺤﺻ
|
||||
be = Пустыня
|
||||
bg = Пустинен
|
||||
cs = Poušť
|
||||
da = Ørken
|
||||
de = Wüste
|
||||
el = Ερημος
|
||||
es = Desierto
|
||||
eu = Basamortua
|
||||
fa = ﺮﯾﻮﮐ
|
||||
fi = Aavikko
|
||||
fr = Désert
|
||||
he = רבָּדמִ
|
||||
hu = Sivatag
|
||||
id = Gurun
|
||||
it = Deserto
|
||||
ja = 荒野
|
||||
ko = 사막
|
||||
nb = Ørken
|
||||
nl = Woestijn
|
||||
pl = Pustynia
|
||||
pt = Deserto
|
||||
ru = Пустыня
|
||||
uk = Пустиня
|
||||
|
||||
[type.natural.geyser]
|
||||
en = Geyser
|
||||
ar = نبع ماء حار
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
3.2 Region
|
||||
3.3 Military
|
||||
4.VEGETATION
|
||||
5.BEACH & GLACIER
|
||||
5.BEACH, GLACIER, DESERT, etc.
|
||||
6.WATER
|
||||
6.1 Area water(lake,pond etc.)
|
||||
6.2 Line water(river,canal etc.)
|
||||
|
|
@ -39,6 +39,7 @@ area[place=islet]
|
|||
|
||||
area[natural=glacier],
|
||||
area[natural=beach],
|
||||
area[natural=desert],
|
||||
area[leisure=beach_resort],
|
||||
area[aeroway=airport][aerodrome=international],
|
||||
area[aeroway=aerodrome][aerodrome=international],
|
||||
|
|
@ -263,7 +264,7 @@ line|z10-[boundary=military]
|
|||
|
||||
area|z10-[landuse=forest],
|
||||
area|z10-[leisure=park],
|
||||
area|z10-[leisure=garden],
|
||||
area|z12-[leisure=garden],
|
||||
area|z12-[landuse=grass],
|
||||
area|z12-[natural=grassland],
|
||||
area|z12-[leisure=golf_course],
|
||||
|
|
@ -349,10 +350,11 @@ area|z16-[leisure=garden]
|
|||
area|z12-[natural=bare_rock],
|
||||
{fill-color: @barerock;}
|
||||
|
||||
/* 5.BEACH & GLACIER */
|
||||
/* 5.BEACH, GLACIER, DESERT, etc. */
|
||||
|
||||
area|z0-[natural=glacier],
|
||||
area|z10-[natural=beach],
|
||||
area|z0-[natural=desert],
|
||||
area|z10-[leisure=beach_resort],
|
||||
{fill-position: background; fill-opacity: 1;}
|
||||
|
||||
|
|
@ -363,6 +365,9 @@ area|z10-[natural=beach],
|
|||
area|z10-[leisure=beach_resort],
|
||||
{fill-color: @beach;}
|
||||
|
||||
area|z0-[natural=desert],
|
||||
{fill-color: @desert;}
|
||||
|
||||
/* 6.WATER */
|
||||
|
||||
area|z0-[natural=water],
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
4.4 Districts & Small localities
|
||||
5.VEGETATION, BEACH & GLACIER
|
||||
5.1 Vegetation
|
||||
5.2 Beach & Glacier
|
||||
5.2 Beach, Glacier, Desert, etc.
|
||||
6.WATER
|
||||
6.1 Area water(lake,pond etc.)
|
||||
6.2 Line water(river,canal etc.)
|
||||
|
|
@ -524,8 +524,9 @@ node|z17-[landuse=orchard],
|
|||
node|z17-[landuse=vineyard],
|
||||
{text: name;font-size: 10;text-color: @poi_label;}
|
||||
|
||||
/* 5.2 Beach & Glacier */
|
||||
/* 5.2 Beach, Glacier, Desert, etc. */
|
||||
|
||||
area|z14-[natural=desert],
|
||||
area|z15-[leisure=beach_resort],
|
||||
area|z15-[natural=beach],
|
||||
node|z17-[leisure=beach_resort],
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
@wetland: #c9ddd6;
|
||||
@beach: #FCEC7E;
|
||||
@barerock: #EDE5DC;
|
||||
@desert: #EEE5B2;
|
||||
|
||||
/*3.2 Vegetation*/
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
@wetland: #001919;
|
||||
@beach: #28281A;
|
||||
@barerock: #302A2A;
|
||||
@desert: #12114E;
|
||||
|
||||
/*3.2 Vegetation*/
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
3.1 Countries
|
||||
3.2 Region
|
||||
4.VEGETATION
|
||||
5.BEACH & GLACIER
|
||||
5.BEACH, GLACIER, DESERT, etc.
|
||||
6.WATER
|
||||
6.1 Area water(lake,pond etc.)
|
||||
6.2 Line water(river,canal etc.)
|
||||
|
|
@ -37,6 +37,7 @@ area[place=islet]
|
|||
|
||||
area[natural=glacier],
|
||||
area[natural=beach],
|
||||
area[natural=desert],
|
||||
area[leisure=beach_resort],
|
||||
area[amenity=university],
|
||||
area[aeroway=airport][aerodrome=international],
|
||||
|
|
@ -232,7 +233,7 @@ line|z10-[boundary=administrative][admin_level=4]
|
|||
|
||||
area|z10-[landuse=forest],
|
||||
area|z10-[leisure=park],
|
||||
area|z10-[leisure=garden],
|
||||
area|z12-[leisure=garden],
|
||||
area|z14-[landuse=grass],
|
||||
area|z14-[natural=grassland],
|
||||
area|z14-[leisure=golf_course],
|
||||
|
|
@ -302,10 +303,11 @@ area|z16-[leisure=garden]
|
|||
area|z12-[natural=bare_rock],
|
||||
{fill-color: @barerock;}
|
||||
|
||||
/* 5.BEACH & GLACIER */
|
||||
/* 5.BEACH, GLACIER, DESERT, etc. */
|
||||
|
||||
area|z0-[natural=glacier],
|
||||
area|z10-[natural=beach],
|
||||
area|z0-[natural=desert],
|
||||
area|z10-[leisure=beach_resort],
|
||||
{fill-position: background; fill-opacity: 1;}
|
||||
|
||||
|
|
@ -316,6 +318,9 @@ area|z10-[natural=beach],
|
|||
area|z10-[leisure=beach_resort],
|
||||
{fill-color: @beach;fill-opacity: 0.35;}
|
||||
|
||||
area|z0-[natural=desert],
|
||||
{fill-color: @desert;}
|
||||
|
||||
/* 6.WATER */
|
||||
|
||||
area|z0-[natural=water],
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
4.4 Districts & Small localities
|
||||
5.VEGETATION, BEACH & GLACIER
|
||||
5.1 Vegetation
|
||||
5.2 Beach & Glacier
|
||||
5.2 Beach, Glacier, Desert, etc.
|
||||
6.WATER
|
||||
6.1 Area water(lake,pond etc.)
|
||||
6.2 Line water(river,canal etc.)
|
||||
|
|
@ -465,8 +465,9 @@ area|z18-[leisure=forest]::int_name
|
|||
|
||||
|
||||
|
||||
/* 5.2 Beach & Glacier */
|
||||
/* 5.2 Beach, Glacier, Desert, etc. */
|
||||
|
||||
area|z14-[natural=desert],
|
||||
area|z15-[leisure=beach_resort],
|
||||
area|z15-[natural=beach],
|
||||
node|z17-[leisure=beach_resort],
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@
|
|||
@natpark: #C8DBAD;
|
||||
@beach: #FCEC7E;
|
||||
@barerock: #EDE5DC;
|
||||
@desert: #EEE5B2;
|
||||
|
||||
/*forest-park*/
|
||||
@green0: #C6D9AB;
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
@wetland: #001919;
|
||||
@beach: #28281A;
|
||||
@barerock: #302A2A;
|
||||
@desert: #12114E;
|
||||
|
||||
/*3.2 Vegetation*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1934,6 +1934,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
|
|||
{"natural", "cave_entrance"},
|
||||
{"natural", "cliff"},
|
||||
{"natural", "coastline"},
|
||||
{"natural", "desert"},
|
||||
{"natural", "earth_bank"},
|
||||
{"natural", "geyser"},
|
||||
{"natural", "glacier"},
|
||||
|
|
@ -2355,6 +2356,7 @@ 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"}}},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue