summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjandegr <jandegr@users.noreply.github.com>2017-05-09 07:34:14 +0200
committerGitHub <noreply@github.com>2017-05-09 07:34:14 +0200
commite04fc064064841728286e1cf023fe60d3f3e509e (patch)
treeced4abe16c153aca39fdcb4a5cbf246ed126ff0b
parentf7bb87aba3b185bc7b466312fe4d314cbb9246c2 (diff)
parentb261b113cdef163499661110e6a4c34289d8d8f9 (diff)
downloadnavit-e04fc064064841728286e1cf023fe60d3f3e509e.tar.gz
Merge pull request #247 from jfitie/AddFeaturesGWSR7518
Add grass, grassland, wetland and sand
-rw-r--r--navit/maptool/osm.c4
-rw-r--r--navit/navit_shipped.xml16
2 files changed, 20 insertions, 0 deletions
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index f30b06365..02278ae86 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -669,6 +669,7 @@ static char *attrmap={
"w landuse=farmland poly_farm\n"
"w landuse=farmyard poly_town\n"
"w landuse=forest poly_wood\n"
+ "w landuse=grass poly_meadow\n"
"w landuse=greenfield poly_greenfield\n"
"w landuse=industrial poly_industry\n"
"w landuse=landfill poly_landfill\n"
@@ -706,14 +707,17 @@ static char *attrmap={
"w natural=coastline water_line\n"
"w natural=fell poly_fell\n"
"w natural=glacier poly_glacier\n"
+ "w natural=grassland poly_meadow\n"
"w natural=heath poly_heath\n"
"w natural=land poly_land\n"
"w natural=marsh poly_marsh\n"
"w natural=meadow poly_meadow\n"
"w natural=mud poly_mud\n"
+ "w natural=sand poly_beach\n"
"w natural=scree poly_scree\n"
"w natural=scrub poly_scrub\n"
"w natural=water poly_water\n"
+ "w natural=wetland poly_mud\n"
"w natural=wood poly_wood\n"
"w piste:type=downhill,piste:difficulty=advanced piste_downhill_advanced\n"
"w piste:type=downhill,piste:difficulty=easy piste_downhill_easy\n"
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 292ee7611..570b6ff6d 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -485,6 +485,14 @@ Waypoint</text></img>
<polygon color="#7cc334"/>
<text text_size="5"/>
</itemgra>
+ <itemgra item_types="poly_beach" order="0-">
+ <polygon color="#fbed66"/>
+ <text text_size="5"/>
+ </itemgra>
+ <itemgra item_types="poly_mud" order="0-">
+ <polygon color="#553f23"/>
+ <text text_size="5"/>
+ </itemgra>
<itemgra item_types="poly_pedestrian" order="10">
<polyline color="#d2d2d2" width="3"/>
<polyline color="#dddddd" width="1"/>
@@ -2238,6 +2246,14 @@ Waypoint</text></img>
<polygon color="#041a06"/>
<text color="#55c4bd" background_color="#000000" text_size="5"/>
</itemgra>
+ <itemgra item_types="poly_beach" order="0-">
+ <polygon color="#081f0b"/>
+ <text color="#55c4bd" background_color="#000000" text_size="5"/>
+ </itemgra>
+ <itemgra item_types="poly_mud" order="0-">
+ <polygon color="#020803"/>
+ <text color="#55c4bd" background_color="#000000" text_size="5"/>
+ </itemgra>
<itemgra item_types="poly_pedestrian" order="10">
<polygon color="#202020"/>
</itemgra>