drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[styles] Add natural=sand (#2451)

Browse Source 
Signed-off-by: map-per <map-per@gmx.de>

Reviewed-on: https://codeberg.org/comaps/comaps/pulls/2451
Reviewed-by: Yannik Bloscheck <yannikbloscheck@noreply.codeberg.org>
Reviewed-by: Konstantin Pastbin <pastk@noreply.codeberg.org>
Co-authored-by: map-per <map-per@gmx.de>
Co-committed-by: map-per <map-per@gmx.de>
This commit is contained in:
map-per
2025-11-16 19:19:58 +01:00
committed by map-per
parent 5683606c31
commit 680d97bc4f
14 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/sdk/src/main/res/values/types_strings.xml
View File

@@ -819,6 +819,7 @@
<string name="type.man_made.embankment">Embankment</string>
<string name="type.natural.coastline">Coastline</string>
<string name="type.natural.desert">Desert</string>
<string name="type.natural.sand">Sand</string>
<string name="type.natural.geyser">Geyser</string>
<string name="type.natural.glacier">Glacier</string>
<string name="type.natural.grassland">Grassland</string>

4
data/mapcss-mapping.csv
View File

@@ -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;
Can't render this file because it contains an unexpected character in line 7 and column 16.

5
data/replaced_tags.txt
View File

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

3
data/styles/default/include/Basemap.mapcss
View File

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

1
data/styles/default/include/Basemap_label.mapcss
View File

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

1
data/styles/default/include/priorities_1_BG-by-size.prio.txt
View File

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

1
data/styles/default/include/priorities_4_overlays.prio.txt
View File

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

1
data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
View File

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

1
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View File

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

3
data/styles/vehicle/include/Basemap.mapcss
View File

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

1
data/styles/vehicle/include/Basemap_label.mapcss
View File

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

1
data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
View File

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

1
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View File

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

1
iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
View File

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